From dcd660c86dba586c1b78c0530ddee7c1dc093ee6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 四月 2024 17:51:15 +0800
Subject: [PATCH] 2024-04-25
---
src/menu/debug/index.jsx | 382 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 258 insertions(+), 124 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 91b7f27..93bcf14 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -74,13 +74,7 @@
{ reg: /@\$/ig, value: '' },
{ reg: /@datam@/ig, value: `''` },
]
-
- if (window.GLOB.externalDatabase !== null) {
- regs.push({
- reg: /@db@/ig,
- value: window.GLOB.externalDatabase
- })
- }
+
if (config.urlFields) {
config.urlFields.forEach(field => {
regs.push({
@@ -254,13 +248,16 @@
item.action && item.action.forEach(cell => {
if (cell.hidden === 'true') return false
- let sql = this.resetButton(item, cell, process)
+ let res = this.resetButton(item, cell, process)
- if (sql) {
- if (typeof(sql) === 'string') {
- children.push({label: cell.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: cell.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: cell.label, sql: res.sql})
+ children.push({label: cell.label + '锛堝洖璋冿級', sql: res.backSql})
} else {
- children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: res})
}
}
})
@@ -276,13 +273,16 @@
} else if (col.type === 'custom') {
col.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- let sql = this.resetButton(item, cell, process)
+ let res = this.resetButton(item, cell, process)
- if (sql) {
- if (typeof(sql) === 'string') {
- children.push({label: cell.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: cell.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: cell.label, sql: res.sql})
+ children.push({label: cell.label + '锛堝洖璋冿級', sql: res.backSql})
} else {
- children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: res})
}
}
})
@@ -300,13 +300,16 @@
item.subcards && item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- let sql = this.resetButton(item, cell, process)
+ let res = this.resetButton(item, cell, process)
- if (sql) {
- if (typeof(sql) === 'string') {
- children.push({label: cell.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: cell.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: cell.label, sql: res.sql})
+ children.push({label: cell.label + '锛堝洖璋冿級', sql: res.backSql})
} else {
- children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: res})
}
}
})
@@ -315,13 +318,16 @@
card.backElements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- let sql = this.resetButton(item, cell, process, null, true)
+ let res = this.resetButton(item, cell, process, null, true)
- if (sql) {
- if (typeof(sql) === 'string') {
- children.push({label: cell.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: cell.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: cell.label, sql: res.sql})
+ children.push({label: cell.label + '锛堝洖璋冿級', sql: res.backSql})
} else {
- children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: res})
}
}
})
@@ -329,13 +335,16 @@
} else if (item.type === 'balcony') {
item.elements.forEach(cell => {
if (cell.eleType !== 'button' || cell.hidden === 'true') return
- let sql = this.resetButton(item, cell, process)
+ let res = this.resetButton(item, cell, process)
- if (sql) {
- if (typeof(sql) === 'string') {
- children.push({label: cell.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: cell.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: cell.label, sql: res.sql})
+ children.push({label: cell.label + '锛堝洖璋冿級', sql: res.backSql})
} else {
- children.push({label: cell.label, tabName: cell.label, sql: '', children: sql})
+ children.push({label: cell.label, tabName: cell.label, sql: '', children: res})
}
}
})
@@ -345,10 +354,15 @@
if (!group.subButton.Ot) {
group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
}
- let sql = this.resetButton(item, group.subButton, process, group)
+ let res = this.resetButton(item, group.subButton, process, group)
- if (sql) {
- children.push({label: group.subButton.label, sql: sql})
+ if (res) {
+ if (typeof(res) === 'string') {
+ children.push({label: group.subButton.label, sql: res})
+ } else if (res.backSql) {
+ children.push({label: group.subButton.label, sql: res.sql})
+ children.push({label: group.subButton.label + '锛堝洖璋冿級', sql: res.backSql})
+ }
}
})
}
@@ -372,9 +386,46 @@
let _item = fromJS(item).toJS()
_item.columns = _item.subColumns || []
_item.setting.primaryKey = _item.setting.subKey
- sql = this.getSysDefaultSql(cell, _item, process, group)
+ sql = this.getSysDefaultSql(cell, _item, process, group, false)
} else {
- sql = this.getSysDefaultSql(cell, item, process, group)
+ sql = this.getSysDefaultSql(cell, item, process, group, false)
+ }
+ }
+ if (cell.callbackType === 'script' && cell.verify && cell.verify.cbScripts) {
+ let defSql = ''
+ if (item.subtype === 'dualdatacard' && isback) {
+ let _item = fromJS(item).toJS()
+ _item.columns = _item.subColumns || []
+ _item.setting.primaryKey = _item.setting.subKey
+ defSql = this.getSysDefaultSql(cell, _item, process, group, true)
+ } else {
+ defSql = this.getSysDefaultSql(cell, item, process, group, true)
+ }
+
+ let backSql = this.getSysBackSql(cell.verify.cbScripts, cell.cbTable)
+
+ if (backSql) {
+ backSql = `${defSql}
+ ${backSql}
+ `
+
+ if (cell.output) {
+ backSql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${cell.output} as mk_b_id`
+ } else {
+ backSql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ }
+
+ backSql = backSql.replace(/@typename@/ig, `'typename'`)
+ backSql = backSql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`)
+ }
+
+ if (backSql) {
+ return {
+ backSql,
+ sql
+ }
}
}
} else if (cell.OpenType === 'excelIn') {
@@ -399,13 +450,6 @@
{ reg: /@\$/ig, value: '' },
{ reg: /@datam@/ig, value: `''` },
]
-
- if (window.GLOB.externalDatabase !== null) {
- regs.push({
- reg: /@db@/ig,
- value: window.GLOB.externalDatabase
- })
- }
if (process) {
regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
@@ -421,9 +465,90 @@
return sql
}
- getSysDefaultSql = (btn, component, process, group) => {
- let primaryId = 'id'
- let BID = 'bid'
+ getSysBackSql = (scripts, cbTable) => {
+ let _prev = ''
+ let _back = ''
+
+ scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (script.position === 'front') {
+ _prev += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ } else {
+ _back += `
+ /* 鑷畾涔夎剼鏈� */
+ ${script.sql}
+ `
+ }
+ })
+
+ if (!_prev) return ''
+
+ let tbs = []
+ _prev.replace(/\n|\r/g, ' ').split(/\sdeclare\s/ig).forEach(line => {
+ if (!/^\s*(@|#)[a-zA-Z0-9_]+\s+table\s+\(/ig.test(line)) return
+ let tb = line.match(/(@|#)[a-zA-Z0-9_]+\s+table\s+\(.+(\)|date|datetime)\s*\)/ig)
+
+ if (tb && tb.length === 1) {
+ tbs.push(tb[0])
+ }
+ })
+
+ tbs.forEach(tb => {
+ let tbName = tb.match(/(@|#)[a-zA-Z0-9_]+/ig)[0]
+
+ if (!tbName) return
+
+ let content = tb.replace(/(@|#)[a-zA-Z0-9_]+\s+table\s+\(\s*/, '').replace(/\s*\)$/, '')
+ content = content.replace(/decimal\(\s*\d+\s*,\s*\d+\s*\)/ig, 'decimal')
+
+ let keys = []
+ let vals = []
+ let error = false
+ let istop = new RegExp(cbTable + '$', 'ig').test(tbName)
+ let id = tbName.replace(/@|#/, '')
+
+ content.split(/\s*,\s*/).forEach(m => {
+ let ms = m.split(/\s+/)
+ if (ms.length > 1) {
+ keys.push(ms[0])
+ if (/^mk_level$/i.test(ms[0])) {
+ vals.push(istop ? `'1'` : `'2'`)
+ } else if (/^mk_id$/i.test(ms[0])) {
+ vals.push(istop ? `'${cbTable}'` : `'${id}'`)
+ } else if (/^mk_bid$/i.test(ms[0])) {
+ vals.push(istop ? `''` : `'${cbTable}'`)
+ } else if (/nvarchar/i.test(ms[1])) {
+ vals.push(`'mk'`)
+ } else if (/date/i.test(ms[1])) {
+ vals.push(`'1949-10-01'`)
+ } else if (/int|decimal/i.test(ms[1])) {
+ vals.push('0')
+ } else {
+ error = true
+ }
+ } else {
+ error = true
+ }
+ })
+
+ if (error || vals.length === 0) return
+
+ _prev += `
+ Insert into ${tbName} (${keys.join(',')})
+ Select ${vals.join(',')}
+ `
+ })
+
+ return _prev + _back
+ }
+
+ getSysDefaultSql = (btn, component, process, group, retmsg) => {
+ let primaryId = Utils.getuuid()
+ let BID = Utils.getuuid()
let verify = btn.verify || {}
let _actionType = null
let setting = component.setting
@@ -492,6 +617,9 @@
_item.fieldlen = item.decimal || 0
} else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (item.declare === 'decimal') {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
}
formdata.push(_item)
@@ -536,6 +664,9 @@
_item.fieldlen = item.decimal || 0
} else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (item.declare === 'decimal') {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
}
formdata.push(_item)
@@ -639,7 +770,7 @@
}
_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}
`
-
+
let userName = 'User_Name'
let fullName = 'Full_Name'
let RoleID = 'role_id'
@@ -671,6 +802,10 @@
/* 鏄剧ず鍒楀彉閲忚祴鍊� */
select ${_initColfields.join(',')}
`
+ }
+
+ if (retmsg) {
+ return _sql
}
// 鍘婚櫎绂佺敤鐨勯獙璇�
@@ -879,15 +1014,13 @@
item.field.split(',').forEach((_field, index) => {
let _key = _field.toLowerCase()
let _val = ''
- let _fval = `'${_val}'`
+ arr.push(_key)
if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
- _fval = '@BID@'
+ _val = BID
}
- arr.push(_key)
- _fieldValue.push(`${_key}=${_fval}`)
-
+ _fieldValue.push(`${_key}='${_val}'`)
_value.push(`${_labels[index] || ''}锛�${_val || ''}`)
})
@@ -1148,15 +1281,46 @@
let detailId = '0'
if (verify.flowSql === 'true') {
- _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,upid)
- select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@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@
- `
+ 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,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@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@
+ `
+ } else {
+ _sql += `
+ /* 宸ヤ綔娴侀粯璁ql */
+ 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
+ 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,upid)
+ select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@time_id@
+
+ 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
+ `
+ }
}
_sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
@@ -1192,10 +1356,6 @@
_sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
_sql = _sql.replace(/@BID@/ig, `'${BID}'`)
- _sql = _sql.replace(/@LoginUID@/ig, `'LoginUID'`)
- _sql = _sql.replace(/@SessionUid@/ig, `'SessionUid'`)
- _sql = _sql.replace(/@UserID@/ig, `'UserID'`)
- _sql = _sql.replace(/@Appkey@/ig, `'appkey'`)
_sql = _sql.replace(/@typename@/ig, `'typename'`)
_sql = _sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`)
@@ -1225,19 +1385,8 @@
let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
database = database ? (database[0] || '') : ''
-
- let getuuid = () => {
- let uuid = []
- let timestamp = new Date().getTime()
- let _options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 19; i++) {
- uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- uuid = timestamp + uuid.join('')
- return uuid
- }
- let upId = getuuid()
+ let upId = Utils.getuuid()
let vals = []
btn.columns.forEach(col => {
@@ -1281,21 +1430,11 @@
{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: `'id'`},
- {reg: /@BID@/ig, value: `'bid'`},
- {reg: /@LoginUID@/ig, value: `'LoginUID'`},
- {reg: /@SessionUid@/ig, value: `'SessionUid'`},
- {reg: /@UserID@/ig, value: `'UserID'`},
- {reg: /@Appkey@/ig, value: `'appkey'`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: ''},
{reg: /@\$/ig, value: ''},
{reg: /@datam@/ig, value: `''`},
]
-
- 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
@@ -1386,7 +1525,7 @@
`
}
- sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50) )
+ sql = `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}'
@@ -1483,20 +1622,11 @@
{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
@@ -1610,11 +1740,10 @@
let item = {setting: {}, columns: [], search: []}
btn.verify.columns.forEach(col => {
- if (col.Column && col.Column !== '$Index') {
- item.columns.push({
- field: col.Column
- })
- }
+ if (col.output === 'false' || !col.Column || col.Column === '$Index') return
+ item.columns.push({
+ field: col.Column
+ })
})
if (btn.verify.useSearch !== 'false') {
@@ -1624,10 +1753,14 @@
item.setting.interType = 'system'
item.setting.execute = btn.verify.defaultSql || 'true'
item.setting.dataresource = btn.verify.dataresource || ''
- item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID'
+ item.setting.primaryKey = btn.verify.primaryKey || ''
item.setting.queryType = btn.verify.queryType
item.setting.laypage = btn.pagination
item.setting.order = btn.verify.order || ''
+
+ if (btn.Ot === 'requiredOnce') {
+ item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID'
+ }
item.scripts = btn.verify.scripts || []
@@ -1636,13 +1769,6 @@
{ reg: /@\$/ig, value: '' },
{ reg: /@datam@/ig, value: `''` },
]
-
- if (window.GLOB.externalDatabase !== null) {
- regs.push({
- reg: /@db@/ig,
- value: window.GLOB.externalDatabase
- })
- }
let sql = this.formatDataSource(item, regs)
@@ -1659,9 +1785,20 @@
item.$searches = fromJS(searches).toJS()
searches = formatSearch(searches)
- let _columns = item.columns || []
+ let _columns = []
if (item.subtype === 'dualdatacard') {
_columns = [...item.columns, ...item.subColumns]
+ } else if (item.columns) {
+ _columns = [...item.columns]
+ }
+
+ if (item.setting.primaryKey) {
+ let key = item.setting.primaryKey.toLowerCase()
+ if (_columns.findIndex(cell => cell.field.toLowerCase() === key) === -1) {
+ _columns.push({
+ field: item.setting.primaryKey
+ })
+ }
}
let arr_field = _columns.map(col => col.field).join(',')
@@ -1714,24 +1851,27 @@
let sql = ''
if (_customScript) {
- sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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)
+ select @ErrorCode='',@retmsg ='',@UserName='', @FullName='', @RoleID='', @mk_departmentcode='', @mk_organization='', @mk_user_type='', @mk_nation='', @mk_province='', @mk_city='', @mk_district='', @mk_address=''
${_customScript}
${_dataresource}
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else if (_tailScript) {
- sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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)
+ select @ErrorCode='',@retmsg ='',@UserName='', @FullName='', @RoleID='', @mk_departmentcode='', @mk_organization='', @mk_user_type='', @mk_nation='', @mk_province='', @mk_city='', @mk_district='', @mk_address=''
${_dataresource}
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else {
- sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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) select @ErrorCode='',@retmsg =''
+ sql = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@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)
+ select @ErrorCode='',@retmsg ='',@UserName='', @FullName='', @RoleID='', @mk_departmentcode='', @mk_organization='', @mk_user_type='', @mk_nation='', @mk_province='', @mk_city='', @mk_district='', @mk_address=''
${_dataresource}`
}
@@ -1744,17 +1884,11 @@
{ reg: /@orderBy@/ig, value: item.setting.order || '' },
{ reg: /@pageSize@/ig, value: 9999 },
{ reg: /@pageIndex@/ig, value: 1},
- { reg: /@ID@/ig, value: `''`},
- { reg: /@BID@/ig, value: `''`},
- { 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'`},
)
if (item.type === 'calendar') {
- regoptions.push({ reg: /@mk_year@/ig, value: '2023' })
+ regoptions.push({ reg: /@mk_year@/ig, value: '2024' })
}
regoptions.forEach(cell => {
--
Gitblit v1.8.0