From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/menu/components/card/cardcellcomponent/index.jsx | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index f5275c9..cd73458 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -314,7 +314,17 @@
menulist = []
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid) || []
+ let supId = ''
+ if (cards.setting && cards.setting.supModule) {
+ let pid = cards.setting.supModule[cards.setting.supModule.length - 1]
+ if (pid && pid !== 'empty') {
+ supId = pid
+ } else {
+ supId = ''
+ }
+ }
+
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId) || []
let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
this.setState({
@@ -417,14 +427,17 @@
this.actionFormRef.handleConfirm().then(res => {
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
- res = {...cell, ...res}
+ res.eleType = cell.eleType || null
+ res.style = cell.style || null
+ res.modal = cell.modal || null
+ // res = {...cell, ...res}
- if (!res.control) {
- delete res.controlField
- delete res.controlVal
- }
+ // if (!res.control) {
+ // delete res.controlField
+ // delete res.controlVal
+ // }
- delete res.focus
+ // delete res.focus
if (res.OpenType === 'form') {
if (cell.OpenType !== 'form') {
@@ -549,6 +562,8 @@
} else if (btn.OpenType === 'popview') {
MKEmitter.emit('changePopview', cards, btn)
} else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ } else if (btn.OpenType === 'funcbutton' && (btn.funcType === 'copyurl' || btn.funcType === 'scan') && btn.linkmenu) {
MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
} else {
this.handleElement(item)
@@ -716,7 +731,7 @@
<Modal
title="鎸夐挳路缂栬緫"
visible={actvisible}
- width={800}
+ width={920}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
--
Gitblit v1.8.0