From 7bba7b209c0637d7afff05953a4b0563db0e9bdc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 15 六月 2023 14:25:57 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/calendar/index.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 7dec056..7ed4d3f 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -37,7 +37,6 @@
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
- searchlist: null, // 鎼滅储鏉′欢
arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: null, // 鍒楄〃鏁版嵁闆�
@@ -190,6 +189,18 @@
config.setting.customScript = _customScript
}
+ config.type = 'table'
+ config.wrap = {
+ show: config.setting.show || '',
+ float: config.setting.float || '',
+ advanceType: config.setting.advanceType || '',
+ advanceWidth: config.setting.advanceWidth || '',
+ drawerPlacement: config.setting.drawerPlacement || '',
+ searchRatio: config.setting.searchRatio || '',
+ searchLwidth: config.setting.searchLwidth,
+ borderRadius: config.setting.borderRadius,
+ }
+
this.setState({
hasReqFields,
BID: param && param.$BID ? param.$BID : '',
@@ -197,7 +208,6 @@
config: config,
userConfig: userConfig,
setting: config.setting,
- searchlist: config.search,
arr_field: config.columns.map(item => item.field).join(','),
search: Utils.initMainSearch(config.search)
}, () => {
@@ -543,13 +553,13 @@
}
render() {
- const { BID, setting, searchlist, loadingview, viewlost, config, loading, data, triggerTime } = this.state
+ const { BID, loadingview, viewlost, config, loading, data, triggerTime } = this.state
return (
<div className="calendar-page">
{loadingview && <Spin size="large" />}
- {searchlist && searchlist.length > 0 ?
- <MainSearch BID={BID} searchlist={searchlist} setting={setting} refreshdata={this.refreshbysearch}/> : null
+ {config.search && config.search.length > 0 ?
+ <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
{config && config.calendar ? <CalendarComponent calendar={config.calendar} loading={loading} data={data} triggerDate={this.triggerDate} changeDate={this.changeDate}/> : null}
{!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
--
Gitblit v1.8.0