From cf903a5b0095d11609864e470723aaa11c4dc17f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 五月 2023 15:47:49 +0800
Subject: [PATCH] 2023-05-29
---
src/tabviews/custom/popview/index.jsx | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 6dccc71..c426ea7 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -323,7 +323,7 @@
cell = this.resetButton(item, cell, Tab)
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'
@@ -372,7 +372,7 @@
cell = this.resetButton(item, cell, Tab)
- 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'
@@ -407,6 +407,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 => {
@@ -423,7 +431,7 @@
cell = this.resetButton(item, cell, Tab)
- 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'
@@ -444,7 +452,7 @@
cell = this.resetButton(item, cell, Tab)
- 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'
@@ -471,7 +479,7 @@
cell = this.resetButton(item, cell, Tab)
- 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'
@@ -496,9 +504,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