From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/tabviews/custom/components/table/base-table/index.jsx | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 80579fb..9658a04 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -200,7 +200,7 @@
})
}
if (setting.controlField) {
- if (setting.controlVal.includes(item[setting.controlField])) {
+ if (setting.controlVal.includes(item[setting.controlField] + '')) {
item.$disabled = true
}
}
@@ -396,26 +396,13 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { setting } = this.state
-
- if (setting.onload === 'false') {
- this.setState({
- pageIndex: 1,
- search: searches,
- setting: {...setting, onload: 'true'}
- }, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
- })
- } else {
- this.setState({
- pageIndex: 1,
- search: searches
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
- })
- }
+ this.setState({
+ pageIndex: 1,
+ search: searches
+ }, () => {
+ this.loadmaindata(true, 'true')
+ this.getStatFieldsValue()
+ })
}
/**
--
Gitblit v1.8.0