From 3e13e3e61854671fce6aac45679e1b7252126105 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:41:01 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 3c8a93c..63d4fe6 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -780,6 +780,7 @@
let className = ''
let content = null
let initVal = item.initVal || ''
+ let help = item.help || ''
if (item.type === 'splitLine') {
fields.push(
@@ -857,6 +858,7 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
+ on
getPopupContainer={() => document.getElementById('winter')}
>
{item.options.map((option, index) =>
@@ -909,7 +911,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 + '!' }
@@ -936,7 +938,7 @@
{ required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
- content = <MkPrintTemps />
+ content = <MkPrintTemps onChange={(value) => {this.optionChange(item.key, value)}}/>
} else if (item.type === 'keyinterface') {
span = 24
className = 'textarea'
@@ -947,9 +949,13 @@
content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
}
+ if (help && typeof(help) === 'function') {
+ help = help(this.record)
+ }
+
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} help={item.help} label={item.tooltip ?
+ <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}
--
Gitblit v1.8.0