From c29a1e1c8278a25b83b6158c2d426aa26c427569 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 16:18:30 +0800
Subject: [PATCH] 2021-09-01
---
src/tabviews/custom/index.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 11d0459..572dc3e 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -812,13 +812,13 @@
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
- tab.components = this.formatSetting(tab.components, [], [], inherit, regs, balMap)
+ tab.components = this.formatSetting(tab.components, null, null, inherit, regs, balMap)
tab = {...tab, ...inherit}
return tab
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, [], [], inherit, regs, balMap)
+ component.components = this.formatSetting(component.components, null, null, inherit, regs, balMap)
component = {...component, ...inherit}
return component
}
@@ -882,7 +882,7 @@
// floor 缁勪欢鐨勫眰绾�
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
- if (component.floor === 1 && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
+ if (params && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
let searchlist = []
if (component.search && component.search.length > 0) {
searchlist = Utils.initMainSearch(component.search)
@@ -900,7 +900,7 @@
component.setting.sync = 'false'
component.setting.onload = 'false'
} else {
- params.push(getStructDefaultParam(component, searchlist))
+ params.push(getStructDefaultParam(component, searchlist, params.length === 0))
}
} else if (component.floor === 1) {
component.setting.sync = 'false'
--
Gitblit v1.8.0