From b792d045a87a7d68b5ba8d159bb2fcd2d6f0e607 Mon Sep 17 00:00:00 2001 From: han2015 <1019850453@qq.com> Date: Tue, 10 Feb 2026 16:16:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/tableButton.ts | 6 + src/components/DesignForm/app/groupPage.vue | 236 ++++++++++++++++++ src/components/DesignForm/app/index.vue | 54 +++- .../DesignForm/tableListPage/index.vue | 18 ++ src/directive/permission/button.ts | 18 +- src/views/sysworkflow/lowCodeTasks/index.vue | 7 + .../appPage/appPageForm/openAppFormPage.vue | 9 +- .../appPage/appPageForm/pageList.vue | 73 ++++++ .../sysworkflow/lowcodepage/pageList.vue | 1 + .../lowcodepage/runApp/runAppForm.vue | 8 + 10 files changed, 418 insertions(+), 12 deletions(-) create mode 100644 src/components/DesignForm/app/groupPage.vue 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..2dcd504 --- /dev/null +++ b/src/components/DesignForm/app/groupPage.vue @@ -0,0 +1,236 @@ + + + + diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 04be0e6..7069802 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -58,6 +58,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"; @@ -973,6 +974,7 @@ watch( ); const timeAxisRef = ref(null); +const groupPageRef = ref(null); const calendarPageRef = ref(null); const cardPageRef = ref(null); const searchSend = reactive({ @@ -1005,7 +1007,7 @@ const getPageData = () => { searchData: json2string(props.searchData), sortData: arr.join(", "), }; - // console.log("获取列表详细信息",sendData) + console.log("获取列表详细信息??????",sendData) switch (viewType.value) { case 2: @@ -1026,6 +1028,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); @@ -1766,6 +1774,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; break; case 3: props.viewPage.list.isClick = false; @@ -1774,6 +1783,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; getPageData(); break; case 4: @@ -1783,6 +1793,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.map.isClick = false; props.viewPage.card.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; break; case 5: props.viewPage.list.isClick = false; @@ -1791,6 +1802,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.card.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; break; case 6: props.viewPage.list.isClick = false; @@ -1799,6 +1811,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; break; case 7: props.viewPage.card.isClick = false; @@ -1807,6 +1820,16 @@ const tabsView = (val: any, types: number) => { props.viewPage.time.isClick = false; props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; + props.viewPage.group.isClick = false; + break; + case 8: + props.viewPage.card.isClick = false; + props.viewPage.list.isClick = false; + props.viewPage.date.isClick = false; + props.viewPage.time.isClick = false; + props.viewPage.gantt.isClick = false; + props.viewPage.map.isClick = false; + props.viewPage.chart.isClick = false; break; default: props.viewPage.date.isClick = false; @@ -1815,6 +1838,7 @@ const tabsView = (val: any, types: number) => { props.viewPage.gantt.isClick = false; props.viewPage.map.isClick = false; props.viewPage.chart.isClick = false; + props.viewPage.group.isClick = false; break; } }; @@ -2113,6 +2137,23 @@ const isObject = (obj: any) => { @click="tabsView(props.viewPage.card, 6)" /> + + + + { - +++++++++++++++++++++ { /> + + + { @click="tabsView(props.viewPage.card, 6)" /> + + + + + { const userStore = useUserStore(); - console.log("判断应用级权限--appSystemPower->",userStore.myPower.appSystemPower) + //console.log("判断应用级权限--appSystemPower->",userStore.myPower.appSystemPower) return userStore.myPower.appSystemPower.some((perm: any) => { - console.log(signCode,"判断应用级权限--->",buttonKey) + //console.log(signCode,"判断应用级权限--->",buttonKey) if(perm.AppId == signCode){ - console.log("判断应用级权限-1111-->",perm.AppId,buttonKey) - console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower)) + // console.log("判断应用级权限-1111-->",perm.AppId,buttonKey) + // console.log("判断应用级权限-222-->",perm.butPower && Array.isArray(perm.butPower)) if(perm.butPower && Array.isArray(perm.butPower)){ // console.log("判断应用级权限--->",perm.AppId,buttonKey) return perm.butPower.includes(buttonKey) @@ -101,15 +101,15 @@ export const appHasPower = (signCode:string,buttonKey:string) => { */ export const formHasPower = (signCode:string,tormCode:string,buttonKey:string,classType:number) => { const userStore = useUserStore(); - console.log("判断表单级权限-1111-->",signCode,userStore.myPower.appSystemPower) + //console.log("判断表单级权限-1111-->",signCode,userStore.myPower.appSystemPower) if(userStore.myPower.appSystemPower && Array.isArray(userStore.myPower.appSystemPower)){ return userStore.myPower.appSystemPower.some((perm: any) => { if(perm.AppId == signCode){ - console.log("判断表单级权限-1112-->",signCode) - console.log("判断表单级权限-1113-->",tormCode) - console.log("判断表单级权限-1114-->",perm.formPower) - console.log("判断表单级权限-1115-->",buttonKey) + // console.log("判断表单级权限-1112-->",signCode) + // console.log("判断表单级权限-1113-->",tormCode) + // console.log("判断表单级权限-1114-->",perm.formPower) + // console.log("判断表单级权限-1115-->",buttonKey) if(perm.formPower && Array.isArray(perm.formPower)){ return perm.formPower.some((formPerm: any) => { switch(classType){ diff --git a/src/views/sysworkflow/lowCodeTasks/index.vue b/src/views/sysworkflow/lowCodeTasks/index.vue index 28789ab..1ca5996 100644 --- a/src/views/sysworkflow/lowCodeTasks/index.vue +++ b/src/views/sysworkflow/lowCodeTasks/index.vue @@ -102,6 +102,13 @@ const stateList = reactive({ title: [], }, }, + group: { + status: false, + isClick: false, + form: { + title: [], + }, + }, time: { status: false, isClick: false, diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue index 5402bad..2a38643 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue @@ -116,6 +116,13 @@ const stateList = reactive({ dayType: 1, }, }, + group: { + status: false, + isClick: false, + form: { + title: [], + }, + }, time: { status: false, isClick: false, @@ -381,6 +388,7 @@ const gainAppFormPageInit = () => { stateList.view.time = stateData.view.time; stateList.view.gantt = stateData.view.gantt; stateList.view.map = stateData.view.map; + stateList.view.group = stateData.view.group; } stateList.view.chart.status = data.data.chart; // console.log("开发---->", stateList.view); @@ -537,7 +545,6 @@ defineExpose({ - { }, }; } + + if(!state.view.group){ + state.view.group={ + status: false, + isClick: false, + form: { + title: [], + }, + } + } } } @@ -852,6 +869,8 @@ const saveFormListData = () => { data: json2string(state), id: props.appPageKey.toString(), }; + console.log(params,"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<") + // console.log("添加自定义表单列表设定",params) editCustomerFormList(params).then((data) => { // console.log("添加自定义表单列表设定",data) @@ -1656,6 +1675,16 @@ const delAllPick = () => { + + + + { + + + +
+ + + + + + + +
+ + { data: json2string(state), id: props.formKey.toString(), }; + console.log(params,"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<") // console.log("添加自定义表单列表设定",params) editCustomerFormList(params).then((data) => { // console.log("添加自定义表单列表设定",data) diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue index 8144246..5144906 100644 --- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue +++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue @@ -108,6 +108,13 @@ const stateList = reactive({ title: [], }, }, + group: { + status: false, + isClick: false, + form: { + title: [], + }, + }, time: { status: false, isClick: false, @@ -300,6 +307,7 @@ const initLoadData = () => { stateList.view.time = stateData.view.time; stateList.view.gantt = stateData.view.gantt; stateList.view.map = stateData.view.map; + stateList.view.group = stateData.view.group; } stateList.view.chart.status = data.data.chart; }