From c8804ceb1fe2dea76f9949c5ea04423876ee2c81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 六月 2024 14:02:47 +0800
Subject: [PATCH] 2024-06-28
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 52ac1b9..f093777 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')
@@ -595,16 +598,18 @@
{ required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
span = 24
- className = 'text-area'
if (this.record.type === 'select' || this.record.type === 'link') {
extra = <span className="add-resource-empty" onClick={this.handleEmpty}>鍏ㄩ儴</span>
+ }
+ if (item.placeholder) {
+ className = 'show-public-var'
+ extra = <><span className="resource-public-var">{item.placeholder}</span>{extra}</>
}
content = <CodeMirror />
} else if (item.type === 'options') {
span = 24
- className = 'text-area'
let type = this.record.type
@@ -651,7 +656,6 @@
}
} else if (item.type === 'fields') {
span = 24
- className = 'text-area'
rules = [
{ required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
@@ -664,7 +668,7 @@
]
content = <Checkbox.Group style={{width: '105%'}} options={item.options} onChange={(values) => this.optionChange(item.key, values)}/>
- } else if (item.type === 'multiselect') { // 澶氶��
+ } else if (item.type === 'multiselect') {
content = <Select
showSearch
mode="multiple"
@@ -674,8 +678,8 @@
<Select.Option id={i} key={i} value={option.value}>{option.text}</Select.Option>
)}
</Select>
- } else if (item.type === 'cascader') { // 澶氶��
- content = <Cascader options={item.options} placeholder="" />
+ } else if (item.type === 'cascader') {
+ content = <Cascader options={item.options} />
} else if (item.type === 'color') {
className = 'color-form-item'
rules = [
@@ -688,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