From 100079be55493c439bfef2d4792bfa0d9f429bd1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 十月 2024 15:14:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

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..8f61d44 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>
 
@@ -208,20 +210,16 @@
 import func from "@/util/func";
 import {
   getPLPageDefinations,
-  getBtmDatasByPage,
-  getPortalVIDatasByPage,
-  getQTInfoDatasByPage,
   getTabButtons,
   addTapButton,
   updateTapButton,
-  getLinkDatasByPage,
   addPageDefination,
   deleteTabButton,
   delPageDefination,
   joinBtn,
   exitBtn
 } from "@/api/UI/uiDefine";
-import actionDialog from '@/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/components/action';
+import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog';
 import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog";
 
 export default {
@@ -243,10 +241,10 @@
   name: "index",
   data() {
     return {
-      formBtnOid:'',
-      sourceBtnOid:'',
-      sourceOId:'',
-      fromOid:'',
+      formBtnOid: '',
+      sourceBtnOid: '',
+      sourceOId: '',
+      fromOid: '',
       paramsForm: {},
       eventOption: {
         ...basicOption,
@@ -722,7 +720,7 @@
     sourceData: {
       handler(val) {
         if (val && val.plOId) {
-          this.getTableList()
+          this.getTableList();
         } else {
           this.data = [];
         }
@@ -869,7 +867,8 @@
         console.log(res);
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
-          done()
+          this.getTableList();
+          done();
         }
       }).catch(err => {
         loading();
@@ -941,7 +940,7 @@
     // 妯℃澘绫诲瀷涓烘爲琛�
     templateTypeTreeTable(val) {
       if (!val) return;
-      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'zkfs']);
+      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode']);
     },
 
     // 妯℃澘绫诲瀷涓鸿〃鍗�
@@ -997,6 +996,7 @@
         this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�');
         return;
       }
+      console.log(this.selectList);
       this.btnDesignVisible = true;
       this.formBtnOid = this.selectList[0].id;
       this.getTabBtnTree();
@@ -1122,7 +1122,8 @@
       const params = this.saveType === 'add' ? {
         ...this.basicForm,
         parentId: this.nodeTreeRow.oId === 'parentNode' ? '' : this.nodeTreeRow.parentId,
-        buttonParams: bottomParams
+        buttonParams: bottomParams,
+        tableOId:this.selectList[0].id
       } : {
         ...this.basicForm,
         buttonParams: bottomParams
@@ -1192,7 +1193,7 @@
 
     // 閫夋嫨action
     actionFoucus() {
-      this.$refs.actionDialog.btnActionVisible = true;
+      this.$refs.actionDialog.openDialog();
     },
 
     // 淇濆瓨action

--
Gitblit v1.9.3