From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 16 五月 2024 10:56:41 +0800 Subject: [PATCH] 2024-05-16 --- src/menu/debug/index.jsx | 190 ++++++++++++++++++++++------------------------- 1 files changed, 89 insertions(+), 101 deletions(-) diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx index 99ff975..09c2038 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({ @@ -423,12 +417,6 @@ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` } - backSql = backSql.replace(/@ID@/ig, `'id'`) - backSql = backSql.replace(/@BID@/ig, `'bid'`) - backSql = backSql.replace(/@LoginUID@/ig, `'LoginUID'`) - backSql = backSql.replace(/@SessionUid@/ig, `'SessionUid'`) - backSql = backSql.replace(/@UserID@/ig, `'UserID'`) - backSql = backSql.replace(/@Appkey@/ig, `'appkey'`) backSql = backSql.replace(/@typename@/ig, `'typename'`) backSql = backSql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, `''`) } @@ -462,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'` }) @@ -566,8 +547,8 @@ } getSysDefaultSql = (btn, component, process, group, retmsg) => { - let primaryId = 'id' - let BID = 'bid' + let primaryId = Utils.getuuid() + let BID = Utils.getuuid() let verify = btn.verify || {} let _actionType = null let setting = component.setting @@ -789,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' @@ -1033,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 || ''}`) }) @@ -1302,15 +1281,52 @@ 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,bid,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@ + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,@userid@,@start_type@,@userid@,@UserName,@FullName,@time_id@ + insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid,typecharone) + select @ID@,@works_flow_code@,@userid@,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@,'begin' + ` + } else { + _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${verify.flowRemark ? ',remark=@' + verify.flowRemark : ''} + where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 + insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,works_flow_detail_id,work_group,work_grade,bid,createuserid,CreateUser,CreateStaff,upid${verify.flowRemark ? ',remark' : ''}) + select @ID@,@works_flow_code@,@works_flow_name@ ,@works_flow_param@,@status@,@statusname@,@works_flow_detail_id@,@work_group@,@work_grade@,@bid@,@UserID@,@UserName,@FullName,@time_id@${verify.flowRemark ? ',@' + verify.flowRemark : ''} + + update s_my_works_flow_role set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname + where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0 + + if @check_userids@ != '' + begin + insert into s_my_works_flow_role (works_flow_id,works_flow_code,userid,works_flow_detail_id,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,ID,@works_flow_detail_id@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@) + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@check_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@check_userids@) + end + if @notice_userids@ != '' + begin + update n + set deleted=10,modifydate=getdate(),upid=@time_id@,modifyuserid=@userid@,modifyuser=@username,modifystaff=@fullname + from (select * from s_my_works_flow_notice where works_flow_id=@ID@ and works_flow_code=@works_flow_code@ and deleted=0) n + inner join (select ID from dbo.SplitComma(@notice_userids@)) s + on n.userid = s.id + insert into s_my_works_flow_notice (works_flow_id,works_flow_code,works_flow_detail_id,userid,notice_type,createuserid,CreateUser,CreateStaff,upid) + select @ID@,@works_flow_code@,@works_flow_detail_id@,ID,@notice_type@,@userid@,@UserName,@FullName,@time_id@ from dbo.SplitComma(@notice_userids@) + end + ` + } + } + + if (_backCustomScript) { + _sql += _backCustomScript } _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`) @@ -1318,6 +1334,7 @@ _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`) _sql = _sql.replace(/@check_userids@/ig, `''`) _sql = _sql.replace(/@notice_userids@/ig, `''`) + _sql = _sql.replace(/@works_flow_sign@/ig, `''`) _sql = _sql.replace(/@works_flow_code@/ig, `'mk'`) _sql = _sql.replace(/@works_flow_name@/ig, `'mk'`) _sql = _sql.replace(/@works_flow_param@/ig, `''`) @@ -1326,9 +1343,7 @@ _sql = _sql.replace(/@statusname@/ig, `'${statusName}'`) _sql = _sql.replace(/@work_group@/ig, `'mk'`) _sql = _sql.replace(/@work_grade@/ig, `'0'`) - } - - if (_backCustomScript) { + } else if (_backCustomScript) { _sql += _backCustomScript } @@ -1346,10 +1361,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, `''`) @@ -1379,19 +1390,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 => { @@ -1435,21 +1435,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 @@ -1540,7 +1530,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}' @@ -1637,20 +1627,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 @@ -1738,7 +1719,7 @@ ` } - sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50) ) + sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256)) Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512) Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}' @@ -1764,11 +1745,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') { @@ -1778,10 +1758,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 || [] @@ -1790,13 +1774,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) @@ -1813,9 +1790,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(',') @@ -1868,7 +1856,8 @@ 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} @@ -1877,7 +1866,8 @@ 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: @@ -1885,7 +1875,8 @@ 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}` } @@ -1898,17 +1889,14 @@ { 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.hasExtend) { + regs.push({reg: /@mk_time@/ig, value: '2024-04-29 17:20:00'}) + } 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