From d712ae0a0d338bdc96c463c9ffe42f8c844f3c37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 12:46:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/popview/index.jsx | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index a3eb065..a3970b8 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -385,6 +385,9 @@
if (!mutil && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
}
if (cell.btnstyle) { // 鍏煎
@@ -417,6 +420,9 @@
if (!mutil && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
}
if (card.btnstyle) { // 鍏煎
card.style = card.style || {}
@@ -451,6 +457,9 @@
if (!mutil && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
}
if (card.btnstyle) { // 鍏煎
@@ -491,6 +500,9 @@
if (cell.syncComponentId === item.wrap.supModule) {
cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
}
} else if (['text', 'number', 'formula'].includes(cell.eleType)) {
if (!cell.height) {
@@ -520,6 +532,9 @@
if (cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
}
if (cell.btnstyle) { // 鍏煎
@@ -553,6 +568,9 @@
if (group.subButton.syncComponentId === item.setting.supModule) {
group.subButton.syncComponentId = ''
+ if (group.subButton.execSuccess === 'grid') {
+ group.subButton.execSuccess = 'mainline'
+ }
}
group.fields = group.fields.map(cell => {
@@ -713,7 +731,7 @@
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
if (component.setting.sync === 'true') {
- component.dataName = Utils.getdataName()
+ component.dataName = 'mk' + component.uuid.slice(-18)
}
// floor 缁勪欢鐨勫眰绾�
--
Gitblit v1.8.0