From 3659f0773a14b54c18ed0af8b64de4afe8227489 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十二月 2020 19:31:12 +0800
Subject: [PATCH] 2020-12-04

---
 src/utils/utils.js |  301 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 187 insertions(+), 114 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 31c3abf..4631294 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -161,9 +161,13 @@
       let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
       value = value.replace(reg, item.value)
     })
-    // 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙f瀽鍚巗ql鎶ラ敊锛�
+    // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙f瀽鍚巗ql鎶ラ敊锛�
     value = value.replace(/%/ig, ' mpercent ')
-    // 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
+    // 澶栬仈鏁版嵁搴撴浛鎹�
+    if (window.GLOB.externalDatabase !== null) {
+      value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+    }
+    // encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
     value = window.btoa(window.encodeURIComponent(value))
     // 鎻掑叆瀛楃
     let index = Math.floor(value.length / 2)
@@ -230,6 +234,10 @@
 
     // 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙f瀽鍚巗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 ''
@@ -244,11 +252,21 @@
       return window.btoa(_value)
     }
 
+    let len = value.length
     // 娉細LText 涓� LText1 椤哄簭棰犲��
-    return {
-      LText: encodesql(value.substring(5000, 10000)),
-      LText1: encodesql(value.substring(0, 5000)),
-      LText2: encodesql(value.substring(10000))
+    if (len > 1000) {
+      let limit = Math.floor(len / 3)
+      return {
+        LText1: encodesql(value.substring(0, limit)),
+        LText: encodesql(value.substring(limit, limit * 2)),
+        LText2: encodesql(value.substring(limit * 2))
+      }
+    } else {
+      return {
+        LText1: '',
+        LText: encodesql(value),
+        LText2: ''
+      }
     }
   }
 
@@ -506,7 +524,7 @@
   }
 
   /**
-   * @description 鎷兼帴鎼滅储鏉′欢main
+   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
    * @param {Array}   searches     鎼滅储鏉′欢
    * @return {String}  searchText  鎷兼帴缁撴灉
    */
@@ -520,9 +538,7 @@
         key: search.key,
         match: search.match,
         type: search.type,
-        label: search.label,
-        value: search.value,
-        required: search.required
+        value: search.value
       }
 
       if (fieldmap.has(item.key)) {
@@ -595,6 +611,50 @@
   }
 
   /**
+   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
+   * @param {Array}   searches     鎼滅储鏉′欢
+   * @return {String}  searchText  鎷兼帴缁撴灉
+   */
+  static getRegOptions (searches) {
+    if (!searches || searches.length === 0) return []
+
+    let options = []
+    let fieldmap = new Map()
+    searches.forEach(search => {
+      let item = {
+        key: search.field,
+        value: '0'
+      }
+
+      if (fieldmap.has(item.key)) {
+        item.key = item.key + '1'
+      }
+
+      fieldmap.set(item.key, true)
+
+      if (search.type === 'group') {
+        options.push({
+          key: search.datefield,
+          value: '0'
+        })
+        if (search.transfer === 'true') {
+          options.push(item)
+        }
+      } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
+        options.push(item)
+        options.push({
+          key: item.key + '1',
+          value: '0'
+        })
+      } else {
+        options.push(item)
+      }
+    })
+
+    return options
+  }
+
+  /**
    * @description 鎷兼帴鎼滅储鏉′欢datamanage
    * @param {Array}   searches     鎼滅储鏉′欢
    * @return {String}  searchText  鎷兼帴缁撴灉
@@ -634,9 +694,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
   }
@@ -668,8 +726,11 @@
 
     if (item.type === 'link') {
       arrfield.push(item.linkField)
-    } else if (item.type === 'select' && item.linkSubField && item.linkSubField.length > 0) {
+    } else if ((item.type === 'select' || item.type === 'radio') && item.linkSubField && item.linkSubField.length > 0) {
       arrfield.push(...item.linkSubField)
+    } else if (item.type === 'checkcard') {
+      arrfield = item.fields.map(f => f.field)
+      arrfield.push(item.valueField)
     }
 
     arrfield = Array.from(new Set(arrfield))
@@ -684,9 +745,9 @@
     arrfield = arrfield.join(',')
 
     if (item.orderBy) {
-      sql = `select ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
+      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 distinct ' + arrfield + ' from ' + _datasource
+      sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
     }
 
     return {
@@ -710,6 +771,9 @@
       userName = sessionStorage.getItem('CloudUserName') || ''
       fullName = sessionStorage.getItem('CloudFullName') || ''
     }
+
+    let database = item.sheet.match(/(.*)\.(.*)\./ig) || ''
+    let sheet = item.sheet.replace(/(.*)\.(.*)\./ig, '')
 
     let errors = []
     let _topline = btn.range || 0
@@ -876,7 +940,7 @@
           _uniquesql += `
         /* 閲嶅鎬ч獙璇� */
         Set @tbid=''
-        Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${item.sheet} ) a group by ${unique.field} having sum(n)>1
+        Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${sheet} ) a group by ${unique.field} having sum(n)>1
         
         If @tbid!=''
         Begin
@@ -885,7 +949,7 @@
         end
         
         Set @tbid=''
-        Select top 1 @tbid=${_afields.join('+\' \'+')} from  @${item.sheet} a Inner join ${item.sheet} b on ${_fields_}
+        Select top 1 @tbid=${_afields.join('+\' \'+')} from  @${sheet} a Inner join ${sheet} b on ${_fields_}
         
         If @tbid!=''
         Begin
@@ -916,20 +980,20 @@
       if (btn.default !== 'false') {
         _insert = `
         /* 榛樿sql */
-        Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid) 
-        Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
+        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
+        Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
         `
       }
 
       _sql = `
         /* 绯荤粺鐢熸垚 */
-        declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
+        declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
         Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
         
         Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
         ${_initCustomScript}
         `
-      _sqlInsert = `Insert into @${item.sheet} (${fields},jskey,BID)`
+      _sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
       _sqlBottom = `
         /* 榛樿sql */
         delete tmp_excel_in where upid=@upid@
@@ -939,7 +1003,7 @@
         ${_prevCustomScript}
         ${_insert}
         ${_backCustomScript}
-        Delete @${item.sheet}
+        Delete @${sheet}
         
         aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
@@ -953,12 +1017,12 @@
         ${_sqlBottom}
         `
         fsql = fsql.replace(/\n\s{8}/ig, '\n')
-        console.log(fsql)
+        console.info(fsql)
       }
     } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
       _sql = `
         /* 绯荤粺鐢熸垚 */
-        declare @${item.sheet} table (jskey nvarchar(50))
+        declare @${sheet} table (jskey nvarchar(50))
         Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
         
         Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
@@ -984,7 +1048,7 @@
    * @return {String} type   鎵ц绫诲瀷
    * @return {String} table  琛ㄥ悕
    */
-  static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns, tab) {
+  static getSysDefaultSql (btn, setting, formdata, param, data, columns, tab) {
     let primaryId = param.ID
     let BID = param.BID
     let verify = btn.verify || {}
@@ -1023,106 +1087,92 @@
     })
 
     // 闇�瑕佸0鏄庣殑鍙橀噺闆�
-    // let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
     let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
 
     // 涓婚敭瀛楁
     let primaryKey = setting.primaryKey || 'id'
 
-    // 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
-    let _sql = `/* 绯荤粺鐢熸垚 */
-        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)
-      `
+    // sql璇彞
+    let _sql = ''
 
-    // let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
     let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
-    let _initfields = []
+    let _initFormfields = []
+    let _initColfields = []
     let _declarefields = []
 
     // 鑾峰彇瀛楁閿�煎
-    if (formdata) {
-      formdata.forEach(form => {
-        if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
-          form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
-          form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
-          form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
+    formdata && formdata.forEach(form => {
+      if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
+        form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
+        form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
+        form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
+      }
+
+      _formFieldValue[form.key] = form.value
+      let _key = form.key.toLowerCase()
+
+      if (!_initvars.includes(_key)) {
+        _initvars.push(_key)
+
+        if (form.type === 'number') {
+          let val = form.value
+          if (typeof(val) !== 'number') {
+            val = parseFloat(val)
+            if (isNaN(val)) {
+              val = 0
+            }
+          }
+          _initFormfields.push(`@${_key}=${val}`)
+        } else {
+          _initFormfields.push(`@${_key}='${form.value}'`)
+        }
+      }
+      
+      if (!_vars.includes(_key)) {
+        _vars.push(_key)
+
+        if (form.fieldlen && form.fieldlen > 2048) {
+          form.fieldlen = 'max'
         }
 
-        _formFieldValue[form.key] = form.value
-        let _key = form.key.toLowerCase()
+        let _type = `nvarchar(${form.fieldlen})`
+
+        if (form.type.match(/date/ig)) {
+          _type = 'datetime'
+        } else if (form.type === 'number') {
+          _type = `decimal(18,${form.fieldlen})`
+        }
+
+        _declarefields.push(`@${_key} ${_type}`)
+      }
+    })
+
+    // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
+    if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
+      _formFieldValue = {...data, ..._formFieldValue}
+      const setField = (col) => {
+        if (!col.field) return
+        let _key = col.field.toLowerCase()
 
         if (!_initvars.includes(_key)) {
-          _initvars.push(_key)
+          let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
 
-          if (form.type === 'number') {
-            let val = form.value
-            if (typeof(val) !== 'number') {
-              val = parseFloat(val)
-              if (isNaN(val)) {
-                val = 0
-              }
-            }
-            _initfields.push(`@${_key}=${val}`)
-          } else {
-            _initfields.push(`@${_key}='${form.value}'`)
-          }
+          _initvars.push(_key)
+          _initColfields.push(`@${_key}='${_val}'`)
         }
         
         if (!_vars.includes(_key)) {
           _vars.push(_key)
 
-          if (form.fieldlen && form.fieldlen > 2048) {
-            form.fieldlen = 'max'
-          }
-
-          let _type = `nvarchar(${form.fieldlen})`
-
-          if (form.type.match(/date/ig)) {
-            _type = 'datetime'
-          } else if (form.type === 'number') {
-            _type = `decimal(18,${form.fieldlen})`
-          }
-
-          _declarefields.push(`@${_key} ${_type}`)
-        }
-      })
-    }
-
-    // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
-    if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
-      _formFieldValue = {...data, ..._formFieldValue}
-
-      if (logcolumns && logcolumns.length > 0) {
-        logcolumns.forEach(col => {
-          let _key = col.field.toLowerCase()
-
-          if (!_initvars.includes(_key)) {
-            _initvars.push(_key)
-
-            let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
-
-            if (col.type === 'number') {
-              if (typeof(_val) !== 'number') {
-                _val = parseFloat(_val)
-                if (isNaN(_val)) {
-                  _val = 0
-                }
-              }
-              _initfields.push(`@${_key}=${_val}`)
-            } else {
-              _initfields.push(`@${_key}='${_val}'`)
-            }
-          }
-          
-          if (!_vars.includes(_key)) {
-            _vars.push(_key)
-
+          if (col.datatype) {
+            _declarefields.push(`@${_key} ${col.datatype}`)
+          } else {
             if (col.fieldlength && col.fieldlength > 2048) {
               col.fieldlength = 'max'
             }
   
             let _type = `nvarchar(${col.fieldlength || 50})`
-
+  
             if (col.type === 'number') {
               let _length = col.decimal ? col.decimal : 0
               _type = `decimal(18,${_length})`
@@ -1132,6 +1182,18 @@
   
             _declarefields.push(`@${_key} ${_type}`)
           }
+        }
+      }
+
+      if (columns && columns.length > 0) {
+        columns.forEach(col => {
+          if (col.type === 'colspan' || col.type === 'old_colspan') {
+            col.subcols.forEach(cell => {
+              setField(cell)
+            })
+          } else {
+            setField(col)
+          }
         })
       }
     }
@@ -1139,17 +1201,24 @@
     // 鍙橀噺澹版槑
     _declarefields = _declarefields.join(',')
     if (_declarefields) {
-      _sql = `/* 绯荤粺鐢熸垚 */
-        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}
-      `
+      _declarefields = ',' + _declarefields
     }
+    _sql = `/* 绯荤粺鐢熸垚 */
+        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(',')}
         `
     }
 
@@ -1266,8 +1335,12 @@
 
     // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
     let _billcodesSql  = ''
-    if (verify.billcodes && verify.billcodes.length > 0) {
+    if (formdata && verify.billcodes && verify.billcodes.length > 0) {
+      let keys = formdata.map(item => item.key.toLowerCase()) // 琛ㄥ崟瀛楁
+
       verify.billcodes.forEach(item => {
+        if (!keys.includes(item.field.toLowerCase())) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
+
         let _ModularDetailCode = ''
         let _lpline = ''
         if (item.TypeCharOne === 'Lp') {
@@ -1553,10 +1626,10 @@
     
     } else if (_actionType === 'delete') {      // 鐗╃悊鍒犻櫎
       let _msg = ''
-      if (data && logcolumns && logcolumns.length > 0) {
+      if (data && columns && columns.length > 0) {
         let _index = 0
-        logcolumns.forEach(col => {
-          if (col.Hide !== 'true' && _index < 4) {
+        columns.forEach(col => {
+          if (col.Hide !== 'true' && col.type !== 'colspan' && col.type !== 'old_colspan' && _index < 4) {
             _msg += col.label + '=' + data[col.field] + ','
             _index++
           }
@@ -1598,7 +1671,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