From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 187 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index f34ad5d..8bc29d8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Icon, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { btnCustomClasses, formRule } from '@/utils/option.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -10,12 +11,12 @@
const { TextArea } = Input
const MkIcon = asyncComponent(() => import('@/components/mkIcon'))
const actionTypeOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width', 'openmenu', 'open', 'output'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width', 'openmenu', 'open', 'output'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width', 'openmenu', 'open', 'output'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'execSuccess', 'execError', 'syncComponent', 'resetPageIndex', 'pagination', 'search', 'width'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'popClose', 'resetPageIndex', 'width'],
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'output', 'refreshTab', 'reload'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'output', 'refreshTab', 'reload'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'output', 'refreshTab', 'reload'],
+ excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width'],
+ excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width'],
+ popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'placement'],
tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'linkmenu', 'width'],
innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'icon', 'class', 'width', 'open'],
funcbutton: ['label', 'OpenType', 'funcType', 'show', 'icon', 'class', 'width']
@@ -37,6 +38,7 @@
interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
funcType: null, // 鍔熻兘绫诲瀷
procMode: null, // 鍙傛暟鏂瑰紡
+ control: '',
pageTemplate: null,
appType: sessionStorage.getItem('appType'),
Ot: null,
@@ -98,11 +100,13 @@
let _procMode = card.procMode || 'system'
let _Ot = card.Ot || 'requiredSgl'
let _pageTemplate = card.pageTemplate || ''
+ let control = card.control || ''
- let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot)
+ let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, control)
this.setState({
Ot: _Ot,
+ control: control,
openType: _opentype,
interType: _intertype,
procMode: _procMode,
@@ -113,18 +117,30 @@
item.options = btnCustomClasses
} else if (item.key === 'innerFunc' && _procMode === 'inner') {
item.required = true
+ } else if (item.key === 'linkmenu') {
+ if (_opentype === 'funcbutton' && _funcType === 'scan') {
+ item.required = false
+ item.tooltip = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
+ } else {
+ item.tooltip = ''
+ item.required = true
+ }
} else if (item.key === 'intertype') {
let iscustom = ['pop', 'prompt', 'exec'].includes(_opentype)
item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
} else if (item.key === 'Ot') {
if (type === 'card') {
- item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ if (card.sqlType === 'insert') {
+ item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
+ } else {
+ item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ }
} else if (_pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
} else if (['innerpage', 'tab', 'popview', 'excelIn'].includes(_opentype)) {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
} else if (card.sqlType === 'insert') {
- item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+ item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
} else {
item.options = this.state.requireOptions
}
@@ -144,9 +160,9 @@
})
}
- getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot) => {
+ getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, _control) => {
let _options = actionTypeOptions[_opentype] ? fromJS(actionTypeOptions[_opentype]).toJS() : [] // 閫夐」鍒楄〃
-
+
if (_opentype === 'innerpage') { // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
if (_pageTemplate === 'custom') {
_options.push('url', 'joint')
@@ -177,6 +193,12 @@
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
_options.push('execSuccess', 'execError')
+ } else if (_funcType === 'closetab') {
+ _options.push('refreshTab')
+ } else if (_funcType === 'scan') {
+ _options.push('linkmenu')
+ } else if (_funcType === 'goBack') {
+ _options.push('reload')
}
} else if (_opentype !== 'popview' && _opentype !== 'tab') {
if (_intertype === 'custom') {
@@ -197,11 +219,8 @@
}
if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
- if (this.state.appType === 'mob') {
- if (_opentype !== 'funcbutton') {
- _options.push('controlField', 'controlVal')
- }
- } else {
+ _options.push('control')
+ if (_control) {
_options.push('controlField', 'controlVal')
}
}
@@ -219,7 +238,7 @@
try {
let _form = document.getElementById('label')
_form && _form.select()
- } catch {
+ } catch (e) {
console.warn('琛ㄥ崟focus澶辫触锛�')
}
}
@@ -233,10 +252,10 @@
*/
optionChange = (key, value) => {
const { card, type } = this.props
- const { openType, procMode, Ot, pageTemplate } = this.state
+ const { openType, procMode, Ot, pageTemplate, control } = this.state
if (key === 'OpenType') {
- let _options = this.getOptions(value, 'system', this.state.funcType, '', 'system', Ot)
+ let _options = this.getOptions(value, 'system', this.state.funcType, '', 'system', Ot, control)
let _fieldval = {}
let _formlist = this.state.formlist.map(item => {
@@ -245,12 +264,16 @@
if (item.key === 'intertype') {
let iscustom = ['pop', 'prompt', 'exec'].includes(value)
item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
+ } else if (item.key === 'control') {
+ item.initVal = control
}
if (item.hidden) return item
if (item.key === 'intertype') {
_fieldval.intertype = 'system'
+ } else if (item.key === 'popClose' && value === 'popview') {
+ _fieldval.popClose = 'grid'
} else if (item.key === 'Ot') {
if (type === 'card') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -272,6 +295,14 @@
_fieldval.sqlType = ''
} else if (item.key === 'pageTemplate') {
item.initVal = ''
+ } else if (item.key === 'linkmenu') {
+ if (value === 'funcbutton' && this.state.funcType === 'scan') {
+ item.required = false
+ item.tooltip = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
+ } else {
+ item.tooltip = ''
+ item.required = true
+ }
}
return item
@@ -295,10 +326,17 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'funcType') {
- let _options = this.getOptions(openType, this.state.interType, value, pageTemplate, procMode, Ot)
+ let _options = this.getOptions(openType, this.state.interType, value, pageTemplate, procMode, Ot, control)
let _fieldval = {}
+ if (value === 'print') {
+ _fieldval.label = '鎵撳嵃'
+ } else if (value === 'closetab') {
+ _fieldval.label = '鍏抽棴'
+ }
+
this.setState({
+ funcType: value,
formlist: this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
@@ -312,6 +350,14 @@
} else {
item.options = this.state.requireOptions
}
+ } else if (item.key === 'linkmenu') {
+ if (value === 'scan') {
+ item.required = false
+ item.tooltip = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
+ } else {
+ item.tooltip = ''
+ item.required = true
+ }
}
return item
@@ -324,9 +370,13 @@
this.setState({
formlist: this.state.formlist.map(item => {
if (item.key === 'Ot' && type === 'card') {
- item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ if (value === 'insert') {
+ item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
+ } else {
+ item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ }
} else if (item.key === 'Ot' && value === 'insert') {
- item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+ item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
} else if (item.key === 'Ot') {
item.options = this.state.requireOptions
}
@@ -343,7 +393,7 @@
_fieldval.Ot = 'requiredSgl'
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
- _fieldval.class = 'purple'
+ _fieldval.class = 'primary'
_fieldval.Ot = 'requiredSgl'
} else if (value === 'LogicDelete' || value === 'delete') {
_fieldval.label = '鍒犻櫎'
@@ -359,7 +409,7 @@
})
} else if (key === 'pageTemplate') {
let _fieldval = {}
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, value, procMode, Ot)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, value, procMode, Ot, control)
this.setState({
pageTemplate: value,
@@ -383,7 +433,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'intertype') {
- let _options = this.getOptions(openType, value, this.state.funcType, pageTemplate, procMode, Ot)
+ let _options = this.getOptions(openType, value, this.state.funcType, pageTemplate, procMode, Ot, control)
this.setState({
interType: value,
@@ -405,7 +455,7 @@
})
})
} else if (key === 'procMode') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, value, Ot)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, value, Ot, control)
this.setState({
procMode: value,
@@ -419,10 +469,20 @@
})
})
} else if (key === 'Ot') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, value)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, value, control)
this.setState({
Ot: value,
+ formlist: this.state.formlist.map(item => {
+ item.hidden = !_options.includes(item.key)
+ return item
+ })
+ })
+ } else if (key === 'control') {
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, Ot, value)
+
+ this.setState({
+ control: value,
formlist: this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
return item
@@ -493,7 +553,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -523,7 +583,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -544,7 +604,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -579,7 +639,7 @@
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -621,10 +681,15 @@
</Form.Item>
</Col>
)
- } else if (item.type === 'cascader') { // 澶氶��
+ } else if (item.type === 'cascader') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
{getFieldDecorator(item.key, {
initialValue: item.initVal || [],
rules: [
@@ -634,7 +699,7 @@
}
]
})(
- <Cascader options={item.options || []} placeholder=""/>
+ <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
)}
</Form.Item>
</Col>
@@ -653,18 +718,6 @@
]
})(
<MkIcon allowClear/>
- )}
- </Form.Item>
- </Col>
- )
- } else if (item.type === 'mcascader') {
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.label}>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal
- })(
- <Cascader options={item.options} expandTrigger="hover" placeholder="" />
)}
</Form.Item>
</Col>
@@ -713,6 +766,46 @@
values.verify.invalid = 'true'
}
}
+ } else if (values.OpenType === 'tab' && values.linkmenu) {
+ if (sessionStorage.getItem('thdMenuList')) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = values.linkmenu[values.linkmenu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ values.MenuID = id
+ values.MenuName = item.MenuName
+ values.MenuNo = item.MenuNo
+ values.tabType = item.type
+ }
+ })
+ }
+ }
+
+ if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
+ let list = null
+ try {
+ list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+ } catch (e) {
+ list = []
+ }
+
+ let id = values.openmenu[values.openmenu.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ values.MenuID = id
+ values.MenuName = item.MenuName
+ values.MenuNo = item.MenuNo
+ values.tabType = item.type
+ }
+ })
}
resolve(values)
--
Gitblit v1.8.0