From 7211da6d1b345f7ced655c406eecd1feaa4de4fd Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Thu, 8 Jun 2023 14:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=AE=8C=E5=96=84=20=E8=B5=84=E6=BA=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/memberManagement/components/resetPassword.js | 4 ++--
 .../sections/metadataManagement/containers/databasesTable.js  | 2 +-
 .../src/sections/metadataManagement/containers/filesTable.js  | 2 +-
 .../sections/metadataManagement/containers/restapisTable.js   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/memberManagement/components/resetPassword.js b/web/client/src/sections/memberManagement/components/resetPassword.js
index ce4dfdc..f633c36 100644
--- a/web/client/src/sections/memberManagement/components/resetPassword.js
+++ b/web/client/src/sections/memberManagement/components/resetPassword.js
@@ -37,7 +37,7 @@ export default (props) => {
                 rules={[{ required: true, message: '请输入旧密码' },
                 { max: 255, message: '旧密码长度不能大于255个字符' },
                 {
-                    pattern: /^[a-z0-9A-Z_]{6,20}$/, message: '密码由6-20位字母、数字或_组成'
+                    pattern: /^[a-z0-9A-Z]{6,20}$/, message: '密码由6-20位字母或数字组成'
                 },
                 ]}
                 name="oldpassword"
@@ -48,7 +48,7 @@ export default (props) => {
                 rules={[{ required: true, message: '请输入新密码' },
                 { max: 255, message: '新密码长度不能大于255个字符' },
                 {
-                    pattern: /^[a-z0-9A-Z_]{6,20}$/, message: '密码由6-20位字母、数字或_组成'
+                    pattern: /^[a-z0-9A-Z]{6,20}$/, message: '密码由6-20位字母或数字组成'
                 },
                 ]}
                 name="password"
diff --git a/web/client/src/sections/metadataManagement/containers/databasesTable.js b/web/client/src/sections/metadataManagement/containers/databasesTable.js
index 2f2b131..beac381 100644
--- a/web/client/src/sections/metadataManagement/containers/databasesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/databasesTable.js
@@ -179,7 +179,7 @@ const DatabaseTable = (props) => {
                         onConfirm={() => confirmDelete(record.id)}
                     > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
                     {record.type === '表' ? <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a> : null}
-                    {record.type === '表' ? resourceApplicationsRecords.length === 0 ?
+                    {user.role == '系统管理员' ? '' : record.type === '表' ? resourceApplicationsRecords.length === 0 ?
                         <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                         <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span> : null}
                 </ButtonGroup>
diff --git a/web/client/src/sections/metadataManagement/containers/filesTable.js b/web/client/src/sections/metadataManagement/containers/filesTable.js
index 0f7110c..04c82d9 100644
--- a/web/client/src/sections/metadataManagement/containers/filesTable.js
+++ b/web/client/src/sections/metadataManagement/containers/filesTable.js
@@ -213,7 +213,7 @@ const FilesTable = (props) => {
                         onConfirm={() => confirmDelete(record)}
                     > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
                     <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
-                    {resourceApplicationsRecords.length === 0 ?
+                    {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
                         <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                         <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
                 </ButtonGroup>
diff --git a/web/client/src/sections/metadataManagement/containers/restapisTable.js b/web/client/src/sections/metadataManagement/containers/restapisTable.js
index b24c995..cd16505 100644
--- a/web/client/src/sections/metadataManagement/containers/restapisTable.js
+++ b/web/client/src/sections/metadataManagement/containers/restapisTable.js
@@ -149,7 +149,7 @@ const RestapisTable = (props) => {
                     onConfirm={() => confirmDelete(record.id)}
                 > <a style={{ marginLeft: 10 }}>删除</a></Popconfirm>
                 <a style={{ marginLeft: 10 }} onClick={() => marking(record.id)}>打标</a>
-                {resourceApplicationsRecords.length === 0 ?
+                {user.role == '系统管理员' ? '' : resourceApplicationsRecords.length === 0 ?
                     <a style={{ marginLeft: 10 }} onClick={() => applyResources(record)}>申请资源</a> :
                     <span style={{ marginLeft: 10, color: "#c0c0c0" }} title='已存在资源申请'>申请资源</span>}
             </ButtonGroup>