From 2a3629979d1bc6d0a6c90e481ac93eabd2bfefd1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 六月 2023 10:45:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/index.jsx | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index f10ec65..42725b3 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
@@ -501,7 +501,7 @@
cell.$toolbtn = true
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
+ if (!mutil && cell.syncComponentId && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
cell.execSuccess = 'mainline'
@@ -554,7 +554,7 @@
cell = this.resetButton(item, cell, popview)
- if (cell.syncComponentId === item.setting.supModule) {
+ if (cell.syncComponentId && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
cell.execSuccess = 'mainline'
@@ -594,6 +594,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,7 +618,7 @@
cell = this.resetButton(item, cell, popview)
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
+ if (!mutil && cell.syncComponentId && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
cell.execSuccess = 'mainline'
@@ -635,7 +643,7 @@
cell = this.resetButton(item, cell, popview)
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
+ if (!mutil && cell.syncComponentId && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
cell.execSuccess = 'mainline'
@@ -666,7 +674,7 @@
cell = this.resetButton(item, cell, popview)
- if (cell.syncComponentId === item.wrap.supModule) {
+ if (cell.syncComponentId && cell.syncComponentId === item.wrap.supModule) {
cell.syncComponentId = ''
if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
cell.execSuccess = 'mainline'
@@ -696,9 +704,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'
--
Gitblit v1.8.0