From 2a347c8d91d6962f4302f0553c55a3b9f743baa5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 九月 2020 21:15:58 +0800
Subject: [PATCH] 2020-09-09

---
 src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx
index ae1a6b6..0358ea7 100644
--- a/src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/treesettingcomponent/settingform/utils.jsx
@@ -2,27 +2,45 @@
 export default class SettingUtils {
   /**
    * @description 鐢熸垚椤甸潰鏌ヨ璇彞
+   * @return {String}  scripts       鑷畾涔夎剼鏈�
    * @return {Object}  setting       椤甸潰璁剧疆
    */
-  static getDebugSql (setting) {
+  static getDebugSql (setting, scripts) {
+    let arr_field = `${setting.valueField},${setting.labelField},${setting.parentField}`
     let sql = ''
-    let _dataresource = setting.dataresource
-    let _customScript = setting.customScript
+    let _dataresource = setting.dataresource || ''
+    let _customScript = ''
 
-    if (setting.interType === 'inner' && !setting.innerFunc && setting.default === 'false') {
+    scripts && scripts.forEach(script => {
+      _customScript += `
+      ${script.sql}
+      `
+    })
+
+    if (_customScript) {
+      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+        ${_customScript}
+      `
+    }
+
+    if (setting.default === 'false') {
       _dataresource = ''
     }
     
-    if (_dataresource) {
-      _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
-    }
-    if (_customScript) {
-      _customScript = _customScript.replace(/@\$|\$@/ig, '')
-    }
+    _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+    _customScript = _customScript.replace(/@\$|\$@/ig, '')
+    
+    // 姝e垯鏇挎崲
+    let _regoptions = [
+      {
+        reg: new RegExp('@orderBy@', 'ig'),
+        value: setting.order
+      }
+    ]
 
-    if (_customScript) {
-      _customScript = _customScript.replace(/@orderBy@/ig, setting.order)
-    }
+    _regoptions.forEach(item => {
+      _customScript = _customScript.replace(item.reg, item.value)
+    })
 
     // 鏁版嵁婧愬鐞�
     if (_dataresource) {
@@ -30,9 +48,7 @@
         _dataresource = '(' + _dataresource + ') tb'
       }
 
-      let arr_field = `${setting.valueField}, ${setting.labelField}, ${setting.parentField}`
-
-      _dataresource = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource}) tmptable order by tmptable.rows`
+      _dataresource = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource}) tmptable order by tmptable.rows `
     }
 
     if (_customScript) {

--
Gitblit v1.8.0