From 2292d1826e69e21c8a411c217faef635fe57d458 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 10:48:49 +0800
Subject: [PATCH] Merge branch 'bms' of ssh://39.106.218.81:29418/~jinfei/pc-plat into bms
---
src/views/menudesign/index.jsx | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index dd9c02a..908789a 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -38,6 +38,7 @@
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
sessionStorage.setItem('isEditState', 'true')
+document.body.className = ''
class MenuDesign extends Component {
state = {
@@ -216,8 +217,8 @@
config.parentId = 'BillPrintTemp'
config.MenuName = MenuName
config.MenuNo = MenuNo
- config.firstCount = config.firstCount || 5
- config.everyPCount = config.everyPCount || 5
+ config.firstCount = config.firstCount || 15
+ config.everyPCount = config.everyPCount || 15
config.lastCount = config.lastCount || ''
}
@@ -249,6 +250,8 @@
item.subtabs.forEach(tab => {
traversal(tab.components)
})
+ } else if (item.type === 'group') {
+ traversal(item.components)
} else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
item.action && item.action.forEach(btn => {
buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
@@ -301,6 +304,8 @@
item.subtabs.forEach(tab => {
tab.components = this.filterConfig(tab.components)
})
+ } else if (item.type === 'group') {
+ item.components = this.filterConfig(item.components)
} else if (item.type === 'table' && item.subtype === 'normaltable') {
item.search = item.search.filter(a => !a.origin)
item.action = item.action.filter(a => !a.origin)
--
Gitblit v1.8.0