From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/comtableconfig/updatetable/index.jsx | 214 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 161 insertions(+), 53 deletions(-)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index ffe2380..647404a 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -21,6 +21,7 @@
state = {}
delButtons = []
+ baseMsg = {}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
@@ -52,8 +53,14 @@
}
execUpdate = (_resolve) => {
- const { config } = this.props
+ const config = fromJS(this.props.config).toJS()
this.delButtons = []
+ this.baseMsg = {
+ fstMenuId: config.fstMenuId,
+ parentId: config.ParentId,
+ MenuName: config.MenuName,
+ MenuNo: config.MenuNo,
+ }
let _config = {
version: 1.0,
@@ -80,13 +87,14 @@
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, popActions, oldtabs)
+ let tbl = this.getTable(config, mainTb, errors, formActions, formTabs, 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) {
@@ -183,7 +191,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, popActions, oldtabs)
+ tab.components[0] = this.getTable(menus[tab.components[0].linkTab], tab.components[0], errors, formActions, formTabs, popActions, oldtabs)
return tab
})
@@ -191,14 +199,14 @@
return item
})
- this.setPopView(_resolve, _config, formActions, popActions, errors)
+ this.setPopView(_resolve, _config, formActions, formTabs, popActions, errors)
})
} else {
- this.setPopView(_resolve, _config, formActions, popActions, errors)
+ this.setPopView(_resolve, _config, formActions, formTabs, popActions, errors)
}
}
- setPopView = (_resolve, _config, formActions, popActions, errors) => {
+ setPopView = (_resolve, _config, formActions, formTabs, popActions, errors) => {
if (popActions.length > 0) {
let defers = popActions.map((item, i) => {
return new Promise((resolve) => {
@@ -260,7 +268,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -284,7 +292,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -309,7 +317,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -333,7 +341,7 @@
MenuName: btn.label,
tables: _config.tables || [],
Template: 'BaseTable',
- components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions)],
+ components: [this.getTable(menus[btn.uuid], mainTb, errors, formActions, formTabs)],
viewType: 'popview',
style: { backgroundColor: '#ffffff', backgroundImage: '', paddingTop: '16px', paddingBottom: '40px', paddingLeft: '16px', paddingRight: '16px' }
}
@@ -346,14 +354,14 @@
}
})
- this.setPopForm(_resolve, _config, formActions, errors)
+ this.setPopForm(_resolve, _config, formActions, formTabs, errors)
})
} else {
- this.setPopForm(_resolve, _config, formActions, errors)
+ this.setPopForm(_resolve, _config, formActions, formTabs, errors)
}
}
- setPopForm = (_resolve, _config, formActions, errors) => {
+ setPopForm = (_resolve, _config, formActions, formTabs, errors) => {
if (formActions.length > 0) {
let defers = formActions.map((item, i) => {
return new Promise((resolve) => {
@@ -477,10 +485,10 @@
}
})
- this.saveConfig(_resolve, _config, errors)
+ this.saveConfig(_resolve, _config, errors, formTabs)
})
} else {
- this.saveConfig(_resolve, _config, errors)
+ this.saveConfig(_resolve, _config, errors, formTabs)
}
}
@@ -518,7 +526,7 @@
})
}
- saveConfig = (_resolve, _config, errors) => {
+ saveConfig = (_resolve, _config, errors, formTabs) => {
let err = errors.join('锛�')
let _this = this
@@ -529,17 +537,17 @@
content: '',
onOk() {
return new Promise(resolve => {
- _this.saveNewMenu(resolve, _config)
+ _this.saveNewMenu(resolve, _config, formTabs)
})
},
onCancel() {}
})
} else {
- this.saveNewMenu(_resolve, _config)
+ this.saveNewMenu(_resolve, _config, formTabs)
}
}
- saveNewMenu = (_resolve, _config) => {
+ saveNewMenu = (_resolve, _config, formTabs) => {
_config.components.forEach(item => {
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
@@ -558,6 +566,20 @@
})
tab.components[0].$tables = getTables(tab.components[0])
+
+ tab.components[0].errors = []
+ let columns = tab.components[0].columns.map(c => c.field)
+ if (tab.components[0].setting.interType === 'system' && tab.components[0].setting.execute !== 'false' && !tab.components[0].setting.dataresource) {
+ tab.components[0].errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
+ } else if (tab.components[0].setting.interType === 'system' && tab.components[0].setting.execute === 'false' && tab.components[0].scripts.filter(script => script.status !== 'false').length === 0) {
+ tab.components[0].errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
+ } else if (!tab.components[0].setting.primaryKey) {
+ tab.components[0].errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!columns.includes(tab.components[0].setting.primaryKey)) {
+ tab.components[0].errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
+ } else if (!tab.components[0].setting.supModule) {
+ tab.components[0].errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
})
} else {
item.action.forEach(btn => {
@@ -575,35 +597,6 @@
})
item.$tables = getTables(item)
- }
- })
-
- let tbs = []
- _config.components.forEach(item => {
- if (item.type === 'tabs') {
- item.subtabs.forEach(tab => {
- if (tab.components[0].$tables) {
- tbs.push(...tab.components[0].$tables)
- }
-
- tab.components[0].errors = []
- let columns = tab.components[0].columns.map(c => c.field)
- if (tab.components[0].setting.interType === 'system' && tab.components[0].setting.execute !== 'false' && !tab.components[0].setting.dataresource) {
- tab.components[0].errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
- } else if (tab.components[0].setting.interType === 'system' && tab.components[0].setting.execute === 'false' && tab.components[0].scripts.filter(script => script.status !== 'false').length === 0) {
- tab.components[0].errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
- } else if (!tab.components[0].setting.primaryKey) {
- tab.components[0].errors.push({ level: 0, detail: '鏈缃富閿紒'})
- } else if (!columns.includes(tab.components[0].setting.primaryKey)) {
- tab.components[0].errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
- } else if (!tab.components[0].setting.supModule) {
- tab.components[0].errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
- }
- })
- } else {
- if (item.$tables) {
- tbs.push(...item.$tables)
- }
item.errors = []
let columns = item.columns.map(c => c.field)
@@ -621,10 +614,100 @@
}
})
- this.submitConfig(_resolve, _config, tbs)
+ // if (formTabs.length > 0) {
+ // this.transformTabs(_resolve, _config, formTabs)
+ // } else {
+ this.submitConfig(_resolve, _config)
+ // }
}
- submitConfig = (_resolve, config, tbs) => {
+ 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()
+ }
+ })
+ }
+
+ submitConfig = (_resolve, config) => {
+ let tbs = []
+ config.components.forEach(item => {
+ if (item.type === 'tabs') {
+ item.subtabs.forEach(tab => {
+ if (tab.components[0].$tables) {
+ tbs.push(...tab.components[0].$tables)
+ }
+ })
+ } else {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+ }
+ })
+
let arr = []
tbs = tbs.filter(tb => {
let _tb = tb.toLowerCase()
@@ -734,7 +817,7 @@
})
}
- getTable = (config, newCon, errors, formActions, popActions, oldtabs) => {
+ getTable = (config, newCon, errors, formActions, formTabs, popActions, oldtabs) => {
let _card = {
uuid: newCon.uuid,
type: 'table',
@@ -759,7 +842,7 @@
return _card
}
- if (newCon.supModule && oldtabs[newCon.supModule]) {
+ if (oldtabs && newCon.supModule && oldtabs[newCon.supModule]) {
_card.setting.supModule = [oldtabs[newCon.supModule]]
} else {
_card.setting.supModule = ['empty']
@@ -983,6 +1066,9 @@
if (_btn.intertype === 'inner' && !_btn.innerFunc) {
_btn.intertype = 'system'
}
+ if ((_btn.intertype === 'outer' || _btn.intertype === 'custom') && !_btn.procMode) { // 鍏煎澶栭儴鍑芥暟鐩翠紶绫诲瀷
+ _btn.procMode = !_btn.innerFunc ? 'none' : 'inner'
+ }
if (_btn.funcType === 'print' && _btn.execMode) {
_btn.OpenType = 'funcbutton'
} else if (_btn.OpenType === 'blank') {
@@ -1029,7 +1115,29 @@
popActions.push({origin: btn.uuid, linkTab: btn.linkTab || '', uuid: _btn.uuid, name: newCon.name, label: btn.label})
} else if (_btn.OpenType === 'tab') {
- if (btn.tabTemplate === 'FormTab' || !btn.linkmenu || btn.linkmenu.length !== 3) {
+ if (btn.tabTemplate === 'FormTab') {
+ 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 + '銆嬩笉鍦ㄦ敮鎸�')
return
--
Gitblit v1.8.0