From d5ce81026882ada34e5d49411be7c90ee96cc102 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:20:11 +0800
Subject: [PATCH] 2023-01-17
---
src/tabviews/zshare/mutilform/index.jsx | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 1f25c6c..e69e00d 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -301,7 +301,7 @@
})
} else if (item.regular === 'email') {
_rules.push({
- pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
+ pattern: /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
message: item.regularText || '璇锋纭緭鍏ラ偖绠卞湴鍧�'
})
}
@@ -715,6 +715,7 @@
if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
let options = []
let map = new Map()
+ let all = false
result[item.field].forEach(cell => {
let _cell = { key: Utils.getuuid() , ParentID: ''}
@@ -725,13 +726,27 @@
if (item.type !== 'checkcard') {
_cell.value = cell[item.valueField]
_cell.label = cell[item.valueText] + ''
- if (!_cell.label || map.has(_cell.ParentID + _cell.value)) return
+ if (map.has(_cell.ParentID + _cell.value)) return
+ if (!_cell.label) {
+ if (!all) {
+ _cell.label = '鍏ㄩ儴'
+ all = true
+ } else {
+ return
+ }
+ }
map.set(_cell.ParentID + _cell.value, 0)
} else {
_cell.$value = cell[item.cardValField]
_cell = {..._cell, ...cell}
+ if (item.urlField) {
+ _cell.$url = cell[item.urlField] || ''
+ } else if (item.colorField) {
+ _cell.$color = cell[item.colorField] || ''
+ }
+
if (map.has(_cell.ParentID + _cell.$value)) return
map.set(_cell.ParentID + _cell.$value, 0)
--
Gitblit v1.8.0