From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 7838109..fbc3454 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -412,7 +412,7 @@
})
} else if (item.regular === 'phone') {
item.rules.push({
- pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+ pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\s?\d{4}\s?\d{4}$/,
message: item.regularText || dict['phone_error'] || '璇锋纭緭鍏ユ墜鏈哄彿'
})
} else if (item.regular === 'email') {
@@ -1559,10 +1559,10 @@
} else if (item.declare === 'decimal') {
_item.type = 'number'
_item.fieldlen = item.decimal || 0
- } else if (['text', 'textarea', 'linkMain'].includes(item.type)) {
+ } else if (['text', 'textarea', 'linkMain', 'brafteditor'].includes(item.type)) {
_item.value = _item.value + ''
_item.value = _item.value.replace(/\t+|\v+/g, '') // 鍘婚櫎鍒惰〃绗�
-
+
if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
if (item.interception === 'func') {
try {
@@ -1592,14 +1592,19 @@
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
}
- if (item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
- _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
- }
- if (item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
- if (item.lenControl === 'left') {
- _item.value = _item.value.substr(0, item.fieldlength)
- } else {
- _item.value = _item.value.slice(-item.fieldlength)
+ if (item.type === 'text') {
+ if (/@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
+ _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
+ }
+ if (item.lenControl && item.lenControl !== 'limit') {
+ if (item.lenControl === 'left') {
+ _item.value = _item.value.substr(0, item.fieldlength)
+ } else {
+ _item.value = _item.value.slice(-item.fieldlength)
+ }
+ }
+ if (item.regular === 'phone') {
+ _item.value = _item.value.replace(/\s+/g, '')
}
}
} else if (item.type === 'datemonth') {
--
Gitblit v1.8.0