From 4d6b9f8a2d7b316633e43b489eae9ada949c07b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 九月 2024 10:18:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index d8cc4d1..c2871bb 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -234,8 +234,11 @@
if (this.record.selectStyle === 'custom') {
shows.push('backgroundColor')
}
- if (this.record.multiple === 'dropdown' && this.record.resourceType === '1') {
- shows.push('mark', 'parentField')
+ if (this.record.multiple === 'dropdown') {
+ shows.push('mark')
+ if (this.record.resourceType === '1') {
+ shows.push('parentField')
+ }
}
}
shows.push('linkField')
@@ -280,7 +283,7 @@
} else if (type === 'dateweek' || type === 'daterange' || type === 'range') {
reOptions.match = matchReg.class5
} else if (type === 'checkcard') {
- if (this.record.multiple === 'false') {
+ if (this.record.multiple === 'false' || this.record.multiple === 'dropdown') {
reOptions.match = matchReg.class1
} else if (this.record.multiple === 'true') {
reOptions.match = matchReg.class3
@@ -689,7 +692,7 @@
fields.push(
<Col span={span} key={index}>
<Form.Item className={className} extra={extra} label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
+ <Tooltip placement="topLeft" title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
--
Gitblit v1.8.0