From c94eaa728f9d68a872d904823c964e5d5810f202 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十二月 2024 18:02:49 +0800
Subject: [PATCH] 修改自定义url绑定值&&登录添加中文密码错误提示&&

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 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 c1df775..97eef61 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
@@ -577,7 +577,7 @@
 
               if (this.searchTargerChangeFlag) {
                 // 鍒囨崲娓呯┖妯℃澘绫诲瀷
-                const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'queryTemplateName', 'searchObjType', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl'];
+                const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'queryTemplateName', 'searchObjType', 'bsDataModel', 'csDataModel'];
                 list.forEach(item => {
                   this.form[item] = '';
                 })
@@ -606,7 +606,7 @@
                 change: (val) => {
                   if (val.value) {
                     let params = {
-                      'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? this.form.showType : this.form.linkType
+                      'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? val.value : this.form.linkType
                     }
                     getPortalVIDatasByPage(1, -1, params).then(res => {
                       this.templateIdList = res.data.data;
@@ -793,14 +793,14 @@
               },
               {
                 label: 'B/S鑷畾涔夋煡璇�',
-                prop: 'bsCustQueryCLsOrUrl',
+                prop: 'bsDataModel',
                 display: false,
                 labelWidth: 115,
                 span: 12
               },
               {
                 label: 'C/S鑷畾涔夋煡璇�',
-                prop: 'csCustQueryCLsOrUrl',
+                prop: 'csDataModel',
                 display: false,
                 labelWidth: 115,
                 span: 12
@@ -916,6 +916,8 @@
     // 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍
     beforeClose(done) {
       this.eventData = [];
+      this.showTypeChangeFlag = false;
+      this.linkTypeChangeFlag = false;
       done();
     },
 
@@ -935,6 +937,7 @@
           };
         });
       }
+      console.log('row',row);
       this.searchTargerChangeFlag = false;
       this.$refs.crud.rowEdit(row);
     },
@@ -1055,7 +1058,7 @@
     // 妯℃澘绫诲瀷涓鸿〃鏍�
     templateTypeTable(val) {
       if (!val) return;
-      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']);
+      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsDataModel', 'csDataModel']);
     },
 
     // 妯℃澘绫诲瀷涓鸿嚜瀹氫箟妯℃澘
@@ -1069,13 +1072,13 @@
     // 妯℃澘绫诲瀷涓烘爲琛�
     templateTypeTreeTable(val) {
       if (!val) return;
-      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']);
+      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode', 'bsDataModel', 'csDataModel']);
     },
 
     // 妯℃澘绫诲瀷涓鸿〃鍗�
     templateTypeForm(val) {
       if (!val) return;
-      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']);
+      this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsDataModel', 'csDataModel']);
     },
 
     // 妯℃澘绫诲瀷涓烘爲
@@ -1083,7 +1086,7 @@
       if (!val) return;
       const searchTarger = this.option.column.find(item => item.prop === 'searchTarger');  // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤�
       searchTarger.display = false; // 涓嶅睍绀烘悳绱㈢被鍨�
-      this.updateDisplay(val, ['showType', 'queryTemplateName', 'rootContent', 'showAbs', 'showLinkAbs', 'separator', 'expandMode', 'linkType', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']);
+      this.updateDisplay(val, ['showType', 'queryTemplateName', 'rootContent', 'showAbs', 'showLinkAbs', 'separator', 'expandMode', 'linkType', 'bsDataModel', 'csDataModel']);
     },
 
     // 妯℃澘绫诲瀷涓篣I瀹氫箟
@@ -1091,7 +1094,7 @@
       if (!val) return;
       const searchTarger = this.option.column.find(item => item.prop === 'searchTarger');  // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤�
       searchTarger.display = false; // 涓嶅睍绀烘悳绱㈢被鍨�
-      this.updateDisplay(val, ['showType', 'SubUILayout', 'searchType', 'searchObjType', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']);
+      this.updateDisplay(val, ['showType', 'SubUILayout', 'searchType', 'searchObjType', 'queryTemplateName', 'bsDataModel', 'csDataModel']);
     },
 
     // 鏌ユ壘鏁扮粍涓璞$储寮�

--
Gitblit v1.9.3