fix(department): merge xyh

src/locales/zh-CN/pages.ts

@@ -128,6 +128,9 @@ export default {
   // 系统设置-部门管理
   'pages.system.department.user': '用户',
   'pages.system.department.option.add': '新增子部门',
+  'pages.system.role.option.unBind': '是否解除绑定',
+  'pages.system.role.option.unBinds': '是否批量解除绑定?',
+  'pages.system.role.option.delete': '确定要删除吗？',
   // 系统设置-第三方平台
   'pages.system.openApi': '第三方平台',
   'pages.system.openApi.username': '用户名',

src/pages/system/Department/Assets/deivce/bind.tsx

@@ -2,7 +2,7 @@
 import type { ProColumns, ActionType } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
 import { DeviceBadge, service } from './index';
-import { Modal } from 'antd';
+import { message, Modal } from 'antd';
 import { useParams } from 'umi';
 import Models from './model';
 import { useEffect, useRef, useState } from 'react';
@@ -73,7 +73,8 @@ const Bind = observer((props: Props) => {
     if (Models.bindKeys.length) {
       setPerVisible(true);
     } else {
-      props.onCancel();
+      message.warn('请先勾选数据');
+      // props.onCancel();
     }
   };
 

src/pages/system/Department/Assets/deivce/index.tsx

@@ -13,7 +13,7 @@ import Service from '@/pages/system/Department/Assets/service';
 import Bind from './bind';
 import SearchComponent from '@/components/SearchComponent';
 
-export const service = new Service<DeviceItem>();
+export const service = new Service<DeviceItem>('assets');
 
 type DeviceBadgeProps = {
   type: string;

src/pages/system/Department/Assets/permissionModal.tsx

@@ -80,10 +80,11 @@ export default (props: PerModalProps) => {
         'x-decorator': 'FormItem',
         'x-component': 'Checkbox.Group',
         enum: [
-          { label: '查看', value: 'read' },
+          { label: '查看', value: 'read', disabled: true },
           { label: '编辑', value: 'save' },
           { label: '删除', value: 'delete' },
         ],
+        'x-value': ['read'],
       },
     },
   };

src/pages/system/Department/Assets/product/bind.tsx

@@ -2,7 +2,7 @@
 import type { ProColumns, ActionType } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
 import { service } from './index';
-import { Modal } from 'antd';
+import { message, Modal } from 'antd';
 import { useParams } from 'umi';
 import Models from './model';
 import { useEffect, useRef, useState } from 'react';
@@ -55,7 +55,8 @@ const Bind = observer((props: Props) => {
     if (Models.bindKeys.length) {
       setPerVisible(true);
     } else {
-      props.onCancel();
+      message.warn('请先勾选数据');
+      // props.onCancel();
     }
   };
 

src/pages/system/Department/Assets/product/index.tsx

@@ -13,7 +13,7 @@ import Models from './model';
 import Bind from './bind';
 import SearchComponent from '@/components/SearchComponent';
 
-export const service = new Service<ProductItem>();
+export const service = new Service<ProductItem>('assets');
 
 export default observer(() => {
   const intl = useIntl();

src/pages/system/Department/Assets/productCategory/bind.tsx

@@ -2,7 +2,7 @@
 import type { ProColumns, ActionType } from '@jetlinks/pro-table';
 import ProTable from '@jetlinks/pro-table';
 import { service, getTableKeys } from './index';
-import { Modal } from 'antd';
+import { Modal, message } from 'antd';
 import { useParams } from 'umi';
 import Models from './model';
 import { useRef, useState, useEffect } from 'react';
@@ -53,7 +53,8 @@ const Bind = observer((props: Props) => {
     if (Models.bindKeys.length) {
       setPerVisible(true);
     } else {
-      props.onCancel();
+      message.warn('请先勾选数据');
+      // props.onCancel();
     }
   };
 

src/pages/system/Department/Member/index.tsx

@@ -43,11 +43,6 @@ const Member = observer(() => {
 
   const columns: ProColumns<MemberItem>[] = [
     {
-      dataIndex: 'index',
-      valueType: 'indexBorder',
-      width: 48,
-    },
-    {
       dataIndex: 'name',
       title: intl.formatMessage({
         id: 'pages.system.name',
@@ -58,6 +53,16 @@ const Member = observer(() => {
       },
     },
     {
+      dataIndex: 'username',
+      title: intl.formatMessage({
+        id: 'pages.system.username',
+        defaultMessage: '用户名',
+      }),
+      search: {
+        transform: (value) => ({ username$LIKE: value }),
+      },
+    },
+    {
       title: intl.formatMessage({
         id: 'pages.searchTable.titleStatus',
         defaultMessage: '状态',
@@ -192,7 +197,7 @@ const Member = observer(() => {
           </Button>,
           <Popconfirm
             title={intl.formatMessage({
-              id: 'pages.system.role.option.unBindUser',
+              id: 'pages.system.role.option.unBinds',
               defaultMessage: '是否批量解除绑定',
             })}
             key="unBind"

src/pages/system/Department/index.tsx

@@ -141,8 +141,8 @@ export default observer(() => {
         <Popconfirm
           key="unBindUser"
           title={intl.formatMessage({
-            id: 'pages.system.role.option.unBindUser',
-            defaultMessage: '是否批量解除绑定',
+            id: 'pages.system.role.option.delete',
+            defaultMessage: '确定要删除吗',
           })}
           onConfirm={() => {
             deleteItem(record.id);
@@ -183,11 +183,14 @@ export default observer(() => {
   };
 
   const location = useLocation();
+
   useEffect(() => {
     if ((location as any).query?.save === 'true') {
       State.visible = true;
     }
+    /* eslint-disable */
   }, []);
+
   return (
     <PageContainer>
       <Card>
@@ -239,6 +242,14 @@ export default observer(() => {
         })}
       />
       <Save<DepartmentItem>
+        title={
+          State.current.parentId
+            ? intl.formatMessage({
+                id: 'pages.system.department.option.add',
+                defaultMessage: '新增子部门',
+              })
+            : undefined
+        }
         service={service}
         onCancel={(type) => {
           if (type) {

src/pages/system/Department/save.tsx

@@ -101,10 +101,14 @@ const Save = <T extends object>(props: SaveModalProps<T>) => {
 
   return (
     <Modal
-      title={intl.formatMessage({
-        id: `pages.data.option.${data && 'id' in data ? 'edit' : 'add'}`,
-        defaultMessage: '新增',
-      })}
+      title={
+        props.title
+          ? props.title
+          : intl.formatMessage({
+              id: `pages.data.option.${data && 'id' in data ? 'edit' : 'add'}`,
+              defaultMessage: '新增',
+            })
+      }
       visible={props.visible}
       onOk={saveData}
       onCancel={() => {