feat: 修改系统管理-角色分配

react-ui/src/components/IFramePage/index.tsx

@@ -61,7 +61,7 @@ function IframePage({ type, className, style }: IframePageProps) {
 
   return (
     <div className={classNames('kf-iframe-page', className)} style={style}>
-      {loading && <KFSpin />}
+      {loading && <KFSpin size="large" />}
       <FullScreenFrame url={iframeUrl} onload={hideLoading} onerror={hideLoading} />
     </div>
   );

react-ui/src/pages/System/Role/authUser.tsx

@@ -129,7 +129,7 @@ const AuthUserTableList: React.FC = () => {
     {
       title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="操作" />,
       dataIndex: 'option',
-      width: '60px',
+      width: '160px',
       valueType: 'option',
       render: (_, record) => [
         <Button

react-ui/src/pages/System/Role/components/DataScope.tsx

@@ -111,10 +111,7 @@ const DataScopeForm: React.FC<DataScopeFormProps> = (props) => {
         grid={true}
         layout="horizontal"
         onFinish={handleFinish}
-        initialValues={{
-          login_password: '',
-          confirm_password: '',
-        }}
+        submitter={false}
         {...formLayout}
         size="large"
         labelAlign="right"
@@ -203,8 +200,9 @@ const DataScopeForm: React.FC<DataScopeFormProps> = (props) => {
           })}
           required={dataScopeType === '1'}
           hidden={dataScopeType !== '1'}
+          style={{ width: '100%', padding: '0 4px' }}
         >
-          <Row gutter={[16, 16]}>
+          <Row gutter={[16, 16]} style={{ marginTop: '10px' }}>
             <Col md={24}>
               <Checkbox.Group
                 options={[
@@ -235,7 +233,7 @@ const DataScopeForm: React.FC<DataScopeFormProps> = (props) => {
                   }
                 }}
                 onExpand={(expandedKeys: Key[]) => {
-                  setDeptTreeExpandKey(deptTreeExpandKey.concat(expandedKeys));
+                  setDeptTreeExpandKey(expandedKeys);
                 }}
               />
             </Col>

react-ui/src/pages/System/Role/components/UserSelectorModal.less

@@ -0,0 +1,12 @@
+.user-selector-modal {
+  :global {
+    // 输入框高度为46px
+    .ant-input-affix-wrapper {
+      padding-top: 4px !important;
+      padding-bottom: 4px !important;
+      .ant-input {
+        height: 22px !important;
+      }
+    }
+  }
+}

react-ui/src/pages/System/Role/components/UserSelectorModal.tsx

@@ -10,6 +10,7 @@ import {
 } from '@ant-design/pro-components';
 import { FormattedMessage, useIntl } from '@umijs/max';
 import React, { useEffect, useRef, useState } from 'react';
+import styles from './UserSelectorModal.less';
 /* *
  *
  * @author whiteshader@163.com
@@ -90,7 +91,7 @@ const UserSelectorModal: React.FC<DataScopeFormProps> = (props) => {
 
   return (
     <KFModal
-      width={800}
+      width={920}
       title={intl.formatMessage({
         id: 'system.role.auth.user',
         defaultMessage: '选择用户',
@@ -99,6 +100,7 @@ const UserSelectorModal: React.FC<DataScopeFormProps> = (props) => {
       destroyOnClose
       onOk={handleOk}
       onCancel={handleCancel}
+      className={styles['user-selector-modal']}
     >
       <ProTable<API.System.User>
         headerTitle={intl.formatMessage({

react-ui/src/pages/System/User/components/AuthRole.tsx

@@ -34,7 +34,7 @@ const AuthRoleForm: React.FC<AuthRoleFormProps> = (props) => {
 
   return (
     <KFModal
-      width={640}
+      width={680}
       title={intl.formatMessage({
         id: 'system.user.auth.role',
         defaultMessage: '分配角色',
@@ -50,10 +50,10 @@ const AuthRoleForm: React.FC<AuthRoleFormProps> = (props) => {
         grid={true}
         layout="horizontal"
         onFinish={handleFinish}
-        initialValues={{
-          login_password: '',
-          confirm_password: '',
-        }}
+        submitter={false}
+        size="large"
+        labelAlign="right"
+        autoComplete="off"
       >
         <ProFormSelect
           name="roleIds"

react-ui/src/pages/System/User/components/ResetPwd.tsx

@@ -39,7 +39,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
 
   return (
     <KFModal
-      width={640}
+      width={680}
       title={intl.formatMessage({
         id: 'system.user.reset.password',
         defaultMessage: '密码重置',
@@ -58,8 +58,12 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           password: '',
           confirm_password: '',
         }}
+        submitter={false}
+        size="large"
+        labelAlign="right"
+        autoComplete="off"
       >
-        <p>请输入用户{props.values.userName}的新密码！</p>
+        <p>请输入用户 {props.values.userName} 的新密码！</p>
         <ProFormText.Password
           name="password"
           label="登录密码"