From 0173a5b8b4cb7d537f5e0d71c414ed1e6e92a725 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 四月 2025 11:59:56 +0800
Subject: [PATCH] 2025-04-27
---
src/menu/components/search/main-search/index.jsx | 2
src/menu/components/table/edit-table/options.jsx | 10 +-
src/menu/components/table/normal-table/options.jsx | 10 +-
src/tabviews/zshare/topSearch/index.scss | 30 +++++++++
src/tabviews/zshare/topSearch/index.jsx | 4
src/menu/components/table/base-table/options.jsx | 10 +-
src/menu/components/search/main-search/index.scss | 25 ++++++++
src/menu/components/search/main-search/options.jsx | 10 +-
src/templates/sharecomponent/searchcomponent/index.scss | 25 ++++++++
src/templates/sharecomponent/searchcomponent/index.jsx | 2
10 files changed, 101 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index c87bbd9..281ea26 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -392,7 +392,7 @@
let _style = resetStyle(card.style)
return (
- <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}>
+ <div className={`main-search-edit-list ${card.wrap.float} ${showField ? 'show-field' : ''} mk-order-${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 b5a03a5..b7f1fe6 100644
--- a/src/menu/components/search/main-search/index.scss
+++ b/src/menu/components/search/main-search/index.scss
@@ -157,7 +157,7 @@
}
}
-.main-search-edit-list.mk-size-small {
+.main-search-edit-list.mk-order-small {
.page-card {
height: 45px;
}
@@ -167,6 +167,29 @@
}
}
}
+.main-search-edit-list.mk-order-updown {
+ .mk-search-item-wrap {
+ .page-card {
+ height: auto;
+ }
+ .ant-form-item {
+ display: block;
+ .ant-form-item-label {
+ display: block;
+ width: 100% !important;
+ text-align: left;
+ float: none;
+ line-height: 2;
+ height: 24px;
+ }
+ .ant-form-item-control-wrapper {
+ display: block;
+ width: 100% !important;
+ float: none;
+ }
+ }
+ }
+}
.main-search-edit-list:not(.show-field) {
.ant-form-explain {
diff --git a/src/menu/components/search/main-search/options.jsx b/src/menu/components/search/main-search/options.jsx
index 6d586f9..0641d23 100644
--- a/src/menu/components/search/main-search/options.jsx
+++ b/src/menu/components/search/main-search/options.jsx
@@ -163,13 +163,13 @@
{
type: 'radio',
field: 'searchSize',
- label: '鎼滅储闂磋窛',
- initval: wrap.searchSize || 'middle',
- tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
required: false,
options: [
- {value: 'middle', label: '榛樿'},
- {value: 'small', label: '灏�'},
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
],
},
{
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 281b215..f88acc1 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -79,13 +79,13 @@
{
type: 'radio',
field: 'searchSize',
- label: '鎼滅储闂磋窛',
- initval: wrap.searchSize || 'middle',
- tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
required: false,
options: [
- {value: 'middle', label: '榛樿'},
- {value: 'small', label: '灏�'},
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
],
},
{
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index c6899e7..a239a89 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -131,13 +131,13 @@
{
type: 'radio',
field: 'searchSize',
- label: '鎼滅储闂磋窛',
- initval: wrap.searchSize || 'middle',
- tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
required: false,
options: [
- {value: 'middle', label: '榛樿'},
- {value: 'small', label: '灏�'},
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
],
},
{
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index 94e0641..62fd279 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -162,13 +162,13 @@
{
type: 'radio',
field: 'searchSize',
- label: '鎼滅储闂磋窛',
- initval: wrap.searchSize || 'middle',
- tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
required: false,
options: [
- {value: 'middle', label: '榛樿'},
- {value: 'small', label: '灏�'},
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
],
forbid: appType === 'mob'
},
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 6b79f41..6a50820 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -85,7 +85,7 @@
_setting.wrapperCol = {style: {width: (100 - _setting.labelwidth) + '%'}}
_setting.borderRadius = config.wrap.borderRadius
_setting.resetContrl = config.wrap.resetContrl || 'init'
- _setting.size = config.wrap.searchSize || ''
+ _setting.order = config.wrap.searchSize || ''
if (config.wrap.searchBtn === 'show') {
_setting.showBtn = true
@@ -1266,7 +1266,7 @@
return (
<>
- <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float} mk-size-${setting.size}`} style={setting.style}>
+ <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float} mk-order-${setting.order}`} 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 021510b..7f921b2 100644
--- a/src/tabviews/zshare/topSearch/index.scss
+++ b/src/tabviews/zshare/topSearch/index.scss
@@ -132,11 +132,39 @@
text-align: right;
}
}
-.mk-search-wrap.mk-size-small {
+.mk-search-wrap.mk-order-small {
.ant-form-item, .search-button {
min-height: 45px;
}
}
+.mk-search-wrap.mk-order-updown {
+ .mk-search-col {
+ .ant-form-item {
+ display: block;
+ min-height: auto;
+ margin-bottom: 15px;
+
+ .ant-form-item-label {
+ display: block;
+ width: 100% !important;
+ text-align: left;
+ float: none;
+ line-height: 2;
+ height: 24px;
+ }
+ .ant-form-item-control-wrapper {
+ display: block;
+ width: 100% !important;
+ float: none;
+ }
+ }
+ }
+ .mk-search-col:last-child {
+ .ant-form-item {
+ margin-bottom: 20px;
+ }
+ }
+}
.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 16dcefa..5e6ae12 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -339,7 +339,7 @@
let size = ''
if (config.wrap && config.wrap.searchSize) {
- size = ' mk-size-' + config.wrap.searchSize
+ size = ' mk-order-' + config.wrap.searchSize
}
return (
diff --git a/src/templates/sharecomponent/searchcomponent/index.scss b/src/templates/sharecomponent/searchcomponent/index.scss
index b156cdb..b6f619c 100644
--- a/src/templates/sharecomponent/searchcomponent/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/index.scss
@@ -142,7 +142,7 @@
}
}
}
-.model-table-search-list.mk-size-small {
+.model-table-search-list.mk-order-small {
.page-card {
height: 45px;
}
@@ -151,4 +151,27 @@
height: 45px!important;
}
}
+}
+.model-table-search-list.mk-order-updown {
+ .mk-search-item-wrap {
+ .page-card {
+ height: auto;
+ }
+ .ant-form-item {
+ display: block;
+ .ant-form-item-label {
+ display: block;
+ width: 100% !important;
+ text-align: left;
+ float: none;
+ line-height: 2;
+ height: 24px;
+ }
+ .ant-form-item-control-wrapper {
+ display: block;
+ width: 100% !important;
+ float: none;
+ }
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0