From 796a4e93022f3274ea453f178e632f8dc41c252e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 七月 2023 17:37:30 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/comtableconfig/updatetable/index.jsx | 137 ++++++---------------------------------------
1 files changed, 20 insertions(+), 117 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 82d0052..299a683 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -87,14 +87,13 @@
let formActions = []
let popActions = []
let errors = []
- let formTabs = []
let mainTb = {name: '涓昏〃', uuid: Utils.getuuid(), useMSearch: 'false', isMain: true}
let oldtabs = {
mainTable: mainTb.uuid
}
- let tbl = this.getTable(config, mainTb, errors, formActions, formTabs, popActions, oldtabs)
+ let tbl = this.getTable(config, mainTb, errors, formActions, popActions, oldtabs)
if (config.autoMatic && config.autoMatic.enable === 'true') {
if (tbl.action.filter(item => item.uuid === config.autoMatic.action && (['pop', 'prompt', 'exec'].includes(item.OpenType) || (item.OpenType === 'funcbutton' && item.funcType === 'print'))).length === 0) {
@@ -191,7 +190,7 @@
_config.components = _config.components.map(item => {
if (item.type === 'tabs') {
item.subtabs = item.subtabs.map(tab => {
- tab.components[0] = this.getTable(menus[tab.components[0].linkTab], tab.components[0], errors, formActions, formTabs, popActions, oldtabs)
+ tab.components[0] = this.getTable(menus[tab.components[0].linkTab], tab.components[0], errors, formActions, popActions, oldtabs)
return tab
})
@@ -199,14 +198,14 @@
return item
})
- this.setPopView(_resolve, _config, formActions, formTabs, popActions, errors)
+ this.setPopView(_resolve, _config, formActions, popActions, errors)
})
} else {
- this.setPopView(_resolve, _config, formActions, formTabs, popActions, errors)
+ this.setPopView(_resolve, _config, formActions, popActions, errors)
}
}
- setPopView = (_resolve, _config, formActions, formTabs, popActions, errors) => {
+ setPopView = (_resolve, _config, formActions, popActions, errors) => {
if (popActions.length > 0) {
let defers = popActions.map((item, i) => {
return new Promise((resolve) => {
@@ -267,7 +266,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -293,7 +292,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -319,7 +318,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -345,7 +344,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -360,10 +359,10 @@
}
})
- this.setPopForm(_resolve, _config, formActions, formTabs, errors)
+ this.setPopForm(_resolve, _config, formActions, errors)
})
} else {
- this.setPopForm(_resolve, _config, formActions, formTabs, errors)
+ this.setPopForm(_resolve, _config, formActions, errors)
}
}
@@ -386,7 +385,7 @@
return enabled
}
- setPopForm = (_resolve, _config, formActions, formTabs, errors) => {
+ setPopForm = (_resolve, _config, formActions, errors) => {
if (formActions.length > 0) {
let defers = formActions.map((item, i) => {
return new Promise((resolve) => {
@@ -512,10 +511,10 @@
}
})
- this.saveConfig(_resolve, _config, errors, formTabs)
+ this.saveConfig(_resolve, _config, errors)
})
} else {
- this.saveConfig(_resolve, _config, errors, formTabs)
+ this.saveConfig(_resolve, _config, errors)
}
}
@@ -554,7 +553,7 @@
})
}
- saveConfig = (_resolve, _config, errors, formTabs) => {
+ saveConfig = (_resolve, _config, errors) => {
let err = errors.join('锛�')
let _this = this
@@ -565,17 +564,17 @@
content: '',
onOk() {
return new Promise(resolve => {
- _this.saveNewMenu(resolve, _config, formTabs)
+ _this.saveNewMenu(resolve, _config)
})
},
onCancel() {}
})
} else {
- this.saveNewMenu(_resolve, _config, formTabs)
+ this.saveNewMenu(_resolve, _config)
}
}
- saveNewMenu = (_resolve, _config, formTabs) => {
+ saveNewMenu = (_resolve, _config) => {
_config.components.forEach(item => {
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
@@ -616,82 +615,7 @@
}
})
- // if (formTabs.length > 0) {
- // this.transformTabs(_resolve, _config, formTabs)
- // } else {
- this.submitConfig(_resolve, _config)
- // }
- }
-
- transformTabs = (_resolve, _config, formTabs) => {
- let tab = formTabs.shift()
-
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: tab.uuid
- }).then(res => {
- if (res.status) {
- let _LongParam = ''
- if (res.LongParam) {
- try {
- _LongParam = JSON.parse(window.decodeURIComponent(window.atob(res.LongParam)))
- } catch (e) {
- console.warn('Parse Failure')
- _LongParam = ''
- }
- }
-
- if (_LongParam && (_LongParam.type === 'FormTab' || _LongParam.Template === 'FormTab') && _LongParam.enabled) {
- if (!_LongParam.tabgroups) {
- _LongParam.tabgroups = []
- } else if (typeof(_LongParam.tabgroups[0]) === 'string') {
- let _tabgroups = []
- _LongParam.tabgroups.forEach(groupId => {
- let _group = {
- uuid: groupId,
- sublist: fromJS(_LongParam[groupId]).toJS()
- }
-
- delete _LongParam[groupId]
-
- _tabgroups.push(_group)
- })
-
- _LongParam.tabgroups = _tabgroups
- }
-
- _LongParam.tabgroups = _LongParam.tabgroups.filter(group => group.sublist.length > 0)
-
- _LongParam.tabgroups.forEach(group => {
- group.sublist = group.sublist.map(tab => {
- if (tab.supMenu === 'mainTable') {
- tab.supMenu = ''
- }
- return tab
- })
- })
-
- _LongParam.action = _LongParam.action.map(item => {
- if (item.intertype === 'inner' && !item.innerFunc) {
- item.intertype = 'system'
- }
- return item
- })
-
- delete _LongParam.funcs
- delete _LongParam.tables
- } else {
- _config.components[0].action = _config.components[0].action.filter(btn => btn.uuid !== tab.uuid)
- }
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- _resolve()
- }
- })
+ this.submitConfig(_resolve, _config)
}
checkBtns = (card) => {
@@ -854,7 +778,7 @@
})
}
- getTable = (config, newCon, errors, formActions, formTabs, popActions, oldtabs) => {
+ getTable = (config, newCon, errors, formActions, popActions, oldtabs) => {
let _card = {
uuid: newCon.uuid,
type: 'table',
@@ -1155,27 +1079,6 @@
if (btn.tabTemplate === 'FormTab') {
errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
return
- // if (newCon.isMain !== true) {
- // errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
- // return
- // }
-
- // delete _btn.tabTemplate
-
- // _btn.MenuID = 'tab' + md5(btn.uuid).substr(3)
- // _btn.MenuName = this.baseMsg.MenuName + '-' + btn.label
- // _btn.MenuNo = this.baseMsg.MenuNo + '_' + _btn.MenuID.substr(-4).toUpperCase()
- // _btn.hidden = _btn.hidden || 'false'
- // _btn.tabType = 'CustomPage'
- // _btn.linkmenu = [this.baseMsg.fstMenuId, this.baseMsg.parentId, _btn.MenuID]
-
- // let _tab = {...btn}
-
- // _tab.MenuID = _btn.MenuID
- // _tab.MenuNo = _btn.MenuNo
- // _tab.MenuName = _btn.MenuName
-
- // formTabs.push(_tab)
} else if (!btn.linkmenu || btn.linkmenu.length !== 3) {
errors.push(newCon.name + '涓寜閽��' + btn.label + '銆嬩笉鍦ㄦ敮鎸�')
--
Gitblit v1.8.0