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 |  141 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 97 insertions(+), 44 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 987a514..4631294 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -252,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: ''
+      }
     }
   }
 
@@ -514,7 +524,7 @@
   }
 
   /**
-   * @description 鎷兼帴鎼滅储鏉′欢main
+   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
    * @param {Array}   searches     鎼滅储鏉′欢
    * @return {String}  searchText  鎷兼帴缁撴灉
    */
@@ -528,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)) {
@@ -593,6 +601,50 @@
           cell.key = field
 
           options.push(item)
+        })
+      } else {
+        options.push(item)
+      }
+    })
+
+    return options
+  }
+
+  /**
+   * @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)
@@ -965,7 +1017,7 @@
         ${_sqlBottom}
         `
         fsql = fsql.replace(/\n\s{8}/ig, '\n')
-        console.log(fsql)
+        console.info(fsql)
       }
     } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
       _sql = `
@@ -996,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 || {}
@@ -1098,38 +1150,29 @@
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
       _formFieldValue = {...data, ..._formFieldValue}
+      const setField = (col) => {
+        if (!col.field) return
+        let _key = col.field.toLowerCase()
 
-      if (logcolumns && logcolumns.length > 0) {
-        logcolumns.forEach(col => {
-          let _key = col.field.toLowerCase()
+        if (!_initvars.includes(_key)) {
+          let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
 
-          if (!_initvars.includes(_key)) {
-            _initvars.push(_key)
+          _initvars.push(_key)
+          _initColfields.push(`@${_key}='${_val}'`)
+        }
+        
+        if (!_vars.includes(_key)) {
+          _vars.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
-                }
-              }
-              _initColfields.push(`@${_key}=${_val}`)
-            } else {
-              _initColfields.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})`
@@ -1138,6 +1181,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)
           }
         })
       }
@@ -1153,19 +1208,17 @@
       `
 
     // 琛ㄥ崟鍙橀噺璧嬪��
-    _initFormfields = _initFormfields.join(',')
-    if (_initFormfields) {
+    if (_initFormfields.length > 0) {
       _sql += `
         /* 琛ㄥ崟鍙橀噺璧嬪�� */
-        select ${_initFormfields}
+        select ${_initFormfields.join(',')}
         `
     }
     // 鏄剧ず鍒楀彉閲忚祴鍊�
-    _initColfields = _initColfields.join(',')
-    if (_initColfields) {
+    if (_initColfields.length > 0) {
       _sql += `
         /* 鏄剧ず鍒楀彉閲忚祴鍊� */
-        select ${_initColfields}
+        select ${_initColfields.join(',')}
         `
     }
 
@@ -1573,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++
           }
@@ -1618,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