Browse Source

(*)修改密码完善 资源申请权限判断

master
peng.peng 1 year ago
parent
commit
7211da6d1b
  1. 4
      web/client/src/sections/memberManagement/components/resetPassword.js
  2. 2
      web/client/src/sections/metadataManagement/containers/databasesTable.js
  3. 2
      web/client/src/sections/metadataManagement/containers/filesTable.js
  4. 2
      web/client/src/sections/metadataManagement/containers/restapisTable.js

4
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"

2
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>

2
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>

2
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>

Loading…
Cancel
Save