From e739b47d88c14c2d83ad400d74241f9396e5d7cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 14:35:37 +0800
Subject: [PATCH] 2020-12-03

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

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 987a514..19713b8 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 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
    * @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 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
+   * @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 = `
@@ -1153,19 +1205,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(',')}
         `
     }
 
@@ -1618,7 +1668,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