From 06404e701a89955958cbf56213e2eec618d8644d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 16 十二月 2020 18:36:16 +0800
Subject: [PATCH] 2020-12-16

---
 src/utils/utils.js | 1491 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 659 insertions(+), 832 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index dd981d9..ca41324 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2,9 +2,55 @@
 import md5 from 'md5'
 import options from '@/store/options.js'
 
-const service = window.GLOB.service ? (/\/$/.test(window.GLOB.service) ? window.GLOB.service : window.GLOB.service + '/') : ''
+const formatKeys = [
+  { key: 'select', value: ' msltk ' },
+  { key: 'from', value: ' mfrmk ' },
+  { key: 'where', value: ' mwhrk ' },
+  { key: 'order by', value: ' modbk ' },
+  { key: 'asc', value: ' modack ' },
+  { key: 'desc', value: ' moddesk ' },
+  { key: 'top', value: ' mtpk ' },
+  { key: 'like', value: ' mlkk ' },
+  { key: 'not like', value: ' mnlkk ' },
+  { key: 'between', value: ' mbtnk ' },
+  { key: 'and', value: ' madk ' },
+  { key: 'insert', value: ' mistk ' },
+  { key: 'into', value: ' mitk ' },
+  { key: 'update', value: ' muptk ' },
+  { key: 'delete', value: ' mdelk ' },
+  { key: 'begin', value: ' mbgink ' },
+  { key: 'end', value: ' medk ' },
+  { key: 'if', value: ' mefk ' },
+  { key: 'while', value: ' mwilk ' },
+  { key: 'create', value: ' mcrtk ' },
+  { key: 'alter', value: ' matek ' },
+  { key: 'len', value: ' mlnk ' },
+  { key: 'left', value: ' mlftk ' },
+  { key: 'right', value: ' mritk ' },
+  { key: 'union', value: ' munok ' },
+  { key: 'varchar', value: ' mvcrk ' },
+  { key: 'getdate', value: ' mgtdtk ' },
+  { key: 'TRY', value: ' mtryonek ' },
+  { key: 'TRAN', value: ' mtrnk ' },
+  { key: 'goto', value: ' mgtk ' },
+  { key: 'set', value: ' mstk ' },
+  { key: 'ROLLBACK', value: ' mrlbkk ' }
+]
 
 export default class Utils {
+  /**
+   * @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
+   * @return {String}  name
+   */
+  static getdataName () {
+    let name = []
+    let _options = 'abcdefghigklmnopqrstuvwxyz'
+    for (let i = 0; i < 6; i++) {
+      name.push(_options.substr(Math.floor(Math.random() * 26), 1))
+    }
+    return name.join('')
+  }
+
   /**
    * @description 鐢熸垚32浣島uid string + 鏃堕棿
    * @return {String}  uuid
@@ -12,9 +58,9 @@
   static getuuid () {
     let uuid = []
     let timestamp = new Date().getTime()
-    let options = '0123456789abcdefghigklmnopqrstuv'
+    let _options = '0123456789abcdefghigklmnopqrstuv'
     for (let i = 0; i < 19; i++) {
-      uuid.push(options.substr(Math.floor(Math.random() * 0x20), 1))
+      uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
     }
     uuid = timestamp + uuid.join('')
     return uuid
@@ -39,14 +85,27 @@
   /**
    * @description md5鍔犲瘑
    * @return {String}  str         鍔犲瘑涓�
-   * @return {String}  timestamp   鏃堕棿鎴�  
+   * @return {String}  timestamp   鏃堕棿鎴�
    */
   static encrypt (str, timestamp) {
-    let salt = 'mingke' // 鐩愬��
+    let salt = 'mingke'    // sql璇硶鐩愬��
     let _str = str + salt + timestamp
+
     if (_str.length > 8000) {
       _str = _str.slice(_str.length - 8000)
     }
+    return md5(_str)
+  }
+
+  /**
+   * @description md5鍔犲瘑 浜戠openkey鍔犲瘑
+   * @return {String}  secretkey   Ltext瀵嗛挜
+   * @return {String}  timestamp   鏃堕棿鎴�
+   */
+  static encryptOpenKey (secretkey, timestamp) {
+    let salt = 'open_key'  // 浜戠鏁版嵁鎿嶄綔鐩愬��
+    let _str = salt + timestamp + secretkey
+
     return md5(_str)
   }
 
@@ -72,12 +131,15 @@
       {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_sqlvarbasetostr\(HashBytes\('MD5'/ig, '') // 璺宠繃MD5鍔犲瘑
+
     chars.forEach(char => {
       if (!error && char.reg.test(sql)) {
         error = char.key
@@ -89,90 +151,126 @@
 
   /**
    * @description sql鍔犲瘑
-   * @return {String}  value
+   * @return {String}   value
    */
-  static formatOptions (value, isUnFormat = false) {
+  static formatOptions (value) {
     if (!value) return ''
 
     let salt = 'minKe' // 鐩愬��
-    // 鍏抽敭瀛楄浆鎹㈣鍒�
-    let format = [
-      { key: 'select', value: ' msltk ' },
-      { key: 'from', value: ' mfrmk ' },
-      { key: 'where', value: ' mwhrk ' },
-      { key: 'order by', value: ' modbk ' },
-      { key: 'asc', value: ' modack ' },
-      { key: 'desc', value: ' moddesk ' },
-      { key: 'top', value: ' mtpk ' },
-      { key: 'like', value: ' mlkk ' },
-      { key: 'not like', value: ' mnlkk ' },
-      { key: 'between', value: ' mbtnk ' },
-      { key: 'and', value: ' madk ' },
-      { key: 'insert', value: ' mistk ' },
-      { key: 'into', value: ' mitk ' },
-      { key: 'update', value: ' muptk ' },
-      { key: 'delete', value: ' mdelk ' },
-      { key: 'begin', value: ' mbgink ' },
-      { key: 'end', value: ' medk ' },
-      { key: 'if', value: ' mefk ' },
-      { key: 'while', value: ' mwilk ' },
-      { key: 'create', value: ' mcrtk ' },
-      { key: 'alter', value: ' matek ' },
-      { key: 'len', value: ' mlnk ' },
-      { key: 'left', value: ' mlftk ' },
-      { key: 'right', value: ' mritk ' },
-      { key: 'union', value: ' munok ' },
-      { key: 'varchar', value: ' mvcrk ' },
-      { key: 'getdate', value: ' mgtdtk ' },
-      { key: 'TRY', value: ' mtryonek ' },
-      { key: 'TRAN', value: ' mtrnk ' },
-      { key: 'goto', value: ' mgtk ' },
-      { key: 'set', value: ' mstk ' },
-      { key: 'ROLLBACK', value: ' mrlbkk ' }
-    ]
 
-    if (!isUnFormat) { // 鍔犲瘑
-      value = value.replace(/\n/ig, ' \n ')
-      // 鏇挎崲鍏抽敭瀛�
-      format.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 ')
-
-      // 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥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)
-    } else { // 瑙e瘑
-      try {
-        value = window.atob(value)
-        value = value.replace(salt, '')
-        value = window.decodeURIComponent(window.atob(value))
-
-        value = value.replace(/\smpercent\s/g, '%')
-
-        format.forEach(item => {
-          let reg = new RegExp(item.value, 'g')
-          value = value.replace(reg, ' ' + item.key + ' ')
-        })
-
-        value = value.replace(/\s\n\s/ig, '\n')
-        value = value.replace(/(^\s+|\s+$)/ig, '')
-      } catch {
-        console.warn('UnFormat Failure')
-        value = ''
-      }
+    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)
 
     return value
+  }
+
+  /**
+   * @description 瑙e瘑
+   * @return {String}   value
+   */
+  static UnformatOptions (value) {
+    if (!value) return ''
+    let salt = 'minKe' // 鐩愬��
+    let _value = ''
+
+    try {
+      try {
+        _value = JSON.parse(window.decodeURIComponent(window.atob(value)))
+      } catch {
+        _value = ''
+      }
+
+      if (!_value) {
+        _value = window.atob(value)
+        _value = _value.replace(salt, '')
+        _value = window.decodeURIComponent(window.atob(_value))
+  
+        _value = _value.replace(/\smpercent\s/g, '%')
+  
+        formatKeys.forEach(item => {
+          let reg = new RegExp(item.value, 'g')
+          _value = _value.replace(reg, ' ' + item.key + ' ')
+        })
+  
+        _value = _value.replace(/\s\n\s/ig, '\n')
+        _value = _value.replace(/(^\s+|\s+$)/ig, '')
+      }
+    } catch {
+      console.warn('UnFormat Failure')
+      _value = ''
+    }
+
+    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: ''
+      }
+    }
   }
 
   /**
@@ -345,7 +443,7 @@
 
         newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
         newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
-      } else if (item.type === 'text') {
+      } else if (item.type === 'text' || item.type === 'select') {
         item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
           newsearches[field] = item.value
         })
@@ -378,17 +476,13 @@
       if (item.forbid || !item.value || (item.type === 'multiselect' && item.value.length === 0)) return
       
       searchText += (searchText !== '' ? ' AND ' : '')
-      if (item.type === 'text') {
+      if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
         let str = item.match === '=' ? '' : '%'
-        let fields = item.key.split(',').map(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+        let fields = item.key.split(',').map(field => {
           return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
         })
 
         searchText += '(' + fields.join(' OR ') + ')'
-      } else if (item.type === 'select') {
-        let str = item.match === '=' ? '' : '%'
-
-        searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
       } else if (item.type === 'multiselect') {
 
         searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
@@ -429,7 +523,7 @@
   }
 
   /**
-   * @description 鎷兼帴鎼滅储鏉′欢main
+   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
    * @param {Array}   searches     鎼滅储鏉′欢
    * @return {String}  searchText  鎷兼帴缁撴灉
    */
@@ -443,9 +537,7 @@
         key: search.key,
         match: search.match,
         type: search.type,
-        label: search.label,
-        value: search.value,
-        required: search.required
+        value: search.value
       }
 
       if (fieldmap.has(item.key)) {
@@ -502,12 +594,63 @@
         item.value = item.value ? item.value.join(',') : item.value
 
         options.push(item)
-      } else if (item.type === 'text') {
+      } else if (item.type === 'text' || item.type === 'select') {
         item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
           let cell = JSON.parse(JSON.stringify(item))
           cell.key = field
 
+          options.push(cell)
+        })
+      } else {
+        options.push(item)
+      }
+    })
+
+    return options
+  }
+
+  /**
+   * @description 鑾峰彇鎼滅储鐢ㄤ簬姝e垯鏇挎崲
+   * @param {Array}   searches     鎼滅储鏉′欢
+   * @return {String}  searchText  鎷兼帴缁撴灉
+   */
+  static getRegOptions (searches) {
+    if (!searches || searches.length === 0) return []
+
+    let options = []
+    let fieldmap = new Map()
+    searches.forEach(search => {
+      let item = {
+        key: search.field,
+        value: '0'
+      }
+
+      if (fieldmap.has(item.key)) {
+        item.key = item.key + '1'
+      }
+
+      fieldmap.set(item.key, true)
+
+      if (search.type === 'group') {
+        options.push({
+          key: search.datefield,
+          value: '0'
+        })
+        if (search.transfer === 'true') {
           options.push(item)
+        }
+      } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
+        options.push(item)
+        options.push({
+          key: item.key + '1',
+          value: '0'
+        })
+      } else if (search.type === 'text' || search.type === 'select') {
+        item.key.split(',').forEach(field => {
+          let cell = JSON.parse(JSON.stringify(item))
+          cell.key = field
+
+          options.push(cell)
         })
       } else {
         options.push(item)
@@ -553,13 +696,11 @@
 
     let baseurl = ''
     if (process.env.NODE_ENV === 'production') {
-      baseurl = document.location.origin + '/' + service
+      baseurl = document.location.origin + '/' + window.GLOB.service
     } else {
-      baseurl = 'http://qingqiumarket.cn/' + service
+      baseurl = window.GLOB.location + window.GLOB.service
     }
-    // if (!/Content\/images\/upload\//.test(url)) {
-    //   baseurl = baseurl + 'Content/images/upload/'
-    // }
+
     let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
     return realurl
   }
@@ -576,7 +717,7 @@
     if (options.cloudServiceApi) {
       baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
     } else {
-      baseurl = document.location.origin + '/' + service
+      baseurl = document.location.origin + '/' + window.GLOB.service
     }
 
     return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
@@ -591,8 +732,11 @@
 
     if (item.type === 'link') {
       arrfield.push(item.linkField)
-    } else if (item.type === 'select' && item.linkSubField && item.linkSubField.length > 0) {
+    } else if ((item.type === 'select' || item.type === 'radio') && item.linkSubField && item.linkSubField.length > 0) {
       arrfield.push(...item.linkSubField)
+    } else if (item.type === 'checkcard') {
+      arrfield = item.fields.map(f => f.field)
+      arrfield.push(item.valueField)
     }
 
     arrfield = Array.from(new Set(arrfield))
@@ -607,9 +751,9 @@
     arrfield = arrfield.join(',')
 
     if (item.orderBy) {
-      sql = 'select distinct ' + arrfield + ',' + item.orderBy + ' as orderfield from ' + _datasource + ' order by orderfield ' + item.orderType
+      sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield},${item.orderBy} as orderfield from ${_datasource} ) a order by orderfield ${item.orderType}`
     } else {
-      sql = 'select distinct ' + arrfield + ' from ' + _datasource
+      sql = `select ${item.type === 'checkcard' ? 'top 20' : ''} ${arrfield} from (select distinct ${arrfield} from ${_datasource}) a`
     }
 
     return {
@@ -623,9 +767,19 @@
    * @return {String} btn   鎸夐挳
    * @return {String} data  excel鏁版嵁
    */
-  static getExcelInSql (item, data, dict) {
+  static getExcelInSql (item, data, dict, BID) {
     let btn = item.verify
     let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
+    let userName = sessionStorage.getItem('User_Name') || ''
+    let fullName = sessionStorage.getItem('Full_Name') || ''
+
+    if (sessionStorage.getItem('isEditState') === 'true') {
+      userName = sessionStorage.getItem('CloudUserName') || ''
+      fullName = sessionStorage.getItem('CloudFullName') || ''
+    }
+
+    let database = item.sheet.match(/(.*)\.(.*)\./ig) || ''
+    let sheet = item.sheet.replace(/(.*)\.(.*)\./ig, '')
 
     let errors = []
     let _topline = btn.range || 0
@@ -641,22 +795,31 @@
 
         if (script.position === 'init') {
           _initCustomScript += `
-          ${script.sql}
-          `
+        /* 鑷畾涔夎剼鏈� */
+        ${script.sql}
+        `
         } else if (script.position === 'front') {
           _prevCustomScript += `
-          ${script.sql}
-          `
+        /* 鑷畾涔夎剼鏈� */
+        ${script.sql}
+        `
         } else {
           _backCustomScript += `
-          ${script.sql}
-          `
+        /* 鑷畾涔夎剼鏈� */
+        ${script.sql}
+        `
         }
       })
     }
 
+    // 鎺у埗鍙版墦鍗版暟鎹�
+    let conLtext = []
     let _Ltext = data.map((item, lindex) => {
-      let vals = btn.columns.map((col, cindex) => {
+      let vals = []
+      let convals = []
+      btn.columns.forEach((col, cindex) => {
+        if (col.import === 'false') return
+
         let val = item[col.Column] !== undefined ? item[col.Column] : ''
         let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + (cindex + 1) + dict['main.excel.column']  + ' '
 
@@ -667,91 +830,113 @@
 
           val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
 
-          if (!val && col.required === 'true') { // 蹇呭~鏍¢獙
-            let _error =  _position + dict['main.excel.content.emptyerror']
-            errors.push(_error)
-          } else if (val.length > col.limit) {    // 闀垮害鏍¢獙
-            let _error =  _position + dict['main.excel.content.maxlimit']
-            errors.push(_error)
-          } else {                               // 鍏抽敭瀛楁牎楠�
+          if (!val && col.required === 'true') {            // 蹇呭~鏍¢獙
+            errors.push(_position + dict['main.excel.content.emptyerror'])
+          } else if (col.limit && val.length > col.limit) { // 闀垮害鏍¢獙
+            errors.push(_position + dict['main.excel.content.maxlimit'])
+          } else {                                          // 鍏抽敭瀛楁牎楠�
             keys.forEach(key => {
               let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
               if (_patten.test(val)) {
-                let _error = _position + dict['main.excel.includekey'] + key
-                errors.push(_error)
+                errors.push(_position + dict['main.excel.includekey'] + key)
               }
             })
           }
         } else if (/^int/ig.test(col.type)) {
           if (!val && val !== 0) {
-            let _error =  _position + dict['main.excel.content.emptyerror']
-            errors.push(_error)
+            errors.push(_position + dict['main.excel.content.emptyerror'])
           } else {
             let _val = val + ''
 
             if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) {               // 妫�楠屾槸鍚︿负鏁存暟
-              let _error = _position + dict['main.excel.content.interror']
-              errors.push(_error)
+              errors.push(_position + dict['main.excel.content.interror'])
             } else if ((col.min || col.min === 0) && val < col.min) {          // 鏈�灏忓�兼楠�
-              let _error = _position + dict['main.excel.content.limitmin']
-              errors.push(_error)
+              errors.push(_position + dict['main.excel.content.limitmin'])
             } else if ((col.max || col.max === 0) && val > col.max) {          // 鏈�澶у�兼楠�
-              let _error = _position + dict['main.excel.content.limitmax']
-              errors.push(_error)
+              errors.push(_position + dict['main.excel.content.limitmax'])
             }
           }
         } else if (/^Decimal/ig.test(col.type)) {
           if (!val && val !== 0) {
-            let _error =  _position + dict['main.excel.content.emptyerror']
-            errors.push(_error)
+            errors.push(_position + dict['main.excel.content.emptyerror'])
           } 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)) {                           // 妫�楠屾槸鍚︿负娴偣鏁�
-              let _error = _position + dict['main.excel.content.floaterror']
-              errors.push(_error)
-            } else if (_vals[0].length > 18) {                         // 妫�楠屾暣鏁颁綅
-              let _error = _position + dict['main.excel.content.floatIntover']
-              errors.push(_error)
+              errors.push(_position + dict['main.excel.content.floaterror'])
+            } else if (_vals[0].length > 18) {                          // 妫�楠屾暣鏁颁綅
+              errors.push(_position + dict['main.excel.content.floatIntover'])
             } else if (_vals[1] && _vals[1].length > col.limit) {       // 鏈�灏忓�兼楠�
-              let _error = _position + dict['main.excel.content.floatPointover']
-              errors.push(_error)
-            } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
-              let _error = _position + dict['main.excel.content.limitmin']
-              errors.push(_error)
-            } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
-              let _error = _position + dict['main.excel.content.limitmax']
-              errors.push(_error)
+              errors.push(_position + dict['main.excel.content.floatPointover'])
+            } else if ((col.min || col.min === 0) && val < col.min) {   // 鏈�灏忓�兼楠�
+              errors.push(_position + dict['main.excel.content.limitmin'])
+            } else if ((col.max || col.max === 0) && val > col.max) {   // 鏈�澶у�兼楠�
+              errors.push(_position + dict['main.excel.content.limitmax'])
             }
           }
+        } else if (col.type === 'date') {
+          if (typeof(val) === 'number') {
+            if (val > 2958465 || val <= 0) {                 // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
+              errors.push(_position + dict['main.excel.content.date.over'])
+            } 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 + dict['main.excel.content.emptyerror'])
+            } else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝e垯鏍¢獙
+              errors.push(_position + dict['main.excel.content.date.formatError'])
+            }
+          } else {                                           // 鏃堕棿鏍煎紡閿欒
+            errors.push(_position + dict['main.excel.content.date.formatError'])
+          }
         }
-        
-        return `'${val}' as ${col.Column}`
+
+        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}' as jskey`)
+      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(',')}`
     })
 
-    _Ltext = _Ltext.join(' Union all ')
+    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 === 'inner' && !item.innerFunc) {
+    if (item.intertype === 'system') {
       let _uniquesql = ''
       if (btn.uniques && btn.uniques.length > 0) {
         btn.uniques.forEach(unique => {
           if (unique.status === 'false') return
 
           let _fields = unique.field.split(',')
-          let _fields_ = _fields.map(_field => {
-            return `a.${_field}=b.${_field}`
-          })
+          let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
+          let _afields = _fields.map(_field => `a.${_field}`)
           _fields_ = _fields_.join(' and ')
 
           if (unique.verifyType !== 'physical') {
@@ -759,81 +944,107 @@
           }
 
           _uniquesql += `
-          Set @tbid=''
-          Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${item.sheet} ) a group by ${unique.field} having sum(n)>1
-
-          If @tbid!=''
-          Begin
-            select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
-            goto aaa
-          end
-
-          Set @tbid=''
-          Select top 1 @tbid=${_fields.join('+\' \'+')} from  @${item.sheet} a
-          Inner join ${item.sheet} b on ${_fields_}
-
-          If @tbid!=''
-          Begin
-            select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
-            goto aaa
-          end
-          `
+        /* 閲嶅鎬ч獙璇� */
+        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
+        
+        If @tbid!=''
+        Begin
+          select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+          goto aaa
+        end
+        
+        Set @tbid=''
+        Select top 1 @tbid=${_afields.join('+\' \'+')} from  @${sheet} a Inner join ${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 = []
 
       btn.columns.forEach(col => {
-        declarefields.push(`${col.Column} ${col.type}`)
+        if (col.import === 'false') return
+        
+        if (col.type === 'date') {
+          declarefields.push(`${col.Column} Nvarchar(50)`)
+        } else {
+          declarefields.push(`${col.Column} ${col.type}`)
+        }
         fields.push(col.Column)
       })
 
       fields = fields.join(',')
 
       let _insert = ''
-
-      if (_prevCustomScript) {
-        _insert += _prevCustomScript
-      }
-
       if (btn.default !== 'false') {
-        _insert += `
-        Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid) 
-        Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
+        _insert = `
+        /* 榛樿sql */
+        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
+        Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
         `
       }
 
-      if (_backCustomScript) {
-        _insert += _backCustomScript
+      _sql = `
+        /* 绯荤粺鐢熸垚 */
+        declare @${sheet} table (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
+        Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+        
+        Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
+        ${_initCustomScript}
+        `
+      _sqlInsert = `Insert into @${sheet} (${fields},jskey,BID)`
+      _sqlBottom = `
+        /* 榛樿sql */
+        delete tmp_excel_in where upid=@upid@
+        
+        delete tmp_excel_in where datediff(day,createdate,getdate())>15
+        ${_uniquesql}
+        ${_prevCustomScript}
+        ${_insert}
+        ${_backCustomScript}
+        Delete @${sheet}
+        
+        aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+      if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+        let fsql = `
+        ${_sql}
+        ${_sqlInsert}
+        
+        /* excel鏁版嵁锛堝墠40鏉★級 */
+        ${conLtext.join(' Union all ')}
+        ${_sqlBottom}
+        `
+        fsql = fsql.replace(/\n\s{8}/ig, '\n')
+        console.info(fsql)
       }
-
-      _sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
-      Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
-
-      Select  @ErrorCode='', @retmsg=''
-      
-      select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
-      ${_initCustomScript}
-      Insert into  @${item.sheet} (${fields},jskey)
-      ${_Ltext}
-      ${_uniquesql}
-      ${_insert}
-      Delete @${item.sheet}
-
-      aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
-
-    } else {
-      _sql = _Ltext
+    } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
+      _sql = `
+        /* 绯荤粺鐢熸垚 */
+        declare @${sheet} table (jskey nvarchar(50))
+        Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+        
+        Select  @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
+        `
     }
 
-    console.log(_sql)
     return {
       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('; ')
     }
   }
@@ -843,12 +1054,14 @@
    * @return {String} type   鎵ц绫诲瀷
    * @return {String} table  琛ㄥ悕
    */
-  static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns, tab) {
+  static getSysDefaultSql (btn, setting, formdata, param, data, columns, tab) {
     let primaryId = param.ID
     let BID = param.BID
     let verify = btn.verify || {}
-    let _formFieldValue = {}
+    let datavars = {}                 // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
     let _actionType = null
+    let appkey = window.GLOB.appkey || ''
+    let sessionUid = localStorage.getItem('SessionUid') || ''
 
     if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
       _actionType = btn.sqlType
@@ -880,100 +1093,99 @@
     })
 
     // 闇�瑕佸0鏄庣殑鍙橀噺闆�
-    // let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
     let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
 
     // 涓婚敭瀛楁
     let primaryKey = setting.primaryKey || 'id'
 
-    // 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
-    let _sql = `/* 绯荤粺鐢熸垚 */
-        Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50)
-      `
+    // sql璇彞
+    let _sql = ''
 
-    // let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
     let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
-    let _initfields = []
+    let _initFormfields = []
+    let _initColfields = []
     let _declarefields = []
 
     // 鑾峰彇瀛楁閿�煎
-    if (formdata) {
-      formdata.forEach(form => {
-        _formFieldValue[form.key] = form.value
-        let _key = form.key.toLowerCase()
+    formdata && formdata.forEach(form => {
+      if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
+        form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
+        form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
+        form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
+      }
 
-        if (!_initvars.includes(_key)) {
-          _initvars.push(_key)
+      let _key = form.key.toLowerCase()
+      datavars[_key] = form.value
 
-          if (form.type === 'number') {
-            let val = form.value
-            if (typeof(val) !== 'number') {
-              val = parseFloat(val)
-              if (isNaN(val)) {
-                val = 0
-              }
+      if (!_initvars.includes(_key)) {
+        _initvars.push(_key)
+
+        if (form.type === 'number') {
+          let val = form.value
+          if (typeof(val) !== 'number') {
+            val = parseFloat(val)
+            if (isNaN(val)) {
+              val = 0
             }
-            _initfields.push(`@${_key}=${val}`)
-          } else {
-            _initfields.push(`@${_key}='${form.value}'`)
           }
+          _initFormfields.push(`@${_key}=${val}`)
+        } else {
+          _initFormfields.push(`@${_key}='${form.value}'`)
         }
-        
-        if (!_vars.includes(_key)) {
-          _vars.push(_key)
+      }
+      
+      if (!_vars.includes(_key)) {
+        _vars.push(_key)
 
-          if (form.fieldlen && form.fieldlen > 2048) {
-            form.fieldlen = 'max'
-          }
-
-          let _type = `nvarchar(${form.fieldlen})`
-
-          if (form.type.match(/date/ig)) {
-            _type = 'datetime'
-          } else if (form.type === 'number') {
-            _type = `decimal(18,${form.fieldlen})`
-          }
-
-          _declarefields.push(`@${_key} ${_type}`)
+        if (form.fieldlen && form.fieldlen > 2048) {
+          form.fieldlen = 'max'
         }
+
+        let _type = `nvarchar(${form.fieldlen})`
+
+        if (form.type.match(/date/ig)) {
+          _type = 'datetime'
+        } else if (form.type === 'number') {
+          _type = `decimal(18,${form.fieldlen})`
+        }
+
+        _declarefields.push(`@${_key} ${_type}`)
+      }
+    })
+
+    if (data) {
+      Object.keys(data).forEach(key => {
+        data[key.toLowerCase()] = data[key]
       })
     }
 
     // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
     if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
-      _formFieldValue = {...data, ..._formFieldValue}
+      datavars = {...data, ...datavars}
 
-      if (logcolumns && logcolumns.length > 0) {
-        logcolumns.forEach(col => {
-          let _key = col.field.toLowerCase()
+      const setField = (col) => {
+        if (!col.field) return
+        let _key = col.field.toLowerCase()
 
-          if (!_initvars.includes(_key)) {
-            _initvars.push(_key)
+        if (!_initvars.includes(_key)) {
+          let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
 
-            let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
+          _initvars.push(_key)
+          _initColfields.push(`@${_key}='${_val}'`)
+        }
+        
+        if (!_vars.includes(_key)) {
+          _vars.push(_key)
 
-            if (col.type === 'number') {
-              if (typeof(_val) !== 'number') {
-                _val = parseFloat(_val)
-                if (isNaN(_val)) {
-                  _val = 0
-                }
-              }
-              _initfields.push(`@${_key}=${_val}`)
-            } else {
-              _initfields.push(`@${_key}='${_val}'`)
-            }
-          }
-          
-          if (!_vars.includes(_key)) {
-            _vars.push(_key)
-
+          if (col.datatype) {
+            _declarefields.push(`@${_key} ${col.datatype}`)
+          } else {
             if (col.fieldlength && col.fieldlength > 2048) {
               col.fieldlength = 'max'
             }
   
             let _type = `nvarchar(${col.fieldlength || 50})`
-
+  
             if (col.type === 'number') {
               let _length = col.decimal ? col.decimal : 0
               _type = `decimal(18,${_length})`
@@ -983,6 +1195,18 @@
   
             _declarefields.push(`@${_key} ${_type}`)
           }
+        }
+      }
+
+      if (columns && columns.length > 0) {
+        columns.forEach(col => {
+          if (col.type === 'colspan' || col.type === 'old_colspan') {
+            col.subcols.forEach(cell => {
+              setField(cell)
+            })
+          } else {
+            setField(col)
+          }
         })
       }
     }
@@ -990,15 +1214,24 @@
     // 鍙橀噺澹版槑
     _declarefields = _declarefields.join(',')
     if (_declarefields) {
-      _sql = `/* 绯荤粺鐢熸垚 */
-        Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50),${_declarefields}
-      `
+      _declarefields = ',' + _declarefields
     }
+    _sql = `/* 绯荤粺鐢熸垚 */
+        Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
+      `
 
-    // 鍙橀噺璧嬪��
-    _initfields = _initfields.join(',')
-    if (_initfields) {
-      _sql += `select ${_initfields}
+    // 琛ㄥ崟鍙橀噺璧嬪��
+    if (_initFormfields.length > 0) {
+      _sql += `
+        /* 琛ㄥ崟鍙橀噺璧嬪�� */
+        select ${_initFormfields.join(',')}
+        `
+    }
+    // 鏄剧ず鍒楀彉閲忚祴鍊�
+    if (_initColfields.length > 0) {
+      _sql += `
+        /* 鏄剧ず鍒楀彉閲忚祴鍊� */
+        select ${_initColfields.join(',')}
         `
     }
 
@@ -1027,7 +1260,7 @@
     // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
     _sql += `
         /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
-        select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
+        select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @BillCode='', @ModularDetailCode=''
         `
 
     if (_initCustomScript) {
@@ -1036,9 +1269,18 @@
 
     // 鍚敤璐︽湡楠岃瘉
     if (verify.accountdate === 'true') {
+      let orgcode = `''`
+      let date = `''`
+      if (verify.accountfield && _initvars.includes(verify.accountfield.toLowerCase())) {
+        orgcode = '@' + verify.accountfield
+      }
+      if (verify.voucherdate && _initvars.includes(verify.voucherdate.toLowerCase())) {
+        date = '@' + verify.voucherdate
+      }
+
       _sql += `
         /* 璐︽湡楠岃瘉 */
-        exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
+        exec s_FIBVoucherDateCheck @OrgCode=${orgcode},@FIBVoucherDate=${date},@ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
         if @ErrorCode!=''
           GOTO aaa
         `
@@ -1047,25 +1289,42 @@
     // 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
     if (btn.sqlType !== 'insert' && verify.invalid === 'true' && setting.dataresource) {
       let datasource = setting.dataresource
-      if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
+      if (/\s/.test(datasource) && !/tb$/.test(datasource)) { // 鎷兼帴鍒悕
         datasource = '(' + datasource + ') tb'
       }
 
-      let _ID = '=@ID@'
-      if (btn.Ot === 'requiredOnce') {
-        _ID = ' in (select ID from  dbo.SplitComma(@ID@))'
+      if (setting.customScript) {
+        _sql += `
+        /* 鏁版嵁婧愯嚜瀹氫箟鑴氭湰锛岃娉ㄦ剰鍙橀噺瀹氫箟鏄惁閲嶅 */
+        ${setting.customScript}
+        `
       }
 
-      _sql += `
+      if (btn.Ot === 'requiredOnce') {
+        _sql += `
         /* 澶辨晥楠岃瘉 */
         select @tbid='', @ErrorCode='',@retmsg=''
-        select @tbid=${primaryKey} from ${datasource} where ${primaryKey} ${_ID}
+        select @tbid='X' from ${datasource} right join (select ID from  dbo.SplitComma(@ID@)) sp
+        on tb.id =sp.id where tb.id is null
+
+        If @tbid!=''
+        Begin
+          select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+          goto aaa
+        end
+        `
+      } else {
+        _sql += `
+        /* 澶辨晥楠岃瘉 */
+        select @tbid='', @ErrorCode='',@retmsg=''
+        select @tbid=${primaryKey} from ${datasource} where ${primaryKey}=@ID@
         If @tbid=''
         Begin
           select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
           goto aaa
         end
         `
+      }
     }
 
     // 姣旇緝楠岃瘉
@@ -1077,76 +1336,6 @@
         Begin
           select @ErrorCode='${item.errorCode}',@retmsg='${item.errmsg}'
             goto aaa
-        end
-        `
-      })
-    }
-
-    // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
-    if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
-      let hasBid = false // 妫�楠岃〃鍗曞強鍒楀瓧娈典腑鏄惁鏈塨id
-      let _keys_ = Object.keys(_formFieldValue).map(key => key.toLowerCase())
-      if (_keys_.includes('bid')) {
-        hasBid = true
-      }
-
-      verify.uniques.forEach(item => {
-        let _fieldValue = []                     // 琛ㄥ崟閿�煎field=value
-        let _value = []                          // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
-        let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
-        let arr = [] // 楠岃瘉涓婚敭
-
-        item.field.split(',').forEach((_field, index) => {
-          let _fval = `'${_formFieldValue[_field]}'`
-
-          if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
-            _fval = '@BID@'
-          }
-          arr.push(_field.toLowerCase())
-
-          _fieldValue.push(`${_field}=${_fval}`)
-          _value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
-        })
-
-        let _verifyType = ''
-        if (item.verifyType === 'logic') {
-          _verifyType = ' and deleted=0'
-        }
-
-        if (!arr.includes(primaryKey.toLowerCase())) {
-          _fieldValue.push(`${primaryKey} !='${primaryId}'`)
-        }
-
-        _sql += `
-        /* 鍞竴鎬ч獙璇� */
-        select @tbid='', @ErrorCode='',@retmsg=''
-        select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
-        If @tbid!=''
-        Begin
-          select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
-          goto aaa
-        end
-        `
-      })
-    } else if (verify.uniques && verify.uniques.length > 0 && btn.Ot === 'requiredOnce' && setting.dataresource) {
-      let datasource = setting.dataresource
-      if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
-        datasource = '(' + datasource + ') tb'
-      }
-
-      verify.uniques.forEach(item => {
-        let _primaryKey = item.field.split(',').includes(primaryKey) ? '' : ',' + primaryKey
-
-        _sql += `
-        /* 鍚岀被鏁版嵁楠岃瘉 */
-        Set @tbid=''
-
-        Select top 1 @tbid='X' from (select ${item.field}${_primaryKey},1 as n from ${datasource} ) tb  inner join (select ID from  dbo.SplitComma(@ID@)) sp on tb.${primaryKey}=sp.ID group by ${item.field} having sum(n)>1
-        
-        If @tbid!=''
-        Begin
-          Set @ErrorCode='E' Set @retmsg='${item.fieldlabel} 鍊间笉鍞竴'
-          goto aaa
         end
         `
       })
@@ -1168,23 +1357,30 @@
 
     // 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽0鏄庡彉閲忥紙妫�楠岋級
     let _billcodesSql  = ''
-    if (verify.billcodes && verify.billcodes.length > 0) {
+    if (formdata && verify.billcodes && verify.billcodes.length > 0) {
+      let keys = formdata.map(item => item.key.toLowerCase()) // 琛ㄥ崟瀛楁
+
       verify.billcodes.forEach(item => {
+        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 (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
             _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
           } else {
-            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
+            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
           }
           _ModularDetailCode = '@ModularDetailCode'
         } else if (item.TypeCharOne === 'BN') {
           let _val = ''
-          if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
             _val = BID
-          } else if (data && data.hasOwnProperty(item.linkField)) {
-            _val = data[item.linkField]
+          } else if (data && data.hasOwnProperty(_linkKey)) {
+            _val = data[_linkKey]
           }
           _ModularDetailCode = `'${item.TypeCharOne + _val}'`
         } else {
@@ -1192,7 +1388,6 @@
         }
 
         let _declare = ''
-        let _key = item.field.toLowerCase()
 
         if (!_vars.includes(_key)) {
           _declare = `Declare @${_key} nvarchar(50)`
@@ -1223,6 +1418,86 @@
       }
     }
 
+    // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
+    if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
+      verify.uniques.forEach(item => {
+        let _fieldValue = []                     // 琛ㄥ崟閿�煎field=value
+        let _value = []                          // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
+        let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
+        let arr = [] // 楠岃瘉涓婚敭
+
+        item.field.split(',').forEach((_field, index) => {
+          let _key = _field.toLowerCase()
+          let _val = datavars[_key] !== undefined ? datavars[_key] : ''
+          let _fval = `'${_val}'`
+
+          if (_key === 'bid' && !datavars.bid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+            _fval = '@BID@'
+          }
+          if (_key === 'bid' && tab && tab.foreignKey) {
+            arr.push(tab.foreignKey.toLowerCase())
+            _fieldValue.push(`${tab.foreignKey}=${_fval}`)
+          } else {
+            arr.push(_key)
+            _fieldValue.push(`${_key}=${_fval}`)
+          }
+          
+          _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+        })
+
+        let _verifyType = ''
+        if (item.verifyType === 'logic') {
+          _verifyType = ' and deleted=0'
+        }
+
+        if (!arr.includes(primaryKey.toLowerCase())) {
+          _fieldValue.push(`${primaryKey} !='${primaryId}'`)
+        }
+
+        _sql += `
+        /* 鍞竴鎬ч獙璇� */
+        select @tbid='', @ErrorCode='',@retmsg=''
+        select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+        If @tbid!=''
+        Begin
+          select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
+          goto aaa
+        end
+        `
+      })
+    } else if (verify.uniques && verify.uniques.length > 0 && btn.Ot === 'requiredOnce' && setting.dataresource) {
+      let datasource = setting.dataresource
+      if (/\s/.test(datasource)) { // 鎷兼帴鍒悕
+        if (!/tb$/.test(datasource)) {
+          datasource = '(' + datasource + ') tb'
+        }
+      } else {
+        datasource = datasource + ' tb'
+      }
+
+      if (setting.customScript) {
+        _sql += `
+        /* 鏁版嵁婧愯嚜瀹氫箟鑴氭湰锛岃娉ㄦ剰鍙橀噺瀹氫箟鏄惁閲嶅 */
+        ${setting.customScript}
+        `
+      }
+
+      verify.uniques.forEach(item => {
+        _sql += `
+        /* 鍚岀被鏁版嵁楠岃瘉 */
+        Set @tbid=''
+
+        Select top 1 @tbid='X' from (select distinct ${item.field},1 as n from ${datasource} inner join (select ID from  dbo.SplitComma(@ID@)) sp on tb.${primaryKey}=sp.ID ) a having sum(n)>1
+        
+        If @tbid!=''
+        Begin
+          Set @ErrorCode='E' Set @retmsg='${item.fieldlabel} 鍊间笉鍞竴'
+          goto aaa
+        end
+        `
+      })
+    }
+
     let hasvoucher = false
 
     // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
@@ -1234,7 +1509,7 @@
       _sql += `
         /* 鍒涘缓鍑瘉 */
         exec s_BVoucher_Create
-          @Bill ='${data[_voucher.linkField]}',
+          @Bill ='${data[_voucher.linkField.toLowerCase()]}',
           @BVoucherType ='${_voucher.BVoucherType}',
           @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
           @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -1258,8 +1533,11 @@
       let values = []
 
       formdata.forEach(item => {
-        keys.push(item.key.toLowerCase())
-        values.push('@' + item.key)
+        if (item.writein === false) return
+        let _key = item.key.toLowerCase()
+
+        keys.push(_key)
+        values.push('@' + _key)
       })
 
       if (!keys.includes(primaryKey.toLowerCase())) {
@@ -1280,13 +1558,13 @@
       }
       if (!keys.includes('bid')) {
         if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
-          keys.push(tab.foreignKey)
+          keys.push(tab.foreignKey.toLowerCase())
         } else {
           keys.push('bid')
         }
         values.push('@BID@')
       } else if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
-        keys.push(tab.foreignKey)
+        keys.push(tab.foreignKey.toLowerCase())
         values.push('@BID@')
       }
 
@@ -1301,8 +1579,11 @@
       let _arr = []
 
       formdata.forEach(item => {
-        _arr.push(item.key.toLowerCase())
-        _form.push(item.key + '=@' + item.key)
+        if (item.writein === false) return
+        let _key = item.key.toLowerCase()
+        
+        _arr.push(_key)
+        _form.push(_key + '=@' + _key)
       })
 
       if (_actionType === 'audit') {
@@ -1367,10 +1648,10 @@
     
     } else if (_actionType === 'delete') {      // 鐗╃悊鍒犻櫎
       let _msg = ''
-      if (data && logcolumns && logcolumns.length > 0) {
+      if (data && columns && columns.length > 0) {
         let _index = 0
-        logcolumns.forEach(col => {
-          if (col.Hide !== 'true' && _index < 4) {
+        columns.forEach(col => {
+          if (col.Hide !== 'true' && col.type !== 'colspan' && col.type !== 'old_colspan' && _index < 4) {
             _msg += col.label + '=' + data[col.field] + ','
             _index++
           }
@@ -1384,7 +1665,8 @@
 
       _sql += `
         /* 榛樿sql */
-        insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}${_ID};`
+        insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@ID@,200),@userid@,@username,@fullname
+        delete ${btn.sql} where ${primaryKey}${_ID};`
     } else if (_actionType === 'insertOrUpdate') {
       _sql += `
         /* 榛樿sql */
@@ -1409,466 +1691,11 @@
     _sql += `
         aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    _sql = _sql.replace(/\n\s{8}/ig, '\n')
-    console.log(_sql)
+    if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+      _sql = _sql.replace(/\n\s{8}/ig, '\n')
+      console.info(_sql)
+    }
+
     return _sql
-  }
-
-  /**
-   * @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 (param, 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 ${param.innerFunc}
-    ( /*${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),
-    @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 {
-            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(),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

--
Gitblit v1.8.0