From 62e34faacf9d5de8bf94de6cabd219560af3b1d7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十二月 2024 18:02:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |   99 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 73 insertions(+), 26 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 534aa18..8f4a109 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
@@ -288,9 +288,11 @@
   name: "index",
   data() {
     return {
-      queryTemplateNameList:[],
+      queryTemplateNameList: [],
       templateIdList: [],
       searchTargerChangeFlag: false,
+      showTypeChangeFlag: false,
+      linkTypeChangeFlag: false,
       formBtnOid: '',
       sourceBtnOid: '',
       sourceOId: '',
@@ -412,6 +414,7 @@
       data: [],
       option: {
         ...basicOption,
+        size:'mini',
         height: this.height,
         addBtn: false,
         index: true,
@@ -422,6 +425,7 @@
           {
             label: '鍚嶇О',
             prop: 'name',
+            labelWidth: 110,
             rules: [
               {
                 required: true,
@@ -433,6 +437,7 @@
           {
             label: '缂栧彿',
             prop: 'seq',
+            labelWidth: 110,
             hide: false,
             rules: [
               {
@@ -446,17 +451,25 @@
             label: '',
             prop: 'uiParser',
             hide: true,
-            labelWidth: 100,
+            labelWidth: 110,
           },
           {
             label: '',
             prop: 'extAttr',
             hide: true,
+            labelWidth: 110,
+          },
+          {
+            label: '鎻忚堪',
+            prop: 'description',
+            labelWidth: 110,
+            hide: false,
           },
           {
             label: '妯℃澘绫诲瀷',
             prop: 'templateType',
             type: 'radio',
+            labelWidth: 110,
             span: 24,
             value: '1',
             dicData: [
@@ -515,6 +528,7 @@
             label: '鏄剧ず绫诲瀷',
             prop: 'navigatorType',
             type: 'radio',
+            labelWidth: 110,
             span: 24,
             value: '1',
             hide: true,
@@ -537,6 +551,7 @@
             label: '鎼滅储绫诲瀷',
             prop: 'searchTarger',
             display: true,
+            labelWidth: 110,
             type: 'radio',
             value: '1',
             span: 24,
@@ -571,27 +586,25 @@
               }
             }
           },
-          {
-            label: '鎻忚堪',
-            prop: 'description',
-            display: false
-          },
         ],
         group: [
           {
-            label: '',
-            arrow: false,
+            icon:'el-icon-info',
+            label:'',
+            arrow: true,
             prop: 'group1',
             column: [
               {
                 label: '婧愬璞�',
                 prop: 'showType',
                 type: 'select',
+                labelWidth: 115,
                 cascader: ['linkType', 'SubUILayout', 'searchObjType'],
                 placeholder: "璇疯緭鍏ュ唴瀹�",
                 dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
                 filterable: true,
                 change: (val) => {
+                  console.log('showTypeChangeFlag',this.showTypeChangeFlag)
                   if (val.value) {
                     let params = {
                       'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? this.form.showType : this.form.linkType
@@ -602,6 +615,20 @@
                     getQTInfoDatasByPage(1, -1, params).then(res => {
                       this.queryTemplateNameList = res.data.data;
                     })
+                  }
+                  if (this.showTypeChangeFlag) {
+                    if (val.value) {
+                      if (this.form.searchTarger === '1') {
+                        this.form.templateId = "";
+                        this.form.queryTemplateName = "";
+                      } else {
+                        this.form.linkType = "";
+                        this.form.templateId = "";
+                        this.form.queryTemplateName = "";
+                      }
+                    }
+                  } else {
+                    this.showTypeChangeFlag = true;
                   }
                 },
                 props: {
@@ -622,6 +649,7 @@
                 prop: 'linkType',
                 type: 'select',
                 display: false,
+                labelWidth: 115,
                 filterable: true,
                 props: {
                   label: 'name',
@@ -629,7 +657,7 @@
                   desc: 'tag'
                 },
                 dicUrl: '/api/uiManagerController/getLinkDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}',
-                change:(val) => {
+                change: (val) => {
                   if (val.value) {
                     let params = {
                       'conditionMap[selectBtmType]': val.value
@@ -641,11 +669,20 @@
                       this.queryTemplateNameList = res.data.data;
                     })
                   }
+                  if (this.linkTypeChangeFlag) {
+                    if (val.value) {
+                      this.form.templateId = "";
+                      this.form.queryTemplateName = "";
+                    }
+                  } else {
+                    this.linkTypeChangeFlag = true;
+                  }
                 }
               },
               {
                 label: '閫夋嫨妯℃澘',
                 prop: 'templateId',
+                labelWidth: 115,
                 display: false,
                 formslot: true,
                 rules: [
@@ -660,6 +697,7 @@
                 label: 'UI瀹氫箟',
                 prop: 'SubUILayout',
                 type: 'select',
+                labelWidth: 115,
                 filterable: true,
                 display: false,
                 props: {
@@ -674,6 +712,7 @@
                 display: false,
                 value: '1',
                 type: 'radio',
+                labelWidth: 115,
                 span: 24,
                 dicData: [
                   {
@@ -691,7 +730,7 @@
                 prop: 'searchObjType',
                 type: 'select',
                 display: false,
-                labelWidth: 100,
+                labelWidth: 115,
                 props: {
                   label: 'qtName',
                   value: 'qtName',
@@ -702,6 +741,7 @@
               {
                 label: '鏌ヨ妯℃澘',
                 prop: 'queryTemplateName',
+                labelWidth: 115,
                 type: 'select',
                 display: false,
                 formslot: true,
@@ -709,6 +749,7 @@
               {
                 label: '鎺у埗璺緞',
                 prop: 'controlPath',
+                labelWidth: 115,
                 display: false,
                 type: 'textarea',
                 span: 24,
@@ -717,18 +758,20 @@
               {
                 label: '鏍戠粨鏋勫睍寮�鍒�',
                 prop: 'expandCols',
-                labelWidth: 110,
+                labelWidth: 115,
                 display: false,
                 span: 12
               },
               {
                 label: '鍙傜収鏍戣缃�',
                 prop: 'showLinkAbs',
+                labelWidth: 115,
                 display: false,
               },
               {
                 label: '鍒嗛殧绗�',
                 prop: 'separator',
+                labelWidth: 115,
                 display: false,
               },
               {
@@ -736,6 +779,7 @@
                 prop: 'expandMode',
                 display: false,
                 type: 'radio',
+                labelWidth: 115,
                 value: '1',
                 dicData: [
                   {
@@ -749,20 +793,6 @@
                 ]
               },
               {
-                label: '鏍硅妭鐐规樉绀鸿〃杈惧紡',
-                prop: 'rootContent',
-                display: false,
-                labelWidth: 135,
-                span: 12
-              },
-              {
-                label: '鏍戣妭鐐规樉绀鸿〃杈惧紡',
-                prop: 'showAbs',
-                display: false,
-                labelWidth: 135,
-                span: 12
-              },
-              {
                 label: 'B/S鑷畾涔夋煡璇�',
                 prop: 'bsCustQueryCLsOrUrl',
                 display: false,
@@ -774,6 +804,20 @@
                 prop: 'csCustQueryCLsOrUrl',
                 display: false,
                 labelWidth: 115,
+                span: 12
+              },
+              {
+                label: '鏍硅妭鐐规樉绀鸿〃杈惧紡',
+                prop: 'rootContent',
+                display: false,
+                labelWidth: 135,
+                span: 12
+              },
+              {
+                label: '鏍戣妭鐐规樉绀鸿〃杈惧紡',
+                prop: 'showAbs',
+                display: false,
+                labelWidth: 135,
                 span: 12
               },
             ]
@@ -873,6 +917,8 @@
     // 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍
     beforeClose(done) {
       this.eventData = [];
+      this.showTypeChangeFlag = false;
+      this.linkTypeChangeFlag = false;
       done();
     },
 
@@ -892,6 +938,7 @@
           };
         });
       }
+      console.log('row',row);
       this.searchTargerChangeFlag = false;
       this.$refs.crud.rowEdit(row);
     },

--
Gitblit v1.9.3