From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-custom.js | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 8f7fa33..b95c0eb 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -728,7 +728,7 @@
* @description 閲嶇疆缁勪欢閰嶇疆
* @return {String} item 缁勪欢淇℃伅
*/
- static resetComponentConfig = (item, appType) => {
+ static resetComponentConfig = (item, appType, commonId) => {
if (item.type === 'navbar') {
return item
}
@@ -736,9 +736,6 @@
if (item.subtype === 'tablecard') { // 鍏煎
item.type = 'card'
}
-
- item.uuid = this.getuuid()
- let commonId = this.getuuid()
// 閲嶇疆缁勪欢鍚嶇О
let sign = this.getSignName()
@@ -961,20 +958,6 @@
cell.uuid = this.getuuid()
return cell
})
- }
-
- if (item.setting && item.setting.supModule && item.setting.supModule[0] !== 'empty') {
- item.setting.supModule = ''
- }
-
- if (item.wrap && item.wrap.supType === 'multi') {
- item.wrap.supType = 'single'
-
- delete item.supNodes
- }
-
- if (item.wrap && item.wrap.supModule) {
- item.wrap.supModule = ''
}
if (item.wrap && item.wrap.doubleClick) {
@@ -1665,6 +1648,14 @@
}
}
}
+
+ if (['pop', 'prompt', 'exec'].includes(cell.OpenType) && cell.verify && !cell.output) {
+ if (cell.verify.noteEnable === 'true') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (cell.verify.emailEnable === 'true') {
+ errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
}
if (card.$c_ac) {
--
Gitblit v1.8.0