From bfbd5a28cacbde2c5d69df79c817c1218da41dde Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 11 九月 2024 18:21:54 +0800 Subject: [PATCH] 2024-09-11 --- src/utils/utils-custom.js | 794 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 671 insertions(+), 123 deletions(-) diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js index 2d86e2d..501e159 100644 --- a/src/utils/utils-custom.js +++ b/src/utils/utils-custom.js @@ -1745,6 +1745,115 @@ } /** + * @description 鑾峰彇鍙戦�佸閮ㄦ秷鎭� + */ +export function getOutMessage (config) { + let message = 'false' + + let filterBtn = (cell) => { + if (['pop', 'exec', 'form', 'prompt', 'formSubmit'].includes(cell.OpenType) && cell.verify) { + if (cell.verify.noteEnable === 'true' || cell.verify.wxNote === 'true' || cell.verify.emailEnable === 'true') { + message = 'true' + } + } + } + + let traversal = (components) => { + if (!components || message === 'true') return + + components.forEach(item => { + if (item.type === 'tabs') { + item.subtabs.forEach(tab => { + traversal(tab.components) + }) + } else if (item.type === 'group') { + traversal(item.components) + } else { + if (item.action) { + item.action.forEach(cell => { + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } + + if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') { + item.subcards.forEach(card => { + card.elements && card.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + card.backElements && card.backElements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + }) + } else if (item.type === 'balcony') { + item.elements && item.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } else if (item.type === 'table') { + let loopCol = (cols) => { + cols.forEach(col => { + if (col.type === 'colspan') { + loopCol(col.subcols) + } else if (col.type === 'custom') { + col.elements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.OpenType === 'popview') { + if (cell.config) { + traversal(cell.config.components) + } + } else { + filterBtn(cell) + } + }) + } + }) + } + loopCol(item.cols) + } else if (item.type === 'form') { + item.subcards.forEach(group => { + filterBtn(group.subButton) + }) + } + } + }) + } + + traversal(config.components) + + return message +} + +/** * @description 妫�娴嬬粍浠跺唴瀹� */ export function checkComponent (card) { @@ -2884,14 +2993,38 @@ let urlFields = config.urlFields let appType = sessionStorage.getItem('appType') let process = config.process === 'true' + let sysVars = ['loginuid', 'sessionuid', 'userid', 'appkey', 'lang', 'username', 'fullname', 'menuname'] if (urlFields) { urlFields = urlFields.map(n => n.toLowerCase()) } - let filterComponent = (components, mainSearch) => { +let callback = ` +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, @ErrorSeverity, @ErrorState); +END CATCH + +aaa: +select @ErrorCode as ErrorCode,@retmsg as retmsg +GOTO_RETURN: + ROLLBACK TRAN` + + let filterComponent = (components, mainSearch, label = '') => { components.forEach(item => { - item.$menuname = (config.MenuName || '') + '-' + (item.name || '') + item.$menuname = (config.MenuName || '') + label + '-' + (item.name || '') if (item.type === 'tabs') { item.subtabs.forEach(tab => { @@ -2904,10 +3037,10 @@ _mainSearch = com.search || [] }) } - filterComponent(tab.components, _mainSearch) + filterComponent(tab.components, _mainSearch, label) }) } else if (item.type === 'group') { - filterComponent(item.components, mainSearch) + filterComponent(item.components, mainSearch, label) } else { if (item.wrap && item.setting) { if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') { @@ -2921,7 +3054,7 @@ if (appType !== 'mob' && item.search && item.search.length > 0) { item.search.forEach(cell => { if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) { - let msg = getFormSql(cell) + let msg = getFormSql(cell, '鎼滅储') sqls.push({uuid: cell.uuid, type: 'sForm', ...msg}) } @@ -2937,6 +3070,7 @@ item.setting.laypage = 'false' item.setting.$top = true } + item.setting.$name = item.$menuname || '' let msg = getDataSource(item, mainSearch) @@ -2971,7 +3105,7 @@ }) } else if (item.subtype === 'editable' && col.editable === 'true') { if (col.editType === 'select' && col.resourceType === '1') { - let msg = getFormSql(col) + let msg = getFormSql(col, '琛ㄥ崟') sqls.push({uuid: col.uuid, type: 'tbForm', ...msg}) } else if (col.editType === 'popSelect') { @@ -2994,7 +3128,8 @@ getCols(item.cols) if (item.subtype === 'editable' && item.submit.intertype === 'system') { - let msg = getEditTableSql(item.submit, item.cols, item.columns) + item.submit.logLabel = item.$menuname + '-鎻愪氦' + let msg = getEditTableSql(item.submit, item.cols, item.columns, item.setting) sqls.push({uuid: 'submit_' + item.uuid, type: 'editable', ...msg}) } @@ -3039,8 +3174,13 @@ } let resetButton = (item, cell, isback) => { + cell.logLabel = item.$menuname + '-' + cell.label + if (['exec', 'prompt', 'pop', 'form', 'formSubmit'].includes(cell.OpenType)) { if (cell.intertype === 'system' || cell.procMode === 'system') { // 绯荤粺鎺ュ彛 + if (cell.verify && cell.verify.linkEnable === 'true' && /@/.test(cell.verify.linkUrl)) { + cell.returnValue = 'true' + } if (item.subtype === 'dualdatacard' && isback) { let _item = fromJS(item).toJS() _item.columns = _item.subColumns || [] @@ -3073,7 +3213,7 @@ cell.modal.fields.forEach(form => { // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗� if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') { - let msg = getFormSql(form) + let msg = getFormSql(form, '琛ㄥ崟') sqls.push({uuid: form.uuid, type: 'form', ...msg}) } else if (form.type === 'popSelect') { @@ -3098,7 +3238,7 @@ } else if (cell.OpenType === 'funcbutton') { if (cell.funcType === 'print') { if (cell.intertype === 'system' && cell.verify && cell.verify.dataType === 'custom') { - let msg = getPrintSql(cell) + let msg = getPrintSql(cell, item) sqls.push({uuid: cell.uuid, type: 'print', ...msg}) } @@ -3106,7 +3246,7 @@ cell.modal.fields.forEach(form => { // 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗� if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(form.type) && form.resourceType === '1') { - let msg = getFormSql(form) + let msg = getFormSql(form, '琛ㄥ崟') sqls.push({uuid: form.uuid, type: 'form', ...msg}) } else if (form.type === 'popSelect') { @@ -3152,7 +3292,7 @@ }) } - filterComponent(cell.config.components, _mainSearch) + filterComponent(cell.config.components, _mainSearch, '-' + cell.label) } } } @@ -3981,35 +4121,65 @@ if (verify.workFlow === 'true' && process) { if (verify.flowType === 'start') { + _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`) // works_flow_error 娴佺▼閿欒 - let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'start_type'] + let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade'] worksReFields.forEach(n => { _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) } else { + _sql = _sql.replace(/@check_type@/ig, verify.flowType === 'reject' ? `'椹冲洖'` : `'瀹℃牳'`) + _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`) // works_flow_error 娴佺▼閿欒 // works_flow_countersign 浼氱/鎴栫鏍囪 浼氱涓� Y // works_begin_branch 椹冲洖鑷冲紑濮嬪垎鏀紙line.mknode === 'startEdge'锛� // works_flow_sign_field 浼氱 鏍囪瀛楁 statuscharone/statuschartwo/statuscharthree/statuscharfour/statuscharfive // works_flow_sign_label 浼氱 鏍囪鍊� ***/***/宸插鏍� // works_flow_sign_values 浼氱鏍囪鎷兼帴鍊硷紙闄ゆ湰浜哄锛� - let worksReFields = ['works_flow_error', 'works_flow_countersign', 'works_flow_sign_values', 'works_begin_branch', 'works_flow_sign_label', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'check_type', 'notice_type', 'check_userids', 'notice_userids', 'works_flow_sign'] + let worksReFields = ['works_flow_error', 'works_flow_countersign', 'works_flow_sign_values', 'works_begin_branch', 'works_flow_sign_label', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'check_userids', 'notice_userids', 'works_flow_sign'] worksReFields.forEach(n => { _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) } } - if (btn.procMode === 'system') { + // if (btn.procMode === 'system' || btn.returnValue === 'true') { + // _sql += ` + // aaa: if @ErrorCode!='' + // insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@` + // } else if (btn.output) { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + // } else { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + // } + + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(_sql)) { + _sql = _sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) _sql += ` - aaa: if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } + + if (btn.procMode === 'system' || btn.returnValue === 'true') { + _sql += callback } else if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback} + ` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback} + ` } let syses = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address'] @@ -4049,7 +4219,7 @@ let reps = [] let decSql = [`@tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50),@mk_deleted int,@bid nvarchar(50)`] - let secSql = [`@ErrorCode='',@retmsg='', @BillCode='',@BVoucher='',@FIBVoucherDate='',@FiYear='',@ModularDetailCode='', @mk_deleted=1, @bid=@BID@`] + let secSql = [`@ErrorCode='S',@retmsg='', @BillCode='',@BVoucher='',@FIBVoucherDate='',@FiYear='',@ModularDetailCode='', @mk_deleted=1, @bid=@BID@`] syses.forEach(s => { if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_sql)) { @@ -4067,20 +4237,36 @@ decSql = [...decSql, ..._declares] - _sql = `Declare ${decSql.join(',')} + // INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2) + // SELECT @appkey@,'sPC_TableData_InUpDe',1,@menuname@,@UserID@,@username@,@fullname@,@SessionUid@,@LoginUID@ + _sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + Declare ${decSql.join(',')} /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */ select ${secSql.join(',')} ${_sql} ` - _sql = _sql.replace(/\n\s{8,10}/g, '\n') - _sql = _sql.replace(/\n\s+\/\*/g, `\n/*`) - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { reps.push(s) } + }) + + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) reps.forEach(n => { @@ -4091,18 +4277,33 @@ _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@') reps.push('datam_begin', 'datam_end') } - - if (/\$check@|@check\$/ig.test(_sql)) { - _sql = _sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@') - reps.push('mk_check_begin', 'mk_check_end') + if (btn.procMode === 'system') { + if (/\$check@|@check\$/ig.test(_sql)) { + _sql = _sql.replace(/\$check@|@check\$/ig, '') + } + } else { + if (/\$check@|@check\$/ig.test(_sql)) { + _sql = _sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@') + reps.push('mk_check_begin', 'mk_check_end') + } } if (/@db@/ig.test(_sql)) { reps.push('db') } - reps = Array.from(new Set([...reps, ...colreps])) + _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + reps = [...reps, ...colreps] - return { LText: _sql, reps } + return { LText: _sql, md5: md5(_sql), reps } } let getSysBackSql = (btn, component) => { @@ -4280,23 +4481,46 @@ } _sql += ` - ${_prev} - /* 澶栭儴鎺ュ彛鍏ュ弬 */ - @mk_outer_params@ - ${_back} - ` + ${_prev} + /* 澶栭儴鎺ュ彛鍏ュ弬 */ + @mk_outer_params@ + ${_back} + ` + // if (btn.output) { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + // } else { + // _sql += ` + // aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + // } + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(_sql)) { + _sql = _sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) + _sql += ` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback} + ` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback} + ` } let syses = ['tbid', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'mk_deleted', 'bid', 'UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address'] let decSql = [`@ErrorCode nvarchar(50),@retmsg nvarchar(4000)`] - let secSql = [`@ErrorCode='',@retmsg=''`] + let secSql = [`@ErrorCode='S',@retmsg=''`] syses.forEach(s => { if (new RegExp('@' + s + '[^0-9a-z_]', 'ig').test(_sql)) { @@ -4324,21 +4548,34 @@ decSql = [...decSql, ..._declares] - _sql = `Declare ${decSql.join(',')} + _sql = `/* ${btn.logLabel}(鍥炶皟) */ + BEGIN TRY + begin TRAN + + Declare ${decSql.join(',')} /* 鍒濆鍖栬祴鍊� */ select ${secSql.join(',')} ${_sql} ` - _sql = _sql.replace(/\n\s{8,10}/g, '\n') - _sql = _sql.replace(/\n\s+\/\*/g, `\n/*`) - - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { reps.push(s) } + }) + + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true }) reps.forEach(n => { @@ -4353,12 +4590,22 @@ reps.push('db') } - reps = Array.from(new Set([...reps, ...colreps])) + _sql = _sql.replace(/\n\x20{8,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') - return { LText: _sql, reps, tbs: tables } + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + reps = [...reps, ...colreps] + + return { LText: _sql, md5: md5(_sql), reps, tbs: tables } } - let getDataSource = (item, mainSearch = []) => { + let getDataSource = (item, mainSearch = [], type) => { if (!item.setting || item.setting.interType !== 'system') return let searches = item.search || [] @@ -4393,18 +4640,22 @@ } }) - if (_customScript || _tailScript) { - _tailScript += `${_tailScript} - aaa: - if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ - ` - } + // if (_customScript || _tailScript) { + // _tailScript += `${_tailScript} + // aaa: + // if @ErrorCode!='' + // insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ + // ` + // } let _search = '' if (item.setting.execute !== 'false') { _dataresource = item.setting.dataresource || '' _search = '@mk_search@' + } + + if (type === 'print') { + _search = '' } if (/\s/.test(_dataresource)) { @@ -4417,7 +4668,7 @@ let testSql = _dataresource + _customScript + _tailScript let decSql = [`@ErrorCode nvarchar(50),@retmsg nvarchar(4000)`] - let secSql = [`@ErrorCode='',@retmsg =''`] + let secSql = [`@ErrorCode='S',@retmsg =''`] let reps = [] @@ -4436,11 +4687,11 @@ } }) - decSql = `declare ${decSql.join(',')} - select ${secSql.join(',')}` + decSql = `declare ${decSql.join(',')}${type === 'print' ? '@mk_print_declare@' : ''} + select ${secSql.join(',')}${type === 'print' ? '@mk_print_select@' : ''}` // 涓嶉渶瑕佸崟寮曞彿锛歰rderBy銆乸ageSize銆乸ageIndex銆乨b - let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'datam', 'typename'] + let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'datam', 'typename'] if (item.hasExtend) { regs.push('mk_time') @@ -4485,6 +4736,8 @@ } else { LText = `select top 1 ${arr_field} from ${_dataresource} ${_search} ` } + } else if (item.setting.$fixOrder) { + LText = `select ${arr_field} from ${_dataresource} ${_search} order by ${item.setting.order} ` } else if (item.setting.order) { LText = `select ${arr_field} from ${_dataresource} ${_search} order by @orderBy@ ` reps.push('orderBy') @@ -4492,8 +4745,6 @@ LText = `select ${arr_field} from ${_dataresource} ${_search} ` } } - - reps = Array.from(new Set(reps)) let sub_name = '' let tabid = '' @@ -4508,9 +4759,33 @@ sub_field = item.subColumns.map(col => col.field).join(',') } - let sql = `SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', - arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}' + // INSERT INTO s_paas_api_log (appkey,api_name,api_count,menuname,createuserid,createuser,createstaff,cdefine1,cdefine2) + // SELECT @appkey@,'sPC_Get_TableData',1,@menuname@,@UserID@,@username@,@fullname@,@SessionUid@,@LoginUID@ + let sql = '' + + if (item.setting.transact === 'true') { + sql = `/* ${item.setting.$name} */ + BEGIN TRY + begin TRAN + + SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', + arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}' ` + + _tailScript += `${_tailScript} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback} + ` + } else { + sql = `/* ${item.setting.$name} */ + SELECT obj_name='@mk_obj_name@',prm_field='',str_field='', + arr_field='${arr_field}',tabid='${tabid}',parid='${parid}',sub_name='${sub_name}',sub_field='${sub_field}' + ` + + _tailScript += `${_tailScript} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ` + } if (DateCount) { sql += `UNION ALL @@ -4518,7 +4793,10 @@ arr_field='',tabid='',parid='',sub_name='',sub_field='' ` } - + // sql += `UNION ALL + // SELECT obj_name='mk_error_code',prm_field='ErrorCode,retmsg',str_field='', + // arr_field='',tabid='',parid='',sub_name='',sub_field='' + // ` sql += ` ${decSql} ${_customScript} @@ -4527,6 +4805,18 @@ ${_tailScript} ` + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true + }) + reps.forEach(n => { if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return @@ -4541,9 +4831,17 @@ } reps.push('mk_obj_name') - sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '') + sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') - return {LText: sql, reps} + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps, luser: /@userid@/ig.test(testSql)} } let getExcelInSql = (item) => { @@ -4691,10 +4989,14 @@ ` } - sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50)) + sql = `/* ${item.logLabel} */ + BEGIN TRY + begin TRAN + + create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),BID nvarchar(50)) Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ ${_initCustomScript} Insert into #${sheet} (${fields},jskey,BID) @@ -4705,6 +5007,17 @@ ${_uniquesql} ${_prevCustomScript} ${_insert}` + + let mk_ent = '' + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(sql + _backCustomScript)) { + mk_ent = ` + if 1=2 + begin + mk_ent: + set @ErrorCode=left(@ErrorCode,1) + end + ` + } if (btn.workFlow === 'true' && process) { if (btn.flowSql === 'true') { @@ -4736,11 +5049,13 @@ ${_backCustomScript} drop table #${sheet} + ${mk_ent} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` - + sql = sql.replace(/@start_type@/ig, `'寮�濮�'`) // works_flow_error 娴佺▼閿欒 - let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade', 'start_type'] + let worksReFields = ['works_flow_error', 'works_flow_code', 'works_flow_name', 'works_flow_param', 'works_flow_detail_id', 'status', 'statusname', 'work_group', 'work_grade'] worksReFields.forEach(n => { sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) @@ -4749,8 +5064,15 @@ ${_backCustomScript} drop table #${sheet} + ${mk_ent} + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` + } - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + if (/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'/ig.test(sql)) { + sql = sql.replace(/@ErrorCode='(ENT|NNT|FNT|NMNT|CNT|-2NT)'[\S\s]+\sgoto\s+aaa($|\s)/ig, (word) => { + return word.replace(/goto aaa/, 'goto mk_ent') + }) } let reps = [] @@ -4778,7 +5100,7 @@ sql = sql.replace(/@mk_init_declare@/ig, decSql) sql = sql.replace(/@mk_init_select@/ig, secSql) - let regs = ['ID', 'BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { @@ -4786,25 +5108,48 @@ } }) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true + }) + reps.forEach(n => { sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) - - sql = sql.replace(/\n\s{6,10}/g, '\n') - sql = sql.replace(/\n\s+\/\*/g, `\n/*`) if (/\$@/ig.test(sql)) { sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@') reps.push('datam_begin', 'datam_end') } + if (/\$check@|@check\$/ig.test(sql)) { + sql = sql.replace(/\$check@/ig, '@mk_check_begin@').replace(/@check\$/ig, '@mk_check_end@') + reps.push('mk_check_begin', 'mk_check_end') + } if (/@db@/ig.test(sql)) { reps.push('db') } - return {LText: sql, reps} + sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } - let getEditTableSql = (btn, cols, columns) => { + let getEditTableSql = (btn, cols, columns, setting) => { let sheet = btn.sheet.replace(/@db@/ig, '') let database = '' if (/@db@/ig.test(btn.sheet)) { @@ -4812,28 +5157,42 @@ } let forms = [] - let _fields = {} - - columns.forEach(col => { - _fields[col.field] = col.datatype - }) + let _forms = {} + let index = 0 let getColumns = (cols) => { cols.forEach(item => { if (item.type === 'colspan') { getColumns(item.subcols) } else if (item.editable === 'true') { - forms.push({ - field: item.field, - type: item.type, - datatype: _fields[item.field] || 'nvarchar(50)' - }) + item.$sort = index + _forms[item.field] = item + index++ } }) } getColumns(cols) - + + columns.forEach(item => { + if (item.field === setting.primaryKey) return + + if (_forms[item.field]) { + let _item = {..._forms[item.field]} + if (_item.editType === 'date') { + _item.datatype = _item.declareType || 'datetime' + } else { + _item.datatype = item.datatype + } + + forms.push(_item) + } else { + forms.push({...item, $sort: 999}) + } + }) + + forms.sort((a, b) => a.$sort - b.$sort) + let sql = '' let _initCustomScript = '' // 鍒濆鍖栬剼鏈� @@ -4968,9 +5327,13 @@ ` } - sql = `create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256)) + sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + create table #${sheet} (${declarefields.join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(256)) Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ ${_initCustomScript} Insert into #${sheet} (${fields},jskey,data_type,BID) @@ -4985,7 +5348,8 @@ drop table #${sheet} - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` let reps = [] let decSql = [] @@ -5012,7 +5376,7 @@ sql = sql.replace(/@mk_init_declare@/ig, decSql) sql = sql.replace(/@mk_init_select@/ig, secSql) - let regs = ['BID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['BID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { @@ -5020,12 +5384,21 @@ } }) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true + }) + reps.forEach(n => { sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) - - sql = sql.replace(/\n\s{6,10}/g, '\n') - sql = sql.replace(/\n\s+\/\*/g, `\n/*`) if (/\$@/ig.test(sql)) { sql = sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@') @@ -5035,7 +5408,17 @@ reps.push('db') } - return {LText: sql, reps} + sql = sql.replace(/\n\x20{6,10}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } let getExcelOutSql = (btn, component) => { @@ -5058,6 +5441,7 @@ item.setting.queryType = btn.verify.queryType item.setting.laypage = btn.pagination item.setting.order = btn.verify.order || '' + item.setting.$name = btn.logLabel || '' if (btn.Ot === 'requiredOnce') { item.setting.primaryKey = btn.verify.primaryKey || component.setting.primaryKey || 'ID' @@ -5070,7 +5454,7 @@ return msg } - let getPrintSql = (btn) => { + let getPrintSql = (btn, component) => { let item = {setting: {}, columns: btn.verify.columns || [], search: [], useMSearch: 'false'} item.setting.interType = 'system' @@ -5079,18 +5463,121 @@ item.setting.queryType = btn.verify.setting.queryType item.setting.laypage = 'false' item.setting.order = btn.verify.setting.order || '' + item.setting.$name = btn.logLabel || '' + item.setting.transact = 'true' + item.setting.$fixOrder = true item.scripts = btn.verify.scripts || [] - let msg = getDataSource(item, []) + let msg = getDataSource(item, [], 'print') + + msg.LText = msg.LText.replace(/@mk_obj_name@/ig, 'data') + msg.reps = msg.reps.filter(n => n !== 'mk_obj_name') + + let formkeys = [] + let colreps = [] + let _declares = [] + let _init = [] + if (btn.execMode === 'pop' && btn.modal && btn.modal.fields) { + btn.modal.fields.forEach(item => { + if (!item.field) return + let _key = item.field.toLowerCase() + + if (!new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return + + formkeys.push(_key) + colreps.push(item.field) + + let _item = { + key: item.field, + fieldlen: item.fieldlength || 50, + writein: item.writein !== 'false', + type: item.type, + isconst: item.constant === 'true' + } + + if (_item.type === 'datemonth') { + _item.type = 'text' + } else if (_item.type === 'number' || _item.type === 'rate') { + _item.fieldlen = item.decimal || 0 + } else if (_item.type === 'date') { + _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date' + } else if (_item.type === 'datetime') { + _item.type = 'date' + } else if (item.declare === 'decimal') { + _item.type = 'number' + _item.fieldlen = item.decimal || 0 + } + + if (_item.type === 'number' || _item.type === 'rate') { + _init.push(`@${_key}=@mk_${_key}_mk@`) + } else if (_item.type === 'date') { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } else if (_item.type === 'select' || _item.type === 'link' || _item.type === 'radio') { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } else if (_item.isconst) { + _init.push(`@${_key}=N'@mk_${_key}_mk@'`) + } else { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } + + if (_item.fieldlen && _item.fieldlen > 4000) { + _item.fieldlen = 'max' + } + + let _type = `nvarchar(${_item.fieldlen})` + + if (_item.type.match(/date/ig)) { + _type = 'datetime' + } else if (_item.type === 'number') { + _type = `decimal(18,${_item.fieldlen})` + } else if (_item.type === 'rate') { + _type = `decimal(18,2)` + } + + _declares.push(`@${_key} ${_type}`) + }) + } + + // 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃) + if (btn.Ot !== 'notRequired' && component.columns.length > 0) { + component.columns.forEach(col => { + let _key = col.field.toLowerCase() + + if (formkeys.includes(_key) || !new RegExp('@' + _key + '[^0-9a-z_]', 'ig').test(msg.LText)) return + if (_key === 'id' && !/@id[^0-9a-z_@]/ig.test(msg.LText)) return + + colreps.push(col.field) + + if (col.type === 'number') { + _init.push(`@${_key}=@mk_${_key}_mk@`) + } else { + _init.push(`@${_key}='@mk_${_key}_mk@'`) + } + + _declares.push(`@${_key} ${col.datatype || 'nvarchar(50)'}`) + }) + } + + _declares = _declares.length ? ',' + _declares.join(',') : '' + _init = _init.length ? ',' + _init.join(',') : '' + + msg.LText = msg.LText.replace('@mk_print_declare@', _declares) + msg.LText = msg.LText.replace('@mk_print_select@', _init) + + msg.reps = [...msg.reps, ...colreps] return msg } let getPaySql = (btn, component) => { - let _sql = `Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid nvarchar(50)@mk_init_declare@ - Select @ErrorCode='',@retmsg=''@mk_init_select@ - ` + let _sql = `/* ${btn.logLabel} */ + BEGIN TRY + begin TRAN + + Declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid nvarchar(50)@mk_init_declare@ + Select @ErrorCode='S',@retmsg=''@mk_init_select@ + ` btn.verify.scripts.forEach(item => { if (item.status === 'false') return @@ -5102,10 +5589,12 @@ if (btn.output) { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id` + select @ErrorCode as ErrorCode,@retmsg as retmsg,${btn.output} as mk_b_id + ${callback}` } else { _sql += ` - aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg` + select @ErrorCode as ErrorCode,@retmsg as retmsg + ${callback}` } let reps = [] @@ -5127,7 +5616,7 @@ } }) - let regs = ['ID', 'time_id', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'typename'] + let regs = ['ID', 'time_id', 'datam', 'typename'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(_sql)) { @@ -5162,13 +5651,21 @@ _sql = _sql.replace(/@mk_init_declare@/ig, decSql) _sql = _sql.replace(/@mk_init_select@/ig, secSql) + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true + }) + reps.forEach(n => { _sql = _sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) }) - - reps = [...reps, ...colreps] - - _sql = _sql.replace(/\n\s{6,8}/g, '\n') if (/\$@/ig.test(_sql)) { _sql = _sql.replace(/\$@/ig, '@datam_begin@').replace(/@\$/ig, '@datam_end@') @@ -5178,10 +5675,22 @@ reps.push('db') } - return {LText: _sql, reps} + _sql = _sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + reps = [...reps, ...colreps] + + return {LText: _sql, md5: md5(_sql), reps} } - let getFormSql = (item) => { + let getFormSql = (item, tname) => { let arrfield = [item.valueField, item.valueText] if (item.type === 'checkcard') { @@ -5245,20 +5754,27 @@ decSql = decSql.join(',') secSql = secSql.join(',') + decSql = decSql ? `Declare ${decSql} select ${secSql}` : '' - if (decSql) { - sql = `Declare ${decSql} select ${secSql} - ${sql} - ` - } + sql = `/* ${item.label}锛�${tname}锛� */ + SELECT obj_name='${item.field}',prm_field='',str_field='', + arr_field='${arrfield}',tabid='',parid='',sub_name='',sub_field='' - let regs = ['ID', 'BID', 'datam', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang'] + ${decSql} + ${sql} + + select 'S' as ErrorCode,'' as retmsg + ` + + let regs = ['ID', 'BID', 'datam'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(sql)) { reps.push(s) } }) + + reps.push(...sysVars) reps.forEach(n => { sql = sql.replace(new RegExp('@' + n + '@', 'ig'), `'@${n}@'`) @@ -5272,7 +5788,19 @@ reps.push('db') } - return {LText: sql, reps} + // reps.push('mk_obj_name') + + sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') + + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } let getPopSelectSql = (item) => { @@ -5303,7 +5831,7 @@ } // 涓嶉渶瑕佸崟寮曞彿锛歰rderBy銆乸ageSize銆乸ageIndex銆乨b - let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'lang', 'datam'] + let regs = [...sFields, 'orderBy', 'pageSize', 'pageIndex', 'ID', 'BID', 'time_id', 'datam'] regs.forEach(s => { if (new RegExp('@' + s + '@', 'ig').test(item.dataSource)) { @@ -5329,10 +5857,7 @@ decSql = decSql.join(',') secSql = secSql.join(',') - - if (decSql) { - decSql = `Declare ${decSql} select ${secSql}` - } + decSql = decSql ? `Declare ${decSql} select ${secSql}` : '' if (item.laypage === 'true') { /*system_query*/ @@ -5360,7 +5885,21 @@ ${decSql} ${LText} ${DateCount} + + select 'S' as ErrorCode,'' as retmsg ` + + let map = new Map() + reps.push(...sysVars) + reps = reps.filter(n => { + if (map.has(n.toLowerCase())) { + return false + } + + map.set(n.toLowerCase(), true) + + return true + }) reps.forEach(n => { if (['orderBy', 'pageSize', 'pageIndex'].includes(n)) return @@ -5375,9 +5914,17 @@ reps.push('db') } - sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '') + sql = sql.replace(/\n\x20{6,8}/g, '\n').replace(/\n{3,}/g, '\n\n').replace(/^\s+|\s+$/g, '').replace(/\t+|\v+/g, '') - return {LText: sql, reps} + reps = reps.filter(n => { + if (sysVars.includes(n.toLowerCase())) { + return false + } + + return true + }) + + return {LText: sql, md5: md5(sql), reps} } let _mainSearch = [] @@ -5418,7 +5965,7 @@ if (search.length > 0) { search.forEach(cell => { if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) { - let msg = getFormSql(cell) + let msg = getFormSql(cell, '鎼滅储') sqls.push({uuid: cell.uuid, type: 'sForm', ...msg}) } @@ -5443,6 +5990,7 @@ m.setting.laypage = 'false' m.setting.$top = true + m.setting.$name = (config.MenuName || '') + '-' + (m.name || '') let msg = getDataSource(m, _mainSearch) -- Gitblit v1.8.0