From 9cf5fc474d2159aad973e3208fbef670f325307f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 17:57:41 +0800
Subject: [PATCH] 2020-11-25

---
 src/utils/utils.js |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 02e850e..76f7af3 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -163,6 +163,10 @@
     })
     // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
     value = value.replace(/%/ig, ' mpercent ')
+    // 澶栬仈鏁版嵁搴撴浛鎹�
+    if (window.GLOB.externalDatabase !== null) {
+      value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+    }
     // encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
     value = window.btoa(window.encodeURIComponent(value))
     // 鎻掑叆瀛楃
@@ -230,6 +234,10 @@
 
     // 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
     value = value.replace(/%/ig, ' mpercent ')
+    // 澶栬仈鏁版嵁搴撴浛鎹�
+    if (window.GLOB.externalDatabase !== null) {
+      value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+    }
 
     let encodesql = (val) => {
       if (!val) return ''
@@ -634,9 +642,7 @@
     } else {
       baseurl = window.GLOB.location + window.GLOB.service
     }
-    // if (!/Content\/images\/upload\//.test(url)) {
-    //   baseurl = baseurl + 'Content/images/upload/'
-    // }
+
     let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
     return realurl
   }
@@ -689,7 +695,7 @@
     if (item.orderBy) {
       sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
     } else {
-      sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource})`
+      sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
     }
 
     return {
@@ -959,7 +965,7 @@
         ${_sqlBottom}
         `
         fsql = fsql.replace(/\n\s{8}/ig, '\n')
-        console.log(fsql)
+        console.info(fsql)
       }
     } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
       _sql = `
@@ -1038,7 +1044,8 @@
     let _sql = ''
 
     let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
-    let _initfields = []
+    let _initFormfields = []
+    let _initColfields = []
     let _declarefields = []
 
     // 鑾峰彇瀛楁閿�煎
@@ -1063,9 +1070,9 @@
               val = 0
             }
           }
-          _initfields.push(`@${_key}=${val}`)
+          _initFormfields.push(`@${_key}=${val}`)
         } else {
-          _initfields.push(`@${_key}='${form.value}'`)
+          _initFormfields.push(`@${_key}='${form.value}'`)
         }
       }
       
@@ -1108,9 +1115,9 @@
                   _val = 0
                 }
               }
-              _initfields.push(`@${_key}=${_val}`)
+              _initColfields.push(`@${_key}=${_val}`)
             } else {
-              _initfields.push(`@${_key}='${_val}'`)
+              _initColfields.push(`@${_key}='${_val}'`)
             }
           }
           
@@ -1145,12 +1152,18 @@
         Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
       `
 
-    // 鍙橀噺璧嬪��
-    _initfields = _initfields.join(',')
-    if (_initfields) {
+    // 琛ㄥ崟鍙橀噺璧嬪��
+    if (_initFormfields.length > 0) {
       _sql += `
-        
-        select ${_initfields}
+        /* 琛ㄥ崟鍙橀噺璧嬪�� */
+        select ${_initFormfields.join(',')}
+        `
+    }
+    // 鏄剧ず鍒楀彉閲忚祴鍊�
+    if (_initColfields.length > 0) {
+      _sql += `
+        /* 鏄剧ず鍒楀彉閲忚祴鍊� */
+        select ${_initColfields.join(',')}
         `
     }
 
@@ -1603,7 +1616,7 @@
 
     if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
       _sql = _sql.replace(/\n\s{8}/ig, '\n')
-      console.log(_sql)
+      console.info(_sql)
     }
 
     return _sql

--
Gitblit v1.8.0