From f18eef383f288e453b7b6d0a34237ddf6e6620e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:50:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/topSearch/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 088db55..06cddd2 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
@@ -186,6 +186,7 @@
} else {
item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
}
+ item.oriInitval = item.initval
}
}
@@ -380,7 +381,7 @@
UNSAFE_componentWillReceiveProps(nextProps) {
const { config, BID } = this.props
- if (config.checkBid && config.type !== 'search' && nextProps.BID !== BID) {
+ if (config.$checkBid && nextProps.BID !== BID) {
this.resetOptions(nextProps.BID)
}
}
@@ -465,6 +466,7 @@
} else {
item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
}
+ item.oriInitval = item.initval
}
}
@@ -1264,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 || 'none'}`} 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">
--
Gitblit v1.8.0