From bb47f06e3c5eaf568aaecf870736787373ce73aa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 六月 2021 13:28:11 +0800
Subject: [PATCH] 2021-06-18
---
src/menu/components/share/actioncomponent/index.jsx | 163 +++++++++++++++++++-----------------------------------
1 files changed, 57 insertions(+), 106 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 1363c41..38ae2a2 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -1,26 +1,26 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
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'
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
import MKEmitter from '@/utils/events.js'
import ActionForm from './actionform'
-import VerifyCard from '@/templates/zshare/verifycard'
+import MenuUtils from '@/utils/utils-custom.js'
import CreateFunc from '@/templates/zshare/createfunc'
-import VerifyPrint from '@/templates/sharecomponent/actioncomponent/verifyprint'
-import VerifyExcelIn from '@/templates/sharecomponent/actioncomponent/verifyexcelin'
-import VerifyExcelOut from '@/templates/sharecomponent/actioncomponent/verifyexcelout'
import DragElement from './dragaction'
import './index.scss'
const { confirm } = Modal
+const VerifyCard = asyncSpinComponent(() => import('@/templates/zshare/verifycard'))
+const VerifyPrint = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyprint'))
+const VerifyExcelIn = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin'))
+const VerifyExcelOut = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelout'))
class ActionComponent extends Component {
static propTpyes = {
@@ -31,7 +31,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
actionlist: null, // 鎸夐挳缁�
@@ -43,8 +43,20 @@
* @description 鎼滅储鏉′欢鍒濆鍖�
*/
UNSAFE_componentWillMount () {
+ const { config } = this.props
+
+ let actionlist = fromJS(config.action).toJS() || []
+
this.setState({
- actionlist: fromJS(this.props.config.action).toJS()
+ actionlist: actionlist.map(item => {
+ if (item.btnstyle) { // 鍏煎
+ item.style = item.style || {}
+ item.style = {...item.style, ...item.btnstyle}
+ delete item.btnstyle
+ }
+
+ return item
+ })
})
}
@@ -85,7 +97,7 @@
if (comIds[0] !== config.uuid || comIds[1] !== 'actionlist') return
let _card = fromJS(card).toJS()
- _card.btnstyle = style
+ _card.style = style
let _actionlist = actionlist.map(cell => {
if (cell.uuid === _card.uuid) return _card
@@ -102,7 +114,7 @@
changeBtnStyle = (element) => {
const { config } = this.props
- let _style = element.btnstyle ? fromJS(element.btnstyle).toJS() : {}
+ let _style = element.style ? fromJS(element.style).toJS() : {}
let options = ['font', 'border', 'background', 'margin']
this.setState({
@@ -137,62 +149,11 @@
}
}
- getModules = (components, selfId) => {
- let modules = components.map(item => {
- if (item.uuid === selfId) {
- return {
- children: null
- }
- } else if (item.format) {
- return {
- value: item.uuid,
- label: item.name
- }
- } else if (item.type === 'tabs') {
- let _item = {
- value: item.uuid,
- label: item.name,
- children: item.subtabs.map(f_tab => {
- let subItem = {
- value: f_tab.uuid,
- label: f_tab.label,
- children: this.getModules(f_tab.components, selfId)
- }
-
- if (!subItem.children || subItem.children.length === 0) {
- return {children: null}
- }
- return subItem
- })
- }
-
- _item.children = _item.children.filter(t => t.children !== null)
-
- if (_item.children.length === 0) {
- return {children: null}
- }
-
- return _item
- } else {
- return {
- children: null
- }
- }
- })
-
- modules = modules.filter(mod => mod.children !== null)
-
- if (modules.length === 0) {
- return null
- }
- return modules
- }
-
/**
* @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
*/
handleAction = (card) => {
- const { menu, config } = this.props
+ const { config } = this.props
let usefulFields = sessionStorage.getItem('permFuncField')
if (usefulFields) {
@@ -208,7 +169,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')
@@ -222,7 +182,7 @@
menulist = []
}
- let modules = this.getModules(menu.components, config.uuid)
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid)
this.setState({
visible: true,
@@ -273,15 +233,15 @@
}
if (item.uuid === btn.uuid) {
- btn.btnstyle = item.btnstyle || {}
+ btn.style = item.style || {}
- if (btn.class !== item.class || btn.show !== item.show || !btn.btnstyle.color) {
+ if (btn.class !== item.class || btn.show !== item.show || !btn.style.color) {
if (btn.show === 'link' || btn.show === 'icon') {
- btn.btnstyle.color = color[btn.class]
- btn.btnstyle.background = 'transparent'
+ btn.style.color = color[btn.class]
+ btn.style.backgroundColor = 'transparent'
} else {
- btn.btnstyle.color = '#ffffff'
- btn.btnstyle.background = color[btn.class]
+ btn.style.color = '#ffffff'
+ btn.style.backgroundColor = color[btn.class]
}
}
return btn
@@ -293,7 +253,7 @@
if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
@@ -327,10 +287,15 @@
MKEmitter.emit('delButtons', [card.uuid])
}
+ let btnlog = config.btnlog || []
+ if (card.OpenType === 'popview' || card.verify || card.modal) {
+ btnlog.push(card)
+ }
+
_this.setState({
actionlist: _actionlist
}, () => {
- _this.props.updateaction({...config, action: _actionlist})
+ _this.props.updateaction({...config, action: _actionlist, btnlog})
})
},
onCancel() {}
@@ -379,7 +344,7 @@
* @description 鍒涘缓鎸夐挳瀛樺偍杩囩▼
*/
creatFunc = () => {
- const { menu } = this.props
+ const menu = window.GLOB.customMenu
let _config = fromJS(this.props.config).toJS()
this.actionFormRef.handleConfirm().then(res => {
@@ -398,37 +363,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.modal ? btn.modal.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,
@@ -436,8 +392,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)
@@ -448,8 +404,14 @@
* @description 鎸夐挳鍙屽嚮瑙﹀彂瀛愰厤缃�
*/
btnDoubleClick = (element) => {
- if (element.OpenType === 'pop' || element.OpenType === 'popview') {
+ if (sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') === 'true') 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,
@@ -508,7 +470,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={[
@@ -534,7 +496,6 @@
visible={profVisible}
width={'75vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
okText={dict['model.submit']}
onOk={this.verifySubmit}
onCancel={() => { this.setState({ profVisible: false }) }}
@@ -579,14 +540,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(ActionComponent)
\ No newline at end of file
+export default ActionComponent
\ No newline at end of file
--
Gitblit v1.8.0