From 0a2fcaf8a8f1cc9ff52458e7f4d2b2840028b4b3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 七月 2021 17:26:36 +0800
Subject: [PATCH] 2021-07-29
---
src/tabviews/zshare/mutilform/index.jsx | 5 +++++
src/tabviews/rolemanage/index.jsx | 6 +++---
src/templates/zshare/formconfig.jsx | 3 +++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index f334a5c..4ea00c0 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -712,12 +712,12 @@
Api.getCloudConfig(param).then(result => {
if (result.status) {
if (!result.data || result.data.length === 0) {
- this.setState({loadingAppTree: false, appTrees: []})
+ this.setState({loadingAppTree: false, appTrees: [], appInitCheckKeys: null, appCheckedKeys: [], appOpenKeys: [], selectAppTrees: [], selectAppOpenKeys: []})
} else {
this.initTrees(result.data)
}
} else {
- this.setState({loadingAppTree: false, appTrees: []})
+ this.setState({loadingAppTree: false, appTrees: [], appInitCheckKeys: null, appCheckedKeys: [], appOpenKeys: [], selectAppTrees: [], selectAppOpenKeys: []})
notification.warning({
top: 92,
message: result.message,
@@ -770,7 +770,7 @@
let expandedKeys = this.getExpandedKeys(trees, 0, [])
- this.setState({loadingAppTree: false, appTrees: trees, appOpenKeys: expandedKeys}, () => {
+ this.setState({loadingAppTree: false, appInitCheckKeys: null, appCheckedKeys: [], selectAppTrees: [], selectAppOpenKeys: [], appTrees: trees, appOpenKeys: expandedKeys}, () => {
this.getSelectAppNodeList()
})
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 28affdd..0a74b45 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -187,6 +187,11 @@
pattern: /^[a-zA-Z0-9]*$/ig,
message: formRule.input.letternummsg
})
+ } else if (item.regular === 'phone') {
+ _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}$/ig,
+ message: '璇锋纭緭鍏ユ墜鏈哄彿'
+ })
} else if (item.regular === 'funcname') {
_rules.push({
pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 2b1c010..42a28d2 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2555,6 +2555,9 @@
}, {
value: 'letter&number',
text: Formdict['header.form.letter&number']
+ }, {
+ value: 'phone',
+ text: '鎵嬫満鍙�'
}]
},
{
--
Gitblit v1.8.0