From 047dbd742341e268ca772eda8d2ff0b6ba09cb44 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 六月 2025 16:57:36 +0800
Subject: [PATCH] 2025-06-05

---
 src/utils/utils.js | 2555 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1,463 insertions(+), 1,092 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index f09195e..d9502c6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,6 +1,7 @@
+import React from 'react'
 import moment from 'moment'
 import md5 from 'md5'
-import options from '@/store/options.js'
+import CryptoJS from 'crypto-js'
 
 const formatKeys = [
   { key: 'select', value: ' msltk ' },
@@ -34,30 +35,11 @@
   { key: 'TRAN', value: ' mtrnk ' },
   { key: 'goto', value: ' mgtk ' },
   { key: 'set', value: ' mstk ' },
-  { key: 'ROLLBACK', value: ' mrlbkk ' }
+  { key: 'ROLLBACK', value: ' mrlbkk ' },
+  { key: 'drop', value: ' mdrpk ' },
 ]
 
 export default class Utils {
-  /**
-   * @description 鑾峰彇浼氬憳绛夌骇
-   * @return {String}  level
-   */
-  static getMemberLevel () {
-    let _level = 10
-    let _Mlevel = sessionStorage.getItem('Member_Level')
-
-    if (_Mlevel) {
-      if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
-        _level = 10
-      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
-        _level = 20
-      } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
-        _level = 30
-      }
-    }
-    return _level
-  }
-
   /**
    * @description 鑾峰彇鍥捐〃楂樺害
    */
@@ -89,6 +71,7 @@
       uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
     }
     uuid = timestamp + uuid.join('')
+    uuid = uuid.replace(/minke/ig, 'mnkie')
     return uuid
   }
 
@@ -135,73 +118,48 @@
   }
 
   /**
-   * @description sql璇硶楠岃瘉
-   * @return {String}  sql    sql璇彞
-   * @return {String}  type   楠岃瘉绫诲瀷
-   */
-  static verifySql (sql, type) {
-    if (!sql) return ''
-    let chars = [
-      {key: 'create', reg: /(^|\s|\(|\))create\s/ig},
-      {key: 'insert', reg: /(^|\s|\(|\))insert\s/ig},
-      {key: 'delete', reg: /(^|\s|\(|\))delete\s/ig},
-      {key: 'update', reg: /(^|\s|\(|\))update\s/ig},
-      {key: 'set', reg: /(^|\s|\(|\))set\s/ig},
-      {key: 'drop', reg: /(^|\s|\(|\))drop\s/ig},
-      {key: 'alter', reg: /(^|\s|\(|\))alter\s/ig},
-      {key: 'truncate', reg: /(^|\s|\(|\))truncate\s/ig},
-      {key: 'if', reg: /(^|\s|\(|\))if\s/ig},
-      {key: 'exec', reg: /(^|\s|\(|\))exec(\s|\()/ig},
-      {key: 'OBJECT', reg: /(^|\s|\(|\))object(\s|\()/ig},
-      {key: 'sys.', reg: /(^|\s|\(|\))sys\./ig},
-      {key: 'kill', reg: /(^|\s|\(|\))kill\s/ig}
-    ]
-    
-    if (type === 'customscript') {
-      chars = chars.filter(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
-    }
-
-    let error = ''
-    
-    sql = sql.replace(/sys\.fn_/ig, '') // 璺宠繃sys.fn_楠岃瘉
-
-    chars.forEach(char => {
-      if (!error && char.reg.test(sql)) {
-        error = char.key
-      }
-    })
-
-    return error
-  }
-
-  /**
    * @description sql鍔犲瘑
    * @return {String}   value
    */
-  static formatOptions (value) {
+  static formatOptions (value, exec_type = '') {
     if (!value) return ''
 
-    let salt = 'minKe' // 鐩愬��
-
     value = value.replace(/\n/ig, ' \n ')
-    // 鏇挎崲鍏抽敭瀛�
-    formatKeys.forEach(item => {
-      let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
-      value = value.replace(reg, item.value)
-    })
-    // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙f瀽鍚巗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))
-    // 鎻掑叆瀛楃
-    let index = Math.floor(value.length / 2)
-    value = value.slice(0, index) + salt + value.slice(index)
-    // base64鍔犲瘑
-    value = window.btoa(value)
+
+    // 鏇挎崲%绗︼紙鏁版嵁搴撲腑瑙f瀽鍚巗ql鎶ラ敊锛�
+    value = value.replace(/%/ig, ' mpercent ')
+
+    if (exec_type === 'x') {
+      let key = CryptoJS.enc.Utf8.parse('D1185ED7B32568C9')
+      let iv = CryptoJS.enc.Utf8.parse('')
+      let srcs = CryptoJS.enc.Utf8.parse(value)
+
+      let encrypted = CryptoJS.AES.encrypt(srcs, key, { iv: iv, mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+      value = encrypted.toString()
+
+      // let wordArray = CryptoJS.enc.Base64.parse(value)
+      // let decryptedWordArray = CryptoJS.AES.decrypt({ ciphertext: wordArray }, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+      // let decryptedText = CryptoJS.enc.Utf8.stringify(decryptedWordArray)
+    } else {
+      // 鏇挎崲鍏抽敭瀛�
+      formatKeys.forEach(item => {
+        let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
+        value = value.replace(reg, item.value)
+      })
+      // encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
+      value = window.btoa(window.encodeURIComponent(value))
+      // 鎻掑叆瀛楃
+      let salt = 'minKe' // 鐩愬��
+      let index = Math.floor(value.length / 2)
+      value = value.slice(0, index) + salt + value.slice(index)
+      // base64鍔犲瘑
+      value = window.btoa(value)
+    }
 
     return value
   }
@@ -216,12 +174,6 @@
   //   value = window.atob(value)
   //   value = value.replace('minKe', '')
   //   value = window.decodeURIComponent(window.atob(value))
-
-  //   // 澶栬仈鏁版嵁搴撴浛鎹�
-  //   if (window.GLOB.externalDatabase !== null && window.GLOB.externalDatabase) {
-  //     value = value.replace(window.GLOB.externalDatabase, '@db@')
-  //   }
-
   //   value = value.replace(/ mpercent /ig, '%')
     
   //   // 鏇挎崲鍏抽敭瀛�
@@ -230,74 +182,39 @@
   //     value = value.replace(reg, ' ' + item.key + ' ')
   //   })
 
-  //   // value = value.replace(/\n/ig, ' \n ')
+  //   value = value.replace(/ \n /ig, '\n')
 
   //   return value
   // }
 
   /**
-   * @description sPC_TableData_InUpDe sql鍔犲瘑
-   * @return {String}  value
-   */
-  static sPCInUpDeFormatOptions (value) {
-    if (!value) return {LText: '', LText1: '', LText2: ''}
-    let salt = 'minKe' // 鐩愬��
-
-    value = value.replace(/\n/ig, ' \n ')
-    // 鏇挎崲鍏抽敭瀛�
-    formatKeys.forEach(item => {
-      let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
-      value = value.replace(reg, item.value)
-    })
-
-    // 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 ''
-
-      let _value = window.btoa(window.encodeURIComponent(val))
-
-      // 鎻掑叆瀛楃
-      let index = Math.floor(_value.length / 2)
-      _value = _value.slice(0, index) + salt + _value.slice(index)
-
-      // base64鍔犲瘑
-      return window.btoa(_value)
-    }
-
-    let len = value.length
-    // 娉細LText 涓� LText1 椤哄簭棰犲��
-    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: ''
-      }
-    }
-  }
-
-  /**
    * @description 鍒濆鍖栨悳绱㈡潯浠跺垵濮嬪��
    * @param {Array}   searches     鎼滅储鏉′欢
    */
-  static initSearchVal (searches) {
-    if (!searches) return []
+  static initSearchVal (config) {
+    if (!config.search || config.search.length === 0) {
+      config.search = []
+      config.$s_keys = []
+      config.$s_req = false
+      return
+    }
 
     let roleId = sessionStorage.getItem('role_id') || ''
+    let required = false
+    let keys = []
+    let values = null
+    if (config.wrap && config.wrap.cacheSearch === 'true') {
+      values = window.GLOB.SearchBox.get(config.$searchId + 'cache')
+    }
 
-    return searches.map(item => {
+    let supModule = ''
+    if (config.setting && config.setting.supModule) {
+      supModule = config.setting.supModule
+    } else if (config.wrap && config.wrap.supModule) {
+      supModule = config.wrap.supModule
+    }
+
+    config.search = config.search.map(item => {
       item.hidden = item.Hide === 'true'
       item.required = !item.hidden && item.required === 'true'
       item.advanced = item.advanced === 'true'
@@ -316,10 +233,43 @@
           format = 'YYYY-MM-DD HH:mm:ss'
         }
 
+        item.format = format
         item.initval = item.initval ? moment().subtract(item.initval, 'days').format(format) : ''
       } else if (item.type === 'datemonth') {
-        item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
+        item.format = 'YYYY-MM'
+
+        if (item.initval) {
+          if (!item.dateShift) {
+            item.initval = moment().subtract(item.initval, 'month').format('YYYY-MM')
+          } else {
+            item.$initval = item.initval
+            item.$supId = config.$pageId
+            if (supModule) {
+              item.$supId = supModule
+
+              config.checkBid = true
+              item.checkShift = true
+            }
+
+            item.initval = ''
+
+            let d = ''
+            if (window.GLOB.CacheData.has(item.$supId)) {
+              d = window.GLOB.CacheData.get(item.$supId)
+              d = d[item.dateShift] || ''
+              if (d) {
+                d = moment(d).format('YYYY-MM-DD')
+                d = d === 'Invalid date' ? '' : d
+              }
+            }
+
+            if (d) {
+              item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
+            }
+          }
+        }
       } else if (item.type === 'dateweek') {
+        item.format = 'YYYY-MM-DD'
         item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
       } else if (item.type === 'daterange') {
         let format = 'YYYY-MM-DD'
@@ -332,17 +282,73 @@
         } else if (item.precision === 'second') {
           format = 'YYYY-MM-DD HH:mm:ss'
         }
-        if (item.initval === 'week') {
-          item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
-        } else if (item.initval === 'month') {
-          item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
-        } else if (item.initval) {
-          try {
-            let _initval = JSON.parse(item.initval)
-            let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
-            item.initval = _vals.join(',')
-          } catch (e) {
+
+        item.format = format
+
+        if (item.initval) {
+          if (!item.dateShift) {
+            if (item.initval === 'week') {
+              item.initval = [moment().startOf('week').format(format), moment().endOf('week').format(format)].join(',')
+            } else if (item.initval === 'month') {
+              item.initval = [moment().startOf('month').format(format), moment().endOf('month').format(format)].join(',')
+            } else if (item.initval === 'lastMonth') {
+              item.initval = [moment().subtract(1, 'months').startOf('month').format(format), moment().subtract(1, 'months').endOf('month').format(format)].join(',')
+            } else if (item.initval === 'year') {
+              item.initval = [moment().startOf('year').format(format), moment().endOf('year').format(format)].join(',')
+            } else if (item.initval === 'lastYear') {
+              item.initval = [moment().subtract(1, 'years').startOf('year').format(format), moment().subtract(1, 'years').endOf('year').format(format)].join(',')
+            } else if (item.initval) {
+              try {
+                let _initval = JSON.parse(item.initval)
+                let _vals = [moment().subtract(_initval[0], 'days').format(format), moment().subtract(_initval[1], 'days').format(format)]
+                item.initval = _vals.join(',')
+              } catch (e) {
+                item.initval = ''
+              }
+            }
+          } else {
+            item.$initval = item.initval
+            item.$supId = config.$pageId
+            if (supModule) {
+              item.$supId = supModule
+
+              config.checkBid = true
+              item.checkShift = true
+            }
+
             item.initval = ''
+
+            let d = ''
+            if (window.GLOB.CacheData.has(item.$supId)) {
+              d = window.GLOB.CacheData.get(item.$supId)
+              d = d[item.dateShift] || ''
+              if (d) {
+                d = moment(d).format('YYYY-MM-DD')
+                d = d === 'Invalid date' ? '' : d
+              }
+            }
+
+            if (d) {
+              if (item.$initval === 'week') {
+                item.initval = [moment(d).startOf('week').format(format), moment(d).endOf('week').format(format)].join(',')
+              } else if (item.$initval === 'month') {
+                item.initval = [moment(d).startOf('month').format(format), moment(d).endOf('month').format(format)].join(',')
+              } else if (item.$initval === 'lastMonth') {
+                item.initval = [moment(d).subtract(1, 'months').startOf('month').format(format), moment(d).subtract(1, 'months').endOf('month').format(format)].join(',')
+              } else if (item.$initval === 'year') {
+                item.initval = [moment(d).startOf('year').format(format), moment(d).endOf('year').format(format)].join(',')
+              } else if (item.$initval === 'lastYear') {
+                item.initval = [moment(d).subtract(1, 'years').startOf('year').format(format), moment(d).subtract(1, 'years').endOf('year').format(format)].join(',')
+              } else {
+                try {
+                  let _initval = JSON.parse(item.$initval)
+                  let _vals = [moment(d).subtract(_initval[0], 'days').format(format), moment(d).subtract(_initval[1], 'days').format(format)]
+                  item.initval = _vals.join(',')
+                } catch (e) {
+                  item.initval = ''
+                }
+              }
+            }
           }
         }
       } else if (item.type === 'group') {
@@ -402,9 +408,26 @@
           item.initval = ''
           item.initType = ''
         }
+      } else if ((item.type === 'select' || item.type === 'link') && item.resourceType === '1') {
+        if (/@BID@/ig.test(item.dataSource) && supModule) {
+          config.checkBid = true
+          item.checkBid = true
+        }
+        if (item.initval === '$first') {
+          item.initval = ''
+          item.$first = true
+        }
       }
-      
+
+      if (window.backend && ['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && item.resourceType === '1') {
+        item.uuid = md5(config.uuid + item.uuid)
+      }
+
       item.oriInitval = item.initval
+
+      if (values) {
+        item.initval = values[item.field] || ''
+      }
 
       if (item.blacklist && item.blacklist.length > 0 && !item.hidden) {
         if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
@@ -413,8 +436,41 @@
         }
       }
 
+      if (item.required) {
+        required = true
+      }
+
+      if (item.type === 'text' || item.type === 'select') {
+        if (/@username@|@fullName@/ig.test(item.initval)) {
+          item.initval = item.initval.replace(/@username@/ig, sessionStorage.getItem('User_Name') || '').replace(/@fullName@/ig, sessionStorage.getItem('Full_Name') || '')
+          item.oriInitval = item.initval
+        }
+        if (/,/.test(item.field)) {
+          item.field.split(',').forEach(field => {
+            keys.push(field.toLowerCase())
+          })
+        } else {
+          keys.push(item.field.toLowerCase())
+        }
+      } else if (item.type === 'group') {
+        keys.push(item.field.toLowerCase())
+        keys.push(item.datefield.toLowerCase())
+      }
+
       return item
     })
+
+    if (config.checkBid) {
+      if (config.setting) {
+        config.setting.checkBid = true
+      }
+      if (config.type !== 'search') {
+        config.$checkBid = true
+      }
+    }
+
+    config.$s_keys = keys
+    config.$s_req = required
   }
 
   /**
@@ -495,17 +551,26 @@
           newsearches[item.key] = _val
         }
       } else if (item.type === 'datemonth') {
-        // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
-        let _startval = ''
-        let _endval = ''
-
-        if (item.value) {
-          _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
-          _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+        if (item.match === '=') {
+          newsearches[item.key] = item.value
+        } else {
+          // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
+          let _startval = ''
+          let _endval = ''
+  
+          if (item.value) {
+            _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+            _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+          }
+          
+          newsearches[item.key] = _startval
+          newsearches[item.key + '1'] = _endval
         }
-        
-        newsearches[item.key] = _startval
-        newsearches[item.key + '1'] = _endval
+      } else if (item.type === 'range') {
+        let val = item.value.split(',')
+
+        newsearches[item.key] = val[0] || -999999999
+        newsearches[item.key + '1'] = val[1] || 999999999
       } else if (item.type === 'dateweek') {
         let _startval = ''
         let _endval = ''
@@ -537,8 +602,16 @@
           }
         }
 
-        newsearches[item.key] = _startval
-        newsearches[item.key + '1'] = _endval
+        let _skey = item.key
+        let _ekey = item.key + '1'
+
+        if (/,/.test(item.key)) {
+          _skey = item.key.split(',')[0]
+          _ekey = item.key.split(',')[1]
+        }
+
+        newsearches[_skey] = _startval
+        newsearches[_ekey] = _endval
       } else if (item.type === 'text' || item.type === 'select') {
         item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
           newsearches[field] = item.value
@@ -601,10 +674,14 @@
 
         searchText.push('(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')')
       } else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
-        let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
-        let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
-
-        searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
+        if (item.match === '=') {
+          searchText.push('(' + item.key + ' = \'' + item.value + '\')')
+        } else {
+          let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+          let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+  
+          searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
+        }
       } else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
         let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
         let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
@@ -629,17 +706,176 @@
           _endval = val[1] + '.000'
         }
 
-        searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
+        let _skey = item.key
+        let _ekey = item.key
+
+        if (/,/.test(item.key)) {
+          _skey = item.key.split(',')[0]
+          _ekey = item.key.split(',')[1]
+        }
+
+        searchText.push('(' + _skey + ' >= \'' + _startval + '\' AND ' + _ekey + ' < \'' + _endval + '\')')
       } else if (item.type === 'range') {
         let val = item.value.split(',')
 
-        searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
+        searchText.push('(' + item.key + ' >= ' + (val[0] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
       } else {
         searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
       }
     })
 
     return searchText.join(' AND ')
+  }
+
+  static getSearchkeys (searches) {
+    let searchText = []
+    let matchs = {
+      'like': '01',
+      'not like': '02',
+      '=': '03',
+      '>': '04',
+      '<': '05',
+      '>=': '06',
+      '<=': '07',
+    }
+
+    searches.forEach(item => {
+      if (item.forbid || !item.value) return
+
+      let cell = {
+        key: item.key,
+        match: item.match,
+        type: 'text',
+        value: item.value
+      }
+      
+      if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
+        if (/,/.test(item.key)) {
+          cell.type = 'text_or'
+        }
+      } else if (item.type === 'multi') {
+        cell.type = 'text_multi'
+      } else if (item.type === 'date') {
+        let _val = item.value
+        let timetail = ''
+
+        if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
+          cell.match = '<'
+          if (item.precision === 'day') {
+            _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+          }
+        }
+        if (item.match === '=') {
+          timetail = ''
+        } else if (item.precision === 'day') {
+          timetail = ' 00:00:00.000'
+        } else if (item.precision === 'hour') {
+          timetail = ':00:00.000'
+        } else if (item.precision === 'minute') {
+          timetail = ':00.000'
+        } else if (item.precision === 'second') {
+          timetail = '.000'
+        }
+
+        cell.value = _val + timetail
+      }
+      
+      if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
+        if (item.match === '=') {
+          searchText.push(cell)
+        } else {
+          let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
+          let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+  
+          searchText.push({
+            key: item.key,
+            match: '>=',
+            type: 'text',
+            value: _startval
+          }, {
+            key: item.key,
+            match: '<',
+            type: 'text',
+            value: _endval
+          })
+        }
+      } else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
+        let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+        let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+
+        searchText.push({
+          key: item.key,
+          match: '>=',
+          type: 'text',
+          value: _startval
+        }, {
+          key: item.key,
+          match: '<',
+          type: 'text',
+          value: _endval
+        })
+      } else if (item.type === 'daterange') {
+        let val = item.value.split(',')
+        let _startval = ''
+        let _endval = ''
+
+        if (item.precision === 'day') {
+          _startval = val[0] + ' 00:00:00.000'
+          _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+        } else if (item.precision === 'hour') {
+          _startval = val[0] + ':00:00.000'
+          _endval = val[1] + ':00:00.000'
+        } else if (item.precision === 'minute') {
+          _startval = val[0] + ':00.000'
+          _endval = val[1] + ':00.000'
+        } else if (item.precision === 'second') {
+          _startval = val[0] + '.000'
+          _endval = val[1] + '.000'
+        }
+
+        let _skey = item.key
+        let _ekey = item.key
+
+        if (/,/.test(item.key)) {
+          _skey = item.key.split(',')[0]
+          _ekey = item.key.split(',')[1]
+        }
+
+        searchText.push({
+          key: _skey,
+          match: '>=',
+          type: 'text',
+          value: _startval
+        }, {
+          key: _ekey,
+          match: '<',
+          type: 'text',
+          value: _endval
+        })
+      } else if (item.type === 'range') {
+        let val = item.value.split(',')
+
+        searchText.push({
+          key: item.key,
+          match: '>=',
+          type: 'text',
+          value: val[0] || -999999999
+        }, {
+          key: item.key,
+          match: '<=',
+          type: 'text',
+          value: val[1] || 999999999
+        })
+      } else {
+        searchText.push(cell)
+      }
+    })
+
+    searchText.forEach(item => {
+      item.match = matchs[item.match] || '01'
+    })
+
+    return searchText
   }
 
   /**
@@ -669,9 +905,9 @@
       if (item.type === 'date') {
         if (!item.value) {
           if (['>=', '>'].includes(item.match)) {
-            item.value = '1970-01-01 00:00:00.000'
+            item.value = '1900-01-01 00:00:00.000'
           } else if (['<=', '<'].includes(item.match)) {
-            item.value = '2050-01-01 00:00:00.000'
+            item.value = '3000-01-01 00:00:00.000'
           }
         } else if (search.precision === 'day') {
           if (['>=', '>'].includes(item.match)) {
@@ -689,20 +925,35 @@
 
         options.push(item)
       } else if (item.type === 'datemonth') {
-        let _startval = item.value ? moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
-        let _endval = item.value ? moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
+        if (item.match === '=') {
+          options.push(item)
+        } else {
+          let _startval = item.value ? moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000' : '1900-01-01 00:00:00.000'
+          let _endval = item.value ? moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '3000-01-01 00:00:00.000'
+  
+          let copy = JSON.parse(JSON.stringify(item))
+          copy.key = copy.key + '1'
+          copy.value = _endval
+          
+          item.value = _startval
+  
+          options.push(item)
+          options.push(copy)
+        }
+      } else if (item.type === 'range') {
+        let val = item.value.split(',')
 
         let copy = JSON.parse(JSON.stringify(item))
         copy.key = copy.key + '1'
-        copy.value = _endval
+        copy.value = val[1] || 999999999
         
-        item.value = _startval
+        item.value = val[0] || -999999999
 
         options.push(item)
         options.push(copy)
       } else if (item.type === 'dateweek') {
-        let _startval = item.value ? moment(item.value, 'YYYY-MM-DD').startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
-        let _endval = item.value ? moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
+        let _startval = item.value ? moment(item.value, 'YYYY-MM-DD').startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000' : '1900-01-01 00:00:00.000'
+        let _endval = item.value ? moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '3000-01-01 00:00:00.000'
 
         let copy = JSON.parse(JSON.stringify(item))
         copy.key = copy.key + '1'
@@ -713,8 +964,8 @@
         options.push(item)
         options.push(copy)
       } else if (item.type === 'daterange') {
-        let _startval = '1970-01-01 00:00:00.000'
-        let _endval = '2050-01-01 00:00:00.000'
+        let _startval = '1900-01-01 00:00:00.000'
+        let _endval = '3000-01-01 00:00:00.000'
 
         if (item.value) {
           let val = item.value.split(',')
@@ -769,24 +1020,6 @@
   }
 
   /**
-   * @description 鑾峰彇浜戠鍥剧墖鐪熷疄璺緞
-   * @return {String}    url 鍥剧墖璺緞
-   */
-  static getcloudurl (url) {
-    if (!url) return ''
-    
-    let baseurl = ''
-    
-    if (options.cloudServiceApi) {
-      baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
-    } else {
-      baseurl = window.GLOB.baseurl
-    }
-
-    return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
-  }
-
-  /**
    * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨ鏉′欢
    * @return {String} item   鎼滅储鏉′欢淇℃伅
    */
@@ -800,6 +1033,8 @@
         arrfield.push(item.urlField)
       } else if (item.colorField) {
         arrfield.push(item.colorField)
+      } else if (item.parentField) {
+        arrfield.push(item.parentField)
       }
     }
 
@@ -807,6 +1042,8 @@
       arrfield.push(item.linkField)
     }
     if (['select', 'radio', 'link', 'checkcard'].includes(item.type) && item.linkSubField && item.linkSubField.length > 0) {
+      arrfield.push(...item.linkSubField)
+    } else if (item.type === 'text' && item.editType === 'select' && item.linkSubField && item.linkSubField.length > 0) { // 鍙紪杈戣〃
       arrfield.push(...item.linkSubField)
     }
     if (item.disableField) {
@@ -831,10 +1068,9 @@
     }
 
     if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-      sql = sql.replace(/\$@/ig, '/*')
-      sql = sql.replace(/@\$/ig, '*/')
+      sql = sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
     } else {
-      sql = sql.replace(/@\$|\$@/ig, '')
+      sql = sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
     }
 
     // 澶栬仈鏁版嵁搴撴浛鎹�
@@ -842,8 +1078,11 @@
       sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
     }
 
+    sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
     sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+    sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
     sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+    sql = sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
 
     return {
       sql: sql,
@@ -874,11 +1113,6 @@
   let address = sessionStorage.getItem('address') || ''
   let _sheet = item.sheet
 
-  if (sessionStorage.getItem('isEditState') === 'true') {
-    userName = sessionStorage.getItem('CloudUserName') || ''
-    fullName = sessionStorage.getItem('CloudFullName') || ''
-  }
-
   if (window.GLOB.externalDatabase !== null) {
     _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
   }
@@ -903,23 +1137,185 @@
   let _topline = btn.range || 0
   let upId = getuuid()
 
-  let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
-  let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
-  let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+  let cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+  for (let i = 0; i < 26; i++) {
+    cols.push('A' + cols[i])
+  }
 
-  if (btn.scripts) {
-    btn.scripts.forEach(script => {
+  let columns = JSON.parse(JSON.stringify(btn.columns))
+  columns = columns.filter((col, index) => {
+    col.colIndex = cols[index] || (index + 1)
+    if (col.import !== 'init' && (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type))) {
+      col.declen = 0
+      if (/^Decimal/ig.test(col.type)) {
+        col.declen = +col.type.match(/\d+/g)[1]
+      }
+      col.declen = col.declen || 0
+    }
+    if (col.required === 'false') {
+      delete col.min
+      delete col.max
+    }
+
+    return col.import !== 'false'
+  })
+
+  let _Ltext = data.map((item, lindex) => {
+    let vals = []
+    columns.forEach(col => {
+      let val = item[col.Column] !== undefined ? item[col.Column] : ''
+      let _position = (_topline + lindex + 1) + '琛� ' + col.colIndex + '鍒� '
+      let eLen = errors.length
+
+      if (col.$error) {
+
+      } else if (col.import === 'init') {
+        if (/^Nvarchar/ig.test(col.type)) {
+          val = ''
+        } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+          val = 0
+        } else if (col.type === 'date') {
+          val = '1949-10-01'
+        } else if (col.type === 'datetime') {
+          val = '1949-10-01 00:00:00'
+        }
+      } else if (/^Nvarchar/ig.test(col.type)) {
+        val = val + ''
+
+        if (/'/.test(val)) {
+          val = val.replace(/'/ig, '"')
+        }
+
+        val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
+
+        if (col.interception !== 'false') {
+          val = val.replace(/^\s+|\s+$/g, '')
+        }
+
+        if (!val && col.required === 'true') {            // 蹇呭~鏍¢獙
+          errors.push(_position + '鍐呭涓嶅彲涓虹┖')
+        } else if (col.limit && val.length > col.limit) { // 闀垮害鏍¢獙
+          errors.push(_position + '鍐呭瓒呴暱')
+        } else {                                          // 鍏抽敭瀛楁牎楠�
+          keys.forEach(key => {
+            let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
+            if (_patten.test(val)) {
+              errors.push(_position + '鍚湁鍏抽敭瀛�' + key)
+            }
+          })
+        }
+      } else if (/^Decimal/ig.test(col.type) || /^int/ig.test(col.type)) {
+        if (col.required === 'false') {
+          if (!val || isNaN(val)) {
+            val = 0
+          }
+        }
+        if (!val && val !== 0) {
+          errors.push(_position + '鍐呭涓嶅彲涓虹┖')
+        } else if (isNaN(val)) {                                  // 妫�楠屾槸鍚︿负鏁板��
+          errors.push(_position + '鍐呭搴斾负鏁板��')
+        } else if (typeof(col.min) === 'number' && val < col.min) { // 鏈�灏忓�兼楠�
+          errors.push(_position + '灏忎簬鏈�灏忓��')
+        } else if (typeof(col.max) === 'number' && val > col.max) { // 鏈�澶у�兼楠�
+          errors.push(_position + '澶т簬鏈�澶у��')
+        } else {
+          let _float = (val + '').split('.')[1]
+          if (_float && _float.length > col.declen) {
+            if (col.declen) {
+              errors.push(_position + `鏁板�间笉鍙ぇ浜�${col.declen}浣嶅皬鏁癭)
+            } else {
+              errors.push(_position + '鏁板�煎簲涓烘暣鏁�')
+            }
+          }
+        }
+      } else if (col.type === 'date' || col.type === 'datetime') {
+        if (typeof(val) === 'number') {
+          if (val > 2958465 || val <= 0) {                 // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
+            errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
+          } else {                                         // 鏃堕棿鏍煎紡鍖�
+            if (val < 60) {                                // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
+              val++
+            }
+            if (col.type === 'datetime') {
+              val = val - 2
+              let day = Math.floor(val)
+              let seconds = Math.round((val - day) * 24 * 60 * 60)
+              val = moment('19000101', 'YYYYMMDD').add(day, 'days').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss')
+            } else {
+              val = moment('19000101', 'YYYYMMDD').add(Math.floor(val - 2), 'days').format('YYYY-MM-DD')
+            }
+          }
+        } else if (typeof(val) === 'string') {
+          val = val.replace(/(^\s+$)|\t+|\v+/ig, '')
+          if (!val) {
+            if (col.required === 'true') {         // 鏃堕棿蹇呭~鏍¢獙
+              errors.push(_position + '鍐呭涓嶅彲涓虹┖')
+            } else if (col.type === 'date') {
+              val = '1949-10-01'
+            } else if (col.type === 'datetime') {
+              val = '1949-10-01 00:00:00'
+            }
+          } else if (!/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝e垯鏍¢獙
+            errors.push(_position + '鏃堕棿鏍煎紡閿欒')
+          }
+        } else {                                    // 鏃堕棿鏍煎紡閿欒
+          errors.push(_position + '鏃堕棿鏍煎紡閿欒')
+        }
+      }
+
+      if (errors.length > eLen) {
+        col.$error = true
+      }
+
+      vals.push(`'${val}'`)
+    })
+
+    let _lineIndex = '0000' + (lindex + 1) + '0'
+    _lineIndex = _lineIndex.substring(_lineIndex.length - 6)
+
+    vals.push(`'${upId + _lineIndex}'`)
+    vals.push(`'${BID}'`)
+
+    return `Select ${vals.join(',')}`
+  })
+
+  let result = []
+  let sql = ''
+  
+  if (item.intertype === 'system') {
+    let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+    let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+    let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+    let isDM = sessionStorage.getItem('dataM') === 'true'
+    let regs = [
+      {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+      {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+      {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
+      {reg: /@ID@/ig, value: `'${primaryId || ''}'`},
+      {reg: /@BID@/ig, value: `'${BID}'`},
+      {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+      {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+      {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+      {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+      {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
+      {reg: /@typename@/ig, value: `'admin'`},
+      {reg: /\$@/ig, value: isDM ? '/*' : ''},
+      {reg: /@\$/ig, value: isDM ? '*/' : ''},
+      {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`},
+    ]
+
+    if (window.GLOB.externalDatabase !== null) {
+      regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase})
+    }
+
+    btn.scripts && btn.scripts.forEach(script => {
       if (script.status === 'false') return
 
       let _sql = script.sql
 
-      _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
-      _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
-      _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-      _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-      _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-      _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-      _sql = _sql.replace(/@typename@/ig, `'admin'`)
+      regs.forEach(item => {
+        _sql = _sql.replace(item.reg, item.value)
+      })
 
       if (script.position === 'init') {
         _initCustomScript += `
@@ -938,153 +1334,64 @@
       `
       }
     })
-  }
 
-  // 鎺у埗鍙版墦鍗版暟鎹�
-  let conLtext = []
-  let cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
-  for (let i = 0; i < 26; i++) {
-    cols.push('A' + cols[i])
-  }
-
-  let _Ltext = data.map((item, lindex) => {
-    let vals = []
-    let convals = []
-    btn.columns.forEach((col, cindex) => {
-      if (col.import === 'false') return
-
-      let val = item[col.Column] !== undefined ? item[col.Column] : ''
-      let _colindex = cols[cindex] || (cindex + 1)
-      let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
-
-      if (/^Nvarchar/ig.test(col.type)) {
-        if (typeof(val) === 'number') {
-          val = val.toString()
-        }
-
-        if (/'/.test(val)) {
-          val = val.replace(/'/ig, '"')
-        }
-
-        val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
-
-        if (!val && col.required === 'true') {            // 蹇呭~鏍¢獙
-          errors.push(_position + '鍐呭涓嶅彲涓虹┖')
-        } else if (col.limit && val.length > col.limit) { // 闀垮害鏍¢獙
-          errors.push(_position + '鍐呭瓒呴暱')
-        } else {                                          // 鍏抽敭瀛楁牎楠�
-          keys.forEach(key => {
-            let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
-            if (_patten.test(val)) {
-              errors.push(_position + '鍚湁鍏抽敭瀛�' + key)
-            }
-          })
-        }
-      } else if (/^int/ig.test(col.type)) {
-        if (!val && val !== 0) {
-          errors.push(_position + '鍐呭涓嶅彲涓虹┖')
-        } else {
-          let _val = val + ''
-
-          if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) {               // 妫�楠屾槸鍚︿负鏁存暟
-            errors.push(_position + '鍐呭搴斾负鏁存暟')
-          } else if ((col.min || col.min === 0) && val < col.min) {          // 鏈�灏忓�兼楠�
-            errors.push(_position + '灏忎簬鏈�灏忓��')
-          } else if ((col.max || col.max === 0) && val > col.max) {          // 鏈�澶у�兼楠�
-            errors.push(_position + '澶т簬鏈�澶у��')
-          }
-        }
-      } else if (/^Decimal/ig.test(col.type)) {
-        if (!val && val !== 0) {
-          errors.push(_position + '鍐呭涓嶅彲涓虹┖')
-        } else {
-          let _val = val + ''
-          let _vals = _val.split('.')
-
-          if (!/^(([^0][0-9]+|0)\.([0-9]+)$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]+)$)|^(([1-9]+)$)/.test(_val)) {                           // 妫�楠屾槸鍚︿负娴偣鏁�
-            errors.push(_position + '鍐呭搴斾负娴偣鏁�')
-          } else if (_vals[0].length > 18) {                          // 妫�楠屾暣鏁颁綅
-            errors.push(_position + '鏁存暟浣嶈秴鍑鸿寖鍥�')
-          } else if (_vals[1] && _vals[1].length > col.limit) {       // 鏈�灏忓�兼楠�
-            errors.push(_position + '灏忔暟浣嶈秴鍑鸿寖鍥�')
-          } else if ((col.min || col.min === 0) && val < col.min) {   // 鏈�灏忓�兼楠�
-            errors.push(_position + '灏忎簬鏈�灏忓��')
-          } else if ((col.max || col.max === 0) && val > col.max) {   // 鏈�澶у�兼楠�
-            errors.push(_position + '澶т簬鏈�澶у��')
-          }
-        }
-      } else if (col.type === 'date') {
-        if (typeof(val) === 'number') {
-          if (val > 2958465 || val <= 0) {                 // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
-            errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
-          } else {                                         // 鏃堕棿鏍煎紡鍖�
-            if (val < 60) {                                // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
-              val++
-            }
-            val = moment('19000101', 'YYYYMMDD').add(Math.floor(val - 2), 'days').format('YYYY-MM-DD')
-          }
-        } else if (typeof(val) === 'string') {
-          val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
-          if (!val && col.required === 'true') {           // 鏃堕棿蹇呭~鏍¢獙
-            errors.push(_position + '鍐呭涓嶅彲涓虹┖')
-          } else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝e垯鏍¢獙
-            errors.push(_position + '鏃堕棿鏍煎紡閿欒')
-          }
-        } else {                                           // 鏃堕棿鏍煎紡閿欒
-          errors.push(_position + '鏃堕棿鏍煎紡閿欒')
-        }
-      }
-
-      vals.push(`'${val}'`)
-
-      if (lindex < 40) {
-        convals.push(`'${val}' as ${col.Column}`)
-      }
-    })
-
-    let _lineIndex = '0000' + (lindex + 1) + '0'
-    _lineIndex = _lineIndex.substring(_lineIndex.length - 6)
-
-    vals.push(`'${upId + _lineIndex}'`)
-    vals.push(`'${BID}'`)
-    
-    if (lindex < 40) {
-      convals.push(`'${upId + _lineIndex}' as jskey`)
-      convals.push(`'${BID}' as BID`)
-      conLtext.push(`Select ${convals.join(',')}`)
-    }
-
-    return `Select ${vals.join(',')}`
-  })
-
-  let result = []
-  for(let i = 0; i < _Ltext.length; i += 20) {
-    result.push(_Ltext.slice(i, i + 20))
-  }
-
-  let _sql = ''
-  let _sqlInsert = ''
-  let _sqlBottom = ''
-
-  if (item.intertype === 'system') {
     let _uniquesql = ''
     if (btn.uniques && btn.uniques.length > 0) {
+      let textFields = []
+      let numberFields = []
+      let dateFields = []
+      btn.columns.forEach((col) => {
+        if (/Nvarchar/ig.test(col.type)) {
+          textFields.push(col.Column)
+        } else if (/Decimal|int/ig.test(col.type)) {
+          numberFields.push(col.Column)
+        } else if (/date/ig.test(col.type)) {
+          dateFields.push(col.Column)
+        }
+      })
+
       btn.uniques.forEach(unique => {
         if (unique.status === 'false' || !unique.verifyType) return
 
         let _fields = unique.field.split(',')
         let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
-        let _afields = _fields.map(_field => `a.${_field}`)
+        
         _fields_ = _fields_.join(' and ')
+
+        let _where = []
+        _fields.forEach(f => {
+          if (textFields.includes(f)) {
+            _where.push(`${f}!=''`)
+          } else if (numberFields.includes(f)) {
+            _where.push(`${f}!=0`)
+          } else if (dateFields.includes(f)) {
+            _where.push(`${f}>'1949-10-01'`)
+          }
+        })
+        _where = _where.length ? `where ${_where.join(' and ')} ` : ''
 
         if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
           _fields_ += ' and b.deleted=0'
         }
 
+        let _afields = []
+        _fields = _fields.map(f => {
+          if (numberFields.includes(f)) {
+            _afields.push(`cast(a.${f} as nvarchar(50))`)
+            return `cast(${f} as nvarchar(50))`
+          } else if (dateFields.includes(f)) {
+            _afields.push(`CONVERT(nvarchar(50), a.${f}, 21)`)
+            return `CONVERT(nvarchar(50), ${f}, 21)`
+          }
+          _afields.push(`a.${f}`)
+
+          return f
+        })
+
         _uniquesql += `
       /* 閲嶅鎬ч獙璇� */
       Set @tbid=''
-      Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${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} ${_where}) a group by ${unique.field} having sum(n)>1
       
       If @tbid!=''
       Begin
@@ -1093,7 +1400,7 @@
       end
       
       ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
-      Select top 1 @tbid=${_afields.join('+\' \'+')} from  @${sheet} a Inner join ${sheet} b on ${_fields_}
+      Select top 1 @tbid=${_afields.join('+\' \'+')} from ${_where ? `(select * from #${sheet} ${_where})` : `#${sheet}`} a Inner join ${database}${sheet} b on ${_fields_}
       
       If @tbid!=''
       Begin
@@ -1122,67 +1429,136 @@
 
     let _insert = ''
     if (btn.default !== 'false') {
+      let _fields = []
+      btn.columns.forEach(col => {
+        if (col.import === 'false' || col.import === 'init') return
+
+        _fields.push(col.Column)
+      })
+
+      _fields = _fields.join(',')
+
       _insert = `
       /* 榛樿sql */
-      Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
-      Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
+      Insert into ${database}${sheet} (${_fields},createuserid,createuser,createstaff,bid) 
+      Select ${_fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
       `
     }
 
-    _sql = `
+    sql = `
       /* 绯荤粺鐢熸垚 */
-      declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
+      create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
       Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
       Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       ${_initCustomScript}
-      `
-    _sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
-    _sqlBottom = `
-      /* 榛樿sql */
-      delete tmp_excel_in where upid=@upid@
       
-      delete tmp_excel_in where datediff(day,createdate,getdate())>15
+      Insert into #${sheet} (${fields},jskey,BID)
+
+      /* excel鏁版嵁*/
+      ${_Ltext.join(' Union all ')}
+
       ${_uniquesql}
       ${_prevCustomScript}
-      ${_insert}
+      ${_insert}`
+
+    if (item.$process && btn.workFlow === 'true' && window.GLOB.UserCacheMap.has(item.$flowId)) {
+      let flow = window.GLOB.UserCacheMap.get(item.$flowId)
+      let target = flow.cells.filter(cell => cell.mknode === 'start')[0]
+      
+      let flowsql = ''
+      let status = 0
+      let statusName = ''
+      let detailId = ''
+      let work_grade = sessionStorage.getItem('work_grade') || 0
+  
+      if (target) {
+        detailId = target.id
+        status = target.mkdata.status
+        statusName = target.mkdata.statusName
+      }
+  
+      if (!target) {
+        status = 0
+        statusName = '寮傚父'
+  
+        flowsql = `
+        /* 宸ヤ綔娴佸紓甯竤ql */
+        select @ErrorCode='E',@retmsg='宸ヤ綔娴佹棤寮�濮嬭妭鐐�' goto aaa
+        `
+      } else if (btn.flowSql === 'true') {
+        flowsql = `
+        /* 宸ヤ綔娴侀粯璁ql */
+        insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+        select jskey,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+        from #${sheet}
+                                                                   
+        insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+        select jskey,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+        from #${sheet}
+                                                                   
+        insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+        select jskey,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+        from #${sheet}
+                                                                   
+        insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
+        select jskey,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
+        from #${sheet}
+        `
+      }
+      sql += `
+      ${flowsql}
       ${_backCustomScript}
-      Delete @${sheet}
+
+      drop table #${sheet}
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
-      let fsql = `
-      ${_sql}
-      ${_sqlInsert}
+      sql = sql.replace(/@start_type@/ig, `'寮�濮�'`)
+      sql = sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+      sql = sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
+  
+      if (target) {
+        let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+        let msg = {...target.mkdata, label: label, id: target.id, checkIds: [], checkUsers: []}
+        sql = sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
+      } else {
+        sql = sql.replace(/@works_flow_param@/ig, `''`)
+      }
+      sql = sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`)
+      sql = sql.replace(/@status@/ig, `'${status}'`)
+      sql = sql.replace(/@statusname@/ig, `'${statusName}'`)
+      sql = sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`)
+      sql = sql.replace(/@work_grade@/ig, `'${work_grade}'`)
+    } else {
+      sql += `
+      ${_backCustomScript}
+
+      drop table #${sheet}
       
-      /* excel鏁版嵁锛堝墠40鏉★級 */
-      ${conLtext.join(' Union all ')}
-      ${_sqlBottom}
-      `
-      fsql = fsql.replace(/\n\s{8}/ig, '\n')
-      console.info(fsql)
+      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
     }
-  } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
-    _sql = `
-      /* 绯荤粺鐢熸垚 */
-      declare @${sheet} table (jskey nvarchar(50))
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
-      
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
-      `
+
+    sql = sql.replace(/\n\s{6}/ig, '\n')
+
+    if (window.GLOB.debugger === true) {
+      window.mkInfo('%c' + item.logLabel, 'color: blue')
+      window.mkInfo(sql)
+    }
+  } else {
+    for(let i = 0; i < _Ltext.length; i += 20) {
+      result.push(_Ltext.slice(i, i + 20))
+    }
   }
 
   return {
-    sql: _sql,
+    sql: sql,
     lines: result.map((list, index) => {
       return {
         Ltext: window.btoa(window.encodeURIComponent(list.join(' Union all '))),
         Sort: (index + 1) * 10
       }
     }),
-    insert: _sqlInsert,
-    bottom: _sqlBottom,
     errors: errors.join('; ')
   }
 }
@@ -1192,7 +1568,7 @@
  * @return {Object} item   鎸夐挳淇℃伅
  * @return {Array}  data   excel鏁版嵁
  */
-export function getEditTableSql (verify, data, columns) {
+export function getEditTableSql (verify, data, columns, setting) {
   let btn = verify
   let userName = sessionStorage.getItem('User_Name') || ''
   let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -1209,11 +1585,6 @@
   let _sheet = btn.sheet
   let BID = data[0].$$BID || ''
 
-  if (sessionStorage.getItem('isEditState') === 'true') {
-    userName = sessionStorage.getItem('CloudUserName') || ''
-    fullName = sessionStorage.getItem('CloudFullName') || ''
-  }
-
   if (window.GLOB.externalDatabase !== null) {
     _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
   }
@@ -1223,44 +1594,12 @@
   
   database = database ? (database[0] || '') : ''
 
-  let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
-  let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
-  let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
-
-  if (btn.scripts && btn.intertype === 'system') {
-    btn.scripts.forEach(script => {
-      if (script.status === 'false') return
-
-      if (script.position === 'init') {
-        _initCustomScript += `
-      /* 鑷畾涔夎剼鏈� */
-      ${script.sql}
-      `
-      } else if (script.position === 'front') {
-        _prevCustomScript += `
-      /* 鑷畾涔夎剼鏈� */
-      ${script.sql}
-      `
-      } else {
-        _backCustomScript += `
-      /* 鑷畾涔夎剼鏈� */
-      ${script.sql}
-      `
-      }
-    })
-  }
-
-  // 鎺у埗鍙版墦鍗版暟鎹�
-  let conLtext = []
-
   let _Ltext = data.map(item => {
     let vals = []
-    let convals = []
     columns.forEach(col => {
       let val = item[col.field]
 
       vals.push(`'${val}'`)
-      convals.push(`'${val}' as ${col.field}`)
     })
 
     let key = item.$$uuid
@@ -1270,42 +1609,120 @@
     vals.push(`'${type}'`)
     vals.push(`'${BID}'`)
 
-    convals.push(`'${key}' as jskey`)
-    convals.push(`'${type}' as data_type`)
-    convals.push(`'${BID}' as BID`)
-    conLtext.push(`Select ${convals.join(',')}`)
-
     return `Select ${vals.join(',')}`
   })
 
   let result = []
-  for(let i = 0; i < _Ltext.length; i += 20) {
-    result.push(_Ltext.slice(i, i + 20))
-  }
-
-  let _sql = ''
-  let _sqlInsert = ''
-  let _sqlBottom = ''
+  let sql = ''
 
   if (btn.intertype === 'system') {
+    let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+    let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+    let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+    let isDM = sessionStorage.getItem('dataM') === 'true'
+    let regs = [
+      {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+      {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+      {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
+      {reg: /@BID@/ig, value: `'${BID}'`},
+      {reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID') || ''}'`},
+      {reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid') || ''}'`},
+      {reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID') || ''}'`},
+      {reg: /@Appkey@/ig, value: `'${window.GLOB.appkey || ''}'`},
+      {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
+      {reg: /@typename@/ig, value: `'admin'`},
+      {reg: /\$@/ig, value: isDM ? '/*' : ''},
+      {reg: /@\$/ig, value: isDM ? '*/' : ''},
+      {reg: /@datam@/ig, value: isDM ? `'Y'` : `''`},
+    ]
+
+    if (window.GLOB.externalDatabase !== null) {
+      regs.push({reg: /@db@/ig, value: window.GLOB.externalDatabase})
+    }
+
+    btn.scripts && btn.scripts.forEach(script => {
+      if (script.status === 'false') return
+
+      let _sql = script.sql
+
+      regs.forEach(item => {
+        _sql = _sql.replace(item.reg, item.value)
+      })
+
+      if (script.position === 'init') {
+        _initCustomScript += `
+      /* 鑷畾涔夎剼鏈� */
+      ${_sql}
+      `
+      } else if (script.position === 'front') {
+        _prevCustomScript += `
+      /* 鑷畾涔夎剼鏈� */
+      ${_sql}
+      `
+      } else {
+        _backCustomScript += `
+      /* 鑷畾涔夎剼鏈� */
+      ${_sql}
+      `
+      }
+    })
+
     let _uniquesql = ''
     if (btn.uniques && btn.uniques.length > 0) {
+      let textFields = []
+      let numberFields = []
+      let dateFields = []
+      columns.forEach((col) => {
+        if (/Nvarchar/ig.test(col.datatype)) {
+          textFields.push(col.field)
+        } else if (/Decimal|int/ig.test(col.datatype)) {
+          numberFields.push(col.field)
+        } else if (/date/ig.test(col.datatype)) {
+          dateFields.push(col.field)
+        }
+      })
       btn.uniques.forEach(unique => {
         if (unique.status === 'false' || !unique.verifyType) return
 
         let _fields = unique.field.split(',')
         let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
-        let _afields = _fields.map(_field => `a.${_field}`)
         _fields_ = _fields_.join(' and ')
+        _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}`
+
+        let _where = []
+        _fields.forEach(f => {
+          if (textFields.includes(f)) {
+            _where.push(`${f}!=''`)
+          } else if (numberFields.includes(f)) {
+            _where.push(`${f}!=0`)
+          } else if (dateFields.includes(f)) {
+            _where.push(`${f}>'1949-10-01'`)
+          }
+        })
+        _where = _where.length ? `where ${_where.join(' and ')} ` : ''
 
         if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
           _fields_ += ' and b.deleted=0'
         }
 
+        let _afields = []
+        _fields = _fields.map(f => {
+          if (numberFields.includes(f)) {
+            _afields.push(`cast(a.${f} as nvarchar(50))`)
+            return `cast(${f} as nvarchar(50))`
+          } else if (dateFields.includes(f)) {
+            _afields.push(`CONVERT(nvarchar(50), a.${f}, 21)`)
+            return `CONVERT(nvarchar(50), ${f}, 21)`
+          }
+          _afields.push(`a.${f}`)
+
+          return f
+        })
+
         _uniquesql += `
       /* 閲嶅鎬ч獙璇� */
       Set @tbid=''
-      Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${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
@@ -1314,7 +1731,7 @@
       end
       
       ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
-      Select top 1 @tbid=${_afields.join('+\' \'+')} from  @${sheet} a Inner join ${sheet} b on ${_fields_}
+      Select top 1 @tbid=${_afields.join('+\' \'+')} from ${_where ? `(select * from #${sheet} ${_where})` : `#${sheet}`} a Inner join ${database}${sheet} b on ${_fields_}
       
       If @tbid!=''
       Begin
@@ -1327,6 +1744,7 @@
 
     let declarefields = []
     let fields = []
+    let upFields = []
 
     columns.forEach(col => {
       let key = col.field.toLowerCase()
@@ -1334,73 +1752,72 @@
 
       declarefields.push(`${col.field} ${col.datatype}`)
       fields.push(col.field)
+      upFields.push(`${col.field}=t.${col.field}`)
     })
 
     fields = fields.join(',')
+    upFields = upFields.join(',')
 
     let _insert = ''
     if (btn.default !== 'false') {
       _insert = `
       /* 榛樿sql */
-      Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
-      Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
+      update a set ${upFields},modifydate=getdate(),modifyuserid='${sessionStorage.getItem('UserID') || ''}',modifyuser=@username,modifystaff=@fullname,deleted=0
+      from (select * from #${sheet} where data_type='upt') t
+      inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+      update a set deleted=1,modifydate=getdate(),modifyuserid='${sessionStorage.getItem('UserID') || ''}',modifyuser=@username,modifystaff=@fullname 
+      from (select * from #${sheet} where data_type='del') t
+      inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+      delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+      Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
+      Select ${fields},'${sessionStorage.getItem('UserID') || ''}',@username,@fullname,'${BID}' From #${sheet}
       `
     }
 
-    _sql = `
+    sql = `
       /* 绯荤粺鐢熸垚 */
-      declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) )
+      create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256))
       Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
       
       Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
       ${_initCustomScript}
-      `
-    _sqlInsert = `Insert into @${sheet} (${fields},jskey,data_type,BID)`
-    _sqlBottom = `
-      /* 榛樿sql */
-      delete tmp_excel_in where upid=@upid@
-      
-      delete tmp_excel_in where datediff(day,createdate,getdate())>15
+      Insert into #${sheet} (${fields},jskey,data_type,BID)
+
+      /* excel鏁版嵁*/
+      ${_Ltext.join(' Union all ')}
+
       ${_uniquesql}
       ${_prevCustomScript}
       ${_insert}
       ${_backCustomScript}
-      Delete @${sheet}
+
+      drop table #${sheet}
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
-      let fsql = `
-      ${_sql}
-      ${_sqlInsert}
-      
-      /* table鏁版嵁 */
-      ${conLtext.join(' Union all \n')}
-      ${_sqlBottom}
-      `
-      fsql = fsql.replace(/\n\s{8}/ig, '\n')
-      console.info(fsql)
+    sql = sql.replace(/\n\s{6}/ig, '\n')
+
+    if (window.GLOB.debugger === true) {
+      window.mkInfo('%c' + btn.logLabel, 'color: blue')
+      window.mkInfo(sql)
     }
-  } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
-    _sql = `
-      /* 绯荤粺鐢熸垚 */
-      declare @${sheet} table (jskey nvarchar(50))
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
-      
-      Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
-      `
+  } else {
+    for(let i = 0; i < _Ltext.length; i += 20) {
+      result.push(_Ltext.slice(i, i + 20))
+    }
   }
 
   return {
-    sql: _sql,
+    sql: sql,
     lines: result.map((list, index) => {
       return {
         Ltext: window.btoa(window.encodeURIComponent(list.join(' Union all '))),
         Sort: (index + 1) * 10
       }
-    }),
-    insert: _sqlInsert,
-    bottom: _sqlBottom
+    })
   }
 }
 
@@ -1414,14 +1831,12 @@
  * @return {Array}   columns   鏄剧ず鍒�
  * @return {Boolean} retmsg    鏄惁闇�瑕佹暟鎹繑鍥�
  */
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, moduleParams, getOptions) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, retmsg = false, submitType = '') {
   let primaryId = param.ID
   let BID = param.BID || ''
   let verify = btn.verify || {}
-  let datavars = {}                 // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
   let _actionType = null
   let _callbacksql = ''
-  let foreignKey = setting.foreignKey ? setting.foreignKey.toLowerCase() : ''
 
   if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
     _actionType = btn.sqlType
@@ -1453,7 +1868,7 @@
   })
 
   // 闇�瑕佸0鏄庣殑鍙橀噺闆�
-  let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
+  let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid', 'mk_submit_type']
 
   // 涓婚敭瀛楁
   let primaryKey = setting.primaryKey || 'id'
@@ -1465,9 +1880,21 @@
   let _initFormfields = []
   let _initColfields = []
   let _declarefields = []
+  let verifyValSql = ''
+  let datavars = {}
 
   // 鑾峰彇瀛楁閿�煎
   formdata && formdata.forEach(form => {
+    if (form.$verify) {
+      verifyValSql += `
+      if @${form.key}=${form.type === 'number' ? 0 : `''`}
+      begin
+        select @errorcode='E',@retmsg='${form.label}锛屽叧鑱斾富琛ㄥけ鏁�'
+        goto aaa
+      end
+      `
+    }
+
     let _key = form.key.toLowerCase()
     datavars[_key] = form.value
 
@@ -1476,7 +1903,7 @@
       let val = form.value
 
       if (form.type === 'number' || form.type === 'rate') {
-        if (isNaN(val)) {
+        if (isNaN(val) || val === '') {
           val = 0
         }
         _initFormfields.push(`@${_key}=${val}`)
@@ -1486,14 +1913,18 @@
         if (/'/.test(val)) {
           val = val.replace(/'/ig, '"')
         }
-        _initFormfields.push(`@${_key}='${val}'`)
+        if (form.isconst) {
+          _initFormfields.push(`@${_key}=N'${val}'`)
+        } else {
+          _initFormfields.push(`@${_key}='${val}'`)
+        }
       }
     }
     
     if (!_vars.includes(_key)) {
       _vars.push(_key)
 
-      if (form.fieldlen && form.fieldlen > 2048) {
+      if (form.fieldlen && form.fieldlen > 4000) {
         form.fieldlen = 'max'
       }
 
@@ -1527,7 +1958,7 @@
       let _key = col.field.toLowerCase()
 
       if (!_initvars.includes(_key)) {
-        let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
+        let _val = _data.hasOwnProperty(_key) ? _data[_key] : ''
 
         if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
           _val = '1949-10-01'
@@ -1547,7 +1978,7 @@
         if (col.datatype) {
           _declarefields.push(`@${_key} ${col.datatype}`)
         } else {
-          if (col.fieldlength && col.fieldlength > 2048) {
+          if (col.fieldlength && col.fieldlength > 4000) {
             col.fieldlength = 'max'
           }
 
@@ -1582,10 +2013,10 @@
     _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),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
+      Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50),@mk_submit_type nvarchar(50)${_declarefields}
     `
 
-  let userName = sessionStorage.getItem('User_Name') || ''
+  let userName = sessionStorage.getItem('User_Name') || '' 
   let fullName = sessionStorage.getItem('Full_Name') || ''
   let RoleID = sessionStorage.getItem('role_id') || ''
   let departmentcode = sessionStorage.getItem('departmentcode') || ''
@@ -1597,15 +2028,10 @@
   let district = sessionStorage.getItem('district') || ''
   let address = sessionStorage.getItem('address') || ''
 
-  if (sessionStorage.getItem('isEditState') === 'true') {
-    userName = sessionStorage.getItem('CloudUserName') || ''
-    fullName = sessionStorage.getItem('CloudFullName') || ''
-  }
-
   // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
   _sql += `
       /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
-      select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
+      select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @mk_submit_type='${submitType}', @BillCode='', @ModularDetailCode=''
       `
 
   // 琛ㄥ崟鍙橀噺璧嬪��
@@ -1665,47 +2091,31 @@
   }
 
   // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
-  if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
+  if (verify.invalid === 'true' && setting.dataresource) {
     let datasource = setting.dataresource
     let customScript = setting.customScript || ''
-    let search = moduleParams ? moduleParams.search : null
-    let orderBy = moduleParams ? moduleParams.orderBy : setting.order
 
-    if (/\s/.test(datasource) && !/tb$/.test(datasource)) { // 鎷兼帴鍒悕
-      datasource = '(' + datasource + ') tb'
-    }
+    let regoptions = [{
+      reg: new RegExp('@userName@', 'ig'),
+      value: `'${sessionStorage.getItem('User_Name') || ''}'`
+    }, {
+      reg: new RegExp('@fullName@', 'ig'),
+      value: `'${sessionStorage.getItem('Full_Name') || ''}'`
+    }, {
+      reg: new RegExp('@orderBy@', 'ig'),
+      value: setting.order || primaryKey
+    }, {
+      reg: new RegExp('@pageSize@', 'ig'),
+      value: 1
+    }, {
+      reg: new RegExp('@pageIndex@', 'ig'),
+      value: 1
+    }]
 
-    if (getOptions && (setting.queryType === 'statistics' || customScript)) {
-      let allSearch = getOptions(search)
-
-      let regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-      regoptions.push({
-        reg: new RegExp('@userName@', 'ig'),
-        value: `'${userName}'`
-      }, {
-        reg: new RegExp('@fullName@', 'ig'),
-        value: `'${fullName}'`
-      }, {
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: 999999
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: 1
-      })
-
-      regoptions.forEach(item => {
-        datasource = datasource.replace(item.reg, item.value)
-        customScript = customScript.replace(item.reg, item.value)
-      })
-    }
+    regoptions.forEach(item => {
+      datasource = datasource.replace(item.reg, item.value)
+      customScript = customScript.replace(item.reg, item.value)
+    })
 
     if (customScript) {
       _sql += `
@@ -1776,45 +2186,39 @@
 
     verify.billcodes.forEach(item => {
       let _key = item.field.toLowerCase()
-      let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
 
       if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
 
-      let _ModularDetailCode = ''
       let _lpline = ''
       if (item.TypeCharOne === 'Lp') {
-        if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+        if (/^BID$/ig.test(item.linkField)) {
           _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
         } else {
-          _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
+          _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
         }
-        _ModularDetailCode = '@ModularDetailCode'
       } else if (item.TypeCharOne === 'BN') {
-        let _val = ''
-        if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
-          _val = BID
-        } else if (_data.hasOwnProperty(_linkKey)) {
-          _val = _data[_linkKey]
+        if (/^BID$/ig.test(item.linkField)) {
+          _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
+        } else {
+          _lpline = `set @ModularDetailCode= 'BN'+ right(@${item.linkField},48)`
         }
-        _ModularDetailCode = `'${item.TypeCharOne + _val}'`
       } else {
-        _ModularDetailCode = `'${item.ModularDetailCode}'`
+        _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
       }
 
-      let _declare = ''
+      // let _declare = ''
 
-      if (!_vars.includes(_key)) {
-        _declare = `Declare @${_key} nvarchar(50)`
-        _vars.push(_key)
-      }
+      // if (!_vars.includes(_key)) {
+      //   _declare = `Declare @${_key} nvarchar(50)`
+      //   _vars.push(_key)
+      // }
 
       _billcodesSql += `
       /* 鍗曞彿鐢熸垚 */
-      ${_declare}
       select @BillCode='', @${_key}='', @ModularDetailCode=''
       ${_lpline}
       exec s_get_BillCode
-        @ModularDetailCode=${_ModularDetailCode},
+        @ModularDetailCode=@ModularDetailCode,
         @Type=${item.Type},
         @TypeCharOne='${item.TypeCharOne}',
         @TypeCharTwo ='${item.TypeCharTwo}',
@@ -1842,36 +2246,32 @@
 
       item.field.split(',').forEach((_field, index) => {
         let _key = _field.toLowerCase()
-        let _val = datavars[_key] !== undefined ? datavars[_key] : ''
-        let _fval = `'${_val}'`
+        let _val = ''
+        let _val2 = datavars[_key] !== undefined ? datavars[_key] : ''
 
-        if (_key === 'bid' && !datavars.bid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
-          _fval = '@BID@'
-        }
-        if (_key === 'bid' && foreignKey) {
-          arr.push(foreignKey)
-          _fieldValue.push(`${foreignKey}=${_fval}`)
+        arr.push(_key)
+        if (_key === 'bid') {
+          _val = `'${BID}'`
         } else {
-          arr.push(_key)
-          _fieldValue.push(`${_key}=${_fval}`)
+          _val = `@${_field}`
         }
         
-        _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+        if (_key === 'bid') {
+          _val2 = BID
+        }
+        
+        _fieldValue.push(`${_key}=${_val}`)
+        _value.push(`${_labels[index] || ''}锛�${_val2}`)
       })
 
-      let _verifyType = ''
-      if (item.verifyType === 'logic') {
-        _verifyType = ' and deleted=0'
-      }
-
-      if (!arr.includes(primaryKey.toLowerCase())) {
+      if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
         _fieldValue.push(`${primaryKey} !='${primaryId}'`)
       }
 
       _sql += `
       /* 鍞竴鎬ч獙璇� */
       select @tbid='', @ErrorCode='',@retmsg=''
-      select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+      select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${item.verifyType === 'logic' ? ' and deleted=0' : ''}
       If @tbid!=''
       Begin
         select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -1915,15 +2315,20 @@
   let hasvoucher = false
 
   // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
-  if (verify.voucher && verify.voucher.enabled && data) {
+  if (verify.voucher && verify.voucher.enabled) {
     let _voucher = verify.voucher
+    let linkField = `@${_voucher.linkField}`
+  
+    if (/^BID$/ig.test(_voucher.linkField)) {
+      linkField = `'${BID}'`
+    }
 
     hasvoucher = true
 
     _sql += `
       /* 鍒涘缓鍑瘉 */
       exec s_BVoucher_Create
-        @Bill ='${_data[_voucher.linkField.toLowerCase()]}',
+        @Bill = ${linkField},
         @BVoucherType ='${_voucher.BVoucherType}',
         @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
         @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -1971,14 +2376,7 @@
       values.push('@fullname')
     }
     if (!keys.includes('bid')) {
-      if (foreignKey && !keys.includes(foreignKey)) {
-        keys.push(foreignKey)
-      } else {
-        keys.push('bid')
-      }
-      values.push('@BID@')
-    } else if (foreignKey && !keys.includes(foreignKey)) {
-      keys.push(foreignKey)
+      keys.push('bid')
       values.push('@BID@')
     }
 
@@ -2085,7 +2483,7 @@
     if (data && columns && columns.length > 0 && btn.Ot !== 'notRequired') {
       let _index = 0
       columns.forEach(col => {
-        if (!col.field || col.Hide === 'true' || _index >= 4) return
+        if (!col.field || col.Hide === 'true' || _index >= 4 || col.field === primaryKey) return
         _msg += col.label + '=' + data[col.field] + ','
         _index++
       })
@@ -2117,8 +2515,445 @@
     `
   }
 
-  if (_backCustomScript) {
+  if (btn.$process && verify.workFlow === 'true' && window.GLOB.UserCacheMap.has(btn.$flowId)) {
+    let flow = window.GLOB.UserCacheMap.get(btn.$flowId)
+    let node = null
+    let line = null
+    let target = null
+    let status = 0
+    let statusName = ''
+    let detailId = ''
+    let sign = ''
+    let error = ''
+    let userid = sessionStorage.getItem('UserID') || ''
+    let checkIds = []
+    let checkUsers = []
+    let noticeIds = []
+    let work_grade = sessionStorage.getItem('work_grade') || 0
+
+    if (verify.flowType === 'start') {
+      target = flow.cells.filter(cell => cell.mknode === 'start')[0]
+
+      if (target) {
+        detailId = target.id
+        status = target.mkdata.status
+        statusName = target.mkdata.statusName
+      } else {
+        error = '宸ヤ綔娴佹棤寮�濮嬭妭鐐�'
+      }
+    } else if (_data.works_flow_param) {
+      try {
+        node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
+      } catch (e) {
+        node = null
+      }
+
+      if (node) {
+        let lines = flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id)
+        if (verify.flowType === 'reject') {
+          line = lines.filter(cell => cell.mkdata.flowType === 'reject' || cell.mknode === 'startEdge')[0]
+        } else {
+          lines = lines.filter(cell => cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge')
+
+          if (lines.length === 0) {
+            error = '鏃犲彲鎵ц鐨勬祦绋嬪垎鏀�'
+          } else {
+            let branchKey = verify.flowBranch ? verify.flowBranch.toLowerCase() : ''
+
+            formdata && formdata.forEach(form => {
+              let _key = form.key.toLowerCase()
+              _data[_key] = form.value
+            })
+
+            if (!branchKey) {
+              lines.forEach(line => {
+                if (line.mkdata.execCondition === 'open') {
+                  error = '鎸夐挳鏈缃祦绋嬫帶鍒跺瓧娈点��'
+                }
+              })
+              if (!error) {
+                lines = lines.filter(cell => {
+                  if (cell.mkdata.seniorCondition === 'open' && !line) {
+                    cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+                      if (per.worker_id === userid) {
+                        line = cell
+                      }
+                    })
+  
+                    return false
+                  }
+  
+                  return true
+                })
+
+                if (!line) {
+                  line = lines[0]
+                }
+              }
+            } else if (!_data.hasOwnProperty(branchKey)) {
+              error = '淇℃伅涓棤娴佺▼鎺у埗瀛楁銆�'
+            } else {
+              let _def_lines = []
+              let _equ_lines = []
+              let _unequ_lines = []
+              let _or_lines = []
+              let branchVal = _data[branchKey]
+
+              if (branchVal && typeof(branchVal) === 'string' && !isNaN(branchVal)) {
+                branchVal = +branchVal
+              }
+
+              lines.forEach(item => {
+                if (item.mkdata.execCondition !== 'open') {
+                  _def_lines.push(item)
+                } else {
+                  if (item.mkdata.match === '=') {
+                    if (item.mkdata.matchVal === branchVal + '') {
+                      _equ_lines.push(item)
+                    }
+                  } else if (item.mkdata.match === '!=') {
+                    if (item.mkdata.matchVal !== branchVal + '') {
+                      _unequ_lines.push(item)
+                    }
+                  } else {
+                    if (item.mkdata.match === '<') {
+                      if (item.mkdata.matchVal < branchVal) {
+                        _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+                      }
+                    } else if (item.mkdata.match === '>') {
+                      if (item.mkdata.matchVal > branchVal) {
+                        _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+                      }
+                    } else if (item.mkdata.match === '<=') {
+                      if (item.mkdata.matchVal <= branchVal) {
+                        _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+                      }
+                    } else if (item.mkdata.match === '>=') {
+                      if (item.mkdata.matchVal >= branchVal) {
+                        _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+                      }
+                    }
+                  }
+                }
+              })
+
+              _or_lines.sort((a, b) => a.dist - b.dist)
+
+              let _lines = [..._equ_lines, ..._or_lines, ..._unequ_lines, ..._def_lines]
+
+              _lines = _lines.filter(cell => {
+                if (cell.mkdata.seniorCondition === 'open' && !line) {
+                  cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+                    if (per.worker_id === userid) {
+                      line = cell
+                    }
+                  })
+
+                  return false
+                }
+
+                return true
+              })
+              
+              if (!line) {
+                line = _lines[0]
+              }
+            }
+          }
+        }
+      } else {
+        error = '琛屼俊鎭腑宸ヤ綔娴佸弬鏁版棤娉曡В鏋�'
+      }
+      
+      if (line) {
+        detailId = line.id
+        status = line.mkdata.status
+        statusName = line.mkdata.statusName
+        sign = line.mkdata.seniorSign || ''
+        target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
+
+        line.mkdata.members && line.mkdata.members.forEach(item => {
+          if (line.mkdata.approver === 'departmentManager') {
+            if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
+              checkIds.push(item.worker_id)
+              checkUsers.push(item)
+            }
+          } else if (line.mkdata.approver === 'directManager') {
+            if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
+              checkIds.push(item.worker_id)
+              checkUsers.push(item)
+            }
+          } else {
+            checkIds.push(item.worker_id)
+            checkUsers.push(item)
+          }
+        })
+        line.mkdata.copys && line.mkdata.copys.forEach(item => {
+          noticeIds.push(item.worker_id)
+        })
+
+        if (!target) {
+          error = '鏈煡璇㈠埌宸ヤ綔娴佺洰鏍囪妭鐐�'
+        } else if (checkIds.length === 0 && !['startEdge', 'endEdge', 'throughEdge'].includes(line.mknode)) {
+          error = '鏈幏鍙栧埌涓嬩竴姝ュ鎵逛汉'
+        } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
+          error = '褰撳墠鐢ㄦ埛涓嶅湪瀹℃壒浜哄垪琛ㄤ腑'
+        }
+      } else if (!error) {
+        error = '宸ヤ綔娴佷腑鏃犲搴旀祦绋�'
+      }
+    } else {
+      error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
+    }
+
+    if (!error && verify.flowSql !== 'true' && verify.flowType !== 'start' && line && line.approvalMethod === 'countersign') {
+      error = '浼氱娴佺▼闇�瑕佷娇鐢ㄩ粯璁よ剼鏈�'
+    }
+
+    if (error) {
+      status = 0
+      statusName = '寮傚父'
+
+      _sql += `
+      /* 宸ヤ綔娴佸紓甯竤ql */
+      select @ErrorCode='E',@retmsg='${error}' goto aaa
+      `
+    } else if (verify.flowSql === 'true') {
+      if (verify.flowType === 'start') {
+        _sql += `
+      /* 宸ヤ綔娴侀粯璁ql */
+      insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+      select @ID@,@works_flow_code@,@works_flow_name@,@works_flow_param@,@status@,@statusname@,@work_group@,@works_flow_detail_id@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+      insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
+      select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@
+      insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+      select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@
+      insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone)
+      select @ID@,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin'
+      `
+      } else if (line.approvalMethod === 'countersign' && node.checkIds.length > 1) {
+        let label = ''
+        let field = ''
+        let mark = line.mark || '宸插鏍�'
+        let _declare = []
+        let _select = []
+        let _select2 = []
+        let _where = []
+        let fields = ['statuscharone', 'statuschartwo', 'statuscharthree', 'statuscharfour', 'statuscharfive']
+        node.checkUsers.forEach((user, index) => {
+          if (user.worker_id === userid) {
+            field = fields[index]
+            label = `'${user.parentNames[2] || ''}${user.workername || ''}${mark}'`
+          } else {
+            _declare.push(`@works_flow_${fields[index]} nvarchar(50)`)
+            _select.push(`@works_flow_${fields[index]}=''`)
+            _select2.push(`@works_flow_${fields[index]}=${fields[index]}`)
+            _where.push(`@works_flow_${fields[index]}!=''`)
+          }
+        })
+        _declare = _declare.join(',')
+        _select = _select.join(',')
+        _select2 = _select2.join(',')
+        _where = _where.join(' and ')
+
+        _sql += `
+      /* 宸ヤ綔娴侀粯璁ql */
+      set @retmsg =''
+      select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+      if @retmsg =''
+      begin
+          select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+          if @retmsg !=''
+          begin
+              select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+              goto aaa
+          end
+
+          set @retmsg =''
+          select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+          if @retmsg !=''
+          begin
+              select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+
+              select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+              goto aaa
+          end
+
+          select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+          goto aaa
+      end
+
+      declare ${_declare},@works_flow_key_id nvarchar(50),@works_flow_key_status nvarchar(20),@s_my_works_flow_log_param  nvarchar(max),@s_my_works_flow_log_status int,@s_my_works_flow_log_statusname nvarchar(50),@s_my_works_flow_log_detail_id  nvarchar(50)
+      select ${_select},@works_flow_key_id='',@works_flow_key_status ='',@s_my_works_flow_log_param='',@s_my_works_flow_log_status=0,@s_my_works_flow_log_statusname='',@s_my_works_flow_log_detail_id=''
+
+      select ${_select2},@works_flow_key_id=id,@s_my_works_flow_log_param=works_flow_param,@s_my_works_flow_log_status=status,@s_my_works_flow_log_statusname=statusname,@s_my_works_flow_log_detail_id=works_flow_detail_id
+      from s_my_works_flow where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+
+      if ${_where}
+      begin
+          set @works_flow_key_status='Y'
+      end
+
+      if @works_flow_key_status='Y'
+      begin
+            update s_my_works_flow set ${field}=${label},status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
+            where id=@works_flow_key_id
+
+            insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''},${field})
+            select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''},${label}
+            
+            update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname 
+            where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+
+            if @check_userids@ != ''
+            begin
+                  insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
+                  select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+                  insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+                  select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+            end
+            if @notice_userids@ != ''
+            begin
+                  update n
+                  set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname 
+                  from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
+                  inner join (select ID from dbo.SplitComma(@notice_userids@)) s
+                  on n.userid = s.id
+                  insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+                  select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@)
+            end
+      end
+      else
+      begin
+            update s_my_works_flow set ${field}=${label},modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
+            where id =@works_flow_key_id
+
+            insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''},${field})
+            select @ID@,@works_flow_code@,@works_flow_name@ ,@s_my_works_flow_log_param,@s_my_works_flow_log_status,@s_my_works_flow_log_statusname,@s_my_works_flow_log_detail_id,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''},${label}
+          
+            update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname 
+            where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@
+      end
+      `
+      } else {
+        _sql += `
+      /* 宸ヤ綔娴侀粯璁ql */
+      set @retmsg =''
+      select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and userid =@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+      if @retmsg =''
+      begin
+          select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and userid=@userid@ and works_flow_detail_id =@works_flow_detail_id
+
+          if @retmsg !=''
+          begin
+              select @ErrorCode='E', @retmsg='褰撳墠鍗曟嵁宸插鏍革紝璇峰埛鏂板悗閲嶈瘯'
+              goto aaa
+          end
+
+          if @dataM@ !='' 
+          begin
+            set @retmsg =''
+            select @retmsg='X' from s_my_works_flow_role where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+
+            if @retmsg != ''
+            begin
+                goto goto_mk
+            end
+          end
+          else
+          begin
+              set @retmsg =''
+              select @retmsg=userid from s_my_works_flow_role where works_flow_id=@id@ and works_flow_code=@works_flow_code@ and deleted=0 and works_flow_detail_id =@works_flow_detail_id
+              
+              if @retmsg !=''
+              begin
+                  select @retmsg=workerCode+workerName from BD_workers where id=@retmsg 
+                  
+                  select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺锛岃鑱旂郴'+@retmsg+'鎿嶄綔'
+                  goto aaa 
+              end
+          end
+
+          select @retmsg='椤甸潰鏁版嵁宸叉洿鏂帮紝鎴栨病鏈夊綋鍓嶅崟鎹殑瀹℃壒鏉冮檺'
+          goto aaa 
+      end
+
+      goto_mk:
+
+      set @retmsg=''
+
+      update s_my_works_flow set status=@status@,statusname=@statusname@,works_flow_param=@works_flow_param@,works_flow_detail_id=@works_flow_detail_id@,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''}
+      where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+      insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''})
+      select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''}
+      
+      update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname 
+      where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0
+
+      ${line.mknode === 'startEdge' ? `update s_my_works_flow_role set deleted=0,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname,works_flow_detail_id=@works_flow_detail_id@ 
+      where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and typecharone='begin'` : ''}
+
+      if @check_userids@ != ''
+      begin
+            insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid)
+            select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+            insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+            select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@)
+      end
+      if @notice_userids@ != ''
+      begin
+            update n
+            set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname 
+            from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n
+            inner join (select ID from dbo.SplitComma(@notice_userids@)) s
+            on n.userid = s.id
+            insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid)
+            select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@)
+      end
+      `
+      }
+    }
+
+    if (_backCustomScript) {
+      _sql += _backCustomScript
+    }
+
+    if (verify.flowType === 'start') {
+      _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+    } else {
+      _sql = _sql.replace(/@works_flow_sign@/ig, `'${sign}'`)
+
+      _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`)
+      _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+
+      _sql = _sql.replace(/@check_userids@/ig, `'${checkIds.join(',')}'`)
+      _sql = _sql.replace(/@notice_userids@/ig, `'${noticeIds.join(',')}'`)
+    }
+
+    _sql = _sql.replace(/@works_flow_code@/ig, `'${flow.flow_code}'`)
+    _sql = _sql.replace(/@works_flow_name@/ig, `'${flow.flow_name}'`)
+
+    if (target) {
+      let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+      let msg = {...target.mkdata, label: label, id: target.id, checkIds, checkUsers}
+      _sql = _sql.replace(/@works_flow_param@/ig, `'${window.btoa(window.encodeURIComponent(JSON.stringify(msg)))}'`)
+    } else {
+      _sql = _sql.replace(/@works_flow_param@/ig, `''`)
+    }
+    _sql = _sql.replace(/@works_flow_detail_id@/ig, `'${detailId}'`)
+    _sql = _sql.replace(/@status@/ig, `'${status}'`)
+    _sql = _sql.replace(/@statusname@/ig, `'${statusName}'`)
+    _sql = _sql.replace(/@work_group@/ig, `'${sessionStorage.getItem('work_group') || ''}'`)
+    _sql = _sql.replace(/@work_grade@/ig, `'${work_grade}'`)
+  } else if (_backCustomScript) {
     _sql += _backCustomScript
+  }
+
+  if (verifyValSql) {
+    _sql += verifyValSql
   }
 
   if (window.GLOB.breakpoint) {
@@ -2135,7 +2970,7 @@
       z_debug_end: select @ErrorCode='E',@retmsg='debug_end' goto aaa`
   }
 
-  if (retmsg) {
+  if (retmsg || btn.returnValue === 'true') {
     _sql += `
       aaa: if @ErrorCode!=''
       insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
@@ -2153,22 +2988,25 @@
   _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
   _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
   _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+  _sql = _sql.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
   _sql = _sql.replace(/@typename@/ig, `'admin'`)
 
-  if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
-    // _sql = _sql.replace(/\n\s{8}/ig, '\n')
-    console.info(_sql)
+  if (window.GLOB.externalDatabase !== null) {
+    _sql = _sql.replace(/@db@/ig, window.GLOB.externalDatabase)
+  }
+
+  if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+    _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, `'Y'`)
+  } else {
+    _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`)
+  }
+
+  if (window.GLOB.debugger === true) {
+    window.mkInfo('%c' + btn.logLabel, 'color: blue')
+    window.mkInfo(_sql)
   }
 
   if (retmsg) {
-    _callbacksql = _callbacksql.replace(/@ID@/ig, `'${primaryId || ''}'`)
-    _callbacksql = _callbacksql.replace(/@BID@/ig, `'${BID}'`)
-    _callbacksql = _callbacksql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-    _callbacksql = _callbacksql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-    _callbacksql = _callbacksql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-    _callbacksql = _callbacksql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-    _callbacksql = _callbacksql.replace(/@typename@/ig, `'admin'`)
-    
     return {
       sql: _sql,
       callbacksql: _callbacksql
@@ -2181,12 +3019,8 @@
 /**
  * @description 鑾峰彇鏍囪淇℃伅
  */
-export function getMark (marks, record, style = {}) {
-  let icon = null
-  let innerStyle = null
-  let position = null
-  let signType = ''
-  style = JSON.parse(JSON.stringify(style))
+export function getMark (marks, record, style) {
+  let res = {signType: ''}
 
   marks.some(mark => {
     let originVal = record[mark.field[0]]
@@ -2222,530 +3056,67 @@
 
     if (type === 'font') {
       style.color = mark.color
-      innerStyle = {color: mark.color}
-      signType = ' sign-font'
+      res.innerStyle = {color: mark.color}
+      res.signType = ' sign-font'
     } else if (type === 'background') {
       style.backgroundColor = mark.color
       if (mark.fontColor) {
         style.color = mark.fontColor
-        innerStyle = {color: mark.fontColor}
+        res.innerStyle = {color: mark.fontColor}
       }
     } else if (type === 'underline') {
       style.textDecoration = 'underline'
       style.color = mark.color
-      innerStyle = {color: mark.color, textDecoration: 'underline'}
+      res.innerStyle = {color: mark.color, textDecoration: 'underline'}
     } else if (type === 'line-through') {
       style.textDecoration = 'line-through'
       style.color = mark.color
-      innerStyle = {color: mark.color, textDecoration: 'line-through'}
+      res.innerStyle = {color: mark.color, textDecoration: 'line-through'}
     } else if (type.indexOf('icon') > -1) {
-      icon = mark.signType[mark.signType.length - 1]
-      innerStyle = {color: mark.color}
+      res.icon = mark.signType[mark.signType.length - 1]
+      res.innerStyle = {color: mark.color}
       if (type === 'iconfront' || mark.signType[1] === 'front') {
-        position = 'front'
+        res.position = 'front'
       } else {
-        position = 'back'
+        res.position = 'back'
       }
+    } else if (type === 'indent') {
+      style.color = mark.color
+      res.space = Array(mark.signType[1] + 1).join('&nbsp;')
+    } else if (type === 'pointfront') {
+      res.position = 'front'
+      res.point = <span style={{display: 'inline-block', marginRight: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
+    } else if (type === 'pointback') {
+      res.position = 'back'
+      res.point = <span style={{display: 'inline-block', marginLeft: '3px', width: '8px', height: '8px', borderRadius: '14px', background: mark.color, verticalAlign: 'middle'}}></span>
     }
 
     return true
   })
 
-  return {
-    style,
-    icon,
-    innerStyle,
-    position,
-    signType
-  }
+  return res
 }
 
 /**
  * @description 鐢熸垚鏇挎崲鍑芥暟鍒楄〃
  */
-export function setGLOBFuncs () {
-  window.GLOB.funcs = []
-  if (!window.GLOB.IndexDB) {
-    return
-  }
+// export function setGLOBFuncs () {
+//   window.GLOB.funcs = []
+//   if (!window.GLOB.IndexDB) {
+//     return
+//   }
 
-  let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+//   let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
 
-  objectStore.openCursor().onsuccess = (event) => {
-    let cursor = event.target.result
+//   objectStore.openCursor().onsuccess = (event) => {
+//     let cursor = event.target.result
 
-    if (cursor) {
-      window.GLOB.funcs.push({
-        func_code: cursor.value.func_code,
-        key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
-      })
-      cursor.continue()
-    }
-  }
-}
-
-/**
- * @description 鍒涘缓瀛樺偍杩囩▼绫�
- */
-export class FuncUtils {
-  /**
-   * @description 鍒犻櫎瀛樺偍杩囩▼sql
-   * @return {String} name 瀛樺偍杩囩▼鍚嶇О
-   */
-  static dropfunc (name) {
-    return `IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID('${name}') AND type in (N'P', N'PC'))  mdrpk PROCEDURE ${name}`
-  }
-
-  /**
-   * @description 鍒涘缓椤甸潰瀛樺偍杩囩▼
-   * @return {String}
-   */
-  static getTableFunc (func = 'func', menu, config) {
-    let form = ''
-    let formParam = ''
-    let _vars = ['bid', 'pageindex', 'pagesize', 'ordercol', 'ordertype', 'exceltype', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
-    let _columns = []
-    let primaryKey = config.setting.primaryKey || 'ID'
-
-    if (!_vars.includes(primaryKey.toLowerCase())) {
-      _vars.push(primaryKey.toLowerCase())
-      formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
-    }
-
-    if (config.search && config.search.length > 0) {
-      let _fields = new Map()
-      config.search.forEach(item => {
-        if (item.field) {
-          let type = ''
-
-          if (item.type.match(/date/ig)) {
-            type = 'datetime=null'
-          } else {
-            type = 'nvarchar(50)=\'\''
-          }
-
-          item.field.split(',').forEach(cell => {
-            let _f = cell
-            if (_fields.has(cell)) {
-              _f = _f + '1'
-            }
-  
-            _fields.set(cell, true)
-
-            if (!_vars.includes(_f.toLowerCase())) {
-              _vars.push(_f.toLowerCase())
-              formParam = formParam + `mchr13k@${_f} ${type},`
-            }
-          })
-        }
-      })
-    }
-
-    if (config.columns && config.columns.length > 0) {
-      config.columns.forEach(item => {
-        if (item.field) {
-          _columns.push(`${item.field} as ${item.label}`)
-        }
-      })
-
-      form = `
-        declare @dc table (${_columns.join(',')})
-        
-        @tableid ='${menu.MenuID}'
-      `
-    }
-
-    let Ltext = `create proc ${func}
-    ( /*${menu.MenuName}*/
-    @appkey nvarchar(50)='',
-    @BID nvarchar(50)='',${formParam}
-    @PageIndex nvarchar(50)='',
-    @PageSize nvarchar(50)='',
-    @OrderCol nvarchar(50)='',
-    @OrderType nvarchar(50)='',
-    @exceltype nvarchar(50)='',
-    @sEPTMenuNo nvarchar(50)='${menu.MenuNo}',
-    @lang nvarchar(50)='',
-    @debug nvarchar(50)='',
-    @LoginUID nvarchar(50)='',
-    @SessionUid nvarchar(50)='',
-    @UserID nvarchar(50),
-    @dataM nvarchar(50),
-    @ErrorCode nvarchar(50) out,
-    @retmsg nvarchar(4000) out
-    )
-    as
-    begin
-    declare  @BegindateTest datetime,@EnddateTest datetime
-    select  @BegindateTest=getdate()
-    set @ErrorCode=''
-    set @retmsg=''
-    BEGIN TRY
-      /*浜嬪姟鎿嶄綔*/
-      BEGIN TRAN
-        /*鍏蜂綋涓氬姟鎿嶄綔*/
-        
-        /* 
-        select top 10 * from sProcExcep order by id desc
-        
-        declare @UserName  nvarchar(50),@FullName nvarchar(50)
-        
-        select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
-        ${form}
-        if 1=2
-        begin
-          set @ErrorCode='E'
-          set @retmsg='鍦ㄦ鍐欐姤閿�'
-          goto GOTO_RETURN
-        end
-        
-        insert into sNote (remark,createuserid,CreateUser,CreateStaff)
-        select '鍦ㄦ鍐欐棩蹇�',@UserID,@UserName,@FullName
-        */
-        
-      COMMIT TRAN
-      SET NOCOUNT ON
-      RETURN
-    END TRY
-    BEGIN CATCH
-      /*閿欒澶勭悊*/
-      ROLLBACK TRAN
-      DECLARE @ErrorMessage NVARCHAR(4000);
-      DECLARE @ErrorSeverity INT;
-      DECLARE @ErrorState INT;
-      
-      /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
-      set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
-      SET @retmsg=ERROR_MESSAGE();
-      SELECT @ErrorMessage=ERROR_MESSAGE(),
-        @ErrorSeverity=ERROR_SEVERITY(),
-        @ErrorState=ERROR_STATE();
-        
-      RAISERROR(@ErrorMessage, /*-- Message text.*/
-        @ErrorSeverity, /*-- Severity.*/
-        @ErrorState  /*-- State.*/
-      );
-    END CATCH
-    
-    GOTO_RETURN:
-      ROLLBACK TRAN
-      
-    END`
-
-    Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
-
-    return Ltext
-  }
-
-  /**
-   * @description 鍒涘缓瀛樺偍杩囩▼
-   * @return {String}
-   */
-  static getfunc (param, btn, menu, config) {
-    let form = ''
-    let formParam = ''
-    let _vars = ['bid', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
-    let columns = config.columns
-    let primaryKey = config.setting.primaryKey || 'ID'
-
-    if (!_vars.includes(primaryKey.toLowerCase())) {
-      _vars.push(primaryKey.toLowerCase())
-      let _type = '50'
-      if (btn.Ot === 'requiredOnce') { // 澶氳鎷兼帴鏃讹紝涓婚敭璁句负max
-        _type = 'max'
-      }
-      formParam = `mchr13k@${primaryKey} nvarchar(${_type})='',`
-    }
-
-    if (param.fields && param.fields.length > 0) {
-      let _fields = []
-      param.fields.forEach(item => {
-        if (item.field) {
-          let type = ''
-          if (item.type.match(/date/ig)) {
-            type = 'datetime=null'
-          } else if (item.type === 'number') {
-            type = `decimal(18,${item.decimal})=0`
-          } else if (item.type === 'rate') {
-            type = `decimal(18,2)=0`
-          } else {
-            type = 'nvarchar(50)=\'\''
-          }
-
-          if (!_vars.includes(item.field.toLowerCase())) {
-            _vars.push(item.field.toLowerCase())
-            formParam = formParam + `mchr13k@${item.field} ${type},`
-          }
-
-          _fields.push(item.field)
-        }
-      })
-
-      let field1 = _fields.join(',')
-      let field2 = _fields.join(',@')
-      let field3 = _fields.map(cell => {
-        return cell + '=@' + cell
-      })
-
-      field2 = field2 ? '@' + field2 : ''
-      field3 = field3.join(',')
-
-      form = `
-        insert into ${param.name} (${field1},createuserid) select ${field2},@UserID
-        
-        update ${param.name} set ${field3},modifydate=getdate(),modifyuser=@username,modifyuserid=@UserID
-      `
-    } else if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') {
-      form = `
-        update ${param.name} set ModifyDate=getdate(),ModifyUserID=@UserID where ${primaryKey}=@${primaryKey}
-      `
-    }
-
-    if (columns) {
-      let _col = []
-      let _field = []
-      columns.forEach(col => {
-        if (col.field) {
-          if (col.type === 'number') {
-            _col.push(col.field + ' decimal(18,2)')
-          } else {
-            _col.push(col.field + ' nvarchar(50)')
-          }
-          _field.push(col.field)
-        }
-      })
-      _col = _col.join(',')
-      _field = _field.join(',')
-
-      form = form + `
-        declare @dc table (${_col})
-        
-        insert into @dc (${_field})
-
-        @tableid ='${menu.MenuID}'
-      `
-    }
-
-    // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
-    let _printRemark = ''
-    if (btn.funcType === 'print') {
-      _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
-    }
-
-    let Ltext = `create proc ${param.funcName}
-    ( /*${menu.MenuName}  ${btn.label}*/
-    @appkey nvarchar(50)='',
-    @BID nvarchar(50)='',${formParam}
-    @sEPTMenuNo nvarchar(50)='${param.menuNo}',
-    @lang nvarchar(50)='',
-    @debug nvarchar(50)='',
-    @LoginUID nvarchar(50)='',
-    @SessionUid nvarchar(50)='',
-    @UserID nvarchar(50),
-    @ErrorCode nvarchar(50) out,
-    @retmsg nvarchar(4000) out
-    )
-    as
-    begin
-    declare  @BegindateTest datetime,@EnddateTest datetime
-    select  @BegindateTest=getdate()
-    set @ErrorCode=''
-    set @retmsg=''
-    BEGIN TRY
-      /*浜嬪姟鎿嶄綔*/
-      BEGIN TRAN
-        /*鍏蜂綋涓氬姟鎿嶄綔*/
-        ${_printRemark}
-        /* 
-        select top 10 * from sProcExcep order by id desc
-        
-        declare @UserName  nvarchar(50),@FullName nvarchar(50)
-        
-        select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
-        ${form}
-        if 1=2
-        begin
-          set @ErrorCode='E'
-          set @retmsg='鍦ㄦ鍐欐姤閿�'
-          goto GOTO_RETURN
-        end
-        
-        insert into sNote (remark,createuserid,CreateUser,CreateStaff)
-        select '鍦ㄦ鍐欐棩蹇�',@UserID,@UserName,@FullName
-        */
-        
-      COMMIT TRAN
-      SET NOCOUNT ON
-      RETURN
-    END TRY
-    BEGIN CATCH
-      /*閿欒澶勭悊*/
-      ROLLBACK TRAN
-      DECLARE @ErrorMessage NVARCHAR(4000);
-      DECLARE @ErrorSeverity INT;
-      DECLARE @ErrorState INT;
-      
-      /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
-      set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
-      SET @retmsg=ERROR_MESSAGE();
-      SELECT @ErrorMessage=ERROR_MESSAGE(),
-        @ErrorSeverity=ERROR_SEVERITY(),
-        @ErrorState=ERROR_STATE();
-        
-      RAISERROR(@ErrorMessage, /* Message text.*/
-        @ErrorSeverity, /* Severity.*/
-        @ErrorState  /* State.*/
-      );
-    END CATCH
-    
-    GOTO_RETURN:
-      ROLLBACK TRAN
-      
-    END`
-
-    Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
-
-    return Ltext
-  }
-
-  /**
-   * @description 鍒涘缓瀵煎叆瀛樺偍杩囩▼
-   * @return {String}
-   */
-  static getexcelInfunc (param, btn, menu) {
-    let _verify = btn.verify
-
-    let _uniquesql = ''
-    if (_verify.uniques && _verify.uniques.length > 0) {
-      _verify.uniques.forEach(unique => {
-        if (unique.status === 'false') return
-
-        let _fields = unique.field.split(',')
-        let _fields_ = _fields.map(_field => {
-          return `a.${_field}=b.${_field}`
-        })
-        _fields_ = _fields_.join(' and ')
-
-        if (unique.verifyType !== 'physical') {
-          _fields_ += ' and b.deleted=0'
-        }
-
-        _uniquesql += `
-        Set @tbid=''
-        Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${btn.sheet} ) a group by ${unique.field} having sum(n)>1
-
-        If @tbid!=''
-        Begin
-          select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
-          goto aaa
-        end
-
-        Set @tbid=''
-        Select top 1 @tbid=${_fields.join('+\' \'+')} from  @${btn.sheet} a
-        Inner join ${btn.sheet} b on ${_fields_}
-
-        If @tbid!=''
-        Begin
-          select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
-          goto aaa
-        end
-        `
-      })
-
-      if (_uniquesql) {
-        _uniquesql = `
-        Declare @tbid Nvarchar(512)
-        ${_uniquesql}`
-      }
-    }
-
-    let declarefields = []
-    let fields = []
-
-    _verify.columns.forEach(col => {
-      declarefields.push(`${col.Column} ${col.type}`)
-      fields.push(col.Column)
-    })
-
-    fields = fields.join(',')
-
-    let _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50))
-      Declare @UserName nvarchar(50),@FullName nvarchar(50)
-      
-      select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
-      
-      Insert into @${btn.sheet} (${fields},jskey)
-
-      exec s_KeyWords_Replace
-      @LText=@LText, @BID=@BID,@LoginUID=@LoginUID,@SessionUid=@SessionUid,@UserID=@UserID,@ID=@ID
-      ${_uniquesql}
-      Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid) 
-      Select ${fields},@userid,@username,@fullname,@BID From @${btn.sheet}
-
-      Delete @${btn.sheet}`
-
-    let Ltext = `create proc ${param.funcName}
-    ( /*${menu.MenuName}  ${btn.label}*/
-      @appkey nvarchar(50)='',
-      @ID nvarchar(50)='',
-      @BID nvarchar(50)='',
-      @Ltext nvarchar(max)='',
-      @sEPTMenuNo nvarchar(50)='${param.menuNo}', 
-      @secretkey nvarchar(50)='',
-      @timestamp nvarchar(50)='',
-      @lang nvarchar(50)='',
-      @LoginUID nvarchar(50)='',
-      @SessionUid nvarchar(50)='',
-      @UserID nvarchar(50), 
-      @ErrorCode nvarchar(50) out,
-      @retmsg nvarchar(4000) out
-    )
-    as
-    begin
-    declare @BegindateTest datetime,@EnddateTest datetime 
-    select @BegindateTest=getdate() 
-    set @ErrorCode=''
-    set @retmsg=''
-    BEGIN TRY
-      /*浜嬪姟鎿嶄綔*/
-      BEGIN TRAN
-        /*鍏蜂綋涓氬姟鎿嶄綔*/
-
-        /* 
-        ${_sql}
-        */
-        
-      COMMIT TRAN
-      SET NOCOUNT ON
-      RETURN
-    END TRY
-    BEGIN CATCH
-      /*閿欒澶勭悊*/
-      ROLLBACK TRAN
-      DECLARE @ErrorMessage NVARCHAR(4000);
-      DECLARE @ErrorSeverity INT;
-      DECLARE @ErrorState INT;
-      
-      /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
-      set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
-      SET @retmsg=ERROR_MESSAGE();
-      SELECT @ErrorMessage=ERROR_MESSAGE(),
-        @ErrorSeverity=ERROR_SEVERITY(),
-        @ErrorState=ERROR_STATE();
-        
-      RAISERROR(@ErrorMessage, /* Message text.*/
-        @ErrorSeverity, /* Severity.*/
-        @ErrorState  /* State.*/
-      );
-    END CATCH
-    
-    GOTO_RETURN:
-      ROLLBACK TRAN
-      
-    END`
-
-    Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
-
-    return Ltext
-  }
-}
\ No newline at end of file
+//     if (cursor) {
+//       window.GLOB.funcs.push({
+//         func_code: cursor.value.func_code,
+//         key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
+//       })
+//       cursor.continue()
+//     }
+//   }
+// }
\ No newline at end of file

--
Gitblit v1.8.0