From e36eb1999794bd71e76482b92a0b0b20f49d0032 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 三月 2021 19:37:03 +0800
Subject: [PATCH] 2021-03-05
---
src/views/menudesign/index.jsx | 77 ++++++++++++--------------------------
1 files changed, 24 insertions(+), 53 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 5a23018..f227a6a 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -56,14 +56,12 @@
ParentId: '',
MenuName: '',
MenuNo: '',
- tableFields: [],
delButtons: [],
copyButtons: [],
thawButtons: [],
activeKey: 'basedata',
menuloading: false,
oriConfig: null,
- openEdition: '',
config: null,
popBtn: null, // 寮圭獥鏍囩椤�
visible: false,
@@ -228,10 +226,7 @@
initPopview = (card, btn) => {
const { oriConfig, config } = this.state
- let _config = fromJS(config).toJS()
- delete _config.tableFields
-
- if (!is(fromJS(oriConfig), fromJS(_config))) {
+ if (!is(fromJS(oriConfig), fromJS(config))) {
notification.warning({
top: 92,
message: '閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
@@ -240,7 +235,7 @@
return
}
- btn.config = _config
+ btn.config = fromJS(config).toJS()
btn.component = card
sessionStorage.setItem('editMenuType', 'popview') // 缂栬緫寮圭獥鏍囩
@@ -264,10 +259,7 @@
return
}
- let _config = fromJS(config).toJS()
- delete _config.tableFields
-
- if (!is(fromJS(oriConfig), fromJS(_config))) {
+ if (!is(fromJS(oriConfig), fromJS(config))) {
confirm({
title: '閰嶇疆宸蹭慨鏀癸紝鏀惧純淇濆瓨鍚楋紵',
content: '',
@@ -341,10 +333,11 @@
config.lastCount = config.lastCount || ''
}
+ config.open_edition = result.open_edition || ''
+
this.setState({
oriConfig: config,
- config: fromJS(config).toJS(),
- openEdition: result.open_edition || '',
+ config: fromJS(config).toJS()
})
this.props.modifyCustomMenu(config)
@@ -458,7 +451,7 @@
}
submitConfig = () => {
- const { openEdition, MenuType, delButtons, copyButtons, thawButtons } = this.state
+ const { MenuType, delButtons, copyButtons, thawButtons } = this.state
let config = fromJS(this.state.config).toJS()
if (MenuType === 'billPrint' && (!config.firstCount || !config.everyPCount)) {
@@ -495,21 +488,19 @@
config.enabled = false
}
- let _config = fromJS(config).toJS()
- delete _config.tableFields
-
let param = {
func: 'sPC_TrdMenu_AddUpt',
- FstID: _config.fstMenuId || '',
- SndID: _config.parentId,
- ParentID: _config.parentId,
- MenuID: _config.uuid,
- MenuNo: _config.MenuNo || '',
- EasyCode: _config.easyCode || '',
+ FstID: config.fstMenuId || '',
+ SndID: config.parentId,
+ ParentID: config.parentId,
+ MenuID: config.uuid,
+ MenuNo: config.MenuNo || '',
+ EasyCode: config.easyCode || '',
Template: 'CustomPage',
- MenuName: _config.MenuName || '',
- PageParam: JSON.stringify({Template: 'CustomPage', OpenType: _config.OpenType || 'newtab'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_config))),
+ MenuName: config.MenuName || '',
+ PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab'}),
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(config))),
+ open_edition: config.open_edition,
LText: '',
LTexttb: ''
}
@@ -518,15 +509,11 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (openEdition) { // 鐗堟湰绠＄悊
- param.open_edition = openEdition
- }
-
let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
func: 'sPC_Button_AddUpt',
Type: 40, // 娣诲姞鑿滃崟涓嬬殑鎸夐挳type涓�40锛屾寜閽笅鐨勬寜閽畉ype涓�60
- ParentID: _config.uuid,
- MenuNo: _config.MenuNo,
+ ParentID: config.uuid,
+ MenuNo: config.MenuNo,
Template: 'CustomPage',
PageParam: '',
LongParam: '',
@@ -564,7 +551,7 @@
if (result.status) {
Api.getSystemConfig({
func: 's_PrintTemplateMSub',
- ID: _config.uuid,
+ ID: config.uuid,
Images: Utils.getcloudurl(result.Images),
Remark: '',
temp_type: 'billprint',
@@ -646,9 +633,9 @@
if (!res) return
if (res.status) {
+ config.open_edition = res.open_edition || ''
this.setState({
- oriConfig: fromJS(_config).toJS(),
- openEdition: res.open_edition || ''
+ oriConfig: fromJS(config).toJS()
})
if (btnParam.LText) {
@@ -720,7 +707,7 @@
let _param = {
func: 'sPC_ButtonParam_AddUpt',
- ParentID: _config.uuid,
+ ParentID: config.uuid,
MenuID: item.uuid,
MenuNo: '',
Template: 'CustomPage',
@@ -882,22 +869,6 @@
this.props.modifyCustomMenu(config)
}
- /**
- * @description 鏇存柊甯哥敤琛ㄤ俊鎭紝蹇嵎娣诲姞鍚庢洿鏂伴厤缃俊鎭�
- */
- updatetable = (config, fields) => {
- const { tableFields } = this.state
-
- config.tableFields = fields ? fields : tableFields
-
- this.setState({
- tableFields: fields ? fields : tableFields,
- config
- })
-
- this.props.modifyCustomMenu(config)
- }
-
render () {
const { activeKey, MenuType, popBtn, visible, dict, MenuId, config, ParentId, MenuName, MenuNo, menuloading, customComponents } = this.state
@@ -932,7 +903,7 @@
updateConfig={this.updateConfig}
/> : null}
{/* 琛ㄥ悕娣诲姞 */}
- {config ? <TableComponent config={config} updatetable={this.updatetable}/> : null}
+ {config ? <TableComponent config={config} updatetable={this.updateConfig}/> : null}
</Panel>
{/* 缁勪欢娣诲姞 */}
<Panel header={dict['mob.component']} key="component">
--
Gitblit v1.8.0