From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 /dev/null                                                                                               | 1469 ------------------------------------------------------
 Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue                                  |   13 
 Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue                                            |    9 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java |   32 
 Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue                                  |   11 
 Source/ProjectWeb/src/page/index/index.vue                                                              |    4 
 Source/ProjectWeb/src/views/base/UIContentViewer.vue                                                    |   31 
 Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue                                   |    1 
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java       |    2 
 Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue                                    |   17 
 Source/ProjectWeb/src/page/index/layout.vue                                                             |    5 
 11 files changed, 73 insertions(+), 1,521 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 52bf1b5..d927238 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -39,6 +39,17 @@
         {{ item.name }}
       </el-button>
     </div>
+    <div v-else-if="type === 'tree'" class="tree-buttons">
+      <el-button v-for="item in basicButtonList"
+                 :key="item.oid"
+                 :icon="item.paramVOS.webUiButtonIcon"
+                 :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+                 plain
+                 size="small"
+                 @click="buttonClick(item)">
+        {{ item.name }}
+      </el-button>
+    </div>
   </div>
 </template>
 
@@ -240,7 +251,7 @@
     basicButtonList() {
       const basicColumn = this.butttonList;
 
-      if (this.type === 'form') {
+      if (this.type === 'form' || this.type=='tree') {
         return basicColumn;
       } else if (this.type === 'table' || this.type === 'TreeTable') {
         const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 9d7d32f..c15d92f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
-    <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div>
+    <el-alert
+      class="alert"
+      v-if="isError"
+      title="鑷畾涔夌粍浠堕厤缃俊鎭敊璇紒"
+      type="error"
+      show-icon
+      description="杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡">
+    </el-alert>
     <component v-else :is="currentComponent"
                :btmType="btmType"
                :content="content"
@@ -115,6 +122,6 @@
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 </style>
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 16d531f..5c04b55 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -25,7 +25,6 @@
 </template>
 
 <script>
-import {treeMenu} from '@/api/treeMyMenu'
 import {validatenull} from '@/util/validate'
 export default {
   name: "dynamic-table",
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 30577f9..f6b272f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
+    <dynamic-button v-if="componentVO.buttons && componentVO.buttons.length>0" :butttonList="componentVO.buttons" :selectList="checkDatas" type="tree" style="margin-bottom: 10px;"></dynamic-button>
     <el-input
       placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
       v-model="filterText">
@@ -82,8 +83,7 @@
     sourceData:{
       handler(newval) {
         //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
-        console.log(this.areasName);
-        console.log(newval);
+        this.initData();
       }
     }
   },
@@ -95,7 +95,7 @@
         label: 'text'
       },
       lazy:this.componentVO.treeDefineVO.loadType == 'node',
-      isMuti:true,
+      isMuti:false,
       data:[],
       checkDatas:[]
     }
@@ -104,7 +104,9 @@
     this.initData();
   },
   mounted() {
-    console.log(this.$el.clientHeight)
+    if(this.componentVO.buttons && this.componentVO.buttons.length>0){
+      this.$children[2].$el.style.height = 'calc(100% - 50px - '+this.$children[0].$el.clientHeight+'px - 10px)';
+    }
   },
   methods: {
     filterNode(value, data) {
@@ -2000,12 +2002,7 @@
       //閫愮骇鍔犺浇
       const parentOid = (node.level === 0) ? 0 : node.data.oid;
       setTimeout(() => {
-        const data = [{
-          name: 'leaf',
-          leaf: true
-        }, {
-          name: 'zone'
-        }];
+        const data = this.data;
 
         resolve(data);
       }, 500);
diff --git a/Source/ProjectWeb/src/page/index/index.vue b/Source/ProjectWeb/src/page/index/index.vue
index 93689d3..93aec76 100644
--- a/Source/ProjectWeb/src/page/index/index.vue
+++ b/Source/ProjectWeb/src/page/index/index.vue
@@ -16,7 +16,7 @@
           <search class="avue-view" v-show="isSearch"></search>
         </transition>
         <!-- 涓讳綋瑙嗗浘灞� -->
-        <div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
+        <div style="height:100%;overflow-y:auto;overflow-x:hidden;padding-bottom: 38px;box-sizing: border-box" id="avue-view" v-show="!isSearch">
           <keep-alive>
             <router-view class="avue-view" v-if="$route.meta.keepAlive"/>
           </keep-alive>
@@ -152,6 +152,6 @@
 <style lang="scss">
 #avue-view > .avue-view{
   height: 100%;
-  padding: 0 6px !important;
+  padding: 0 !important;
 }
 </style>
diff --git a/Source/ProjectWeb/src/page/index/layout.vue b/Source/ProjectWeb/src/page/index/layout.vue
index 96976dd..bdd7cf2 100644
--- a/Source/ProjectWeb/src/page/index/layout.vue
+++ b/Source/ProjectWeb/src/page/index/layout.vue
@@ -6,3 +6,8 @@
     <router-view class="avue-view" v-if="!$route.meta.keepAlive" />
   </div>
 </template>
+<style lang="scss">
+.avue-view{
+  padding: 0 6px!important;
+}
+</style>
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 44104ce..a963086 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,6 +1,6 @@
 <template>
   <!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
-  <div style="height:calc(100% - 4px);min-width:1200px">
+  <div style="height:calc(100% - 4px);min-width:1200px" >
     <el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
       <UIContentArea :key="'northArea-'+uiDefineVO.oid" :areasData="uiDefineVO.northAreas"
                      :dataStore="checkedData.northArea"
@@ -24,8 +24,8 @@
                        @setDataStore="setDataStore">
         </UIContentArea>
       </el-aside>
-      <el-container style="height: 100%">
-        <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+      <el-container style="height: 100%;display: block">
+        <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 300px;height: '+centerHeight">
           <UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
                          :dataStore="checkedData.centerArea"
                          :inDialog="inDialog"
@@ -36,7 +36,7 @@
           </UIContentArea>
         </el-main>
         <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
-                   style="max-height: 300px">
+                   style="min-height: 150px;">
           <UIContentArea :key="'southArea-'+uiDefineVO.oid" :areasData="uiDefineVO.southAreas"
                          :dataStore="checkedData.southArea"
                          :inDialog="inDialog"
@@ -78,13 +78,9 @@
     }
   },
   watch: {
-    typeAContent:{
-      handler(newV,oldV){
-        if(oldV!=newV && !verifyNull(newV)){
-          this.initUI();
-        }
-      },
-      immediate: true,
+    $route(to, from) {
+      this.getTheParameters()
+      this.initUI();
     }
   },
   computed: {
@@ -97,21 +93,24 @@
       this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=缁勪欢name?type=xxx&context=yyy&param=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔$被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
       return false;
     }
-    this.btmType = this.$route.query.type;
-    this.content = this.$route.query.context || this.$route.query.content;
-    this.sourceData = this.$route.query;
+    this.getTheParameters()
+    this.initUI();
   },
   methods: {
+    getTheParameters(){
+      this.btmType = this.$route.query.type;
+      this.content = this.$route.query.context || this.$route.query.content;
+      this.sourceData = this.$route.query;
+    },
     initUI() {
       getUIContent({btmType: this.btmType, id: this.content}).then(res => {
-        console.log(res.data.obj)
         this.uiDefineVO = res.data.obj;
         this.initContent();
       })
     },
     initContent() {
       if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
-        this.centerHeight = 'calc(100% - 310px)';
+        this.centerHeight = '65%';
       } else {
         this.centerHeight = '100%';
       }
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 56172a5..86c330a 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,8 +23,8 @@
                        @setDataStore="setDataStore">
         </UIContentArea>
       </el-aside>
-      <el-container style="height: 100%">
-        <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+      <el-container style="height: 100%;display: block">
+        <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 260px;height: '+centerHeight">
           <UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
                          cradStyle=""
                          :areasData="uiDefineVO.centerAreas"
@@ -35,7 +35,7 @@
                          @setDataStore="setDataStore">
           </UIContentArea>
         </el-main>
-        <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="max-height: 300px">
+        <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="min-height: 150px;">
           <UIContentArea :key="'southArea-'+uiDefineVO.oid" areas-name="southAreaInDialog"
                          cradStyle=""
                          :areasData="uiDefineVO.southAreas"
@@ -122,14 +122,13 @@
   methods: {
     initUI() {
       getUIContent({btmType: this.btmType, id: this.content}).then(res => {
-        console.log(res.data.obj)
         this.uiDefineVO = res.data.obj;
         this.initContent();
       })
     },
     initContent() {
       if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
-        this.centerHeight = 'calc(100% - 310px)';
+        this.centerHeight = '65%';
       } else {
         this.centerHeight = '100%';
       }
diff --git a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js b/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
deleted file mode 100644
index 4558584..0000000
--- a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
+++ /dev/null
@@ -1,1469 +0,0 @@
-export const uiDefineVOData= {
-  "btmTypeId": "processreview",
-  "btmname": null,
-  "centerAreas": [
-    {
-      "btmname": null,
-      "checkInBy": null,
-      "checkInTime": null,
-      "checkOutBy": null,
-      "checkOutTime": null,
-      "componentVOs": [
-        {
-          "btmname": null,
-          "buttons": [
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "RefreshAction",
-                "createTime": "2014-10-16 13:07:56.000",
-                "creator": "developer",
-                "csClass": "",
-                "description": "鍒锋柊椤甸潰",
-                "id": "refresh",
-                "lastModifier": "developer",
-                "lastModifyTime": "2014-10-16 13:07:56.000",
-                "licensors": null,
-                "name": "鍒锋柊锛堥噸缃級",
-                "oid": "526E913C-231F-E4CF-D90D-AB968F8C8D45"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2022-07-18 17:30:52.000",
-              "creator": "developer",
-              "csUrl": "",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "refresh",
-              "lastModifier": "developer",
-              "lastModifyTime": "2022-07-18 17:30:52.000",
-              "name": "鍒锋柊",
-              "oid": "E20C314B-E741-FBE0-534A-D68E9C0D8E2C",
-              "orderNum": 6,
-              "paramVOS": {
-                'webUiButtonLocation': 'top',
-                'webUiButtonType': 'primary',
-                'webUiButtonMethods': 'refresh'
-              },
-              "pkComponent": "2D6D571B-BB6E-677D-9764-191BC5D5D3F1",
-              "pkParentOid": "",
-              "url": "RefreshAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "BaseEditAction#doAction",
-                "createTime": "2013-11-09 10:32:41.000",
-                "creator": "eddieliu",
-                "csClass": "plm.uif.actions.client.EditAction",
-                "description": "淇敼涓氬姟瀵硅薄",
-                "id": "edit",
-                "lastModifier": "developer",
-                "lastModifyTime": "2013-11-09 10:32:41.000",
-                "licensors": null,
-                "name": "淇敼",
-                "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2022-07-18 17:30:52.000",
-              "creator": "developer",
-              "csUrl": "plm.uif.actions.client.EditAction",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "edit",
-              "lastModifier": "developer",
-              "lastModifyTime": "2022-07-18 17:30:52.000",
-              "name": "淇敼",
-              "oid": "43F34DC1-C229-359B-AED3-38CA9E7D1534",
-              "orderNum": 1,
-              "paramVOS": {
-                "owner": "true",
-                "context": "CreateAuditQuestionDocume",
-                "type": "document",
-                'webUiButtonLocation': 'top',
-                'webUiButtonMethods': 'edit',
-              },
-              "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
-              "pkParentOid": "",
-              "url": "BaseEditAction#doAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "BaseEditAction#doAction",
-                "createTime": "2013-11-09 10:32:41.000",
-                "creator": "eddieliu",
-                "csClass": "plm.uif.actions.client.EditAction",
-                "description": "淇敼涓氬姟瀵硅薄",
-                "id": "edit",
-                "lastModifier": "developer",
-                "lastModifyTime": "2013-11-09 10:32:41.000",
-                "licensors": null,
-                "name": "淇敼",
-                "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2022-07-18 17:30:52.000",
-              "creator": "developer",
-              "csUrl": "plm.uif.actions.client.EditAction",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "edit",
-              "lastModifier": "developer",
-              "lastModifyTime": "2022-07-18 17:30:52.000",
-              "name": "淇敼",
-              "oid": "43F34DC1-C229-359B-AED3-38CA9E7D1534",
-              "orderNum": 1,
-              "paramVOS": {
-                "owner": "true",
-                "context": "CreateAuditQuestionDocume",
-                "type": "document",
-                'webUiButtonLocation': 'menu',
-                'webUiButtonMethods': 'edit',
-              },
-              "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
-              "pkParentOid": "",
-              "url": "BaseEditAction#doAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "",
-                "createTime": "2021-12-03 15:28:19.000",
-                "creator": "developer",
-                "csClass": "net=VCI.Plugin.631.Actions.dll",
-                "description": "鍒犻櫎宸ヨ壓闂",
-                "id": "deleteprocessquestion",
-                "lastModifier": "developer",
-                "lastModifyTime": "2021-12-03 15:28:19.000",
-                "licensors": null,
-                "name": "鍒犻櫎宸ヨ壓闂",
-                "oid": "FD73DF30-7269-8A85-1B62-B92435000280"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2022-07-18 17:30:52.000",
-              "creator": "developer",
-              "csUrl": "net=VCI.Plugin.631.Actions.dll",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "deleteprocessquestion",
-              "lastModifier": "developer",
-              "lastModifyTime": "2022-07-18 17:30:52.000",
-              "name": "鍒犻櫎",
-              "oid": "BE973D4A-CB99-10FC-3E31-F3010259F823",
-              "orderNum": 2,
-              "paramVOS": {
-                "owner": "true",
-                'webUiButtonLocation': 'menu',
-                'webUiButtonType': 'text',
-                'webUiButtonMethods': 'delete'
-              },
-              "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
-              "pkParentOid": "",
-              "url": ""
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "",
-                "createTime": "2021-12-03 15:28:19.000",
-                "creator": "developer",
-                "csClass": "net=VCI.Plugin.631.Actions.dll",
-                "description": "鍒犻櫎宸ヨ壓闂",
-                "id": "deleteprocessquestion",
-                "lastModifier": "developer",
-                "lastModifyTime": "2021-12-03 15:28:19.000",
-                "licensors": null,
-                "name": "鍒犻櫎宸ヨ壓闂",
-                "oid": "FD73DF30-7269-8A85-1B62-B92435000280"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2022-07-18 17:30:52.000",
-              "creator": "developer",
-              "csUrl": "net=VCI.Plugin.631.Actions.dll",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "deleteprocessquestion",
-              "lastModifier": "developer",
-              "lastModifyTime": "2022-07-18 17:30:52.000",
-              "name": "鍒犻櫎",
-              "oid": "BE973D4A-CB99-10FC-3E31-F3010259F823",
-              "orderNum": 2,
-              "paramVOS": {
-                "owner": "true",
-                'webUiButtonLocation': 'top',
-                'webUiButtonMethods': 'delete'
-              },
-              "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
-              "pkParentOid": "",
-              "url": ""
-            },
-          ],
-          "checkInBy": null,
-          "checkInTime": null,
-          "checkOutBy": null,
-          "checkOutTime": null,
-          "copyFromVersion": null,
-          "createTime": null,
-          "creator": null,
-          "customClass": null,
-          "data": null,
-          "description": "璇勫浠诲姟鍒楄〃",
-          "extendAttr": "",
-          "firstR": null,
-          "firstV": null,
-          "formDefineVO": null,
-          "id": null,
-          "lastModifier": null,
-          "lastModifyTime": null,
-          "lastR": null,
-          "lastV": null,
-          "lcStatus": null,
-          "lcStatusText": null,
-          "lctid": null,
-          "name": "璇勫浠诲姟鍒楄〃",
-          "nameOid": null,
-          "oid": "2D6D571B-BB6E-677D-9764-191BC5D5D3F11",
-          "orderNum": 1,
-          "owner": null,
-          "pkLayout": "2692E26B-8584-4561-8A03-D5921A82E4901",
-          "revisionOid": null,
-          "revisionRule": null,
-          "revisionSeq": 0,
-          "revisionValue": null,
-          "secretGrade": null,
-          "secretGradeText": null,
-          "tableDefineVO": {
-            "btmType": "audittask",
-            "cols": [
-              [
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": null,
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "type",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "缁撴灉",
-                  "unresize": false,
-                  "width": 80
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": null,
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "assigner",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "鎸囨淳浜�",
-                  "unresize": false,
-                  "width": 80
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": null,
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "principal",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "璐熻矗浜�",
-                  "unresize": false,
-                  "width": 80
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": "yyyy-MM-dd",
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "planedstartdate",
-                  "fieldType": "date",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "寮�浼氭椂闂�",
-                  "unresize": false,
-                  "width": 150
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": null,
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "place",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "寮�浼氬湴鐐�",
-                  "unresize": false,
-                  "width": 150
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": null,
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "creator_name,(,creator,)",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": "creator",
-                  "style": null,
-                  "templet": null,
-                  "title": "鍒涘缓浜�",
-                  "unresize": false,
-                  "width": 80
-                },
-                {
-                  "align": "left",
-                  "colspan": 1,
-                  "comboxKey": null,
-                  "data": [],
-                  "dateFormate": "yyyy-MM-dd HH:mm:ss",
-                  "edit": "",
-                  "editConfig": null,
-                  "event": null,
-                  "field": "createtime",
-                  "fieldType": "text",
-                  "fixed": null,
-                  "hidden": false,
-                  "minWidth": null,
-                  "optionButtons": null,
-                  "optionField": false,
-                  "optionJsMap": null,
-                  "queryField": null,
-                  "referConfig": null,
-                  "rowspan": 1,
-                  "showField": null,
-                  "sort": false,
-                  "sortField": null,
-                  "style": null,
-                  "templet": null,
-                  "title": "鍒涘缓鏃堕棿",
-                  "unresize": false,
-                  "width": 150
-                }
-              ]
-            ],
-            "displayFolder": false,
-            "displayQueryArea": true,
-            "folderParentField": "",
-            "hasEditor": true,
-            "id": "auditTaskTable",
-            "limits": null,
-            "linkTypeFlag": false,
-            "oid": "0A8030A1-2E3F-5D7D-A599-961A3829E6C51",
-            "pageVO": null,
-            "queryColumns": [
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "type",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "type",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "缁撴灉",
-                "unresize": false,
-                "width": null
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "assigner",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "assigner",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "鎸囨淳浜�",
-                "unresize": false,
-                "width": null
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "principal",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "principal",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "璐熻矗浜�",
-                "unresize": false,
-                "width": null
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": "yyyy-MM-dd",
-                "edit": "date",
-                "editConfig": null,
-                "event": null,
-                "field": "planedstartdate",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "planedstartdate",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "寮�浼氭椂闂�",
-                "unresize": false,
-                "width": null
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "place",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "place",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "寮�浼氬湴鐐�",
-                "unresize": false,
-                "width": null
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "creator",
-                "fieldType": null,
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": "creator",
-                "referConfig": null,
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "鍒涘缓浜�",
-                "unresize": false,
-                "width": null
-              }
-            ],
-            "queryTemplateName": "ProcessReviewFlow",
-            "seniorQueryColumns": [
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "type",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "缁撴灉",
-                "unresize": false,
-                "width": 80
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "assigner",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "鎸囨淳浜�",
-                "unresize": false,
-                "width": 80
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "principal",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "璐熻矗浜�",
-                "unresize": false,
-                "width": 80
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": "yyyy-MM-dd",
-                "edit": "date",
-                "editConfig": null,
-                "event": null,
-                "field": "planedstartdate",
-                "fieldType": "date",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "寮�浼氭椂闂�",
-                "unresize": false,
-                "width": 150
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "place",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "寮�浼氬湴鐐�",
-                "unresize": false,
-                "width": 150
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": null,
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "creator_name,(,creator,)",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": "creator",
-                "style": null,
-                "templet": null,
-                "title": "鍒涘缓浜�",
-                "unresize": false,
-                "width": 80
-              },
-              {
-                "align": "left",
-                "colspan": 1,
-                "comboxKey": null,
-                "data": [],
-                "dateFormate": "yyyy-MM-dd HH:mm:ss",
-                "edit": null,
-                "editConfig": null,
-                "event": null,
-                "field": "createtime",
-                "fieldType": "text",
-                "fixed": null,
-                "hidden": false,
-                "minWidth": null,
-                "optionButtons": null,
-                "optionField": false,
-                "optionJsMap": null,
-                "queryField": null,
-                "referConfig": {
-                  "backPath": null,
-                  "displayTable": null,
-                  "height": null,
-                  "initSort": null,
-                  "loadType": "all",
-                  "mapFields": null,
-                  "method": "GET",
-                  "muti": false,
-                  "onlyLeaf": false,
-                  "paramForFormKey": null,
-                  "parentFieldName": null,
-                  "parentUsedField": null,
-                  "parentValue": null,
-                  "referContent": null,
-                  "referType": null,
-                  "remoteSort": false,
-                  "tableConfig": null,
-                  "textField": "name",
-                  "type": null,
-                  "url": null,
-                  "useFormKey": null,
-                  "valueField": "oid",
-                  "where": null
-                },
-                "rowspan": 1,
-                "showField": null,
-                "sort": false,
-                "sortField": null,
-                "style": null,
-                "templet": null,
-                "title": "鍒涘缓鏃堕棿",
-                "unresize": false,
-                "width": 150
-              }
-            ],
-            "whereSql": ""
-          },
-          "treeDefineVO": null,
-          "treeTableDefineVO": null,
-          "ts": null,
-          "uiComponentType": "table",
-          "uiComponentTypeText": "琛ㄦ牸",
-          "uiParseClass": "",
-          "versionRule": null,
-          "versionSeq": 0,
-          "versionValue": null
-        }
-      ],
-      "copyFromVersion": null,
-      "createTime": "2022-02-08 10:40:50.000",
-      "creator": "developer",
-      "data": null,
-      "description": "",
-      "displayExpression": "",
-      "enableStatus": true,
-      "extendAttr": "",
-      "firstR": null,
-      "firstV": null,
-      "id": "1",
-      "international": null,
-      "lastModifier": "developer",
-      "lastModifyTime": "2022-07-18 17:30:51.000",
-      "lastR": null,
-      "lastV": null,
-      "layoutAreaType": "center",
-      "layoutAreaTypeText": null,
-      "lcStatus": null,
-      "lcStatusText": null,
-      "lctid": null,
-      "name": "璇勫浠诲姟鍒楄〃",
-      "nameOid": null,
-      "oid": "2692E26B-8584-4561-8A03-D5921A82E4901",
-      "orderNum": 1,
-      "owner": null,
-      "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
-      "revisionOid": null,
-      "revisionRule": null,
-      "revisionSeq": 0,
-      "revisionValue": null,
-      "secretGrade": null,
-      "secretGradeText": null,
-      "title": "璇勫浠诲姟鍒楄〃",
-      "ts": null,
-      "uiParseClass": "",
-      "versionRule": null,
-      "versionSeq": 0,
-      "versionValue": null
-    }
-  ],
-  "checkInBy": null,
-  "checkInTime": null,
-  "checkOutBy": null,
-  "checkOutTime": null,
-  "copyFromVersion": null,
-  "createTime": "2022-02-08 10:40:50.000",
-  "creator": "developer",
-  "data": null,
-  "description": "",
-  "eastAreas": null,
-  "firstR": null,
-  "firstV": null,
-  "id": "ProcessReviewList_web",
-  "lastModifier": "developer",
-  "lastModifyTime": "2022-07-18 17:30:51.000",
-  "lastR": null,
-  "lastV": null,
-  "lcStatus": null,
-  "lcStatusText": null,
-  "lctid": null,
-  "linkTypeFlag": false,
-  "linkTypeId": null,
-  "name": "宸ヨ壓璇勫鍒楄〃_web",
-  "nameOid": null,
-  "northAreas": [],
-  "oid": "DBB13AF7-021F-ED27-B285-03E8599548EB",
-  "owner": null,
-  "revisionOid": null,
-  "revisionRule": null,
-  "revisionSeq": 0,
-  "revisionValue": null,
-  "secretGrade": null,
-  "secretGradeText": null,
-  "southAreas": null,
-  "ts": null,
-  "versionRule": null,
-  "versionSeq": 0,
-  "versionValue": null,
-  "westAreas": [
-    {
-      "btmname": null,
-      "checkInBy": null,
-      "checkInTime": null,
-      "checkOutBy": null,
-      "checkOutTime": null,
-      "componentVOs": [
-        {
-          "btmname": null,
-          "buttons": [
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "BaseAddAction#doAction",
-                "createTime": "2013-11-01 15:17:45.000",
-                "creator": "eddieliu",
-                "csClass": "plm.uif.actions.client.AddAction",
-                "description": "鍒涘缓涓氬姟瀵硅薄",
-                "id": "add",
-                "lastModifier": "developer",
-                "lastModifyTime": "2013-11-01 15:17:45.000",
-                "licensors": null,
-                "name": "鍒涘缓",
-                "oid": "65274704-5557-231C-E3EA-0B32B9BD5A0B"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:41:40.000",
-              "creator": "developer",
-              "csUrl": "plm.uif.actions.client.AddAction",
-              "description": "娣诲姞鍒嗙被",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "add",
-              "lastModifier": "developer",
-              "lastModifyTime": "2024-03-18 16:41:40.000",
-              "name": "娣诲姞",
-              "oid": "3FE96F2B-0A07-0340-0382-A3E5527A22DC",
-              "orderNum": 1,
-              "paramVOS": {
-                "form": "editdocumentfolder_dept",
-                "type": "folder",
-                "initValue": "folderbusinesstype=閮ㄩ棬鍒嗙被"
-              },
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": "BaseAddAction#doAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "BaseAddAction#doAction",
-                "createTime": "2013-11-01 15:17:45.000",
-                "creator": "eddieliu",
-                "csClass": "plm.uif.actions.client.AddAction",
-                "description": "鍒涘缓涓氬姟瀵硅薄",
-                "id": "add",
-                "lastModifier": "developer",
-                "lastModifyTime": "2013-11-01 15:17:45.000",
-                "licensors": null,
-                "name": "鍒涘缓",
-                "oid": "65274704-5557-231C-E3EA-0B32B9BD5A0B"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:22:07.000",
-              "creator": "developer",
-              "csUrl": "plm.uif.actions.client.AddAction",
-              "description": "娣诲姞鍒嗙被",
-              "displayMode": "textandimage",
-              "hidden": true,
-              "iconPath": "",
-              "id": "add",
-              "lastModifier": "developer",
-              "lastModifyTime": "2024-03-18 16:22:07.000",
-              "name": "娣诲姞",
-              "oid": "D6F4FD65-B0B8-3622-3928-A564010592DC",
-              "orderNum": 2,
-              "paramVOS": {
-                "seccontext": "editdocumentfolder",
-                "context": "editdocumentfolder",
-                "querytemplate": "documentlibroot",
-                "rootbusinesstype": "documentlib",
-                "type": "folder",
-                "initvalue": "folderoid=${oid};folderbusinesstype=${folderbusinesstype}"
-              },
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": "BaseAddAction#doAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "BaseEditAction#doAction",
-                "createTime": "2013-11-09 10:32:41.000",
-                "creator": "eddieliu",
-                "csClass": "plm.uif.actions.client.EditAction",
-                "description": "淇敼涓氬姟瀵硅薄",
-                "id": "edit",
-                "lastModifier": "developer",
-                "lastModifyTime": "2013-11-09 10:32:41.000",
-                "licensors": null,
-                "name": "淇敼",
-                "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:05:12.000",
-              "creator": "secAdmin",
-              "csUrl": "plm.uif.actions.client.EditAction",
-              "description": "淇敼閫変腑鐨勫垎绫�",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "edit",
-              "lastModifier": "secAdmin",
-              "lastModifyTime": "2024-03-18 16:05:12.000",
-              "name": "淇敼",
-              "oid": "4E6B22C5-BD68-A7F6-712F-900033A0A32D",
-              "orderNum": 3,
-              "paramVOS": {
-                "context": "editdocumentfolder",
-                "type": "folder",
-                "initvalue": "folderoid=${oid}"
-              },
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": "BaseEditAction#doAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "",
-                "createTime": "2015-01-27 17:14:08.000",
-                "creator": "developer",
-                "csClass": "net=VCI.PPR.Actions.dll",
-                "description": "鍒犻櫎鍒嗙被鑺傜偣",
-                "id": "delfolder",
-                "lastModifier": "developer",
-                "lastModifyTime": "2015-01-27 17:14:08.000",
-                "licensors": null,
-                "name": "鍒犻櫎鍒嗙被鑺傜偣",
-                "oid": "4DCA9256-1E79-A4DC-6E1F-723F55E44B35"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:05:12.000",
-              "creator": "developer",
-              "csUrl": "net=VCI.PPR.Actions.dll",
-              "description": "鍒犻櫎",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "delfolder",
-              "lastModifier": "developer",
-              "lastModifyTime": "2024-03-18 16:05:12.000",
-              "name": "鍒犻櫎",
-              "oid": "60B88211-5E0C-26F8-0E0B-B25A52EADABE",
-              "orderNum": 4,
-              "paramVOS": {
-                "deleteroot": "true"
-              },
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": ""
-            },
-            {
-              "actionVO": {
-                "actionCls": "",
-                "actionUsedType": "business",
-                "bsUrl": "RefreshAction",
-                "createTime": "2014-10-16 13:07:56.000",
-                "creator": "developer",
-                "csClass": "",
-                "description": "鍒锋柊椤甸潰",
-                "id": "refresh",
-                "lastModifier": "developer",
-                "lastModifyTime": "2014-10-16 13:07:56.000",
-                "licensors": null,
-                "name": "鍒锋柊锛堥噸缃級",
-                "oid": "526E913C-231F-E4CF-D90D-AB968F8C8D45"
-              },
-              "areaType": "",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:05:12.000",
-              "creator": "developer",
-              "csUrl": "",
-              "description": "鍒锋柊",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "refresh",
-              "lastModifier": "developer",
-              "lastModifyTime": "2024-03-18 16:05:12.000",
-              "name": "鍒锋柊",
-              "oid": "0AA227B2-79DF-13B3-9DDE-7ADAFA1AC4E7",
-              "orderNum": 5,
-              "paramVOS": {},
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": "RefreshAction"
-            },
-            {
-              "actionVO": {
-                "actionCls": "B1DD4B55-4210-29DD-2656-4B9DA12BDAD8",
-                "actionUsedType": "business",
-                "bsUrl": "",
-                "createTime": "2021-03-23 17:38:34.000",
-                "creator": "developer",
-                "csClass": "net=VCI.PPR.Actions.dll",
-                "description": "",
-                "id": "movetootherfolder",
-                "lastModifier": "developer",
-                "lastModifyTime": "2021-03-23 17:38:34.000",
-                "licensors": null,
-                "name": "绉诲埌鍏朵粬鍒嗙被",
-                "oid": "73C86108-0649-B649-518B-8294FCDD302E"
-              },
-              "areaType": "tab",
-              "authorization": true,
-              "children": null,
-              "createTime": "2024-03-18 16:05:12.000",
-              "creator": "secAdmin",
-              "csUrl": "net=VCI.PPR.Actions.dll",
-              "description": "",
-              "displayMode": "textandimage",
-              "hidden": false,
-              "iconPath": "",
-              "id": "movetootherfolder",
-              "lastModifier": "secAdmin",
-              "lastModifyTime": "2024-03-18 16:05:12.000",
-              "name": "绉诲埌鍏朵粬鍒嗙被",
-              "oid": "682D5C6F-9F2E-123E-6D4E-EB4C82B5A565",
-              "orderNum": 6,
-              "paramVOS": {},
-              "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
-              "pkParentOid": "",
-              "url": ""
-            }
-          ],
-          "checkInBy": null,
-          "checkInTime": null,
-          "checkOutBy": null,
-          "checkOutTime": null,
-          "copyFromVersion": null,
-          "createTime": null,
-          "creator": null,
-          "customClass": null,
-          "data": null,
-          "description": "鍒嗙被鏍�",
-          "extendAttr": "",
-          "firstR": null,
-          "firstV": null,
-          "formDefineVO": null,
-          "id": null,
-          "lastModifier": null,
-          "lastModifyTime": null,
-          "lastR": null,
-          "lastV": null,
-          "lcStatus": null,
-          "lcStatusText": null,
-          "lctid": null,
-          "name": "鍒嗙被鏍�",
-          "nameOid": null,
-          "oid": "7170DFF8-C1DE-04A8-46F0-BC4379980BC71",
-          "orderNum": 1,
-          "owner": null,
-          "pkLayout": "7DDAED74-95BC-FDCE-53F4-A5E72815D5E61",
-          "revisionOid": null,
-          "revisionRule": null,
-          "revisionSeq": 0,
-          "revisionValue": null,
-          "secretGrade": null,
-          "secretGradeText": null,
-          "tableDefineVO": null,
-          "treeDefineVO": {
-            "btmType": "folder",
-            "fieldSep": ",",
-            "linkType": "",
-            "loadType": "all",
-            "orientation": false,
-            "queryTemplateName": "querySubFolder",
-            "rootContent": "${name}",
-            "showImage": false,
-            "showLinkAbs": "${name}",
-            "treeNodeExpression": "${name}[${folderbusinesstype}]"
-          },
-          "treeTableDefineVO": null,
-          "ts": null,
-          "uiComponentType": "tree",
-          "uiComponentTypeText": "鏍�",
-          "uiParseClass": "",
-          "versionRule": null,
-          "versionSeq": 0,
-          "versionValue": null
-        }
-      ],
-      "copyFromVersion": null,
-      "createTime": "2022-02-08 10:40:51.000",
-      "creator": "developer",
-      "data": null,
-      "description": "",
-      "displayExpression": "",
-      "enableStatus": true,
-      "extendAttr": "",
-      "firstR": null,
-      "firstV": null,
-      "id": "1",
-      "international": null,
-      "lastModifier": "developer",
-      "lastModifyTime": "2022-07-18 17:30:51.000",
-      "lastR": null,
-      "lastV": null,
-      "layoutAreaType": "west",
-      "layoutAreaTypeText": null,
-      "lcStatus": null,
-      "lcStatusText": null,
-      "lctid": null,
-      "name": "宸ヨ壓璇勫鍒楄〃",
-      "nameOid": null,
-      "oid": "E28B0555-FAF3-4F59-0EE8-64A30A77C9CB1",
-      "orderNum": 1,
-      "owner": null,
-      "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
-      "revisionOid": null,
-      "revisionRule": null,
-      "revisionSeq": 0,
-      "revisionValue": null,
-      "secretGrade": null,
-      "secretGradeText": null,
-      "title": "宸ヨ壓璇勫鍒楄〃",
-      "ts": null,
-      "uiParseClass": "",
-      "versionRule": null,
-      "versionSeq": 0,
-      "versionValue": null
-    }
-  ]
-}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
index 04b1109..f6cbef8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
@@ -1,5 +1,6 @@
 package com.vci.web.controller;
 
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
 import com.vci.starter.web.annotation.log.VciBusinessLog;
 import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.web.pageModel.UIContentVO;
@@ -41,6 +42,7 @@
 	 * @return UI涓婁笅鏂�
 	 */
 	@GetMapping("/getUIContentByBtmTypeAndId")
+	@VciUnCheckRight
 	public UIContentVO getUIContentByBtmTypeAndId(String btmType,String id){
 		return uiService.getUIContentByBtmTypeAndId(btmType,id);
 	}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index dfe9ef3..c7876ed 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -837,8 +837,8 @@
 			actionVO.setCreator(action.plCreateUser);
 			actionVO.setLastModifier(action.plModifyUser);
 			try {
-				actionVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
-				actionVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
+				actionVO.setCreateTime(new Date(action.plCreateTime));
+				actionVO.setLastModifyTime(new Date(action.plCreateTime));
 			}catch (Throwable e){
 				logger.error("杞崲鏃堕棿",e);
 			}
@@ -922,8 +922,8 @@
 			contentVO.setDescription(pageLayoutDefination.plDesc);
 			contentVO.setCreator(pageLayoutDefination.plCreateUser);
 			try {
-				contentVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plCreateTime),VciDateUtil.DateTimeFormat));
-				contentVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plModifyTime),VciDateUtil.DateTimeFormat));
+				contentVO.setCreateTime(new Date(pageLayoutDefination.plCreateTime));
+				contentVO.setLastModifyTime(new Date(pageLayoutDefination.plModifyTime));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -1144,8 +1144,8 @@
 			}
 			layoutVO.setCreator(page.plCreateUser);
 			try {
-				layoutVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(page.plCreateTime),VciDateUtil.DateTimeFormat));
-				layoutVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(page.plModifyTime),VciDateUtil.DateTimeFormat));
+				layoutVO.setCreateTime(new Date(page.plCreateTime));
+				layoutVO.setLastModifyTime(new Date(page.plModifyTime));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -1223,7 +1223,7 @@
 	 * @param pages 鏁版嵁瀵硅薄
 	 * @return 鏄剧ず瀵硅薄
 	 */
-	private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
+	private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
 		List<UIComponentVO> componentVOS = new ArrayList<>();
 		pages.stream().forEach(page->{
 			componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1454,10 +1454,10 @@
 	 * @return 鏄剧ず瀵硅薄
 	 */
 	@Override
-	public UIButtonDefineVO buttonDO2VO(PLTabButton button)  {
+	public UIButtonDefineVO buttonDO2VO(com.vci.corba.portal.data.PLTabButton button)  {
 		UIButtonDefineVO buttonVO = new UIButtonDefineVO();
 		Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
-		//Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
+//		Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
 		if(button !=null){
 			buttonVO.setOid(button.plOId);
 			buttonVO.setPkComponent(button.plTableOId);
@@ -1553,22 +1553,24 @@
 	@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${uicache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 ==null")
 	public UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) {
 		WebUtil.alertNotNull(btmType,"涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�",id,"UI涓婁笅鏂囩殑缂栧彿");
-		PLPageLayoutDefination[] obj = null;
+		PLUILayout[] obj = null;
 		try {
-			obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+			obj = ServiceProvider.getUIService().getPLUILayoutsByRelatedType(btmType);
+//			obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+//			obj = ServiceProvider.geT(btmType);
+
 		} catch (VCIError vciError) {
 			throw WebUtil.getVciBaseException(vciError);
 		}
-		PLPageLayoutDefination context = null;
+		PLUILayout context = null;
 		for (int i = 0; i < obj.length; i++) {
 			if (obj[i].plCode.equals(id)) {
 				context = obj[i];
 				break;
 			}
 		}
-		//return UIContentDO2VO(context,true);
-		return UIContentDO2VO(null,true);
+		return UIContentDO2VO(context,true);
+//		return UIContentDO2VO(null,true);
 	}
-
 }
 

--
Gitblit v1.9.3