From a26f13ee999e84fc49cc3545e6e5d3daf9c6c41f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十月 2024 00:15:39 +0800
Subject: [PATCH] 2024-10-07
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 1006 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 806 insertions(+), 200 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c4b526d..af7d1e3 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -48,7 +48,6 @@
dict: window.GLOB.dict
}
- moduleParams = null
preCallback = null
UNSAFE_componentWillMount () {
@@ -225,7 +224,7 @@
this.setState({autoMatic: type === 'autoMatic'})
- let _this = this
+ let that = this
let data = record || selectedData || []
let valid = this.checkBtnData(data)
@@ -248,11 +247,11 @@
cancelText: dict['cancel'] || '鍙栨秷',
onOk() {
return new Promise(resolve => {
- _this.execSubmit(data, resolve)
+ that.execSubmit(data, resolve)
})
},
onCancel() {
- _this.setState({loading: false})
+ that.setState({loading: false})
}
})
} else if (btn.OpenType === 'exec') {
@@ -308,16 +307,16 @@
}
}
- if (window.GLOB.systemType === 'production') {
- let _change = {
- prompt: '鎻愮ず妗�',
- exec: '鐩存帴鎵ц',
- pop: '寮圭獥锛堣〃鍗曪級',
- formSubmit: '琛ㄥ崟',
- form: '琛ㄥ崟',
- }
- MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: _change[btn.OpenType]})
- }
+ // if (window.GLOB.systemType === 'production') {
+ // let _change = {
+ // prompt: '鎻愮ず妗�',
+ // exec: '鐩存帴鎵ц',
+ // pop: '寮圭獥锛堣〃鍗曪級',
+ // formSubmit: '琛ㄥ崟',
+ // form: '琛ㄥ崟',
+ // }
+ // MKEmitter.emit('queryTrigger', {menuId: btn.uuid, name: _change[btn.OpenType]})
+ // }
}
preTrigger = (callback) => {
@@ -332,7 +331,7 @@
return
}
- let _this = this
+ let that = this
let data = selectedData || []
let valid = this.checkBtnData(data)
@@ -360,12 +359,12 @@
cancelText: dict['cancel'] || '鍙栨秷',
onOk() {
return new Promise(resolve => {
- _this.execSubmit(data, resolve)
+ that.execSubmit(data, resolve)
})
},
onCancel() {
callback()
- _this.setState({loading: false})
+ that.setState({loading: false})
}
})
} else if (btn.OpenType === 'exec') {
@@ -459,8 +458,8 @@
let primaryId = ''
- if ((btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') && setting.primaryKey) {
- let ids = data.map(d => { return d[setting.primaryKey] || ''})
+ if (btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
+ let ids = data.map(d => d.$$uuid)
ids = ids.filter(Boolean)
primaryId = ids.join(',')
}
@@ -469,11 +468,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -493,23 +492,14 @@
param.LText = Utils.formatOptions(param.LText, param.exec_type)
} else if (btn.OpenType === 'pop' || btn.OpenType === 'formSubmit' || btn.OpenType === 'form') { // 琛ㄥ崟
if (btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
- primaryId = ''
-
- if (formdata && setting.primaryKey) { // 琛ㄥ崟涓瓨鍦ㄤ富閿瓧娈碉紝涓婚敭鍊间互琛ㄥ崟涓殑鍊间负鍑�
- let _form = formdata.filter(_form => _form.key === setting.primaryKey)[0]
- if (_form) {
- primaryId = _form.value
- }
- }
-
- param.ID = primaryId || Utils.getguid()
+ param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -531,11 +521,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -597,11 +587,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -637,11 +627,11 @@
param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -663,11 +653,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -718,6 +708,464 @@
return _params
}
+ getBackSystemParam = (data, formdata) => {
+ const { btn } = this.props
+
+ let ex = window.GLOB.CacheData.get('sql_' + btn.uuid)
+ let _params = []
+
+ if (btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
+ let primaryId = ''
+ let cell = null
+
+ if (btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') {
+ primaryId = data.map(d => d.$$uuid).filter(Boolean).join(',')
+ cell = data[0]
+ }
+
+ if (btn.OpenType === 'pop' || btn.OpenType === 'formSubmit' || btn.OpenType === 'form') { // 琛ㄥ崟
+ if (btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
+ primaryId = Utils.getguid()
+ }
+ }
+
+ let exp = this.getExps(ex, formdata, cell, primaryId, btn.$process)
+
+ if (ex.reps.includes('mk_check_begin')) {
+ exp.$unCheckParam = fromJS(exp).toJS()
+
+ exp.data[0].exps.push({
+ key: 'mk_check_begin',
+ value: ''
+ }, {
+ key: 'mk_check_end',
+ value: ''
+ })
+ exp.$unCheckParam.data[0].exps.push({
+ key: 'mk_check_begin',
+ value: 'Y'
+ }, {
+ key: 'mk_check_end',
+ value: 'Y'
+ })
+ } else if (btn.procMode === 'system' && btn.callbackType === 'script') {
+ let _backex = window.GLOB.CacheData.get('sql_back_' + btn.uuid)
+ exp.$backParam = this.getExps(_backex, formdata, cell, primaryId)
+ }
+
+ _params.push(exp)
+ } else if (btn.Ot === 'required') {
+ _params = data.map((cell, index) => {
+ let primaryId = cell.$$uuid || ''
+
+ if (btn.OpenType === 'pop') { // 琛ㄥ崟
+ if (index !== 0) {
+ let _cell = {}
+ Object.keys(cell).forEach(key => {
+ _cell[key.toLowerCase()] = cell[key]
+ })
+ formdata = formdata.map(_data => {
+ if (_data.readin && _cell.hasOwnProperty(_data.key.toLowerCase())) {
+ _data.value = _cell[_data.key.toLowerCase()]
+ }
+ return _data
+ })
+ }
+
+ if (btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
+ primaryId = Utils.getguid()
+ }
+ }
+ let exp = this.getExps(ex, formdata, cell, primaryId, btn.$process)
+ if (ex.reps.includes('mk_check_begin')) {
+ exp.$unCheckParam = fromJS(exp).toJS()
+
+ exp.data[0].exps.push({
+ key: 'mk_check_begin',
+ value: ''
+ }, {
+ key: 'mk_check_end',
+ value: ''
+ })
+ exp.$unCheckParam.data[0].exps.push({
+ key: 'mk_check_begin',
+ value: 'Y'
+ }, {
+ key: 'mk_check_end',
+ value: 'Y'
+ })
+ } else if (btn.procMode === 'system' && btn.callbackType === 'script') {
+ let _backex = window.GLOB.CacheData.get('sql_back_' + btn.uuid)
+ exp.$backParam = this.getExps(_backex, formdata, cell, primaryId)
+ }
+
+ return exp
+ })
+ }
+
+ return _params
+ }
+
+ getExps = (ex, formdata, cell, id, process) => {
+ const { columns, BID, btn } = this.props
+ let exps = []
+ let values = {
+ time_id: Utils.getguid(),
+ roleid: sessionStorage.getItem('role_id') || '',
+ mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+ mk_organization: sessionStorage.getItem('organization') || '',
+ mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+ mk_nation: sessionStorage.getItem('nation') || '',
+ mk_province: sessionStorage.getItem('province') || '',
+ mk_city: sessionStorage.getItem('city') || '',
+ mk_district: sessionStorage.getItem('district') || '',
+ mk_address: sessionStorage.getItem('address') || '',
+ id: id || '',
+ bid: BID || '',
+ typename: 'admin',
+ datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ // mk_check_begin: '',
+ // mk_check_end: ''
+ }
+
+ if (window.GLOB.externalDatabase !== null) {
+ values.db = window.GLOB.externalDatabase
+ }
+
+ let formkeys = []
+ formdata && formdata.forEach(form => {
+ // if (!ex.reps.includes(form.key)) return
+
+ formkeys.push(form.key)
+
+ let val = form.value
+ if (form.type === 'number' || form.type === 'rate') {
+ if (isNaN(val)) {
+ val = 0
+ }
+ } else if (['date', 'datemonth'].includes(form.type)) {
+ val = val || '1949-10-01'
+ }
+
+ exps.push({
+ key: 'mk_' + form.key + '_mk',
+ value: val
+ })
+ })
+
+ if (cell && columns && columns.length > 0) {
+ let datavars = {}
+
+ Object.keys(cell).forEach(key => {
+ datavars[key.toLowerCase()] = cell[key]
+ })
+
+ columns.forEach(col => {
+ if (!ex.reps.includes(col.field) || formkeys.includes(col.field)) return
+ if (!col.datatype) return
+
+ let _key = col.field.toLowerCase()
+ let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
+
+ if (/^date/ig.test(col.datatype) && !_val) {
+ _val = '1949-10-01'
+ }
+
+ exps.push({
+ key: 'mk_' + col.field + '_mk',
+ value: _val
+ })
+ })
+ }
+
+ ex.reps.forEach(n => {
+ let key = n.toLowerCase()
+ if (values.hasOwnProperty(key)) {
+ exps.push({
+ key: n,
+ value: values[key]
+ })
+ }
+ })
+
+ if (process && btn.verify.workFlow === 'true') {
+ let flow = window.GLOB.UserCacheMap.get(btn.$flowId)
+ let node = null
+ let line = null
+ let target = null
+ let status = 0
+ let statusName = ''
+ let detailId = ''
+ let sign = ''
+ let error = ''
+ let userid = sessionStorage.getItem('UserID') || ''
+ let checkIds = []
+ let checkUsers = []
+ let noticeIds = []
+ let work_grade = sessionStorage.getItem('work_grade') || 0
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let _data = cell || {}
+ let msg = ''
+
+ if (btn.verify.flowType === 'start') {
+ target = flow ? flow.cells.filter(cell => cell.mknode === 'start')[0] : ''
+
+ if (target) {
+ detailId = target.id
+ status = target.mkdata.status
+ statusName = target.mkdata.statusName
+ } else {
+ error = '宸ヤ綔娴佹棤寮�濮嬭妭鐐�'
+ }
+ } else if (_data.works_flow_param) {
+ try {
+ node = JSON.parse(window.decodeURIComponent(window.atob(_data.works_flow_param)))
+ } catch (e) {
+ node = null
+ }
+
+ if (node) {
+ let lines = flow ? flow.cells.filter(cell => cell.shape === 'edge' && cell.source.cell === node.id) : []
+ if (btn.verify.flowType === 'reject') {
+ line = lines.filter(cell => cell.mkdata.flowType === 'reject' || cell.mknode === 'startEdge')[0]
+ } else {
+ lines = lines.filter(cell => cell.mkdata.flowType !== 'reject' && cell.mknode !== 'startEdge')
+
+ if (lines.length === 0) {
+ error = '鏃犲彲鎵ц鐨勬祦绋嬪垎鏀�'
+ } else {
+ let branchKey = btn.verify.flowBranch ? btn.verify.flowBranch.toLowerCase() : ''
+
+ formdata && formdata.forEach(form => {
+ let _key = form.key.toLowerCase()
+ _data[_key] = form.value
+ })
+
+ if (!branchKey) {
+ lines.forEach(line => {
+ if (line.mkdata.execCondition === 'open') {
+ error = '鎸夐挳鏈缃祦绋嬫帶鍒跺瓧娈点��'
+ }
+ })
+ if (!error) {
+ lines = lines.filter(cell => {
+ if (cell.mkdata.seniorCondition === 'open' && !line) {
+ cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+ if (per.worker_id === userid) {
+ line = cell
+ }
+ })
+ return false
+ }
+ return true
+ })
+
+ if (!line) {
+ line = lines[0]
+ }
+ }
+ } else if (!_data.hasOwnProperty(branchKey)) {
+ error = '淇℃伅涓棤娴佺▼鎺у埗瀛楁銆�'
+ } else {
+ let _def_lines = []
+ let _equ_lines = []
+ let _unequ_lines = []
+ let _or_lines = []
+ let branchVal = _data[branchKey]
+
+ if (branchVal && typeof(branchVal) === 'string' && !isNaN(branchVal)) {
+ branchVal = +branchVal
+ }
+
+ lines.forEach(item => {
+ if (item.mkdata.execCondition !== 'open') {
+ _def_lines.push(item)
+ } else {
+ if (item.mkdata.match === '=') {
+ if (item.mkdata.matchVal === branchVal + '') {
+ _equ_lines.push(item)
+ }
+ } else if (item.mkdata.match === '!=') {
+ if (item.mkdata.matchVal !== branchVal + '') {
+ _unequ_lines.push(item)
+ }
+ } else {
+ if (item.mkdata.match === '<') {
+ if (item.mkdata.matchVal < branchVal) {
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '>') {
+ if (item.mkdata.matchVal > branchVal) {
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '<=') {
+ if (item.mkdata.matchVal <= branchVal) {
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ } else if (item.mkdata.match === '>=') {
+ if (item.mkdata.matchVal >= branchVal) {
+ _or_lines.push({...item, dist: Math.abs(item.mkdata.matchVal - branchVal)})
+ }
+ }
+ }
+ }
+ })
+
+ _or_lines.sort((a, b) => a.dist - b.dist)
+
+ let _lines = [..._equ_lines, ..._or_lines, ..._unequ_lines, ..._def_lines]
+
+ _lines = _lines.filter(cell => {
+ if (cell.mkdata.seniorCondition === 'open' && !line) {
+ cell.mkdata.seniorbers && cell.mkdata.seniorbers.forEach(per => {
+ if (per.worker_id === userid) {
+ line = cell
+ }
+ })
+ return false
+ }
+ return true
+ })
+
+ if (!line) {
+ line = _lines[0]
+ }
+ }
+ }
+ }
+ } else {
+ error = '琛屼俊鎭腑宸ヤ綔娴佸弬鏁版棤娉曡В鏋�'
+ }
+
+ if (line) {
+ detailId = line.id
+ status = line.mkdata.status
+ statusName = line.mkdata.statusName
+ sign = line.mkdata.seniorSign || ''
+ target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
+
+ line.mkdata.members && line.mkdata.members.forEach(item => {
+ if (line.mkdata.approver === 'departmentManager') {
+ if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ } else if (line.mkdata.approver === 'directManager') {
+ if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ } else {
+ checkIds.push(item.worker_id)
+ checkUsers.push(item)
+ }
+ })
+ line.mkdata.copys && line.mkdata.copys.forEach(item => {
+ noticeIds.push(item.worker_id)
+ })
+
+ if (!target) {
+ error = '鏈煡璇㈠埌宸ヤ綔娴佺洰鏍囪妭鐐�'
+ } else if (checkIds.length === 0 && !['startEdge', 'endEdge', 'throughEdge'].includes(line.mknode)) {
+ error = '鏈幏鍙栧埌涓嬩竴姝ュ鎵逛汉'
+ } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
+ error = '褰撳墠鐢ㄦ埛涓嶅湪瀹℃壒浜哄垪琛ㄤ腑'
+ }
+ } else if (!error) {
+ error = '宸ヤ綔娴佷腑鏃犲搴旀祦绋�'
+ }
+ } else {
+ error = '琛屼俊鎭腑鏃犲伐浣滄祦鍙傛暟'
+ }
+
+ if (error) {
+ status = 0
+ statusName = '寮傚父'
+ } else if (target) {
+ let label = target.attrs && target.attrs.text && target.attrs.text.text ? target.attrs.text.text : ''
+ msg = {...target.mkdata, label: label, id: target.id, checkIds: [], checkUsers: []}
+ msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg)))
+ }
+
+ if (btn.verify.flowType === 'start') {
+ exps.push(
+ { key: 'works_flow_error', value: error },
+ { key: 'works_flow_code', value: flow ? flow.flow_code : '' },
+ { key: 'works_flow_name', value: flow ? flow.flow_name : '' },
+ { key: 'works_flow_param', value: msg },
+ { key: 'works_flow_detail_id', value: detailId },
+ { key: 'status', value: status },
+ { key: 'statusname', value: statusName },
+ { key: 'work_group', value: sessionStorage.getItem('work_group') || '' },
+ { key: 'work_grade', value: sessionStorage.getItem('work_grade') || 0 },
+ // { key: 'start_type', value: '寮�濮�' },
+ )
+ } else {
+ let works_flow_countersign = ''
+ let works_flow_sign_values = ''
+ let works_flow_sign_field = ''
+ let works_flow_sign_label = ''
+ let works_begin_branch = ''
+ if (line.approvalMethod === 'countersign' && node.checkIds.length > 1) {
+ works_flow_countersign = 'Y'
+ let mark = line.mark || '宸插鏍�'
+ let fields = ['statuscharone', 'statuschartwo', 'statuscharthree', 'statuscharfour', 'statuscharfive']
+ node.checkUsers.forEach((user, index) => {
+ if (user.worker_id === userid) {
+ works_flow_sign_field = fields[index]
+ works_flow_sign_label = `${user.parentNames[2] || ''}${user.workername || ''}${mark}`
+ } else {
+ works_flow_sign_values += `${user.parentNames[2] || ''}${user.workername || ''}${mark}`
+ }
+ })
+ } else {
+ works_begin_branch = line.mknode === 'startEdge' ? 'Y' : ''
+ }
+
+ exps.push(
+ { key: 'works_flow_error', value: error },
+ { key: 'works_flow_countersign', value: works_flow_countersign },
+ { key: 'works_flow_sign_values', value: works_flow_sign_values },
+ { key: 'works_begin_branch', value: works_begin_branch },
+ { key: 'works_flow_sign_field', value: works_flow_sign_field },
+ { key: 'works_flow_sign_label', value: works_flow_sign_label },
+ { key: 'works_flow_code', value: flow ? flow.flow_code : '' },
+ { key: 'works_flow_name', value: flow ? flow.flow_name : '' },
+ { key: 'works_flow_param', value: msg },
+ { key: 'works_flow_detail_id', value: detailId },
+ { key: 'status', value: status },
+ { key: 'statusname', value: statusName },
+ { key: 'work_group', value: sessionStorage.getItem('work_group') || '' },
+ { key: 'work_grade', value: sessionStorage.getItem('work_grade') || 0 },
+ // { key: 'check_type', value: btn.verify.flowType === 'reject' ? '椹冲洖' : '瀹℃牳' },
+ // { key: 'notice_type', value: '鎶勯��' },
+ { key: 'check_userids', value: checkIds.join(',') },
+ { key: 'notice_userids', value: noticeIds.join(',') },
+ { key: 'works_flow_sign', value: sign },
+ )
+ }
+ }
+
+ let md5_id = ''
+ if (window.GLOB.probation) {
+ md5_id = md5(ex.id + JSON.stringify(exps) + Math.floor(new Date().getTime() / 600000))
+ md5_id = moment().format('YYYYMMDDHHmmss') + md5_id.slice(-18)
+ }
+
+ return {
+ $backend: true,
+ $type: 's_TableData_InUpDe',
+ data: [{
+ id: ex.id,
+ menuname: btn.logLabel || '',
+ exps: exps,
+ md5_id: md5_id
+ }]
+ }
+ }
+
getInnerParam = (data, formdata, retmsg) => {
const { setting, btn, columns } = this.props
let _params = []
@@ -744,7 +1192,7 @@
let primaryId = ''
if ((btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce') && setting.primaryKey) {
- let ids = data.map(d => { return d[setting.primaryKey] || ''})
+ let ids = data.map(d => d.$$uuid)
ids = ids.filter(Boolean)
primaryId = ids.join(',')
@@ -763,7 +1211,10 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
- if (retmsg) {
+ if (btn.callbackType === 'script' && window.backend && window.GLOB.CacheData.has('sql_back_' + btn.uuid)) {
+ let _backex = window.GLOB.CacheData.get('sql_back_' + btn.uuid)
+ param.$backParam = this.getExps(_backex, formdata, data[0], primaryId)
+ } else if (retmsg) {
param.$callbacksql = this.getSysDeclareSql(btn, formdata, data[0], columns, this.props.BID)
}
@@ -786,7 +1237,7 @@
param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
}
- let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
+ let primaryId = cell.$$uuid || ''
if (btn.OpenType === 'pop') { // 琛ㄥ崟
if (index !== 0) {
@@ -816,7 +1267,10 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
- if (retmsg) {
+ if (btn.callbackType === 'script' && window.backend && window.GLOB.CacheData.has('sql_back_' + btn.uuid)) {
+ let _backex = window.GLOB.CacheData.get('sql_back_' + btn.uuid)
+ param.$backParam = this.getExps(_backex, formdata, cell, primaryId)
+ } else if (retmsg) {
param.$callbacksql = this.getSysDeclareSql(btn, formdata, cell, columns, this.props.BID)
}
@@ -1006,53 +1460,10 @@
* @description 鎸夐挳鎻愪氦鎵ц
*/
execSubmit = (data, _resolve, formdata, force) => {
- const { setting, btn } = this.props
- this.moduleParams = null
+ const { btn } = this.props
if (btn.preButton && !force) {
this.trigger(btn.preButton, data, _resolve, formdata, 0)
- } else if (btn.verify && btn.verify.invalid === 'true' && setting.dataresource) {
- MKEmitter.emit('queryModuleParam', btn.$menuId, (param) => {
- let datasource = setting.dataresource
- let customScript = setting.customScript || ''
- let allSearch = Utils.getAllSearchOptions(param.search)
-
- let regoptions = allSearch.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
-
- regoptions.push({
- reg: new RegExp('@userName@', 'ig'),
- value: `'${sessionStorage.getItem('User_Name') || ''}'`
- }, {
- reg: new RegExp('@fullName@', 'ig'),
- value: `'${sessionStorage.getItem('Full_Name') || ''}'`
- }, {
- reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
- }, {
- reg: new RegExp('@pageSize@', 'ig'),
- value: 10
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
-
- regoptions.forEach(item => {
- datasource = datasource.replace(item.reg, item.value)
- customScript = customScript.replace(item.reg, item.value)
- })
-
- this.moduleParams = {
- datasource,
- customScript
- }
-
- this.execRealSubmit(data, _resolve, formdata)
- })
} else {
this.execRealSubmit(data, _resolve, formdata)
}
@@ -1110,7 +1521,9 @@
if (btn.intertype === 'system' || btn.intertype === 'inner') { // 绯荤粺鎺ュ彛
let params = []
- if (btn.intertype === 'system') {
+ if (btn.intertype === 'system' && window.backend && window.GLOB.CacheData.has('sql_' + btn.uuid)) {
+ params = this.getBackSystemParam(data, formdata)
+ } else if (btn.intertype === 'system') {
params = this.getSystemParam(data, formdata)
if (btn.returnValue === 'true') {
params = params.map(item => {
@@ -1170,6 +1583,14 @@
_resolve()
})
} else if (params.length <= 20 && btn.execType !== 'single') {
+ if (window.backend && params[0].$backend && (!btn.verify || (btn.verify.printEnable !== 'true' && !btn.output))) {
+ params = [{
+ $backend: true,
+ $type: 's_TableData_InUpDe',
+ data: params.map(item => item.data[0])
+ }]
+ }
+
let deffers = params.map((param, i) => {
return new Promise(resolve => {
setTimeout(() => {
@@ -1217,7 +1638,9 @@
/** *********************璋冪敤澶栭儴鎺ュ彛************************* */
let _params = [] // 璇锋眰鍙傛暟鏁扮粍
- if (btn.procMode === 'system') {
+ if (btn.procMode === 'system' && window.backend && window.GLOB.CacheData.has('sql_' + btn.uuid)) {
+ _params = this.getBackSystemParam(data, formdata)
+ } else if (btn.procMode === 'system') {
_params = this.getSystemParam(data, formdata, true)
_params = _params.map(item => {
item.script_type = 'Y'
@@ -1238,7 +1661,9 @@
} else if (btn.intertype === 'custom') { // 绯荤粺鎺ュ彛
let params = []
- if (btn.procMode === 'system') {
+ if (btn.procMode === 'system' && window.backend && window.GLOB.CacheData.has('sql_' + btn.uuid)) {
+ params = this.getBackSystemParam(data, formdata)
+ } else if (btn.procMode === 'system') {
params = this.getSystemParam(data, formdata, true)
params = params.map(item => {
item.script_type = 'Y'
@@ -1274,13 +1699,15 @@
BID: param.BID || '',
ID: param.ID || '',
callbacksql: param.$callbacksql || '',
- mk_api_key: ''
+ mk_api_key: '',
+ backParam: param.$backParam || ''
}
if (!record.ID && btn.Ot !== 'notRequired' && param[setting.primaryKey]) {
record.ID = param[setting.primaryKey]
}
+ delete param.$backParam
delete param.$callbacksql
if (param.$pice) {
@@ -1290,7 +1717,7 @@
this.customOuterRequest(params, param, record, _resolve)
return
- } else if (!param.func) {
+ } else if (!param.func && !param.$backend) {
this.customOuterRequest(params, param, record, _resolve)
return
}
@@ -1344,7 +1771,7 @@
// Api.directRequest('http://localhost:3001/test.xml', 'get', null, 'true').then(res => {
// let $x2js = new x2js()
// let jsonObj = $x2js.xml2js(res);
- // console.info(jsonObj)
+ // window.mkInfo(jsonObj)
// })
/**
@@ -1386,7 +1813,21 @@
method: btn.method || 'post'
}
- if (btn.cross === 'true') {
+ if (btn.ContentType) {
+ _params.headers = {
+ 'Content-Type': btn.ContentType
+ }
+ }
+
+ if (btn.$outerScript) {
+ if (JSON.stringify(param) !== '{}') {
+ if (btn.stringify === 'qs') {
+ _params.data = qs.stringify(param)
+ } else {
+ _params.data = param
+ }
+ }
+ } else if (btn.cross === 'true') {
if (JSON.stringify(param) !== '{}') {
if (btn.stringify === 'qs') {
_params.data = qs.stringify(param)
@@ -1420,13 +1861,7 @@
_params.method = 'post'
}
- if (btn.ContentType) {
- _params.headers = {
- 'Content-Type': btn.ContentType
- }
- }
-
- Api.directRequest(_params).then(res => {
+ Api.directRequest(_params, btn.$outerScript, 'outer').then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1493,6 +1928,8 @@
_resolve()
}
return
+ } else if (btn.callbackType === 'script' && record.backParam) {
+ param = this.getCallBackendParam(result, record)
} else if (btn.callbackType === 'script' || btn.callbackType === 'default') {
param = this.getCallBackSql(result, record)
} else if (btn.callbackType === 'func') {
@@ -1556,6 +1993,108 @@
})
}
+ getCallBackendParam = (result, record) => {
+ const { btn } = this.props
+ let lines = []
+ let tables = []
+ let param = fromJS(record.backParam).toJS()
+
+ btn.verify.cbScripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (/\s#[a-z0-9_]+(\s|\()/ig.test(script.sql)) {
+ tables.push(...script.sql.match(/\s#[a-z0-9_]+(\s|\()/ig))
+ }
+ })
+
+ tables = tables.map(tb => tb.replace(/\s|\(/g, ''))
+
+ if (result.$ErrCode) {
+ delete result.$ErrCode
+ delete result.$ErrMesg
+ }
+
+ let getDefaultSql = (obj, tb, bid, level) => {
+ let vals = {}
+ let subObjs = []
+ let id = Utils.getuuid()
+
+ delete obj.$$key
+
+ Object.keys(obj).forEach(key => {
+ let val = obj[key]
+ if (val === null || val === undefined) return
+ if (typeof(val) === 'object') {
+ if (Array.isArray(val)) {
+ val.forEach(item => {
+ if (typeof(item) !== 'object' || Array.isArray(item)) return
+ if (Object.keys(item).length === 0) return
+
+ Object.keys(item).forEach(k => {
+ if (item[k] === null) {
+ item[k] = ''
+ }
+ })
+ item.$$key = tb + '_' + key
+ subObjs.push(item)
+ })
+ } else if (Object.keys(val).length > 0) {
+ val.$$key = tb + '_' + key
+ subObjs.push(val)
+ }
+ } else {
+ if (typeof(val) === 'string') {
+ val = val.replace(/'/ig, '"')
+ } else {
+ val = val + ''
+ }
+ vals[key] = val
+ }
+ })
+
+ vals.mk_level = level
+ vals.mk_id = id
+ vals.mk_bid = bid
+
+ let isnew = true
+ lines.forEach(line => {
+ if (line.tb === tb) {
+ line.values.push(vals)
+ isnew = false
+ }
+ })
+ if (isnew) {
+ lines.push({
+ tb: tb,
+ type: tables.includes('#' + tb) ? '01' : '02',
+ values: [vals]
+ })
+ }
+
+ subObjs.forEach(item => {
+ getDefaultSql(item, item.$$key, id, level + 1)
+ })
+ }
+
+ getDefaultSql(result, btn.cbTable, '', 1)
+
+ param.data[0].exps.push({
+ key: 'mk_outer_params', // 鍥炶皟鑴氭湰鐨勬暟鎹浛鎹�
+ value: lines
+ })
+
+ let md5_id = ''
+ if (window.GLOB.probation) {
+ md5_id = md5('back_' + btn.uuid + JSON.stringify(param.data[0].exps) + Math.floor(new Date().getTime() / 600000))
+ md5_id = moment().format('YYYYMMDDHHmmss') + md5_id.slice(-18)
+ }
+
+ param.data[0].md5_id = md5_id
+ param.data[0].menuname = btn.logLabel + '(鍥炶皟)'
+
+ return param
+ }
+
getCallBackSql = (result, record) => {
const { btn } = this.props
let lines = []
@@ -1606,10 +2145,15 @@
if (Array.isArray(val)) {
val.forEach(item => {
if (typeof(item) !== 'object' || Array.isArray(item)) return
- if (Object.keys(item).length > 0) {
- item.$$key = tb + '_' + key
- subObjs.push(item)
- }
+ if (Object.keys(item).length === 0) return
+
+ Object.keys(item).forEach(k => {
+ if (item[k] === null) {
+ item[k] = ''
+ }
+ })
+ item.$$key = tb + '_' + key
+ subObjs.push(item)
})
} else if (Object.keys(val).length > 0) {
val.$$key = tb + '_' + key
@@ -1723,8 +2267,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel + '(鍥炶皟)', 'color: blue')
- console.info(sql.replace(/\n\s{8}/ig, '\n'))
+ window.mkInfo('%c' + btn.logLabel + '(鍥炶皟)', 'color: blue')
+ window.mkInfo(sql.replace(/\n\s{8}/ig, '\n'))
}
param.LText = sql
@@ -1758,7 +2302,7 @@
`)}
`))
sql = sql.join('')
- console.info(sql.replace(/\n\s{10}/ig, '\n'))
+ window.mkInfo(sql.replace(/\n\s{10}/ig, '\n'))
}
}
@@ -1825,7 +2369,7 @@
msg = msg.replace(/\n|\r/ig, '<br/>')
msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
}
- const _this = this
+ const that = this
confirm({
title: window.GLOB.dict['exec_sure'] || '璇风‘璁�',
content: msg,
@@ -1835,16 +2379,16 @@
return new Promise(resolve => {
Api.genericInterface(unCheckParam).then(result => {
if (result.status) {
- _this.triggerNote(result, param.ID) // 娑堟伅
+ that.triggerNote(result, param.ID) // 娑堟伅
if (params.length === 0) {
- _this.execSuccess(result)
+ that.execSuccess(result)
_resolve()
} else {
- _this.checkLoopRequest(params, _resolve)
+ that.checkLoopRequest(params, _resolve)
}
} else {
- _this.execError(result)
+ that.execError(result)
_resolve()
}
resolve()
@@ -1852,7 +2396,7 @@
})
},
onCancel() {
- _this.execError(res)
+ that.execError(res)
_resolve()
}
})
@@ -1882,16 +2426,18 @@
let record = {
BID: param.BID || '',
ID: param.ID || '',
- callbacksql: param.$callbacksql || ''
+ callbacksql: param.$callbacksql || '',
+ backParam: param.$backParam || ''
}
if (!record.ID && btn.Ot !== 'notRequired' && param[setting.primaryKey]) {
record.ID = param[setting.primaryKey]
}
+ delete param.$backParam
delete param.$callbacksql
- if (!param.func) {
+ if (!param.func && !param.$backend) {
this.outerOuterRequest(params, param, record, _resolve)
return
}
@@ -2045,6 +2591,8 @@
_resolve()
}
return
+ } else if (btn.callbackType === 'script' && record.backParam) {
+ param = this.getCallBackendParam(result, record)
} else if (btn.callbackType === 'script' || btn.callbackType === 'default') {
param = this.getCallBackSql(result, record)
} else if (btn.callbackType === 'func' || btn.callbackFunc) {
@@ -2170,6 +2718,7 @@
_resolve()
} else {
if (params.length === 0) {
+ this.clearBackCache()
this.execSuccess(res)
_resolve()
} else {
@@ -2191,6 +2740,7 @@
_resolve()
} else {
if (params.length === 0) {
+ this.clearBackCache()
this.execSuccess(res)
_resolve()
} else {
@@ -2207,6 +2757,7 @@
_resolve()
} else {
if (params.length === 0) {
+ this.clearBackCache()
this.execSuccess(re)
_resolve()
} else {
@@ -2215,6 +2766,34 @@
}
})
}
+ }
+
+ clearBackCache = () => {
+ if (!window.GLOB.backend) return
+
+ Api.cacheInterface({userid: sessionStorage.getItem('UserID') || '', LoginUID: sessionStorage.getItem('LoginUID') || ''}).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message || '缂撳瓨娓呯┖澶辫触锛�',
+ duration: 5
+ })
+ } else if (window.GLOB.localSystemApi) {
+ Api.cacheInterface({
+ userid: sessionStorage.getItem('LocalUserID') || sessionStorage.getItem('UserID') || '',
+ LoginUID: sessionStorage.getItem('LocalLoginUID') || sessionStorage.getItem('LoginUID') || '',
+ rduri: window.GLOB.localSystemApi.replace('dostars', 'excache')
+ }).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message || '缂撳瓨娓呯┖澶辫触锛�',
+ duration: 5
+ })
+ }
+ })
+ }
+ })
}
/**
@@ -2289,9 +2868,9 @@
res.ErrCode = '-1'
}
}
- if (/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i.test(res.message)) {
- sign = res.message.match(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i)[0].toLowerCase()
- res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i, '')
+ if (/@close_tab@|@close_popup@|@goback@|@no_target_menu@|@open_target_menu@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@|@no_target_menu@|@open_target_menu@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@|@open_target_menu@/i, '')
}
let id = ''
@@ -2359,12 +2938,8 @@
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
- // if (btn.formCache === 'clear') { // 娓呴櫎琛ㄥ崟缂撳瓨
- // window.GLOB.CacheMap = new Map()
- // }
-
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
return
}
@@ -2406,7 +2981,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
}
if (btn.switchTab && btn.switchTab.length > 0) {
@@ -2552,11 +3127,19 @@
}
sendWxMessage = (verify, id) => {
- let domain = ''
+ let domain = window.GLOB.baseurl
let appId = window.GLOB.WXAppID || ''
- if (verify.wxAppId && window.GLOB.WXApps && window.GLOB.WXApps.findIndex(item => item.appId === verify.wxAppId) > -1) {
+ if (verify.wxAppId && verify.wxAppId !== appId) {
appId = verify.wxAppId
+ if (!window.GLOB.WXApps || window.GLOB.WXApps.findIndex(item => item.appId === verify.wxAppId) === -1) {
+ notification.warning({
+ top: 92,
+ message: '鎸夐挳鍏宠仈鍏紬鍙蜂笉鍦ㄥ彲鐢ㄥ垪琛ㄤ腑锛岃閲嶆柊淇濆瓨鎸夐挳閰嶇疆锛�',
+ duration: 5
+ })
+ return
+ }
}
if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && window.GLOB.sysType !== 'cloud') {
@@ -2564,14 +3147,7 @@
appId = 'wx4d8a34c8d4494872'
}
- if (!window.GLOB.nginx && !domain) {
- notification.warning({
- top: 92,
- message: 'nginx鏈嶅姟灏氭湭寮�鍚紝涓嶅彲鍙戦�佹ā鏉挎秷鎭��',
- duration: 5
- })
- return
- } else if (!appId) {
+ if (!appId) {
notification.warning({
top: 92,
message: '灏氭湭娣诲姞鍏紬鍙稩D锛屼笉鍙彂閫佹ā鏉挎秷鎭��',
@@ -2651,62 +3227,63 @@
return m
})
- Api.wxAccessToken(appId, domain).then(res => {
- if (!res.access_token) return
-
- params.forEach(n => {
- Api.wxNginxRequest(`${domain}cgi-bin/message/template/send?access_token=${res.access_token}`, 'post', JSON.stringify(n)).then(re => {
- if (verify.wxNoteCallback === 'true') {
- let msg = re.errmsg || ''
+ // cgi-bin/message/template/send
+ params.forEach(n => {
+ Api.directRequest({
+ url: domain + 'wechat/send?appid=' + appId,
+ method: 'post',
+ data: JSON.stringify(n)
+ }).then(re => {
+ if (verify.wxNoteCallback === 'true') {
+ let msg = re.errmsg || ''
- if (msg.length > 50) {
- msg = msg.substr(0, 50)
- }
-
- let _p = {
- func: 's_get_sms_weixin_local_suc_err',
- upid: id,
- send_id: n.client_msg_id || '',
- status_result: re.errcode === 0 ? 'S' : 'E',
- errcode: re.errcode,
- msg_result: msg
- }
-
- _p.LText = Utils.getuuid()
- _p.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _p.secretkey = Utils.encrypt(_p.LText, _p.timestamp)
-
- Api.genericInterface(_p).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- } else if (re.errcode !== 0 && re.errmsg) {
- let msgs = [
- {errcode: -1, errmsg: '绯荤粺绻佸繖锛岃绋嶅�欏啀璇�'},
- {errcode: 40001, errmsg: 'access_token 鏃犳晥'},
- {errcode: 40003, errmsg: '涓嶅悎娉曠殑 OpenID'},
- {errcode: 40014, errmsg: '涓嶅悎娉曠殑 access_token'},
- {errcode: 40033, errmsg: '涓嶅悎娉曠殑璇锋眰瀛楃'},
- {errcode: 43004, errmsg: '闇�瑕佹帴鏀惰�呭叧娉�'},
- {errcode: 43019, errmsg: '闇�瑕佸皢鎺ユ敹鑰呬粠榛戝悕鍗曚腑绉婚櫎'},
- {errcode: 50005, errmsg: '鐢ㄦ埛鏈叧娉ㄥ叕浼楀彿'}
- ]
-
- let msg = msgs.filter(m => m.errcode === re.errcode)[0]
- msg = msg || re
-
- notification.warning({
- top: 92,
- message: msg.errmsg,
- duration: 5
- })
+ if (msg.length > 50) {
+ msg = msg.substr(0, 50)
}
- })
+
+ let _p = {
+ func: 's_get_sms_weixin_local_suc_err',
+ upid: id,
+ send_id: n.client_msg_id || '',
+ status_result: re.errcode === 0 ? 'S' : 'E',
+ errcode: re.errcode,
+ msg_result: msg
+ }
+
+ _p.LText = Utils.getuuid()
+ _p.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _p.secretkey = Utils.encrypt(_p.LText, _p.timestamp)
+
+ Api.genericInterface(_p).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ }
+ })
+ } else if (re.errcode !== 0 && re.errmsg) {
+ let msgs = [
+ {errcode: -1, errmsg: '绯荤粺绻佸繖锛岃绋嶅�欏啀璇�'},
+ {errcode: 40001, errmsg: 'access_token 鏃犳晥'},
+ {errcode: 40003, errmsg: '涓嶅悎娉曠殑 OpenID'},
+ {errcode: 40014, errmsg: '涓嶅悎娉曠殑 access_token'},
+ {errcode: 40033, errmsg: '涓嶅悎娉曠殑璇锋眰瀛楃'},
+ {errcode: 43004, errmsg: '闇�瑕佹帴鏀惰�呭叧娉�'},
+ {errcode: 43019, errmsg: '闇�瑕佸皢鎺ユ敹鑰呬粠榛戝悕鍗曚腑绉婚櫎'},
+ {errcode: 50005, errmsg: '鐢ㄦ埛鏈叧娉ㄥ叕浼楀彿'}
+ ]
+
+ let msg = msgs.filter(m => m.errcode === re.errcode)[0]
+ msg = msg || re
+
+ notification.warning({
+ top: 92,
+ message: msg.errmsg,
+ duration: 5
+ })
+ }
})
})
})
@@ -3028,9 +3605,9 @@
if (!res.message) {
res.ErrCode = '-1'
}
- } else if (/@close_tab@|@close_popup@|@goback@/i.test(res.message)) {
- sign = res.message.match(/@close_tab@|@close_popup@|@goback@/i)[0].toLowerCase()
- res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/i, '')
+ } else if (/@close_tab@|@close_popup@|@goback@|@open_target_menu@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@|@open_target_menu@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@open_target_menu@/i, '')
}
if (res.ErrCode === 'E') {
@@ -3103,7 +3680,7 @@
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
return
}
@@ -3135,7 +3712,7 @@
}
if (tabId) {
- MKEmitter.emit('reloadMenuView', tabId, 'table')
+ MKEmitter.emit('reloadMenuView', tabId)
}
}
@@ -3159,6 +3736,35 @@
if (window.GLOB.breakpoint) {
MKEmitter.emit('refreshDebugTable')
+ }
+
+ if (sign === '@open_target_menu@' && btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0) {
+ let id = ''
+ if (this.state.selines && this.state.selines.length > 0 && btn.Ot !== 'notRequired') {
+ if (btn.Ot === 'requiredOnce') {
+ id = this.state.selines.map(d => d.$$uuid).filter(Boolean).join(',')
+ } else {
+ id = this.state.selines[0].$$uuid
+ }
+ }
+
+ let menuId = btn.openmenu.slice(-1)[0]
+ let menu = null
+
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId), param: { $BID: id || '' }}
+ } else if (btn.MenuID) {
+ menu = {
+ MenuID: btn.MenuID,
+ MenuName: btn.MenuName,
+ type: btn.tabType,
+ param: { $BID: id || '' }
+ }
+ }
+
+ if (menu) {
+ MKEmitter.emit('modifyTabs', menu, true)
+ }
}
if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
@@ -3295,7 +3901,7 @@
modelconfirm = () => {
const { BID } = this.props
const { btnconfig, selines, dict } = this.state
- let _this = this
+ let that = this
let result = []
let _data = {}
@@ -3443,12 +4049,12 @@
cancelText: dict['cancel'] || '鍙栨秷',
onOk() {
return new Promise(resolve => {
- _this.execSubmit(selines, resolve, result)
+ that.execSubmit(selines, resolve, result)
})
},
onCancel() {
- _this.preCallback && _this.preCallback()
- _this.setState({ loading: false })
+ that.preCallback && that.preCallback()
+ that.setState({ loading: false })
}
})
}
--
Gitblit v1.8.0