Merge remote-tracking branch 'origin/master' into performance

zhaofeng
2 parents 47adc9d9 8c20badf
Showing 7 changed files with 34 additions and 90 deletions
build/admin.tar.gz
src/pages/approval/ApprovalSetting/components/ApproveRole.tsx
src/pages/approval/ApprovalSetting/components/CreateItem.tsx
src/pages/approval/ApprovalSetting/entity.ts
src/pages/approval/FlowSetting/components/AddRole.tsx
src/pages/approval/FlowSetting/components/CommonSetting.tsx
src/pages/approval/FlowSetting/components/Drage.tsx
-import React, { useState, useEffect } from "react";
-import {
-  Input,
-  Select,
-  Modal,
-  Form,
-  message,
-  Tooltip,
-  Tag,
-  Button,
-  Space,
-  Table,
-} from "antd";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
-import {
-  ApprovalType,
-  Approval_Status,
-  transformDTO,
-  transformFormData,
-} from "../entity";
-import _ from "lodash";
-import { systemListApi } from "@/pages/admin/Privilege/api";
-import usePagination from "@/hooks/usePagination";
-import { getAllRoleCodeApi } from "@/common/api";
-import useInitial from "@/hooks/useInitail";
-import { saveApproveConfig } from "../api";
+import React from "react";
+import { Modal, Table, } from "antd";
 import toChineseBig from '@/utils/toChinease';
  
 const { Column } = Table;
@@ -39,16 +15,17 @@ export default function CreateItem({ item, setRoleItem }: Props) {
       title="审批角色"
       visible={visible}
       onCancel={() => setRoleItem({ visible: false })}
+      width={800}
       footer={null}
     >
-      <Table dataSource={currentItem} rowKey={(row) => `id${row.roleCode}`}>
+      <Table dataSource={currentItem} rowKey={(t: any) => t.map((it: any) => it.roleName).join("; ")}>
         <Column
           title="级别"
           render={(_, rocord, index) => (
             <span>{`${toChineseBig(index+1)}级审批`}</span>
           )}
         />
-        <Column title="角色" dataIndex="roleName" key="roleName" />
+        <Column title="角色" render={(_, t:any[]) => t.map(it => it.roleName).join("; ")} />
       </Table>
     </Modal>
   );
@@ -162,7 +162,7 @@ export default function CreateItem({ item, setItem, setParams }: Props) {
                           key={key}
                           style={{ width: "100%" }}
                           {...restField}
-                          name={[name, "roleObj"]}
+                          name={[name, "roles"]}
                           rules={[
                               { required: true, message: "请选择审批角色" },
                             ]}
@@ -174,15 +174,16 @@ export default function CreateItem({ item, setItem, setParams }: Props) {
                             showSearch
                             showArrow
                             allowClear
+                            mode="multiple"
                             optionFilterProp="children"
                           >
                             {data.map((item) => (
                               <Option
-                                  value={item.roleCode}
-                                  key={item.roleCode}
-                                >
-                                  {item.roleName}
-                                </Option>
+                                value={item.roleCode}
+                                key={item.roleCode}
+                              >
+                                {item.roleName}
+                              </Option>
                               ))}
                           </Select>
                         </Form.Item>
@@ -111,8 +111,8 @@ export function transformDTO(formData): ApprovalSetteing.ApprovalListItems {
   _.each(formData, (value: any, key: string) => {
     switch (key) {
       case 'approvalRoles':
-        const _options: { roleObj: RoleObj }[] = value || [];
-        const _approvalRoles = _options.map((item: { roleObj: RoleObj }) => ({ roleName: item.roleObj.label, roleCode: item.roleObj.value }));
+        const _options: any[] = value || [];
+        const _approvalRoles = _options.map((item: any) => (item.roles || []).map((it: any) => ({ roleName: it.label, roleCode: it.value })));
         detail.approvalRoles = _approvalRoles;
         break;
       default:
@@ -130,7 +130,7 @@ export function transformFormData(detail: ApprovalSetteing.ApprovalListItems) {
       case 'approvalRoles':
         const _options: ApprovalSetteing.ApprovalRoles[] = value || [];
         if (_options.length) {
-          const _approvalRoles = _options.map((item) => ({ roleObj: { label: item.roleName, value: item.roleCode } }));
+          const _approvalRoles = _options.map((item:any) => ({ roles: item.map((it: any) => ({ label: it.roleName, value: it.roleCode })) }));
           formData.approvalRoles = _approvalRoles;
         } else {
           formData.approvalRoles = [{}];
 import React, { useState, useEffect } from "react";
 import {
-  Input,
   Select,
-  Modal,
   Form,
-  message,
   Card,
   Row,
   Button,
   Popconfirm,
 } from "antd";
 import {
-  ApprovalType,
-  Approval_Status,
-  transformDTO,
-  transformFormData,
-} from "../entity";
-import {
-  MinusCircleOutlined,
-  PlusOutlined,
-  PlusSquareOutlined,
   DeleteOutlined,
 } from "@ant-design/icons";
-import _ from "lodash";
-import { systemListApi } from "@/pages/admin/Privilege/api";
-import usePagination from "@/hooks/usePagination";
 import { getAllRoleCodeApi } from "@/common/api";
 import useInitial from "@/hooks/useInitail";
-import { saveApproveConfig } from "../api";
  
 const { Option } = Select;
-const layout = {
-  labelCol: { span: 4 },
-  wrapperCol: { span: 20 },
-};
 interface Props {
   item: { visible: boolean; currentItem?: ApprovalSetteing.ApprovalListItems };
   setItem: any;
@@ -94,6 +74,7 @@ export default function AddRole({
           rules={[{ required: true, message: "请选择审批角色" }]}
         >
           <Select
+            mode="multiple"
             showArrow={styleVisible}
             onFocus={() => setStyleVisible(true)}
             bordered={styleVisible}
@@ -30,10 +30,10 @@ export default function CommonSetting({ match }: Props) {
       const { sights } = field;
       let approvalRoles;
       if (sights.length) {
-        approvalRoles = sights.map((item) => ({
-          roleCode: item.approvalRoles.value,
-          roleName: item.approvalRoles.label,
-        }));
+        approvalRoles = sights.map((item: any) => (item.approvalRoles || []).map((it: any) => ({
+          roleCode: it.value,
+          roleName: it.label,
+        })));
       }
       const pa = {
         approvalConfigId: Number(approvalConfigId),
@@ -54,11 +54,12 @@ export default function CommonSetting({ match }: Props) {
  
   useEffect(() => {
     if (data.length) {
-      const tempList = data.map((item) => ({
-        approvalRoles: {
-          label: item.roleName,
-          value: item.roleCode,
-        },
+      // @ts-ignore
+      const tempList = data.map((item: any[]) => ({
+        approvalRoles: item.map(it => ({
+          label: it.roleName,
+          value: it.roleCode,
+        })),
       }));
       form.setFieldsValue({
         sights: tempList,
@@ -2,35 +2,19 @@ import React, { useState, useEffect } from &quot;react&quot;;
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import useInitial from "@/hooks/useInitail";
 import { processSetApi, getNodeList } from "../api";
-import { Form, Input, Button, Card, Space, message } from "antd";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Form, Button, Card, message } from "antd";
+import { PlusOutlined } from "@ant-design/icons";
 import AddRole from "./AddRole";
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
  
 interface Props extends common.ConnectProps {}
  
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 4 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 20 },
-  },
-};
 const formItemLayoutWithOutLabel = {
   wrapperCol: {
     xs: { span: 24, offset: 0 },
     sm: { span: 20, offset: 4 },
   },
 };
-// fake data generator
-const getItems = (count) =>
-  Array.from({ length: count }, (v, k) => k).map((k) => ({
-    id: `item-${k}`,
-    content: `item ${k}`,
-  }));
  
 // a little function to help us with reordering the result
 const reorder = (list, startIndex, endIndex) => {
@@ -66,12 +50,12 @@ function Drage({ match }: Props) {
  
   useEffect(() => {
     if (data.length) {
-      const tempList = data.map((item) => ({
+      const tempList = data.map((it: any) => it.map((item: any) => ({
         approvalRoles: {
           label: item.roleName,
           value: item.roleCode,
         },
-      }));
+      })));
       form.setFieldsValue({
         sights: tempList,
       });
@@ -105,10 +89,10 @@ function Drage({ match }: Props) {
       const { sights } = field;
       let approvalRoles;
       if (sights.length) {
-        approvalRoles = sights.map((item) => ({
-          roleCode: item.approvalRoles.value,
-          roleName: item.approvalRoles.label,
-        }));
+        approvalRoles = sights.map((item: any) => (item.approvalRoles || []).map((it: any) => ({
+          roleCode: it.value,
+          roleName: it.label,
+        })));
       }
       const pa = {
         approvalConfigId: Number(approvalConfigId),