From ecbe0dc46ce2b8f607b9afd063104adeb7f10fe8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 三月 2021 15:19:31 +0800
Subject: [PATCH] 2021-03-30
---
src/menu/components/share/actioncomponent/index.jsx | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index d026270..1891e05 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -12,7 +12,7 @@
import MKEmitter from '@/utils/events.js'
import ActionForm from './actionform'
-import MenuUtils from '@/menu/utils/menuUtils.js'
+import MenuUtils from '@/utils/utils-custom.js'
import CreateFunc from '@/templates/zshare/createfunc'
import DragElement from './dragaction'
import './index.scss'
@@ -352,19 +352,10 @@
}
if (btn.OpenType === 'pop') {
- let fields = []
- if (btn.groups.length > 0) {
- btn.groups.forEach(group => {
- fields = [...fields, ...group.sublist]
- })
- } else {
- fields = btn.fields
- }
-
let _param = {
funcName: btn.innerFunc,
name: _config.setting.tableName || '',
- fields: fields,
+ fields: btn.fields,
menuNo: menu.MenuNo
}
newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
@@ -404,8 +395,12 @@
btnDoubleClick = (element) => {
if (sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false') return
- if (element.OpenType === 'pop' || element.OpenType === 'popview') {
+ if (element.OpenType === 'pop' || element.OpenType === 'popview' || element.execMode === 'pop') {
this.props.setSubConfig(element)
+ } else if (element.OpenType === 'innerpage' && element.pageTemplate === 'page') {
+ MKEmitter.emit('changeEditMenu', {MenuID: element.uuid, copyMenuId: element.copyMenuId})
+ } else if (element.OpenType === 'innerpage' && element.pageTemplate === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: element.linkmenu})
} else {
notification.warning({
top: 92,
@@ -490,7 +485,6 @@
visible={profVisible}
width={'75vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
okText={dict['model.submit']}
onOk={this.verifySubmit}
onCancel={() => { this.setState({ profVisible: false }) }}
--
Gitblit v1.8.0