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/index.jsx | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index f10ec65..3c6b9b3 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -153,7 +153,7 @@
// 鏁版嵁缂撳瓨璁剧疆
if (config.cacheUseful === 'true') {
- if (!['day', 'hour'].includes(config.timeUnit)) {
+ if (!['day', 'hour', 'minute'].includes(config.timeUnit)) {
config.timeUnit = 'day'
}
config.cacheTime = config.cacheTime || 1
@@ -473,9 +473,7 @@
item.search = Utils.initSearchVal(item.search)
}
- let mutil = false
if (item.wrap && item.wrap.supType === 'multi') { // 鏁版嵁鍗″涓婄骇缁勪欢
- mutil = true
item.setting.supModule = item.supNodes[0].componentId
} else if (item.setting && item.setting.supModule && typeof(item.setting.supModule) !== 'string') {
let pid = item.setting.supModule.pop()
@@ -500,13 +498,6 @@
cell = this.resetButton(item, cell, popview)
cell.$toolbtn = true
-
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -554,13 +545,6 @@
cell = this.resetButton(item, cell, popview)
- if (cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
-
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
}
@@ -594,6 +578,14 @@
if (item.subtype === 'editable') {
item.submit.logLabel = item.$menuname + '-鎻愪氦'
item.submit.$menuId = item.uuid
+ item.submit.syncComponentId = item.submit.syncComponent ? (item.submit.syncComponent.pop() || '') : ''
+
+ if (item.submit.syncComponentId && item.submit.syncComponentId === item.setting.supModule) {
+ item.submit.syncComponentId = ''
+ if (item.submit.execSuccess === 'grid') {
+ item.submit.execSuccess = 'mainline'
+ }
+ }
}
} else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.subcards && item.subcards.forEach(card => {
@@ -610,13 +602,6 @@
cell = this.resetButton(item, cell, popview)
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
-
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
}
@@ -627,6 +612,30 @@
return cell.eleType !== 'button' || pass || permAction[cell.uuid]
})
+ if (card.setting.click === 'menus') {
+ if (card.menus) {
+ card.menus = card.menus.filter(m => !!m.MenuID)
+ if (card.menus.length === 0) {
+ card.menus = null
+ }
+ }
+ if (!card.menus || item.subtype !== 'datacard' || card.$cardType === 'extendCard') {
+ card.setting.click = ''
+ }
+ } else if (card.setting.click === 'menu') {
+ if (!Array.isArray(card.setting.menu)) {
+ card.setting.click = ''
+ }
+ }
+
+ if (item.subtype === 'dualdatacard' && card.$cardType !== 'extendCard') {
+ if (card.backSetting && card.backSetting.click === 'menu') {
+ if (!Array.isArray(card.backSetting.menu)) {
+ card.backSetting.click = ''
+ }
+ }
+ }
+
if (!card.backElements || card.backElements.length === 0) return
card.backElements = card.backElements.filter(cell => {
@@ -634,13 +643,6 @@
if (cell.hidden === 'true') return false
cell = this.resetButton(item, cell, popview)
-
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -666,13 +668,6 @@
cell = this.resetButton(item, cell, popview)
- if (cell.syncComponentId === item.wrap.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
-
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
}
@@ -696,9 +691,9 @@
group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
}
- group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+ group.subButton.syncComponentId = group.subButton.syncComponent ? (group.subButton.syncComponent.pop() || '') : ''
- if (group.subButton.syncComponentId === item.setting.supModule) {
+ if (group.subButton.syncComponentId && group.subButton.syncComponentId === item.setting.supModule) {
group.subButton.syncComponentId = ''
if (group.subButton.execSuccess === 'grid') {
group.subButton.execSuccess = 'mainline'
@@ -797,6 +792,32 @@
}
}
+ if (cell.syncComponentId) {
+ if (cell.syncComponentId === item.setting.supModule) {
+ cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
+ } else if (cell.syncComponentId === 'multiComponent') {
+ let ids = cell.syncComponents.map(m => {
+ return m.syncComId.pop() || ''
+ })
+
+ if (item.setting.supModule && ids.includes(item.setting.supModule)) {
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
+ ids = ids.filter(id => id !== item.setting.supModule)
+ }
+
+ if (ids.length === 0) {
+ cell.syncComponentId = ''
+ } else {
+ cell.syncComponentIds = ids
+ }
+ }
+ }
+
return cell
}
--
Gitblit v1.8.0