From 3e8101e4b5afb513e21279a00abfa9c98bb81c19 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 16:16:23 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/utils/utils.js |  249 +++++++++++++++++++++----------------------------
 1 files changed, 109 insertions(+), 140 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6299d02..44c6a54 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,26 +39,6 @@
 
 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 鑾峰彇鍥捐〃楂樺害
    */
   static getHeight (val) {
@@ -943,6 +923,8 @@
           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 + ''
@@ -975,7 +957,7 @@
         } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
           errors.push(_position + '澶т簬鏈�澶у��')
         }
-      } else if (col.type === 'date') {
+      } else if (col.type === 'date' || col.type === 'datetime') {
         if (typeof(val) === 'number') {
           if (val > 2958465 || val <= 0) {                 // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
             errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
@@ -983,7 +965,14 @@
             if (val < 60) {                                // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
               val++
             }
-            val = moment('19000101', 'YYYYMMDD').add(Math.floor(val - 2), 'days').format('YYYY-MM-DD')
+            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, '')
@@ -1016,27 +1005,35 @@
     let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
     let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
     let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
-    let tb = new RegExp('(^|\\s)@' + sheet + '(\\s|$|(|))', 'ig')
+    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: /@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(tb, `#${sheet}`)
-      _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'`)
-
-      if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-        _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-      } else {
-        _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-      }
+      regs.forEach(item => {
+        _sql = _sql.replace(item.reg, item.value)
+      })
 
       if (script.position === 'init') {
         _initCustomScript += `
@@ -1140,9 +1137,10 @@
       
       aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
+    sql = sql.replace(/\n\s{6}/ig, '\n')
 
     if (window.GLOB.debugger === true) {
-      console.info(sql.replace(/\n\s{8}/ig, '\n'))
+      console.info(sql)
     }
   } else {
     for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1193,44 +1191,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
@@ -1240,24 +1206,63 @@
     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: /@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) {
       btn.uniques.forEach(unique => {
@@ -1275,7 +1280,7 @@
         _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
@@ -1284,7 +1289,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  #${sheet} a Inner join ${sheet} b on ${_fields_}
       
       If @tbid!=''
       Begin
@@ -1313,86 +1318,50 @@
       _insert = `
       /* 榛樿sql */
       Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
-      Select ${fields},@userid@,@username,@fullname,@BID@ From @${sheet}
+      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(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,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`
 
-    _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'`)
-
-    _sqlBottom = _sqlBottom.replace(/@BID@/ig, `'${BID}'`)
-    _sqlBottom = _sqlBottom.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
-    _sqlBottom = _sqlBottom.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
-    _sqlBottom = _sqlBottom.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
-    _sqlBottom = _sqlBottom.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
-    _sqlBottom = _sqlBottom.replace(/@typename@/ig, `'admin'`)
-
-    if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-      _sql = _sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-      _sqlBottom = _sqlBottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
-    } else {
-      _sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-      _sqlBottom = _sqlBottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
-    }
+    sql = sql.replace(/\n\s{6}/ig, '\n')
 
     if (window.GLOB.debugger === true) {
-      let fsql = `
-      ${_sql}
-      ${_sqlInsert}
-      
-      /* table鏁版嵁 */
-      ${conLtext.join(' Union all \n')}
-      ${_sqlBottom}
-      `
-      fsql = fsql.replace(/\n\s{8}/ig, '\n')
-      console.info(fsql)
+      console.info(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
+    })
   }
 }
 
@@ -1489,7 +1458,7 @@
     if (!_vars.includes(_key)) {
       _vars.push(_key)
 
-      if (form.fieldlen && form.fieldlen > 2048) {
+      if (form.fieldlen && form.fieldlen > 4000) {
         form.fieldlen = 'max'
       }
 
@@ -1543,7 +1512,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'
           }
 

--
Gitblit v1.8.0