From 11b6387d74467f81e33eba8f882bff610f240115 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 九月 2023 20:01:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/index.jsx | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx
index 26b3808..eda176e 100644
--- a/src/menu/datasource/index.jsx
+++ b/src/menu/datasource/index.jsx
@@ -20,14 +20,7 @@
mainSearch: [],
visible: false,
loading: false,
- setting: null,
record: {}
- }
-
- UNSAFE_componentWillMount () {
- const { config } = this.props
-
- this.setState({setting: fromJS(config.setting).toJS()})
}
shouldComponentUpdate (nextProps, nextState) {
@@ -227,6 +220,13 @@
}
this.setState({loading: false, visible: false})
+
+ if (res.cols) {
+ res.cols = [...config.cols, ...res.cols]
+ } else {
+ delete res.cols
+ }
+
this.props.updateConfig({...config, ...res})
}, () => {
this.setState({loading: false})
--
Gitblit v1.8.0