From 27d6ff04382d95f360e4dc18769a9bd36dfca4b4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 六月 2024 15:08:16 +0800
Subject: [PATCH] 2024-06-03
---
src/menu/components/search/main-search/index.jsx | 2
src/menu/components/table/edit-table/options.jsx | 12 ++++++
src/menu/components/table/normal-table/options.jsx | 13 ++++++
src/tabviews/zshare/topSearch/index.scss | 5 ++
src/tabviews/zshare/topSearch/index.jsx | 3 +
src/menu/components/table/base-table/options.jsx | 12 ++++++
src/menu/components/search/main-search/index.scss | 11 +++++
src/menu/components/search/main-search/options.jsx | 12 ++++++
src/templates/sharecomponent/searchcomponent/index.scss | 10 +++++
src/templates/sharecomponent/searchcomponent/index.jsx | 7 +++
10 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index 270358a..07a0c93 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -381,7 +381,7 @@
let _style = resetStyle(card.style)
return (
- <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
+ <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-size-${card.wrap.searchSize || ''}`} onClick={this.clickComponent} id={card.uuid} style={_style}>
<FieldsComponent config={card} type="search" />
<Switch checkedChildren="寮�" size="small" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
diff --git a/src/menu/components/search/main-search/index.scss b/src/menu/components/search/main-search/index.scss
index 656580b..87b0e05 100644
--- a/src/menu/components/search/main-search/index.scss
+++ b/src/menu/components/search/main-search/index.scss
@@ -153,6 +153,17 @@
}
}
+.main-search-edit-list.mk-size-small {
+ .page-card {
+ height: 45px;
+ }
+ .mk-search-item-wrap.action {
+ .ant-form-item {
+ height: 45px!important;
+ }
+ }
+}
+
.main-search-edit-list:not(.show-field) {
.ant-form-explain {
display: none;
diff --git a/src/menu/components/search/main-search/options.jsx b/src/menu/components/search/main-search/options.jsx
index 2ed6c06..32f04b1 100644
--- a/src/menu/components/search/main-search/options.jsx
+++ b/src/menu/components/search/main-search/options.jsx
@@ -160,6 +160,18 @@
},
{
type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储闂磋窛',
+ initval: wrap.searchSize || 'middle',
+ tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ required: false,
+ options: [
+ {value: 'middle', label: '榛樿'},
+ {value: 'small', label: '灏�'},
+ ],
+ },
+ {
+ type: 'radio',
field: 'cacheSearch',
label: '鎼滅储缂撳瓨',
initval: wrap.cacheSearch || 'false',
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 288cd00..580a664 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -76,6 +76,18 @@
{value: 'mini', label: '杩蜂綘'},
]
},
+ {
+ type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储闂磋窛',
+ initval: wrap.searchSize || 'middle',
+ tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ required: false,
+ options: [
+ {value: 'middle', label: '榛樿'},
+ {value: 'small', label: '灏�'},
+ ],
+ },
// {
// type: 'radio',
// field: 'selected',
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 78c1a63..31c5cc7 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -130,6 +130,18 @@
},
{
type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储闂磋窛',
+ initval: wrap.searchSize || 'middle',
+ tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ required: false,
+ options: [
+ {value: 'middle', label: '榛樿'},
+ {value: 'small', label: '灏�'},
+ ],
+ },
+ {
+ type: 'radio',
field: 'parity',
label: '濂囧伓寮傝壊',
initval: wrap.parity || 'false',
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index 22662e1..7a8cd0c 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -161,6 +161,19 @@
},
{
type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储闂磋窛',
+ initval: wrap.searchSize || 'middle',
+ tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ required: false,
+ options: [
+ {value: 'middle', label: '榛樿'},
+ {value: 'small', label: '灏�'},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'radio',
field: 'mode',
label: '妯″紡',
initval: wrap.mode || 'default',
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 0e1c29d..47f13bc 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -67,6 +67,7 @@
_setting.wrapperCol = {style: {width: (100 - _setting.labelwidth) + '%'}}
_setting.borderRadius = config.wrap.borderRadius
_setting.resetContrl = config.wrap.resetContrl || 'init'
+ _setting.size = config.wrap.searchSize || ''
if (config.wrap.searchBtn === 'show') {
_setting.showBtn = true
@@ -1124,7 +1125,7 @@
return (
<>
- <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float}`} style={setting.style}>
+ <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float} mk-size-${setting.size}`} style={setting.style}>
<Row gutter={24}>{this.getFields()}</Row>
{advanceValues.length && (setting.advanceType !== 'pulldown' || (setting.advanceType === 'pulldown' && !visible)) ? <Row gutter={24}>
<div className="advanced-list">
diff --git a/src/tabviews/zshare/topSearch/index.scss b/src/tabviews/zshare/topSearch/index.scss
index bf4590a..021510b 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -132,6 +132,11 @@
text-align: right;
}
}
+.mk-search-wrap.mk-size-small {
+ .ant-form-item, .search-button {
+ min-height: 45px;
+ }
+}
.mk-search-drawer {
.ant-drawer-wrapper-body {
position: relative;
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index 6380283..4a0973a 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -330,8 +330,13 @@
const { config } = this.props
const { searchlist, visible, sqlVerifing, card, showField, setVisible } = this.state
+ let size = ''
+ if (config.wrap && config.wrap.searchSize) {
+ size = ' mk-size-' + config.wrap.searchSize
+ }
+
return (
- <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '')}>
+ <div className={'model-table-search-list length' + searchlist.length + (showField ? ' show-field' : '') + size}>
<FieldsComponent config={{uuid: config.uuid, search: searchlist}} type="search" />
<Switch className="switch-field-show" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={showField} onChange={this.onFieldChange} />
<DragElement
diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index b82e0a3..b156cdb 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -141,4 +141,14 @@
display: block;
}
}
+}
+.model-table-search-list.mk-size-small {
+ .page-card {
+ height: 45px;
+ }
+ .mk-search-item-wrap.action {
+ .ant-form-item {
+ height: 45px!important;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0