From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 27 八月 2023 18:37:36 +0800 Subject: [PATCH] 2023-08-27 --- src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 506 ++++++++++++++++++------------------------------------- 1 files changed, 165 insertions(+), 341 deletions(-) diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx index 78fc739..0cab6e9 100644 --- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx +++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx @@ -6,10 +6,8 @@ import * as XLSX from 'sheetjs-style' import Utils from '@/utils/utils.js' -import options from '@/store/options.js' import Api from '@/api' -import zhCN from '@/locales/zh-CN/main.js' -import enUS from '@/locales/en-US/main.js' +import UtilsDM from '@/utils/utils-datamanage.js' import MKEmitter from '@/utils/events.js' import MkIcon from '@/components/mk-icon' // import './index.scss' @@ -21,14 +19,10 @@ selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁 btn: PropTypes.object, // 鎸夐挳 setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆 - updateStatus: PropTypes.func, // 鎸夐挳鐘舵�佹洿鏂� disabled: PropTypes.any, // 琛屾寜閽鐢� } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, - excelName: '', // 鏂囦欢鍚� - search: '', // 鎼滅储鏉′欢 loading: false, // 瀵煎嚭涓� hidden: false, disabled: false @@ -92,22 +86,6 @@ } MKEmitter.removeListener('triggerBtnId', this.actionTrigger) } - - /** - * @description 鎸夐挳鐘舵�佹敼鍙� - */ - updateStatus = (type, name) => { - if (type === 'start') { - this.setState({ - loading: true, - excelName: name - }) - } else if (type === 'over') { - this.setState({ - loading: false - }) - } - } /** * @description 瑙﹀彂鎸夐挳鎿嶄綔 @@ -130,17 +108,17 @@ return } - if (!btn.verify || !btn.verify.columns || btn.verify.columns.length === 0) { + if (btn.errorType === 'error1') { notification.warning({ top: 92, message: '璇疯缃鍑哄垪锛�', duration: 5 }) return - } else if (btn.intertype === 'system' && setting.interType !== 'system' && btn.verify.dataType !== 'custom') { + } else if (btn.errorType === 'error2') { notification.warning({ top: 92, - message: '瀵煎嚭鎸夐挳閰嶇疆閿欒锛�', + message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹簮锛�', duration: 5 }) return @@ -158,10 +136,11 @@ triggerExcelout = (viewParam) => { const { btn } = this.props - let name = `${viewParam.menuName}${moment().format('YYYYMMDDHHmmss')}.xlsx` let pageSize = 1000 - if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) { + if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') { + viewParam.search = [] + } else if (((btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'true') || btn.intertype !== 'system' || btn.verify.dataType !== 'custom') && btn.search === 'true' && viewParam.search && viewParam.search.length > 0) { let valid = false viewParam.search.forEach(item => { if (item.value || item.value === 0) { @@ -179,69 +158,49 @@ } } - if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟 - if (btn.verify.dataType !== 'custom' && !viewParam.arr_field) { - notification.warning({ - top: 92, - message: '鎸夐挳闇�鑷畾涔夊鍑烘暟鎹紒', - duration: 5 - }) - return - } else if (btn.verify.dataType === 'custom') { - viewParam.arr_field = [] - btn.verify.columns.forEach(col => { - if (col.Column && col.Column !== '$Index') { - viewParam.arr_field.push(col.Column) - } - }) - viewParam.arr_field = viewParam.arr_field.join(',') - - viewParam.orderBy = btn.verify.order || '' - } - } - if (btn.intertype === 'system' && btn.verify.enable === 'true') { - this.setState({search: fromJS(viewParam.search).toJS()}) - } - if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.useSearch === 'false') { - viewParam.search = [] - } - - viewParam.orderBy = viewParam.orderBy || viewParam.arr_field.split(',')[0] - - this.updateStatus('start', name) + this.setState({ + loading: true + }) if (btn.pagination !== 'true') { if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟 - let param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search) + let param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search) Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟 let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search) param.func = btn.innerFunc + if (btn.recordUser === 'true') { + param.username = sessionStorage.getItem('User_Name') || '' + param.fullname = sessionStorage.getItem('Full_Name') || '' + } + Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟 let param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search) if (window.GLOB.mkHS) { - if (btn.sysInterface === 'true' && options.cloudServiceApi) { - param.rduri = options.cloudServiceApi + if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) { + param.rduri = window.GLOB.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (btn.sysInterface !== 'true') { @@ -281,11 +240,12 @@ Api.genericInterface(param).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } else if (btn.intertype === 'outer' && btn.innerFunc) { @@ -300,8 +260,8 @@ delete res.status if (window.GLOB.mkHS) { - if (btn.sysInterface === 'true' && options.cloudServiceApi) { - res.rduri = options.cloudServiceApi + if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) { + res.rduri = window.GLOB.cloudServiceApi res.userid = sessionStorage.getItem('CloudUserID') || '' res.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (btn.sysInterface !== 'true') { @@ -341,7 +301,7 @@ Api.genericInterface(res).then(result => { if (result.status) { - this.exportExcel(result.data) + this.exportExcel(result.data, result.ErrCode, result.message) } else { this.execError(result) } @@ -349,7 +309,8 @@ } else { this.execError(res) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } else { @@ -358,7 +319,9 @@ message: '瀵煎嚭鎸夐挳璁剧疆閿欒锛�', duration: 5 }) - this.updateStatus('over') + this.setState({ + loading: false + }) } } else if (btn.intertype === 'outer' && btn.innerFunc) { // 鍒嗛〉锛屼笖涓ゆ璇锋眰 this.getExcelOutDoubleData(viewParam, 1, pageSize, []) @@ -383,8 +346,8 @@ delete res.status if (window.GLOB.mkHS) { - if (btn.sysInterface === 'true' && options.cloudServiceApi) { - res.rduri = options.cloudServiceApi + if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) { + res.rduri = window.GLOB.cloudServiceApi res.userid = sessionStorage.getItem('CloudUserID') || '' res.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (btn.sysInterface !== 'true') { @@ -432,18 +395,20 @@ this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data) } else { data = data.concat(result.data) - this.exportExcel(data) + this.exportExcel(data, result.ErrCode, result.message) } } else { this.execError(result) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } else { this.execError(res) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } @@ -455,22 +420,22 @@ const { btn } = this.props let param = null if (btn.intertype === 'system') { // 浣跨敤绯荤粺鍑芥暟 - if (!viewParam.arr_field) { - this.execError({ErrCode: 'N', message: '鏈缃樉绀哄垪锛�'}) - return - } - - param = this.getExcelDefaultParam(viewParam.arr_field, viewParam.orderBy, viewParam.search, true, pageIndex, pageSize) + param = this.getExcelDefaultParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize) } else if (btn.intertype === 'inner') { // 浣跨敤鍐呴儴鍑芥暟 param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize) param.func = btn.innerFunc + + if (btn.recordUser === 'true') { + param.username = sessionStorage.getItem('User_Name') || '' + param.fullname = sessionStorage.getItem('Full_Name') || '' + } } else if (btn.intertype === 'outer' && !btn.innerFunc) { // 浣跨敤澶栭儴鍑芥暟 param = this.getExcelCustomParam(viewParam.orderBy, viewParam.search, true, pageIndex, pageSize) if (window.GLOB.mkHS) { - if (btn.sysInterface === 'true' && options.cloudServiceApi) { - param.rduri = options.cloudServiceApi + if (btn.sysInterface === 'true' && window.GLOB.cloudServiceApi) { + param.rduri = window.GLOB.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } else if (btn.sysInterface !== 'true') { @@ -520,12 +485,13 @@ this.getExcelOutData(viewParam, pageIndex, pageSize, data) } else { data = data.concat(result.data) - this.exportExcel(data) + this.exportExcel(data, result.ErrCode, result.message) } } else { this.execError(result) } - }, () => { + }, (error) => { + if (error && error.ErrCode === 'LoginError') return this.execError({}) }) } @@ -533,7 +499,7 @@ /** * @description Excel 鐢熸垚 */ - exportExcel = (data) => { + exportExcel = (data, ErrCode, message) => { const { btn } = this.props let imgCol = false @@ -550,6 +516,29 @@ return col }) + + if (data && data[0]) { + let errors = [] + columns.forEach(col => { + if (col.Column && data[0][col.Column] === undefined) { + errors.push(col.Text) + } + }) + + if (errors.length) { + notification.error({ + top: 92, + message: '鏁版嵁涓己灏戝瓧娈碉細' + errors.join('銆�'), + duration: 5 + }) + + this.setState({ + loading: false + }) + + return + } + } try { if (imgCol) { @@ -576,13 +565,13 @@ columns.forEach((col, i) => { let val = item[col.Column] - if (typeof(val) === 'number') { + if (col.type === 'number' && typeof(val) === 'number') { if (col.abs === 'true') { val = Math.abs(val) } if (col.round) { val = Math.round(val * col.round) / col.round - val = val.toFixed(col.decimal) + // val = val.toFixed(col.decimal) } } @@ -592,13 +581,9 @@ table.push(_row) }) - this.table2excel(column, table, this.state.excelName.replace(/\.xlsx/ig, '.xls')) + this.table2excel(column, table) - if (btn.verify.enable === 'true' && btn.verify.script) { - this.execCustomScript() - } else { - this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'}) - } + this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'}) } else { let letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' let cols = [] @@ -665,13 +650,13 @@ columns.forEach((col, i) => { let val = item[col.Column] - if (typeof(val) === 'number') { + if (col.type === 'number' && typeof(val) === 'number') { if (col.abs === 'true') { val = Math.abs(val) } if (col.round) { val = Math.round(val * col.round) / col.round - val = val.toFixed(col.decimal) + // val = val.toFixed(col.decimal) } } @@ -733,20 +718,16 @@ const wb = XLSX.utils.book_new() XLSX.utils.book_append_sheet(wb, ws, btn.verify.sheet || 'Sheet1') - XLSX.writeFile(wb, this.state.excelName) + XLSX.writeFile(wb, `${btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xlsx`) - if (btn.verify.enable === 'true' && btn.verify.script) { - this.execCustomScript() - } else { - this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'}) - } + this.execSuccess({ErrCode: ErrCode || 'S', message: message || '瀵煎嚭鎴愬姛锛�'}) } } catch (e) { this.execError({ErrCode: 'N', message: 'Excel鐢熸垚澶辫触锛�'}) } } - table2excel = (column, data, excelName) => { + table2excel = (column, data) => { let thead = column.reduce((result, item) => { return result + `<th>${item.title}</th>` }, '') @@ -780,71 +761,10 @@ // let url = 'data:application/vnd.ms-excel;base64,' + window.btoa(unescape(encodeURIComponent(html))) let link = document.createElement('a') link.href = url - link.download = excelName + link.download = `${this.props.btn.$menuName || ''}${moment().format('YYYYMMDDHHmmss')}.xls` document.body.appendChild(link) link.click() document.body.removeChild(link) - } - - - /** - * @description 鎵ц鑷畾涔夎剼鏈� - */ - execCustomScript = () => { - const { btn } = this.props - const { search } = this.state - let script = btn.verify.script - - if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺 - script = script.replace(/\$@/ig, '/*') - script = script.replace(/@\$/ig, '*/') - } else { - script = script.replace(/@\$|\$@/ig, '') - } - - let allSearch = Utils.getAllSearchOptions(search) - let regoptions = allSearch.map(item => { - return { - reg: new RegExp('@' + item.key + '@', 'ig'), - value: `'${item.value}'` - } - }) - - regoptions.forEach(item => { - script = script.replace(item.reg, item.value) - }) - - let param = { - func: 'sPC_TableData_InUpDe', - menuname: btn.logLabel - } - - if (this.props.BID) { - param.BID = this.props.BID - } - - param.exec_type = 'y' // 鍚庡彴瑙g爜 - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') - param.secretkey = Utils.encrypt('', param.timestamp) - param.LText = Utils.formatOptions(script) - - if (window.GLOB.mkHS) { // 绯荤粺鍑芥暟浜戠楠岃瘉 - param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) - } - - if (window.GLOB.probation) { - param.s_debug_type = 'Y' - } - - Api.genericInterface(param).then((res) => { - if (res.status) { - this.execSuccess({ErrCode: 'S', ErrMesg: '瀵煎嚭鎴愬姛锛�'}) - } else { - this.execError(res) - } - }, () => { - this.updateStatus('over') - }) } /** @@ -886,198 +806,89 @@ /** * @description 鑾峰彇榛樿瀛樺偍杩囩▼璇锋眰鍙傛暟 */ - getExcelDefaultParam = (arr_field, orderBy, search, pagination = false, pageIndex = 1, pageSize = 100) => { + getExcelDefaultParam = (orderBy, search, pagination = false, pageIndex = 1, pageSize = 9999) => { const { setting, btn, selectedData, BID } = this.props - let defaultSql = setting.execute || setting.default || 'true' - let customScript = setting.customScript || '' - let _dataresource = setting.dataresource || '' - let queryType = setting.queryType - let primaryKey = setting.primaryKey || 'ID' - + let _setting = {} + let _orderBy = orderBy || '' if (btn.verify.dataType === 'custom') { - defaultSql = btn.verify.defaultSql || 'true' - _dataresource = btn.verify.dataresource || '' - queryType = btn.verify.queryType - // primaryKey = btn.verify.primaryKey || 'ID' + _setting.arr_field = [] - if (/\s/.test(_dataresource)) { - _dataresource = '(' + _dataresource + ') tb' + btn.verify.columns.forEach(col => { + if (col.Column && col.Column !== '$Index') { + _setting.arr_field.push(col.Column) + } + }) + _setting.arr_field = _setting.arr_field.join(',') + _setting.execute = btn.verify.defaultSql !== 'false' + _setting.dataresource = btn.verify.dataresource || '' + _setting.primaryKey = _setting.primaryKey || setting.primaryKey || 'ID' + + if (!_setting.execute) { + _setting.dataresource = '' } - customScript = '' + + if (/\s/.test(_setting.dataresource)) { + _setting.dataresource = '(' + _setting.dataresource + ') tb' + } + + let _customScript = '' + let _tailScript = '' btn.verify.scripts && btn.verify.scripts.forEach(script => { - if (script.status !== 'false') { - customScript += ` + if (script.status === 'false') return + if (script.position !== 'back') { + _customScript += ` + ${script.sql} + ` + } else { + _tailScript += ` ${script.sql} ` } }) if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺 - _dataresource = _dataresource.replace(/\$@/ig, '/*') - _dataresource = _dataresource.replace(/@\$/ig, '*/') - customScript = customScript.replace(/\$@/ig, '/*') - customScript = customScript.replace(/@\$/ig, '*/') + _setting.dataresource = _setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'') + _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'') + _tailScript = _tailScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'') } else { - _dataresource = _dataresource.replace(/@\$|\$@/ig, '') - customScript = customScript.replace(/@\$|\$@/ig, '') + _setting.dataresource = _setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'') + _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'') + _tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'') } - } - let _search = Utils.joinMainSearchkey(search) + _setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰 + _setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈� - _search = _search ? 'where ' + _search : '' - - let param = { - func: 'sPC_Get_TableData', - obj_name: 'data', - arr_field: arr_field, - custom_script: customScript, - default_sql: defaultSql, - menuname: btn.logLabel - } + _setting.laypage = pagination + _setting.custompage = /@pageSize@|@orderBy@/i.test(_setting.dataresource + _setting.customScript) - if (btn.verify.dataType !== 'custom' && setting.sub_field) { - arr_field = arr_field + ',' + setting.sub_field - param.arr_field = arr_field - } + _setting.queryType = btn.verify.queryType + _setting.$name = btn.logLabel - // 鏁版嵁绠$悊鏉冮檺 - if (sessionStorage.getItem('dataM') === 'true') { - param.dataM = 'Y' - } - - if (BID) { - param.BID = BID - } - - let userName = sessionStorage.getItem('User_Name') || '' - let fullName = sessionStorage.getItem('Full_Name') || '' - let RoleID = sessionStorage.getItem('role_id') || '' - let departmentcode = sessionStorage.getItem('departmentcode') || '' - let organization = sessionStorage.getItem('organization') || '' - let mk_user_type = sessionStorage.getItem('mk_user_type') || '' - let nation = sessionStorage.getItem('nation') || '' - let province = sessionStorage.getItem('province') || '' - let city = sessionStorage.getItem('city') || '' - let district = sessionStorage.getItem('district') || '' - let address = sessionStorage.getItem('address') || '' - - if (sessionStorage.getItem('isEditState') === 'true') { - userName = sessionStorage.getItem('CloudUserName') || '' - fullName = sessionStorage.getItem('CloudFullName') || '' - } - - let regoptions = null - if (queryType === 'statistics' || param.custom_script) { - let allSearch = Utils.getAllSearchOptions(search) - - regoptions = allSearch.map(item => { - return { - reg: new RegExp('@' + item.key + '@', 'ig'), - value: `'${item.value}'` - } - }) - - regoptions.push({ - reg: new RegExp('@userName@', 'ig'), - value: userName - }, { - reg: new RegExp('@fullName@', 'ig'), - value: fullName - }, { - reg: new RegExp('@orderBy@', 'ig'), - value: orderBy || '' - }, { - reg: new RegExp('@pageSize@', 'ig'), - value: pageSize - }, { - reg: new RegExp('@pageIndex@', 'ig'), - value: pageIndex - }) - } - - if (queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲 - regoptions.forEach(item => { - _dataresource = _dataresource.replace(item.reg, item.value) - }) - _search = '' + _orderBy = btn.verify.order || '' + } else { + _setting = {...setting} + _setting.laypage = pagination + _setting.arr_field = _setting.all_field || _setting.arr_field } let primaryId = '' if (btn.Ot === 'requiredOnce' && selectedData && selectedData.length > 0) { primaryId = selectedData.map(d => d.$$uuid || '').filter(Boolean).join(',') - if (_search && primaryId) { - _search += ` and ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))` - } else if (primaryId) { - _search = `where ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))` - } + primaryId = primaryId ? 'excel:' + primaryId : '' } - let LText = '' - - if (defaultSql !== 'false' && !pagination) { - LText = ` select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows ` - } else if (defaultSql !== 'false') { - LText = ` select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows ` - } - - if (param.custom_script) { - param.custom_script = `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='${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}' - ${param.custom_script} - ` - regoptions.forEach(item => { - param.custom_script = param.custom_script.replace(item.reg, item.value) - }) - - if (LText) { - LText += ` - aaa: - if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ - ` - } else { - param.custom_script += ` - aaa: - if @ErrorCode!='' - insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@ - ` - } - } else if (LText) { - LText = `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='${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}' - ${LText} - ` - } - - LText = LText.replace(/@ID@/ig, `'${primaryId || ''}'`) - param.custom_script = param.custom_script.replace(/@ID@/ig, `'${primaryId || ''}'`) - LText = LText.replace(/@BID@/ig, `'${BID}'`) - param.custom_script = param.custom_script.replace(/@BID@/ig, `'${BID}'`) - LText = LText.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`) - param.custom_script = param.custom_script.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`) - LText = LText.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`) - param.custom_script = param.custom_script.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`) - LText = LText.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`) - param.custom_script = param.custom_script.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`) - LText = LText.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`) - param.custom_script = param.custom_script.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`) - LText = LText.replace(/@typename@/ig, `'admin'`) - param.custom_script = param.custom_script.replace(/@typename@/ig, `'admin'`) - - // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞 - if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) { - param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`) - LText && console.info(LText) - } + let param = UtilsDM.getDefaultQueryParam(_setting, search, _orderBy, pageIndex, pageSize, primaryId, BID) - param.custom_script = Utils.formatOptions(param.custom_script) - param.LText = Utils.formatOptions(LText) - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') - param.secretkey = Utils.encrypt(param.LText, param.timestamp) param.DateCount = '' - if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉 - param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) + // 鏁版嵁绠$悊鏉冮檺 + if (sessionStorage.getItem('dataM') === 'true') { + param.dataM = 'Y' + } + if (BID) { + param.BID = BID } return param @@ -1094,17 +905,17 @@ execSuccess = (res) => { const { btn } = this.props - if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛 + if (res.ErrCode === 'S') { // 鎵ц鎴愬姛 notification.success({ top: 92, - message: res.ErrMesg || this.state.dict['main.action.confirm.success'], + message: res.message, duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2 }) - } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛 + } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛 Modal.success({ - title: res.ErrMesg || this.state.dict['main.action.confirm.success'] + title: res.message }) - } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず + } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず } @@ -1135,6 +946,10 @@ let node = document.getElementById('tab' + id) node && node.click() } + + if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊 + MKEmitter.emit('refreshPopButton', btn.$tabId) + } } /** @@ -1143,28 +958,32 @@ * 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬� * 3銆侀�氱煡涓诲垪琛ㄥ埛鏂� */ - execError = (res) => { + execError = (res = {}) => { const { btn } = this.props + + if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) { + res.ErrCode = 'E' + } if (res.ErrCode === 'E') { Modal.error({ - title: res.message || res.ErrMesg, + title: res.message || '鎵ц澶辫触锛�', }) } else if (res.ErrCode === 'N') { notification.error({ top: 92, - message: res.message || res.ErrMesg, + message: res.message || '鎵ц澶辫触锛�', duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10 }) } else if (res.ErrCode === 'F') { notification.error({ className: 'notification-custom-error', top: 92, - message: res.message || res.ErrMesg, + message: res.message || '鎵ц澶辫触锛�', duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10 }) } else if (res.ErrCode === 'NM') { - message.error(res.message || res.ErrMesg) + message.error(res.message || '鎵ц澶辫触锛�') } this.setState({ @@ -1175,6 +994,10 @@ MKEmitter.emit('popclose') } else if (btn.execError !== 'never') { MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', []) + } + + if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊 + MKEmitter.emit('refreshPopButton', btn.$tabId) } } @@ -1211,6 +1034,7 @@ return ( <Button type={type} + id={'button' + btn.uuid} title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')} loading={loading} disabled={disabled} -- Gitblit v1.8.0