From a34c10535d130c4be667301434a0e8072ee82716 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 十月 2024 15:21:48 +0800
Subject: [PATCH] 整合代码,修改表单定义按钮排列方式

---
 Source/plt-web/plt-web-ui/src/router/axios.js                                                              |    2 
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue                                   |   17 +-
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue             |   25 ++-
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue |    2 
 Document/training/UI配置实例.doc                                                                               |    0 
 Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue                                 |  112 ++++++++-------
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue                                     |  235 +++++++++++++++++---------------
 Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue                           |    2 
 8 files changed, 212 insertions(+), 183 deletions(-)

diff --git "a/Document/training/UI\351\205\215\347\275\256\345\256\236\344\276\213.doc" "b/Document/training/UI\351\205\215\347\275\256\345\256\236\344\276\213.doc"
index f55f9ee..8bf48c0 100644
--- "a/Document/training/UI\351\205\215\347\275\256\345\256\236\344\276\213.doc"
+++ "b/Document/training/UI\351\205\215\347\275\256\345\256\236\344\276\213.doc"
Binary files differ
diff --git a/Source/plt-web/plt-web-ui/src/router/axios.js b/Source/plt-web/plt-web-ui/src/router/axios.js
index bfe6a01..7029b39 100644
--- a/Source/plt-web/plt-web-ui/src/router/axios.js
+++ b/Source/plt-web/plt-web-ui/src/router/axios.js
@@ -17,7 +17,7 @@
 import 'nprogress/nprogress.css';
 
 //榛樿瓒呮椂鏃堕棿
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 30000;
 //杩斿洖鍏朵粬鐘舵�佺爜
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500;
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index a1d02f2..3fb919b 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -23,8 +23,13 @@
         <h3 style="margin: 0 0 10px 0">UI鏉冮檺閰嶇疆</h3>
         <div>
           <el-button icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">鎺堟潈</el-button>
-          <el-button icon="el-icon-close" plain size="small" type="primary" @click="clearValue" style="margin-right: 40px;">閲嶇疆</el-button>
-          涓氬姟绫诲瀷锛�<el-select v-model="type" placeholder="璇烽�夋嫨" size="small" :clearable="true" @change="typeChange" style="width: 300px;margin-right: 20px;">
+          <el-button icon="el-icon-close" plain size="small" style="margin-right: 40px;" type="primary"
+                     @click="clearValue">閲嶇疆
+          </el-button>
+          涓氬姟绫诲瀷锛�
+          <el-select v-model="type" :clearable="true" placeholder="璇烽�夋嫨" size="small"
+                     style="width: 300px;margin-right: 20px;"
+                     @change="typeChange">
             <el-option
               v-for="item in typeData"
               :key="item.oid"
@@ -32,14 +37,16 @@
               :value="item.attributes.name">
             </el-option>
           </el-select>
-          UI涓婁笅鏂囷細<el-select v-model="context" placeholder="璇烽�夋嫨" size="small" :clearable="true" @change="contextChange" style="width: 350px;">
-          <el-option
-            v-for="item in contextData"
-            :key="item.oid"
-            :label="item.plCode+' '+item.plName"
-            :value="item.plCode">
-          </el-option>
-        </el-select>
+          UI涓婁笅鏂囷細
+          <el-select v-model="context" :clearable="true" placeholder="璇烽�夋嫨" size="small" style="width: 350px;"
+                     @change="contextChange">
+            <el-option
+              v-for="item in contextData"
+              :key="item.oid"
+              :label="item.plCode+' '+item.plName"
+              :value="item.plCode">
+            </el-option>
+          </el-select>
         </div>
         <div style="height:  calc(100vh - 232px);margin-top: 10px;">
           <avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
@@ -59,15 +66,15 @@
 
 <script>
 import {gridRoles} from "@/api/system/role/api";
-import {getUIAuthor,authorizedUI} from "@/api/authority/ui/uiAuthor";
+import {getUIAuthor, authorizedUI} from "@/api/authority/ui/uiAuthor";
 import {getBizTree, gridUIContextData} from "@/api/UI/uiDefine";
 
 export default {
   name: "index",
   data() {
     return {
-      type:'',//涓氬姟绫诲瀷
-      context:'',//UI涓婁笅鏂嘽ode
+      type: '',//涓氬姟绫诲瀷
+      context: '',//UI涓婁笅鏂嘽ode
       treeOption: {
         menu: false,
         addBtn: false,
@@ -79,13 +86,13 @@
       },
       nodeRow: {},
       treeData: [],
-      defaultExpandKeys:[],
+      defaultExpandKeys: [],
       uiTreeOption: {
-        defaultExpandedKeys:this.defaultExpandKeys,
+        defaultExpandedKeys: this.defaultExpandKeys,
         multiple: true,
         menu: false,
         addBtn: false,
-        filter:false,
+        filter: false,
         props: {
           label: 'label',
           value: 'oid',
@@ -93,21 +100,21 @@
         }
       },
       uiTreeData: [],
-      typeData:[],
-      contextData:[]
+      typeData: [],
+      contextData: []
     }
   },
   created() {
     this.getTreeList();
     this.getTypeList()
   },
-  methods:{
+  methods: {
     getTreeList() {
       const loading = this.$loading({});
       gridRoles().then(res => {
         this.treeData = res.data.data;
         loading.close();
-      }).catch(error=>{
+      }).catch(error => {
         loading.close();
       })
     },
@@ -122,12 +129,13 @@
         const params = {
           'conditionMap[roleId]': this.nodeRow.oid,
           'conditionMap[type]': this.type,
-          'conditionMap[context]': this.context
+          'conditionMap[context]': this.context,
+          'conditionMap[showCheckbox]': true
         }
-        this.defaultExpandKeys=['root'];
+        this.defaultExpandKeys = ['root'];
         getUIAuthor(params).then(res => {
           this.processChildren(res.data.data[0]); // 澶勭悊姣忎釜鑺傜偣
-          this.uiTreeOption.defaultExpandedKeys=this.defaultExpandKeys;
+          this.uiTreeOption.defaultExpandedKeys = this.defaultExpandKeys;
           this.uiTreeData = [{
             attributes: {},
             checked: false,
@@ -149,24 +157,25 @@
     processChildren(item) {
       if (item.children && item.children.length > 0) {
         item.children = item.children.map(child => {
-          if(child.level<4){
+          if (child.level < 2) {
+            // 榛樿鏍戣妭鐐瑰睍寮�涓ゅ眰鏁堟灉
             this.defaultExpandKeys.push(child.oid)
           }
-          if(child.level==1){
-            child.icon='el-icon-s-promotion';
-            child.label=child.data.label+'锛�'+child.data.name+'锛�'
-          }else if(child.level==2){
-            child.icon='el-icon-s-order';
-            child.label=child.text
-          }else if(child.level==3){
-            child.icon='el-icon-office-building';
-            child.label=child.text
-          }else if(child.level==4){
-            child.icon='el-icon-document';
-            child.label=child.text
-          }else if(child.level==5){
-            child.icon='el-icon-s-tools';
-            child.label=child.text
+          if (child.level == 1) {
+            child.icon = 'el-icon-s-promotion';
+            child.label = child.data.label + '锛�' + child.data.name + '锛�'
+          } else if (child.level == 2) {
+            child.icon = 'el-icon-s-order';
+            child.label = child.text
+          } else if (child.level == 3) {
+            child.icon = 'el-icon-office-building';
+            child.label = child.text
+          } else if (child.level == 4) {
+            child.icon = 'el-icon-document';
+            child.label = child.text
+          } else if (child.level == 5) {
+            child.icon = 'el-icon-s-tools';
+            child.label = child.text
           }
           this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
           return child; // 鍙繑鍥炲瓙鑺傜偣鐨� attributes
@@ -175,26 +184,26 @@
     },
     getTypeList() {
       getBizTree().then(res => {
-        this.typeData=res.data.obj.children;
+        this.typeData = res.data.obj.children;
       })
     },
-    typeChange(data){
-      this.contextData=[];
-      this.type=data;
-      if(data){
+    typeChange(data) {
+      this.contextData = [];
+      this.type = data;
+      if (data) {
         const params = {
           'conditionMap[btmName]': data,
         }
         gridUIContextData(1, 500, params).then(res => {
           this.contextData = res.data.data;
         })
-      }else {
+      } else {
         this.contextData = [];
       }
       this.getUITree();
     },
-    contextChange(data){
-      this.context=data;
+    contextChange(data) {
+      this.context = data;
       this.getUITree();
     },
     saveHandler() {
@@ -216,8 +225,8 @@
         }
       });
     },
-    clearValue(){
-      this.$refs.uiTree.setCheckedNodes([])
+    clearValue() {
+      this.$refs.uiTree.setCheckedNodes([]);
     }
   }
 }
@@ -228,8 +237,9 @@
   .el-scrollbar__wrap {
     overflow: auto !important;
   }
-  .headerCon{
-    .el-button{
+
+  .headerCon {
+    .el-button {
       width: 82px;
     }
   }
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 49029ed..03c0301 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -1287,7 +1287,7 @@
 
     // 鏂板缂栬緫淇濆瓨
     addDialogSavaHandler() {
-      if (!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
+      if (this.form.revLevel !== '0' &&!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
         this.$message.error('璇锋鏌ョ増鏈彿瑙勫垯涓嶈兘涓虹┖');
         return;
       }
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index 78bea66..ac5f61b 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -25,6 +25,14 @@
 
     <el-main>
       <basic-container>
+        <div v-if="!tableStatus" style="display: flex;justify-content: left;margin-top: 15px">
+          <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">澧炲姞</el-button>
+          <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
+          <el-button icon="el-icon-document-add" plain size="small" type="primary">鍏嬮殕</el-button>
+          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
+          <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+          </el-button>
+        </div>
         <avue-crud
           v-if="!tableStatus"
           ref="crud"
@@ -61,14 +69,6 @@
             </el-button>
           </template>
         </avue-crud>
-        <div v-if="!tableStatus" style="display: flex;justify-content: center;margin-top: 15px">
-          <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">澧炲姞</el-button>
-          <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
-          <el-button icon="el-icon-document-add" plain size="small" type="primary">鍏嬮殕</el-button>
-          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
-          <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
-          </el-button>
-        </div>
       </basic-container>
     </el-main>
     <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"></form-dialog>
@@ -117,6 +117,7 @@
         addBtn: false,
         editBtn: false,
         delBtn: false,
+        calcHeight:-60,
         column: [
           {
             label: '涓氬姟鍚嶇О',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
index 9a6bc20..0bf39a8 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -36,8 +36,10 @@
             <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">鍒涘缓</el-button>
             <!--<el-button icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">淇敼</el-button>
             <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>-->
-            <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
-            <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
+            <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+            </el-button>
+            <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆
+            </el-button>
             <el-button icon="el-icon-place" plain size="small" type="primary" @click="uiAuthorHandler">鎺堟潈</el-button>
           </template>
           <template slot="menu" slot-scope="scope">
@@ -45,7 +47,8 @@
             </el-button>
             <el-button icon="el-icon-delete" size="small" type="text" @click="rowDeleteHandler(scope.row)">鍒犻櫎
             </el-button>
-            <el-button icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">鍏嬮殕</el-button>
+            <el-button icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">鍏嬮殕
+            </el-button>
           </template>
           <template slot="plName" slot-scope="{row}">
             <el-link type="primary" @click="linkClickHandler(row)">{{ row.plName }}</el-link>
@@ -55,11 +58,11 @@
         <el-dialog
           v-dialogDrag
           v-loading="dialogLoading"
+          :close-on-click-modal="false"
           :title="dialogType === 'add' ? ' 鍒涘缓 涓婁笅鏂�' : '缂栬緫 涓婁笅鏂�'"
           :visible.sync="dialogVisible"
           append-to-body="true"
           class="avue-dialog"
-          :close-on-click-modal="false"
           width="500px"
           @close="dialogClose"
         >
@@ -78,7 +81,7 @@
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="鎻忚堪锛�" prop="plDesc">
-              <el-input type="textarea" :rows="5" v-model="form.plDesc"></el-input>
+              <el-input v-model="form.plDesc" :rows="5" type="textarea"></el-input>
             </el-form-item>
           </el-form>
           <span slot="footer" class="dialog-footer">
@@ -90,14 +93,14 @@
         <el-dialog
           key="cloneDialog"
           v-dialogDrag
-          title="鍏嬮殕"
           :visible.sync="cloneDialogVisible"
           append-to-body="true"
           class="avue-dialog"
+          title="鍏嬮殕"
           width="500px"
           @close="cloneDialogClose"
         >
-          <avue-form ref="cloneForm" :option="cloneOption" v-model="cloneForm"></avue-form>
+          <avue-form ref="cloneForm" v-model="cloneForm" :option="cloneOption"></avue-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="cloneDialogClose">鍙� 娑�</el-button>
             <el-button type="primary" @click="cloneSaveHandler">纭� 瀹�</el-button>
@@ -107,10 +110,10 @@
         <el-dialog
           key="cloneDialog"
           v-dialogDrag
-          title="瀵煎嚭"
           :visible.sync="expDialogVisible"
           append-to-body="true"
           class="avue-dialog"
+          title="瀵煎嚭"
           width="500px"
           @close="expDialogVisible=false"
         >
@@ -124,19 +127,20 @@
         </el-dialog>
       </basic-container>
       <!-- 瀵煎叆 -->
-      <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" :fileData="fileData" title="瀵煎叆"
+      <upload-file ref="upload" :fileData="fileData" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList"
+                   title="瀵煎叆"
                    @updata="getTableList" @upfaildata="upFail"></upload-file>
       <!--椤电绐楀彛-->
       <el-dialog v-dialogDrag
+                 :append-to-body="true"
+                 :close-on-click-modal="false"
+                 :destroy-on-close="true"
+                 :fullscreen="true"
                  :title="dialog.title"
                  :visible.sync="dialog.showDialog"
-                 :fullscreen="true"
-                 :append-to-body="true"
                  class="avue-dialog"
-                 :destroy-on-close="true"
-                 :close-on-click-modal="false"
                  @close="dialog.showDialog=false">
-          <pl-show :uiDefineData="dialog.uiDefineData"></pl-show>
+        <pl-show :uiDefineData="dialog.uiDefineData"></pl-show>
       </el-dialog>
       <!--ui鎺堟潈-->
       <ui-author ref="uiAuthor"></ui-author>
@@ -146,26 +150,36 @@
 </template>
 
 <script>
-import {getBizTree,gridUIContextData,saveUIContextData,updateUIContextData,delUIContextData, cloneUIContextData ,getExpContextTree,expUIContextData} from "@/api/UI/uiDefine";
+import {
+  getBizTree,
+  gridUIContextData,
+  saveUIContextData,
+  updateUIContextData,
+  delUIContextData,
+  cloneUIContextData,
+  getExpContextTree,
+  expUIContextData
+} from "@/api/UI/uiDefine";
 import basicOption from "@/util/basic-option";
 import func from "@/util/func";
 import plShow from "@/views/modelingMenu/ui/uiDefine/rightRegion/plShow";
 import uiAuthor from "@/views/authority/ui/uiAuthorization/UIDialog"
+
 export default {
   name: "index",
-  components:{plShow,uiAuthor},
+  components: {plShow, uiAuthor},
   data() {
     return {
       dialog: {
         showDialog: false,
         title: "涓婁笅鏂囪鎯�",
         loading: false,
-        uiDefineData:null
+        uiDefineData: null
       },
       tipList: [],
       upFileType: ['xls'],
       fileUrl: 'api/uiManagerController/impUIContextData',
-      fileData:{},
+      fileData: {},
       lastIndex: null,
       treeOption: {
         height: 'auto',
@@ -194,13 +208,13 @@
       selectList: [],
       option: {
         ...basicOption,
-        calcHeight: -40,
+        calcHeight: -50,
         addBtn: false,
         editBtn: false,
         delBtn: false,
         tip: false,
         searchMenuSpan: 6,
-        align:'left',
+        align: 'left',
         column: [{
           label: '鍚嶇О',
           prop: 'plName',
@@ -214,7 +228,7 @@
           label: '瀵艰埅鍖�',
           prop: 'plIsShowNavigator',
           width: 130,
-          align:'center',
+          align: 'center',
           formatter: function (row, value) {
             if (row.plIsShowNavigator == 0) {
               return '涓嶆樉绀�'
@@ -226,7 +240,7 @@
           label: '鎺у埗鍖�',
           prop: 'plIsShowForm',
           width: 130,
-          align:'center',
+          align: 'center',
           formatter: function (row, value) {
             if (row.plIsShowForm == 0) {
               return '涓嶆樉绀�'
@@ -238,7 +252,7 @@
           label: '鎿嶄綔鍖�',
           prop: 'plIsShowTab',
           width: 130,
-          align:'center',
+          align: 'center',
           formatter: function (row, value) {
             if (row.plIsShowTab == 0) {
               return '涓嶆樉绀�'
@@ -274,18 +288,18 @@
           trigger: 'blur'
         }]
       },
-      cloneDialogVisible:false,
+      cloneDialogVisible: false,
       cloneOption: {
-        submitBtn:false,
-        emptyBtn:false,
+        submitBtn: false,
+        emptyBtn: false,
         column: [{
           label: '鍏嬮殕鐩爣',
           prop: 'cloneTargetName',
-          span:24,
+          span: 24,
           type: 'tree',
           clearable: true,
           dicData: [],
-          defaultExpandAll:true,
+          defaultExpandAll: true,
           rules: [
             {
               required: true,
@@ -296,7 +310,7 @@
         }, {
           label: 'UI鍚嶇О',
           prop: 'cloneName',
-          span:24,
+          span: 24,
           type: 'input',
           rules: [
             {
@@ -308,7 +322,7 @@
         }, {
           label: 'UI涓婁笅鏂�',
           prop: 'cloneContextCode',
-          span:24,
+          span: 24,
           type: 'input',
           rules: [
             {
@@ -319,19 +333,19 @@
           ]
         }]
       },
-      cloneForm:{
+      cloneForm: {
         //鍏嬮殕鐨勬簮瀵硅薄鐨勪俊鎭�
-        sourcePLUILayout:null,
-        cloneTargetName:'n',
-        cloneName:'',
-        cloneContextCode:''
+        sourcePLUILayout: null,
+        cloneTargetName: 'n',
+        cloneName: '',
+        cloneContextCode: ''
       },
-      expDialogVisible:false,
-      expTreeData:[],
-      expOption:{
+      expDialogVisible: false,
+      expTreeData: [],
+      expOption: {
         height: 'auto',
-        filter:false,
-        multiple:true,
+        filter: false,
+        multiple: true,
         defaultExpandAll: true,
         menu: false,
         addBtn: false,
@@ -351,17 +365,17 @@
     getTreeList() {
       const loading = this.$loading({});
       getBizTree().then(res => {
-        this.treeData=[res.data.obj];
+        this.treeData = [res.data.obj];
         const dicData = res.data.obj.children.map(item => {
-          item.label=item.attributes.name;
-          item.value=item.attributes.name;
+          item.label = item.attributes.name;
+          item.value = item.attributes.name;
           return item;
         });
-        this.cloneOption.column[0].dicData=[{
-          label:'涓氬姟绫诲瀷鏍�',
-          value:'涓氬姟绫诲瀷鏍�',
+        this.cloneOption.column[0].dicData = [{
+          label: '涓氬姟绫诲瀷鏍�',
+          value: '涓氬姟绫诲瀷鏍�',
           disabled: true,
-          children:dicData
+          children: dicData
         }];
         loading.close();
       }).catch(error => {
@@ -376,8 +390,8 @@
         this.getTableList();
       }
     },
-    getTableList(){
-      const params = Object.assign(this.searchParams,{
+    getTableList() {
+      const params = Object.assign(this.searchParams, {
         'conditionMap[btmName]': this.nodeRow.attributes.name,
       })
       gridUIContextData(this.page.currentPage, this.page.pageSize, params).then(res => {
@@ -387,14 +401,14 @@
         this.tableLoading = false;
       })
     },
-    linkClickHandler(row){
-      this.dialog.title='銆�'+row.plName+' - '+row.plCode+'銆戣鎯�'
-      this.dialog.uiDefineData=row;
-      this.dialog.showDialog=true;
+    linkClickHandler(row) {
+      this.dialog.title = '銆�' + row.plName + ' - ' + row.plCode + '銆戣鎯�'
+      this.dialog.uiDefineData = row;
+      this.dialog.showDialog = true;
       return false;
       this.$router.push({
-        path: '/UIDefineShow/:'+row.plOId,
-        name: row.plName+'璇︽儏'
+        path: '/UIDefineShow/:' + row.plOId,
+        name: row.plName + '璇︽儏'
       });
     },
     sizeChange(val) {
@@ -439,25 +453,25 @@
     },
 
     //鍒涘缓
-    addHandler(){
-      if(this.nodeRow && this.nodeRow.oid){
-        this.form.plIsShow=[];
-        this.form.plRelatedType=this.nodeRow.attributes.name;
+    addHandler() {
+      if (this.nodeRow && this.nodeRow.oid) {
+        this.form.plIsShow = [];
+        this.form.plRelatedType = this.nodeRow.attributes.name;
         this.dialogType = 'add';
         this.dialogVisible = true;
-      }else {
+      } else {
         this.$message.error('璇烽�夋嫨涓氬姟绫诲瀷');
       }
 
     },
-    editHandler(){
-      if(this.selectList.length!=0){
+    editHandler() {
+      if (this.selectList.length != 0) {
         this.rowEditBtnClick(this.selectList[0]);
-      }else {
+      } else {
         this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛岀紪杈�');
       }
     },
-    delHandler(){
+    delHandler() {
       if (this.selectList.length <= 0) {
         this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
         return;
@@ -491,31 +505,31 @@
       this.form = {
         plName: '',
         plCode: '',
-        plDesc:'',
+        plDesc: '',
         plIsShow: [],
       }
     },
     // 淇濆瓨UI涓婁笅鏂�
     saveHandler() {
-      this.$refs.form.validate((valid,done) => {
+      this.$refs.form.validate((valid, done) => {
         if (valid) {
           let params = {
             ...this.form
           }
-          if(this.form.plIsShow.includes('瀵艰埅鍖�')){
-            params.plIsShowNavigator=1
-          }else {
-            params.plIsShowNavigator=0
+          if (this.form.plIsShow.includes('瀵艰埅鍖�')) {
+            params.plIsShowNavigator = 1
+          } else {
+            params.plIsShowNavigator = 0
           }
-          if(this.form.plIsShow.includes('鎺у埗鍖�')){
-            params.plIsShowForm=1;
-          }else {
-            params.plIsShowForm=0;
+          if (this.form.plIsShow.includes('鎺у埗鍖�')) {
+            params.plIsShowForm = 1;
+          } else {
+            params.plIsShowForm = 0;
           }
-          if(this.form.plIsShow.includes('鎿嶄綔鍖�')){
-            params.plIsShowTab=1;
-          }else {
-            params.plIsShowTab=0;
+          if (this.form.plIsShow.includes('鎿嶄綔鍖�')) {
+            params.plIsShowTab = 1;
+          } else {
+            params.plIsShowTab = 0;
           }
           delete params.plIsShow;
           if (this.dialogType === 'add') {
@@ -550,24 +564,24 @@
         expDatas: this.selectList.map(item => item.plOId).join(',')
       }
       getExpContextTree(params).then(res => {
-        this.expTreeData=[res.data.obj];
+        this.expTreeData = [res.data.obj];
       })
-      this.expDialogVisible=true;
+      this.expDialogVisible = true;
     },
-    exportData(){
+    exportData() {
       const params = {}
-      const checkedDatas=this.$refs.expTree.getCheckedNodes();
+      const checkedDatas = this.$refs.expTree.getCheckedNodes();
       if (checkedDatas.length <= 0) {
         this.$message.error('璇烽�夋嫨鏁版嵁');
         return;
       }
-      this.selectList.forEach(item=>{
-        params[item.plOId]=checkedDatas.filter(checkitem => checkitem.parentId==item.plOId).map(checkitem => checkitem.oid).join(',')
+      this.selectList.forEach(item => {
+        params[item.plOId] = checkedDatas.filter(checkitem => checkitem.parentId == item.plOId).map(checkitem => checkitem.oid).join(',')
       })
       expUIContextData(params).then(res => {
         func.downloadFileByBlobHandler(res);
         this.$message.success('瀵煎嚭鎴愬姛');
-        this.expDialogVisible=false;
+        this.expDialogVisible = false;
       }).catch(err => {
         this.$message.error(err);
       });
@@ -575,37 +589,37 @@
 
     // 瀵煎叆
     upLoadClickHandler() {
-      this.fileData={
-        isCovered:false,
-        selectBtm:this.nodeRow.attributes.name
+      this.fileData = {
+        isCovered: false,
+        selectBtm: this.nodeRow.attributes.name
       }
       this.$refs.upload.visible = true;
     },
     //瀵煎叆澶辫触
-    upFail(response){
+    upFail(response) {
 
     },
     //ui鎺堟潈
-    uiAuthorHandler(){
-      if (this.selectList.length!=1) {
+    uiAuthorHandler() {
+      if (this.selectList.length != 1) {
         this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�');
         return;
       }
-      this.$refs.uiAuthor.openDialog(this.nodeRow.attributes.name,this.selectList[0].plCode);
+      this.$refs.uiAuthor.openDialog(this.nodeRow.attributes.name, this.selectList[0].plCode);
     },
     // 缂栬緫鎸夐挳
     rowEditBtnClick(row) {
-      this.form={
+      this.form = {
         ...row,
         plIsShow: [],
       };
-      if(row.plIsShowNavigator){
+      if (row.plIsShowNavigator) {
         this.form.plIsShow.push('瀵艰埅鍖�')
       }
-      if(row.plIsShowForm){
+      if (row.plIsShowForm) {
         this.form.plIsShow.push('鎺у埗鍖�')
       }
-      if(row.plIsShowTab){
+      if (row.plIsShowTab) {
         this.form.plIsShow.push('鎿嶄綔鍖�')
       }
       this.dialogType = 'edit';
@@ -632,17 +646,17 @@
       });
     },
     //鍏嬮殕
-    rowCloneHandler(row){
-      this.cloneForm={
-        sourcePLUILayout:row,
-        cloneTargetName:'',
-        cloneName:row.plName+'_copy(0)',
-        cloneContextCode:row.plCode+'_copy(0)',
+    rowCloneHandler(row) {
+      this.cloneForm = {
+        sourcePLUILayout: row,
+        cloneTargetName: '',
+        cloneName: row.plName + '_copy(0)',
+        cloneContextCode: row.plCode + '_copy(0)',
       }
-      this.cloneDialogVisible=true;
+      this.cloneDialogVisible = true;
     },
-    cloneSaveHandler(){
-      this.$refs.cloneForm.validate((valid,done) => {
+    cloneSaveHandler() {
+      this.$refs.cloneForm.validate((valid, done) => {
         if (valid) {
           cloneUIContextData(this.cloneForm).then(res => {
             if (res.data.code === 200) {
@@ -656,9 +670,9 @@
         }
       });
     },
-    cloneDialogClose(){
-      this.cloneDialogVisible=false;
-      this.cloneForm= {
+    cloneDialogClose() {
+      this.cloneDialogVisible = false;
+      this.cloneForm = {
         //鍏嬮殕鐨勬簮瀵硅薄鐨勪俊鎭�
         sourcePLUILayout: null,
         cloneTargetName: '',
@@ -675,8 +689,9 @@
   .el-scrollbar__wrap {
     overflow: auto !important;
   }
-  .headerCon{
-    .el-button{
+
+  .headerCon {
+    .el-button {
       width: 82px;
     }
   }
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue
index 952ab1a..20b15b6 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action.vue
@@ -74,7 +74,7 @@
 import basicOption from "@/util/basic-option";
 
 export default {
-  name: "index",
+    name: "index",
   data() {
     return {
       btnActionVisible: false,
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index e770a46..a3aab36 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -136,7 +136,7 @@
                   </el-form-item>
 
                   <el-col :span="12">
-                    <el-form-item label="鏄惁鎺堟潈锛�" prop="resource">
+                    <el-form-item label="鏄惁鎺堟潈锛�" prop="authorization">
                       <el-radio v-model="basicForm.authorization" :disabled="disabledBtn" label="0">鏄�</el-radio>
                       <el-radio v-model="basicForm.authorization" :disabled="disabledBtn" label="1">鍚�</el-radio>
                     </el-form-item>
@@ -198,8 +198,10 @@
       </el-container>
     </el-dialog>
     <action-dialog ref="actionDialog" @updataAction="actionSaveHandler"></action-dialog>
-    <clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" type="pageDef" paramsType="tab"></clone-dialog>
-    <clone-dialog ref="cloneBtnDialog" :fromOid="formBtnOid" :sourceOId="sourceBtnOid" type="tabButton" paramsType="pageDef"></clone-dialog>
+    <clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" paramsType="tab"
+                  type="pageDef"></clone-dialog>
+    <clone-dialog ref="cloneBtnDialog" :fromOid="formBtnOid" :sourceOId="sourceBtnOid" paramsType="pageDef"
+                  type="tabButton"></clone-dialog>
   </div>
 </template>
 
@@ -207,14 +209,14 @@
 import basicOption from "@/util/basic-option";
 import func from "@/util/func";
 import {
-  getPLPageDefinations,
   getBtmDatasByPage,
   getPortalVIDatasByPage,
   getQTInfoDatasByPage,
+  getLinkDatasByPage,
+  getPLPageDefinations,
   getTabButtons,
   addTapButton,
   updateTapButton,
-  getLinkDatasByPage,
   addPageDefination,
   deleteTabButton,
   delPageDefination,
@@ -243,10 +245,10 @@
   name: "index",
   data() {
     return {
-      formBtnOid:'',
-      sourceBtnOid:'',
-      sourceOId:'',
-      fromOid:'',
+      formBtnOid: '',
+      sourceBtnOid: '',
+      sourceOId: '',
+      fromOid: '',
       paramsForm: {},
       eventOption: {
         ...basicOption,
@@ -722,7 +724,7 @@
     sourceData: {
       handler(val) {
         if (val && val.plOId) {
-          this.getTableList()
+          this.getTableList();
         } else {
           this.data = [];
         }
@@ -869,7 +871,8 @@
         console.log(res);
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
-          done()
+          this.getTableList();
+          done();
         }
       }).catch(err => {
         loading();

--
Gitblit v1.9.3