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 | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index aec9697..1891e05 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -4,8 +4,7 @@
import { is, fromJS } from 'immutable'
import { Modal, notification, Button } from 'antd'
-import Utils from '@/utils/utils.js'
-import DevUtils from '@/utils/devutils.js'
+import Utils, { FuncUtils } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import { getActionForm } from './formconfig'
@@ -13,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'
@@ -33,7 +32,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
actionlist: null, // 鎸夐挳缁�
@@ -159,7 +158,6 @@
let ableField = usefulFields.join(', ')
let functip = <div>
<p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
- <p>{this.state.dict['model.tooltip.func.outface']}</p>
</div>
let menulist = sessionStorage.getItem('fstMenuList')
@@ -354,37 +352,28 @@
}
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(DevUtils.getfunc(_param, btn, menu, _config))
- DelText = Utils.formatOptions(DevUtils.dropfunc(btn.innerFunc))
+ newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
+ DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
} else if (btn.OpenType === 'excelIn') {
let _param = {
funcName: btn.innerFunc,
menuNo: menu.MenuNo
}
- newLText = Utils.formatOptions(DevUtils.getexcelInfunc(_param, btn, menu))
- DelText = Utils.formatOptions(DevUtils.dropfunc(btn.innerFunc))
+ newLText = Utils.formatOptions(FuncUtils.getexcelInfunc(_param, btn, menu))
+ DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
} else if (btn.OpenType === 'excelOut') {
let _param = {
innerFunc: btn.innerFunc
}
- newLText = Utils.formatOptions(DevUtils.getTableFunc(_param, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
- DelText = Utils.formatOptions(DevUtils.dropfunc(btn.innerFunc))
+ newLText = Utils.formatOptions(FuncUtils.getTableFunc(_param, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
+ DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
} else {
let _param = {
funcName: btn.innerFunc,
@@ -392,8 +381,8 @@
fields: '',
menuNo: menu.MenuNo
}
- newLText = Utils.formatOptions(DevUtils.getfunc(_param, btn, menu, _config))
- DelText = Utils.formatOptions(DevUtils.dropfunc(btn.innerFunc))
+ newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
+ DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
}
this.refs.btnCreatFunc.exec(btn.innerFunc, newLText, DelText)
@@ -404,8 +393,14 @@
* @description 鎸夐挳鍙屽嚮瑙﹀彂瀛愰厤缃�
*/
btnDoubleClick = (element) => {
- if (element.OpenType === 'pop' || element.OpenType === 'popview') {
+ if (sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false') return
+
+ 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,
@@ -464,7 +459,7 @@
<Modal
title={dict['model.action'] + '-' + (card && card.copyType === 'action' ? dict['model.copy'] : dict['model.edit'])}
visible={visible}
- width={800}
+ width={850}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
@@ -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