From 4d6b9f8a2d7b316633e43b489eae9ada949c07b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 九月 2024 10:18:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 212 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 199 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 40cc3e9..34edff4 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1515,7 +1515,11 @@
deForms: hasBid ? deForms : null
}, () => {
if (deForms.length > 0 && (!hasBid || BID)) {
- this.improveActionForm(deForms, BID)
+ if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+ this.improveBackActionForm(deForms, BID)
+ } else {
+ this.improveActionForm(deForms, BID)
+ }
}
})
}
@@ -1529,7 +1533,11 @@
const { deForms } = this.state
if (deForms && nextProps.BID !== BID) {
- this.improveActionForm(deForms, nextProps.BID)
+ if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+ this.improveBackActionForm(deForms, nextProps.BID)
+ } else {
+ this.improveActionForm(deForms, nextProps.BID)
+ }
}
if (parCtrl && !is(fromJS(this.props.columns), fromJS(nextProps.columns))) {
let getColumns = (cols, sk) => {
@@ -2000,6 +2008,98 @@
})
}
+ improveBackActionForm = (deForms, BID) => {
+ let sysvals = {
+ mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+ mk_organization: sessionStorage.getItem('organization') || '',
+ mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+ bid: BID || '',
+ datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
+ if (window.GLOB.externalDatabase !== null) {
+ sysvals.db = window.GLOB.externalDatabase
+ }
+
+ let deffers = []
+ let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
+ let localItems = [] // 鏈湴鏁版嵁
+
+ deForms.forEach(item => {
+ let ex = window.GLOB.CacheData.get('sql_' + item.uuid)
+
+ if (!ex) return
+
+ let exps = []
+ ex.reps.forEach(n => {
+ let key = n.toLowerCase()
+ if (sysvals.hasOwnProperty(key)) {
+ exps.push({
+ key: n,
+ value: sysvals[key]
+ })
+ }
+ })
+
+ let cell = {
+ id: ex.id,
+ exps: exps,
+ menuname: item.label + '锛堣〃鍗曪級',
+ md5_id: ''
+ }
+
+ if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+ mainItems.push(cell)
+ } else {
+ localItems.push(cell)
+ }
+ })
+
+ if (localItems.length) {
+ deffers.push({
+ $backend: true,
+ data: localItems
+ })
+ }
+
+ if (mainItems.length) {
+ deffers.push({
+ $backend: true,
+ data: mainItems,
+ rduri: window.GLOB.mainSystemApi
+ })
+ }
+
+ if (!deffers.length) return
+
+ deffers = deffers.map(item => {
+ return new Promise(resolve => {
+ Api.getSystemCacheConfig(item, false).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ }
+ resolve(res)
+ })
+ })
+ })
+
+ Promise.all(deffers).then(response => {
+ let result = {...response[0], ...(response[1] || {})}
+
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.message
+ delete result.status
+
+ this.resetFormList(result)
+ })
+ }
+
resetFormList = (result) => {
const { columns, edData } = this.state
@@ -2377,22 +2477,32 @@
if (!data) return
- let result = getEditTableSql(submit, data, forms)
-
- let param = {
- excel_in: result.lines,
- BID: BID || ''
- }
-
this.setState({
loading: true
})
- if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
- param.func = 'sPC_TableData_InUpDe'
-
- delete param.excel_in
+ if (submit.intertype === 'system' && window.backend && window.GLOB.CacheData.has('sql_' + submit.$menuId)) {
+ let ex = window.GLOB.CacheData.get('sql_' + submit.$menuId)
+ let param = this.getExps(ex, submit, data, forms)
+ Api.genericInterface(param).then((res) => {
+ if (res.status) {
+ this.execSuccess(res, record)
+ } else {
+ this.execError(res, record)
+ }
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
+
+ this.execError({})
+ })
+ } else if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
+ let result = getEditTableSql(submit, data, forms)
+ let param = {}
+
+ param.func = 'sPC_TableData_InUpDe'
+ param.BID = BID || ''
+
param.exec_type = window.GLOB.execType || 'y'
param.LText = Utils.formatOptions(result.sql, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -2416,7 +2526,12 @@
this.execError({})
})
} else if (submit.intertype === 'inner' && submit.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
+ let result = getEditTableSql(submit, data, forms)
+ let param = {}
+
param.func = submit.innerFunc
+ param.BID = BID || ''
+ param.excel_in = result.lines
if (submit.recordUser === 'true') {
param.username = sessionStorage.getItem('User_Name') || ''
@@ -2437,6 +2552,77 @@
}
}
+ getExps = (ex, btn, data, forms) => {
+ const { BID } = 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') || '',
+ bid: BID || '',
+ typename: 'admin',
+ datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ }
+
+ if (window.GLOB.externalDatabase !== null) {
+ values.db = window.GLOB.externalDatabase
+ }
+
+ let lines = data.map(item => {
+ let vals = []
+ forms.forEach(col => {
+ vals.push(item[col.field])
+ })
+
+ vals.push(item.$$uuid)
+ vals.push(item.$type || 'upt')
+ vals.push(BID)
+
+ return vals
+ })
+
+ ex.reps.forEach(n => {
+ let key = n.toLowerCase()
+ if (values.hasOwnProperty(key)) {
+ exps.push({
+ key: n,
+ value: values[key]
+ })
+ }
+ })
+
+ exps.push({
+ key: 'mk_excel_data',
+ value: lines
+ })
+
+ 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,
+ data: [{
+ id: ex.id,
+ exps: exps,
+ menuname: btn.logLabel || '',
+ md5_id: md5_id
+ }]
+ }
+ }
+
execSuccess = (res, record) => {
const { submit } = this.props
const { edData, dict } = this.state
--
Gitblit v1.8.0