From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 25 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 3ae1f86..7dea9d8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -12,18 +12,19 @@
const { TextArea } = Input
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
+const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden', 'preButton'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden', 'preButton'],
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'formCache'],
excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden', 'openTab'],
innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
- form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
+ form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'openmenu', 'refreshTab', 'title', 'hidden']
}
class ActionForm extends Component {
@@ -160,7 +161,7 @@
let reRequired = {}
let reReadonly = {}
- if (openType === 'pop' || openType === 'prompt' || openType === 'exec') {
+ if (['pop', 'prompt', 'exec'].includes(openType)) {
let intertype = this.record.intertype
reOptions.intertype = this.state.interTypeOptions
@@ -406,7 +407,7 @@
shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
- reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'requiredOnce'].includes(op.value))
reRequired.linkmenu = true
reTooltip.linkmenu = ''
@@ -425,7 +426,10 @@
reRequired.linkmenu = true
reTooltip.linkmenu = ''
} else if (this.record.pageTemplate === 'billprint') {
- shows.push('printTemp')
+ shows.push('printTemp', 'preHandle')
+ if (this.record.preHandle === 'true') {
+ shows.push('pre_func')
+ }
reOptions.Ot = requireOptions
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
@@ -505,6 +509,10 @@
} else if (_funcType === 'refund') {
shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ } else if (_funcType === 'shareLink') {
+ shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ // } else if (_funcType === 'expPdf') {
+ // shows.push('exportType')
}
}
@@ -523,7 +531,7 @@
shows.push('reason')
}
}
- } else {
+ } else if (openType !== 'funcbutton' || !['expPdf', 'shareLink'].includes(this.record.funcType)) {
if (openType !== 'excelOut') {
reOptions.control = [
{ value: '', text: '鏃�' },
@@ -559,6 +567,9 @@
reRequired.icon = true
} else {
reRequired.icon = false
+ if (['pop', 'prompt', 'exec', 'popview', 'tab', 'innerpage'].includes(openType)) {
+ shows.push('showName')
+ }
}
return {
@@ -780,7 +791,7 @@
let className = ''
let content = null
let initVal = item.initVal || ''
- let help = item.help || ''
+ let help = item.help || null
if (item.type === 'splitLine') {
fields.push(
@@ -911,7 +922,7 @@
rules = [
{ required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
]
- content = (<MKTable tip={''} columns={item.columns || []} actions={[]}/>)
+ content = (<MKTable columns={item.columns || []} actions={item.actions}/>)
} else if (item.type === 'icon') {
rules = [
{ required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
@@ -947,27 +958,53 @@
]
content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
+ } else if (item.type === 'codemirror') {
+ span = 24
+ className = 'codemirror'
+ rules = [
+ { required: item.readonly ? false : item.required, message: '璇疯緭鍏�' + item.label + '!' }
+ ]
+
+ content = <CodeMirror mode="text/javascript"/>
}
if (help && typeof(help) === 'function') {
help = help(this.record)
}
- fields.push(
- <Col span={span} key={index}>
- <Form.Item className={className} help={help} label={item.tooltip ?
- <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: initVal,
- rules: rules
- })(content)}
- </Form.Item>
- </Col>
- )
+ if (help) {
+ fields.push(
+ <Col span={span} key={index}>
+ <Form.Item className={className} help={help} label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: initVal,
+ rules: rules
+ })(content)}
+ </Form.Item>
+ </Col>
+ )
+ } else {
+ fields.push(
+ <Col span={span} key={index}>
+ <Form.Item className={className} label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: initVal,
+ rules: rules
+ })(content)}
+ </Form.Item>
+ </Col>
+ )
+ }
})
return fields
@@ -1083,6 +1120,8 @@
}
})
}
+ } else if (values.OpenType === 'funcbutton' && values.funcType === 'expPdf') {
+ values.Ot = 'notRequired'
}
if (values.outerBlacklist) {
--
Gitblit v1.8.0