From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/topSearch/index.jsx | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 0e1c29d..f169891 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
@@ -729,7 +730,7 @@
const _rules = [
{
required: item.required,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (window.GLOB.dict['not_empty'] || '涓嶅彲涓虹┖锛�')
}
]
@@ -790,13 +791,13 @@
wrapperCol={setting.wrapperCol}
>
{setting.show ? <Button style={style} type="primary" onClick={this.handleSubmit}>
- 鎼滅储
+ {window.GLOB.dict['search'] || '鎼滅储'}
</Button> : null}
{setting.show ? <Button style={{ marginLeft: 8, ...style }} onClick={this.handleReset}>
- 閲嶇疆
+ {window.GLOB.dict['reset'] || '閲嶇疆'}
</Button> : null}
{setting.showAdv ? <Button className={visible ? 'visible' : ''} type="link" onClick={this.handleAdvance}>
- 楂樼骇{setting.advanceType === 'pulldown' ? <DownOutlined /> : null}
+ {window.GLOB.dict['senior'] || '楂樼骇'}{setting.advanceType === 'pulldown' ? <DownOutlined /> : null}
</Button> : null}
</Form.Item>
</Col>
@@ -806,7 +807,7 @@
<Col className="mk-search-col search-button" key="actions">
<Form.Item>
<Button type="primary" onClick={this.handleSubmit}>
- 鎼滅储
+ {window.GLOB.dict['search'] || '鎼滅储'}
</Button>
</Form.Item>
</Col>
@@ -892,7 +893,7 @@
notification.warning({
top: 92,
- message: '璇疯緭鍏�' + labels.join('銆�') + ' !',
+ message: (window.GLOB.dict['input_tip'] || '璇疯緭鍏�') + labels.join('銆�') + ' !',
duration: 3
})
return
@@ -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">
@@ -1140,7 +1141,7 @@
</Row> : null}
</Form>
{setting.advanceType === 'modal' ? <Modal
- title="楂樼骇鎼滅储"
+ title={window.GLOB.dict['adv_search'] || '楂樼骇鎼滅储'}
maskClosable={false}
visible={visible}
width={setting.advWidth}
@@ -1156,7 +1157,7 @@
/>
</Modal> : null}
{setting.advanceType === 'drawer' ? <Drawer
- title="楂樼骇鎼滅储"
+ title={window.GLOB.dict['adv_search'] || '楂樼骇鎼滅储'}
className="mk-search-drawer"
width={setting.advWidth}
height={setting.advHeight}
--
Gitblit v1.8.0