diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts index 346278d..7e6057a 100644 --- a/src/api/DesignForm/tableButton.ts +++ b/src/api/DesignForm/tableButton.ts @@ -382,6 +382,12 @@ export interface viewPageType { } } , + group: { + status: boolean, + isClick: boolean, + form: { + }, + }, time:{ status:boolean, isClick:boolean, diff --git a/src/components/DesignForm/app/groupPage.vue b/src/components/DesignForm/app/groupPage.vue new file mode 100644 index 0000000..230af6d --- /dev/null +++ b/src/components/DesignForm/app/groupPage.vue @@ -0,0 +1,286 @@ + + + + diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index c9af1b1..fc2ea9b 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -56,6 +56,7 @@ import NewTableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/newTableFlow. import TimeAxisPage from "@/components/DesignForm/app/timeAxis.vue"; import CardPage from "@/components/DesignForm/app/cardPage.vue"; import GanttPageIng from "@/components/DesignForm/app/gannttPage.vue"; +import GroupPage from "@/components/DesignForm/app/groupPage.vue"; import MapPage from "@/components/DesignForm/app/mapPage.vue"; import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue"; import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue"; @@ -1123,7 +1124,8 @@ watch( ); watch( () => props.formId, - (_val: any) => { + (val: any) => { + tabsView(props.viewPage.list, 1) getPageData(); }, { @@ -1131,9 +1133,10 @@ watch( } ); -const timeAxisRef = ref(); -const calendarPageRef = ref(); -const cardPageRef = ref(); +const timeAxisRef = ref(null); +const groupPageRef = ref(null); +const calendarPageRef = ref(null); +const cardPageRef = ref(null); const searchSend = reactive({ formId: props.formId, page: state.currentPage, @@ -1150,13 +1153,20 @@ let asfQueryParams: any[] = []; @ 功能: 获取数据 */ const getPageData = () => { + + // by han2015: 处理排序字段信息 + let arr:string[]=[]; + columnSortData.forEach((value, key) => { + arr.push(`${key} ${value}`) + }); + let sendData = { formId: props.formId, page: state.currentPage, pagesize: state.pageSize, searchData: json2string(props.searchData), + sortData: arr.join(", "), }; - // console.log("获取列表详细信息",sendData) switch (viewType.value) { case 2: @@ -1177,6 +1187,12 @@ const getPageData = () => { break; case 5: break; + case 8: //group 分组页面 + nextTick(() => { + console.log("获取列表详细信息-------222---------->??????",); + groupPageRef.value.groupColumnSearch(sendData, 1); + }); + break; case 6: nextTick(() => { cardPageRef.value.getCardList(sendData); @@ -1184,6 +1200,7 @@ const getPageData = () => { break; default: state.loading = true; + //by han2015, 抽成独立部分,方便其他功能调用 doGainFormPageListCont(sendData) .then((datas) => { @@ -1781,6 +1798,32 @@ const lookPageInfoIsShow = ref(false); const asflookPageInfoIsShow = ref(false); const pageInfoCont = ref(); +//------------------ by han2015: 支持表单排序功能---------------------- +const columnSortData = new Map(); +const setHeaderClass=(params:any)=>{ + if(columnSortData.has(params.column.property)){ + if(columnSortData.get(params.column.property)=="DESC"){ + params.column.order="descending" + return + }else{ + params.column.order="ascending" + return + } + } +} +// by han2015: 列表支持表头排序 +const onUpdateSort = (data: { prop: string; order: "ascending" | "descending" | null }) => { + if (data.order === "descending") { + columnSortData.set(data.prop, "DESC"); + } else if (data.order === "ascending") { + columnSortData.set(data.prop, "ASC"); + } else { + columnSortData.delete(data.prop); + } + getPageData() +} + + const lookPageInfo = (val: any) => { console.log("查看详细内容--------------------------->"); console.log(val); @@ -1869,6 +1912,24 @@ const recallSendMsg = (val: any) => { getPageData(); }); }; + +//html 标签全屏操作,只支持现代浏览器 +const enterFullScreen=()=>{ + const docEl= document.getElementById("special-table-container"); + if(docEl){ + //支持多种浏览器 + if (docEl.requestFullscreen) { + docEl.requestFullscreen(); + } else if (docEl.webkitRequestFullscreen) { + docEl.webkitRequestFullscreen(); + } else if (docEl.mozRequestFullScreen) { + docEl.mozRequestFullScreen(); + } else if (docEl.msRequestFullscreen) { + docEl.msRequestFullscreen(); + } + } +} + /** @ 作者: 秦东 @ 时间: 2024-04-11 11:17:42 @@ -1907,7 +1968,7 @@ const viewType = ref(1); const viewLayout = ref(); const resetViewClickStates = (excludeView?: string) => { if (!props.viewPage || typeof props.viewPage !== 'object') return; - const views = ['list', 'date', 'time', 'gantt', 'map', 'card', 'chart']; + const views = ['list', 'date', 'time', 'gantt', 'map','group', 'card', 'chart']; views.forEach(view => { const viewObj = props.viewPage[view]; if (view !== excludeView && viewObj && typeof viewObj === 'object') { @@ -1943,6 +2004,9 @@ const tabsView = (val: any, types: number) => { case 6: resetViewClickStates('card'); break; + case 8: + resetViewClickStates('group'); + break; case 7: resetViewClickStates('chart'); break; @@ -2027,7 +2091,7 @@ const readerColumnSun = (column: any) => { if(labelLong > 6 ){ return labelLong * 15; }else{ - return labelLong * 30; + return labelLong * 20; } }else{ @@ -2095,7 +2159,7 @@ const getNonValue = () => { }