From 3e9b476525c1949577ac2454072e5d62c2a97e90 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 22 十一月 2024 15:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |   70 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 25 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 00148aa..e78aadb 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
@@ -8,10 +8,8 @@
       :data="data"
       :option="option"
       :table-loading="tableLoading"
-      @row-del="rowDelHandler"
       @row-save="rowSaveHandler"
       @row-update="rowUpdateHandler"
-      @refresh-change="handleRefresh"
       @selection-change="selectChangeHandler"
       @row-click="rowClickHandler">
       <template slot="menuLeft" slot-scope="scope">
@@ -217,7 +215,8 @@
   deleteTabButton,
   delPageDefination,
   joinBtn,
-  exitBtn
+  exitBtn,
+  updatePageDefination
 } from "@/api/UI/uiDefine";
 import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog';
 import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog";
@@ -249,7 +248,7 @@
       eventOption: {
         ...basicOption,
         addBtn: false,
-        editBtn: false,
+        // editBtn: false,
         delBtn: false,
         refreshBtn: false,
         highlightCurrentRow: true,
@@ -440,9 +439,10 @@
             },
             change: (val) => {
               const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'searchObjType', 'queryTemplateName', 'controlPath', 'expandCols', 'rootContent', 'showAbs', 'showLinkAbs', 'separator']
-              list.forEach(item => {
-                this.form[item] = "";
-              })
+              // list.forEach(item => {
+              //   this.form[item] = "";
+              // })
+              this.form.searchTarger = '1'
               const searchTarger = this.option.column.find(item => item.prop === 'searchTarger');  // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤�
               searchTarger.display = true; // 鍒囨崲榛樿灞曠ず鎼滅储绫诲瀷
               // 妯℃澘绫诲瀷涓鸿〃鏍�
@@ -509,9 +509,9 @@
               }
               // 鍒囨崲娓呯┖妯℃澘绫诲瀷
               const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'queryTemplateName', 'searchObjType'];
-              list.forEach(item => {
-                this.form[item] = '';
-              })
+              // list.forEach(item => {
+              //   this.form[item] = '';
+              // })
             }
           },
           {
@@ -587,9 +587,8 @@
                 filterable: true,
                 display: false,
                 props: {
-                  label: 'qtName',
-                  value: 'qtName',
-                  desc: 'btmName'
+                  label: 'plName',
+                  value: 'plCode',
                 },
                 dicUrl: '/api/uiManagerController/getUILayoutDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}',
               },
@@ -790,15 +789,11 @@
 
     // 缂栬緫鎵撳紑琛ㄥ崟鍓�
     beforeOpen(done, type) {
-      if (type === 'edit') {
-        this.form.showType = 'Ludc';
-        this.$set(this.form, 'showType', 'Ludc');
-        // this.$set(this.option.group[0].column[0],'value','Ludc');
-        // this.option.group[0].column[0].value = 'Ludc';
-        done();
-      } else {
-        done();
-      }
+      // if (type === 'edit') {
+      //   console.log('edit');
+      //   this.form.showType = 'Ludc';
+      // }
+      done();
     },
 
     // 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍
@@ -875,6 +870,28 @@
       })
     },
 
+    rowUpdateHandler(row,index,done,loading){
+      if (row.templateType === '6') {
+        row.SubUIObjType = row.showType;
+        row.showType = "";
+      }
+      console.log(this.sourceData);
+      const params = {
+        ...row,
+        tabPageOId: this.sourceData.plOId
+      }
+      updatePageDefination(params).then(res => {
+        console.log(res);
+        if (res.data.code === 200) {
+          this.$message.success(res.data.obj);
+          this.getTableList();
+          done();
+        }
+      }).catch(err => {
+        loading();
+      })
+    },
+
     // 瀵硅瘽妗嗚〃鏍艰鐐瑰嚮
     formDataRowClick(row) {
       this.formDataRow = row;
@@ -940,7 +957,7 @@
     // 妯℃澘绫诲瀷涓烘爲琛�
     templateTypeTreeTable(val) {
       if (!val) return;
-      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'zkfs']);
+      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode']);
     },
 
     // 妯℃澘绫诲瀷涓鸿〃鍗�
@@ -996,6 +1013,7 @@
         this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�');
         return;
       }
+      console.log(this.selectList);
       this.btnDesignVisible = true;
       this.formBtnOid = this.selectList[0].id;
       this.getTabBtnTree();
@@ -1041,7 +1059,7 @@
 
     // 鎸夐挳璁捐淇℃伅鍙傛暟淇℃伅淇敼
     paramsRowEditHandler(row) {
-      this.$refs.paramsCrud.rowEdit(row);
+      this.$refs.paramsCrud.rowEdit(row,row.$index);
     },
 
     // 鎸夐挳璁捐鍙傛暟淇℃伅娣诲姞鎸夐挳
@@ -1051,6 +1069,7 @@
 
     // 鎸夐挳璁捐鍙傛暟淇℃伅淇敼淇濆瓨
     paramsRowUpdate(row, index, done, loading) {
+      console.log(row,index);
       this.paramsData.splice(index, 1, row);
       done();
     },
@@ -1121,7 +1140,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

--
Gitblit v1.9.3