From e052b254ed09e05a65396ee3b67201bcf5b0694e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 23:22:16 +0800
Subject: [PATCH] 2022-06-18
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 1 +
src/menu/components/share/actioncomponent/actionform/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 2 +-
src/menu/components/form/formaction/actionform/index.jsx | 2 +-
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 7 ++++++-
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index f0fbb8e..2e2b905 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -520,7 +520,12 @@
}
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index ea3a280..8635568 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -97,6 +97,7 @@
type: 'file',
key: 'url',
label: '鍥剧墖/鏂囦欢',
+ tooltip: '浣跨敤闈欐�佸浘鐗囨椂锛孈icon@浠ｈ〃澶村儚銆�',
initVal: card.url || '',
maxfile: 1,
required: true
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index e0a8cdd..a49f945 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -189,7 +189,7 @@
} else if (item.key === 'output') {
if (interType === 'system') {
_rules = [{
- pattern: /^@[0-9a-zA-Z_]*$/,
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
}, {
max: 100,
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 4dfb893..8a076cb 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -684,7 +684,7 @@
} else if (item.key === 'output') {
if (this.record.intertype === 'system') {
rules = [{
- pattern: /^@[0-9a-zA-Z_]*$/,
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
}, {
max: 100,
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index d410970..c7167db 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -526,7 +526,7 @@
} else if (item.key === 'output') {
if (this.record.intertype === 'system') {
rules = [{
- pattern: /^@[0-9a-zA-Z_]*$/,
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
}, {
max: 100,
--
Gitblit v1.8.0