cfel-base-components 2.5.3 → 2.5.5

package/src/components/universal-pages/cpcRoleInfo/index.tsx

@@ -1,25 +1,15 @@
-import React, { useEffect, useRef, useState } from "react";
-import useTableHooks from "../../../hooks/useTableHooks";
+import React, { useEffect, useRef, useState } from 'react'
+import PageContainer from '../../base-component/PageContainer';
+import QueryFilter from '../../base-component/QueryFilter';
+import ProTable from '../../base-component/ProTable';
+import Pagination from '../../base-component/Pagination';
+import useTableHooks from "../../../hooks/useTableHooks"
+import { timeFormatter, getUrlParams } from '../../../utils';
 
-import PageContainer from "../../base-component/PageContainer";
-import QueryFilter from "../../base-component/QueryFilter";
-import ProTable from "../../base-component/ProTable";
-import Pagination from "../../base-component/Pagination";
-import { get } from "lodash";
-import { ProFormText,ProFormSelect } from "@ant-design/pro-components";
-import {
-  Button,
-  Divider,
-  Modal,
-  Descriptions,
-  Space,
-  message,
-  Tabs,
-  Table,
-  Spin
-} from "antd";
-import EditAccountDrawer from "./EditAccountDrawer/index";
-import { timeFormatter, getUrlParams } from "../../../utils";
+import { get } from 'lodash'
+import { ProFormText, ProFormSelect } from '@ant-design/pro-components'
+import { Button, Divider, Modal, Descriptions, Space, message, Tabs, Table, Spin } from 'antd'
+import EditAccountDrawer from './EditAccountDrawer/index'
 import {
   pageBoundAccounts,
   roleBoundAccounts,
@@ -27,159 +17,178 @@ import {
   getRole,
   queryByKeyword,
   policyAuthorizePage,
-} from "./api";
-import "./index.scss";
-import { InteractionOutlined } from "@ant-design/icons";
-import dayjs from "dayjs";
+  resourceRoleSaveAuths,
+  dataPermissionSaveAuths
+} from './api'
+import './index.scss'
+import { InteractionOutlined } from '@ant-design/icons'
+import dayjs from 'dayjs'
 
 export interface RoleInfoProps {
-  isShowTab: {
-    main: boolean;
-    tableResource: boolean;
-    tableEmpower: boolean;
-    tableData: boolean;
-  };
-  getAuthTree?: any;
-  empowerCom?: any;
-
+  isShowTab?: {
+    main?: boolean
+    tableResource?: boolean
+    tableEmpower?: boolean
+    tableData?: boolean
+  }
+  isResourceAction?: boolean
+  isDataAction?: boolean
+  getAuthTree?: any
+  getRoleAuthTree?: any
+  empowerCom?: any
 }
 
-export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInfoProps) {
-  const searchFormRef: any = useRef();
-  const searchPolicyFormRef: any = useRef();
-  const [roleCode, setRoleCode] = useState(getUrlParams("roleCode"));
-  const [roleInfo, setRoleInfo]: any = useState({});
-  const [editAccountOpen, setEditAccountOpen] = useState(false);
-  const [tabCheck, setTabCheck] = useState("main");
+export default function RoleInfo({
+  isShowTab,
+  getAuthTree,
+  getRoleAuthTree,
+  empowerCom,
+  isResourceAction,
+  isDataAction
+}: RoleInfoProps) {
+  const searchFormRef: any = useRef()
+  const searchPolicyFormRef: any = useRef()
+  const [roleCode, setRoleCode] = useState(getUrlParams('roleCode'))
+  const [roleInfo, setRoleInfo]: any = useState({})
+  const [editAccountOpen, setEditAccountOpen] = useState(false)
+  const [tabCheck, setTabCheck] = useState('main')
+
+  const [ResourceTableData, setResourceTableData]: any = useState([]) //关联资源
+  const [isTableLoading, setisTableLoading] = useState(false)
+  const [loading, setLoading] = useState(false)
+  const [rowKeys, setRowKeys]: any = useState([]) //关联多选数据
+  const [selectedRowKeys, setselectedRowKeys]: any = useState([])
+  const [defaultExpandedRowKeys, setdefaultExpandedRowKeys]: any = useState([])
+
+  const [isTableByDataLoading, setisTableByDataLoading] = useState(false) //数据权限使用
+  const [selectedDataRowKeys, setselectedDataRowKeys]: any = useState([]) //数据权限使用
+  const [defaultExpandedDataRowKeys, setdefaultExpandedDataRowKeys]: any = useState([]) //数据权限使用
+  const [ResourceData, setResourceData]: any = useState([]) //数据权限使用
+  const [changeDataActionType, setChangeDataActionType] = useState(true) //数据权限使用
 
-  const [ResourceTableData, setResourceTableData]: any = useState([]); //关联资源
-  const [isTableLoading, setisTableLoading] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [rowKeys, setRowKeys]: any = useState([]); //关联多选数据
-  const [selectedRowKeys, setselectedRowKeys]: any = useState([]); 
-  const [defaultExpandedRowKeys, setdefaultExpandedRowKeys]: any = useState([]); 
   const [TableItemData, setTableItemData]: any = useState([
     {
-      key: "main",
+      key: 'main',
       label: `关联账号`,
-      icon: <InteractionOutlined />,
-    },
-  ]); //tab 数据
+      icon: <InteractionOutlined />
+    }
+  ]) //tab 数据
+  const [changeActionType, setChangeActionType] = useState(true)
 
   const columns: any = [
     {
-      title: "名称",
-      dataIndex: "name",
-      key: "name",
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name'
     },
     {
-      title: "账号",
-      dataIndex: "account",
-      key: "account",
+      title: '账号',
+      dataIndex: 'account',
+      key: 'account'
     },
     {
-      title: "工号",
-      dataIndex: "jobNumber",
-      key: "jobNumber",
+      title: '工号',
+      dataIndex: 'jobNumber',
+      key: 'jobNumber'
     },
     {
-      title: "手机号",
-      dataIndex: "mobile",
-      key: "mobile",
+      title: '手机号',
+      dataIndex: 'mobile',
+      key: 'mobile'
     },
     {
-      title: "邮箱",
-      dataIndex: "email",
-      key: "email",
-      copyable: true,
+      title: '邮箱',
+      dataIndex: 'email',
+      key: 'email',
+      copyable: true
     },
     {
-      title: "是否企业管理员",
-      dataIndex: "isAdmin",
-      key: "isAdmin",
+      title: '是否企业管理员',
+      dataIndex: 'isAdmin',
+      key: 'isAdmin',
       render: (cell: any) => {
         if (cell) {
-          return "是";
+          return '是'
         } else {
-          return "否";
+          return '否'
         }
-      },
+      }
     },
     {
-      title: "创建时间",
-      dataIndex: "gmtCreate",
-      key: "gmtCreate",
+      title: '创建时间',
+      dataIndex: 'gmtCreate',
+      key: 'gmtCreate',
       render: (cell: any) => {
-        return timeFormatter(cell);
-      },
+        return timeFormatter(cell)
+      }
     },
     {
-      title: "修改时间",
-      dataIndex: "gmtModified",
-      key: "gmtModified",
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (cell: any) => {
-        return timeFormatter(cell);
-      },
+        return timeFormatter(cell)
+      }
     },
     {
-      title: "操作",
+      title: '操作',
       width: 80,
-      fixed: "right",
+      fixed: 'right',
       render: (rowdata: any) => (
         <Space>
           <a
             onClick={() => {
               Modal.confirm({
-                title: "确认解绑吗？",
-                content: "",
+                title: '确认解绑吗？',
+                content: '',
                 onOk: () => {
-                  roleUnboundAccountsFunc(rowdata.id);
-                },
-              });
+                  roleUnboundAccountsFunc(rowdata.id)
+                }
+              })
             }}
           >
             解绑
           </a>
         </Space>
-      ),
-    },
-  ];
+      )
+    }
+  ]
 
   const TableResource: any = [
     {
-      title: "菜单名称",
-      dataIndex: "name",
-      key: "name",
-    },
-  ];
+      title: '菜单名称',
+      dataIndex: 'name',
+      key: 'name'
+    }
+  ]
   const TablePolicy: any = [
     {
-      title: "授权主体",
-      dataIndex: "subject",
-      key: "subject",
+      title: '授权主体',
+      dataIndex: 'subject',
+      key: 'subject'
     },
     {
-      title: "权限策略",
-      dataIndex: "policy",
-      key: "policy",
+      title: '权限策略',
+      dataIndex: 'policy',
+      key: 'policy'
     },
     {
-      title: "资源组",
-      dataIndex: "group",
-      key: "group",
+      title: '资源组',
+      dataIndex: 'group',
+      key: 'group'
     },
     {
-      title: "授权时间",
-      dataIndex: "gmtModified",
-      key: "gmtModified",
+      title: '授权时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text: any, data: any) => {
-        return dayjs(text).format("YYYY-MM-DD HH:mm:ss") || "数据格式错误";
-      },
+        return dayjs(text).format('YYYY-MM-DD HH:mm:ss') || '数据格式错误'
+      }
     },
     {
-      title: "操作",
+      title: '操作',
       width: 80,
-      fixed: "right",
+      fixed: 'right',
       render: (rowdata: any) => (
         <Space>
           <a
@@ -188,16 +197,16 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                 {
                   groupId: rowdata?.groupId,
                   policyId: rowdata?.policyId,
-                  subjectCode: rowdata?.subjectCode,
-                },
-              ];
+                  subjectCode: rowdata?.subjectCode
+                }
+              ]
               Modal.confirm({
                 title: `确认解除指定的授权吗？`,
                 onOk: () => {
-                  DeleteFunc(data);
+                  DeleteFunc(data)
                 },
                 content: (
-                  <div className="deleteBox">
+                  <div className='deleteBox'>
                     <div>
                       <span>授权主体:</span>
                       <div>{rowdata.subject}</div>
@@ -212,305 +221,326 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                     </div>
                     <div>
                       <span>授权时间:</span>
-                      <div>
-                        {dayjs(rowdata.gmtModified).format(
-                          "YYYY-MM-DD HH:mm:ss",
-                        )}
-                      </div>
+                      <div>{dayjs(rowdata.gmtModified).format('YYYY-MM-DD HH:mm:ss')}</div>
                     </div>
                   </div>
-                ),
-              });
+                )
+              })
             }}
           >
             解除授权
           </a>
         </Space>
-      ),
-    },
-  ];
+      )
+    }
+  ]
   useEffect(() => {
-    init();
-    getRoleFunc({ roleCode });
-  }, []);
+    init()
+    getRoleFunc({ roleCode })
+  }, [])
 
   const init = () => {
-    let data: any = [];
+    let data: any = []
     if (isShowTab?.tableResource) {
       data.push({
-        label: "关联菜单",
-        key: "tableResource",
-        icon: <InteractionOutlined />,
-      });
+        label: '关联菜单',
+        key: 'tableResource',
+        icon: <InteractionOutlined />
+      })
     }
-    if (isShowTab?.tableEmpower && roleCode !== "admin") {
+
+    if (isShowTab?.tableEmpower && roleCode !== 'admin') {
       data.push({
-        label: "关联授权",
-        key: "tableEmpower",
-        icon: <InteractionOutlined />,
-      });
+        label: '关联授权',
+        key: 'tableEmpower',
+        icon: <InteractionOutlined />
+      })
     }
     if (isShowTab?.tableData) {
       data.push({
-        label: "关联数据",
-        key: "tableData",
-        icon: <InteractionOutlined />,
-      });
+        label: '关联数权',
+        key: 'tableData',
+        icon: <InteractionOutlined />
+      })
     }
-    setTableItemData([...TableItemData, ...data]);
-  };
+    setTableItemData([...TableItemData, ...data])
+  }
   const tabCheckFunc = () => {
-    if (tabCheck == "tableEmpower") {
-      policy?.execute(); // 获取授权策略
-      empowerCom?.empowerInit();
-    } else if (tabCheck == "tableResource") {
-      getAuthTreeFunc(); // 获取关联资源
+    if (tabCheck === 'tableEmpower') {
+      policy?.execute() // 获取授权策略
+      empowerCom?.empowerInit()
+    } else if (tabCheck === 'tableResource') {
+      getAuthTreeFunc() // 获取关联资源
+    } else if (tabCheck === 'tableData') {
+      getRoleAuthTreeFunc() // 获取关联数据权限
     } else {
-      execute({ roleCode: roleCode });
+      execute({ roleCode: roleCode })
     }
-  };
+  }
   useEffect(() => {
-    tabCheckFunc();
-  }, [tabCheck]);
+    tabCheckFunc()
+  }, [tabCheck])
 
   //获取关联资源
   const getAuthTreeFunc = () => {
-    setisTableLoading(true);
-    getAuthTree &&
-      getAuthTree({
-        roleCode: roleCode,
-      }).then((res: any) => {
-        let listId :Array<[]>= []
-        let defaultRowKeys :Array<[]>= []
-        let {data,list,drkey}: any = resourceAction(res,listId,defaultRowKeys);
-          setselectedRowKeys(list)
-          setdefaultExpandedRowKeys(drkey)
-          setResourceTableData(data);
-          setisTableLoading(false);
-      });
-  };
-
-  const resourceAction: any = (data: any,list:any,drkey:any) => {
-    if (Object.prototype.toString.call(data) === "[object Array]") {
+    setisTableLoading(true)
+    if (!getAuthTree) return
+    getAuthTree().then((res: any) => {
+      let listId: Array<[]> = []
+      let defaultRowKeys: Array<[]> = []
+      let { data, list, drkey }: any = resourceAction(res, listId, defaultRowKeys)
+      setselectedRowKeys(list)
+      setdefaultExpandedRowKeys(drkey)
+      setResourceTableData(data)
+      setisTableLoading(false)
+    })
+  }
+  //获取关联数权
+  const getRoleAuthTreeFunc = () => {
+    setisTableByDataLoading(true)
+    if (!getRoleAuthTree) return
+    getRoleAuthTree().then((res: any) => {
+      let listId: Array<[]> = []
+      let defaultRowKeys: Array<[]> = []
+      let { data, list, drkey }: any = resourceAction(res, listId, defaultRowKeys)
+      console.log(list, 'list')
+      setselectedDataRowKeys(list)
+      setdefaultExpandedDataRowKeys(drkey)
+      setResourceData(data)
+      setisTableByDataLoading(false)
+    })
+  }
+  const resourceAction: any = (data: any, list: any, drkey: any) => {
+    if (Object.prototype.toString.call(data) === '[object Array]') {
       data.map((item: any) => {
-        return resourceAction(item,list,drkey);
-      });
+        return resourceAction(item, list, drkey)
+      })
       return {
         data,
         list,
         drkey
       }
-    } else if (Object.prototype.toString.call(data) === "[object Object]") {
-      if(data.checked)list.push(data.id)
+    } else if (Object.prototype.toString.call(data) === '[object Object]') {
+      if (data.checked) list.push(data.id || data.bizId)
       if (data.children && data.children.length !== 0) {
-        drkey.push(data.id)
-        return resourceAction(data.children,list,drkey);
+        drkey.push(data.id || data.bizId)
+        return resourceAction(data.children, list, drkey)
       } else {
-        delete data.children;
-        drkey.push(data.id)
-        return data;
+        delete data.children
+        drkey.push(data.id || data.bizId)
+        return data
       }
     }
-  };
+  }
 
   const getRoleFunc = (data: any) => {
-    setRoleInfo({});
-    setLoading(true);
+    setRoleInfo({})
+    setLoading(true)
     getRole({
-      ...data,
+      ...data
     }).then((res: any) => {
-      setLoading(false);
-      setRoleInfo(res || {});
-      tabCheckFunc();
-    });
-  };
+      setLoading(false)
+      setRoleInfo(res || {})
+      tabCheckFunc()
+    })
+  }
   const roleUnboundAccountsFunc = (account: any) => {
     roleUnboundAccounts({
       accountIds: [account],
-      roleCode: roleCode,
+      roleCode: roleCode
     }).then((res: any) => {
-      message.success("解绑成功");
-      execute({ roleCode: roleCode });
-    });
-  };
+      message.success('解绑成功')
+      execute({ roleCode: roleCode })
+    })
+  }
 
-  const readDataList = ({
-    innerPageNo,
-    innerPageSize,
-    ...otherOptions
-  }: any) => {
+  const readDataList = ({ innerPageNo, innerPageSize, ...otherOptions }: any) => {
     return pageBoundAccounts({
       currentPage: innerPageNo,
       pageSize: innerPageSize,
       ...searchFormRef.current,
-      ...otherOptions,
+      ...otherOptions
     }).then((res: any) => {
-      let records = get(res, "records", []);
-      let total = get(res, "total", 0);
+      let records = get(res, 'records', [])
+      let total = get(res, 'total', 0)
       return {
+        ...res,
         dataList: records,
-        totalCount: total,
-      };
-    });
-  };
+        totalCount: total
+      }
+    })
+  }
   const { execute, dataList, isLoading, pagination } = useTableHooks({
-    asyncFunction: readDataList,
-  });
+    asyncFunction: readDataList
+  })
 
   const handleRoload = () => {
-    execute({ roleCode: roleCode });
-  };
+    execute({ roleCode: roleCode })
+  }
 
   const getQueryBoundRolesFunc = async () => {
-    setEditAccountOpen(true);
-  };
+    setEditAccountOpen(true)
+  }
 
   const roleBoundAccountsFunc = ({ accountIds }: any) => {
     return roleBoundAccounts({
       accountIds: accountIds,
-      roleCode: roleCode,
+      roleCode: roleCode
     }).then((res: any) => {
-      message.success(`添加账号成功`);
-      execute({ roleCode: roleCode });
-      setEditAccountOpen(false);
-    });
-  };
+      message.success(`添加账号成功`)
+      execute({ roleCode: roleCode })
+      setEditAccountOpen(false)
+    })
+  }
   //搜索关键字
   const queryByKeywordFunc = ({ keyword }: any) => {
     return queryByKeyword({
-      keyword,
-    });
-  };
+      keyword
+    })
+  }
 
   const handleOnReset: any = async (values: any) => {
-    searchFormRef.current = { ...values };
+    searchFormRef.current = { ...values }
     execute({
       innerPageNo: 1,
-      roleCode: roleCode,
-    });
-  };
+      roleCode: roleCode
+    })
+  }
 
   const handleOnFinish: any = async (values: any) => {
-    searchFormRef.current = { ...values };
-    execute({ roleCode: roleCode });
-  };
+    searchFormRef.current = { ...values }
+    execute({ roleCode: roleCode })
+  }
 
-  const readDataListByPolicy = ({
-    innerPageNo,
-    innerPageSize,
-    ...otherOptions
-  }: any) => {
+  const readDataListByPolicy = ({ innerPageNo, innerPageSize, ...otherOptions }: any) => {
     return policyAuthorizePage({
       subjectCodes: [roleCode],
       ...searchPolicyFormRef.current,
       currentPage: innerPageNo,
       pageSize: innerPageSize,
-      ...otherOptions,
+      ...otherOptions
     }).then((res: any) => {
-      let records = get(res, "records", []);
-      let total = get(res, "total", 0);
+      let records = get(res, 'records', [])
+      let total = get(res, 'total', 0)
       return {
+        ...res,
         dataList: records,
-        totalCount: total,
-      };
-    });
-  };
+        totalCount: total
+      }
+    })
+  }
   let policy = useTableHooks({
-    asyncFunction: readDataListByPolicy,
-  });
+    asyncFunction: readDataListByPolicy
+  })
   //批量解绑
   const DeleteFunc = (authorizeList: any) => {
     empowerCom?.RevokeFunc({ authorizeList }).then((res: any) => {
-      message.success("解除成功");
-      setRowKeys([]);
-      policy?.execute();
-    });
-  };
+      message.success('解除成功')
+      setRowKeys([])
+      policy?.execute()
+    })
+  }
   const resOnFinish: any = async (values: any) => {
     if (values?.policyIds) {
       let policyData = values.policyIds.findIndex((item: any) => {
-        return item == "";
-      });
-      if (policyData > -1) values.policyIds = [];
+        return item === ''
+      })
+      if (policyData > -1) values.policyIds = []
     }
     searchPolicyFormRef.current = {
-      ...values,
-    };
-    policy?.execute({ innerPageNo: 1 });
-  };
+      ...values
+    }
+    policy?.execute({ innerPageNo: 1 })
+  }
+  const resourceRoleSaveAuthsFunc = () => {
+    resourceRoleSaveAuths({
+      roleCode: roleCode,
+      resourceIds: selectedRowKeys
+    }).then((res: any) => {
+      message.success('保存成功')
+      getAuthTreeFunc()
+      setChangeActionType(true)
+    })
+  }
+  const dataPermissionSaveAuthsFunc = () => {
+    dataPermissionSaveAuths({
+      roleCode: roleCode,
+      bizIds: selectedDataRowKeys
+    }).then((res: any) => {
+      message.success('保存成功')
+      getRoleAuthTreeFunc()
+      setChangeDataActionType(true)
+    })
+  }
+
   return (
     <PageContainer>
       <Spin spinning={loading}>
-        <div className="deviceTopTitle">
-          <div className="deviceTopDivider">
-            <Divider orientation="left">{roleInfo?.roleName || "-"}</Divider>
+        <div className='deviceTopTitle'>
+          <div className='deviceTopDivider'>
+            <Divider orientation='left'>{roleInfo?.roleName || '-'}</Divider>
           </div>
           <Button
-            className="deviceTopButton"
+            className='deviceTopButton'
             onClick={() => {
-              getRoleFunc({ roleCode });
+              getRoleFunc({ roleCode })
             }}
           >
             刷新
           </Button>
         </div>
-        <Descriptions className="basicInfoWrap">
-          <Descriptions.Item label="角色名称">
-            {roleInfo?.roleName || ""}
-          </Descriptions.Item>
-          <Descriptions.Item label="角色编码">
-            {roleInfo?.roleCode || ""}
-          </Descriptions.Item>
-          <Descriptions.Item label="角色描述">
-            {roleInfo?.description || ""}
+        <Descriptions className='basicInfoWrap'>
+          <Descriptions.Item label='角色名称'>{roleInfo?.roleName || ''}</Descriptions.Item>
+          <Descriptions.Item label='角色编码'>{roleInfo?.roleCode || ''}</Descriptions.Item>
+          <Descriptions.Item label='角色描述'>{roleInfo?.description || ''}</Descriptions.Item>
+          <Descriptions.Item label='创建时间'>
+            {timeFormatter(roleInfo?.gmtCreate) || ''}
           </Descriptions.Item>
-          <Descriptions.Item label="创建时间">
-            {timeFormatter(roleInfo?.gmtCreate) || ""}
-          </Descriptions.Item>
-          <Descriptions.Item label="更新时间">
-            {timeFormatter(roleInfo?.gmtModified) || ""}
+          <Descriptions.Item label='更新时间'>
+            {timeFormatter(roleInfo?.gmtModified) || ''}
           </Descriptions.Item>
         </Descriptions>
 
         <div>
-          <Divider orientation="left">当前角色关联内容</Divider>
-          <div className="jsonWarp">
+          <Divider orientation='left'>当前角色关联内容</Divider>
+          <div className='jsonWarp'>
             <Tabs
-              onChange={(e) => {
-                setTabCheck(e);
+              onChange={e => {
+                setTabCheck(e)
               }}
               items={TableItemData}
             />
-            {tabCheck == "main" && (
+            {tabCheck === 'main' && (
               <>
                 <QueryFilter
-                  style={{ padding: "0px" }}
-                  size="middle"
+                  style={{ padding: '0px' }}
+                  size='middle'
                   onReset={handleOnReset}
                   onFinish={handleOnFinish}
                 >
-                  <ProFormText name="keyword" label="关键词" />
+                  <ProFormText name='keyword' label='关键词' />
                 </QueryFilter>
                 <ProTable
-                  size="small"
+                  size='small'
                   dataSource={dataList}
                   loading={isLoading}
                   columns={columns}
-                  rowKey="id"
+                  rowKey='id'
                   options={{
-                    reload: handleRoload,
+                    reload: handleRoload
                   }}
                   toolBarRender={() => {
                     return [
                       <Button
-                        type="primary"
+                        key='add'
+                        type='primary'
                         onClick={() => {
-                          getQueryBoundRolesFunc();
+                          getQueryBoundRolesFunc()
                         }}
                       >
                         添加账号
-                      </Button>,
-                    ];
+                      </Button>
+                    ]
                   }}
                 />
 
@@ -520,136 +550,199 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                     execute({
                       innerPageNo,
                       innerPageSize,
-                      roleCode: roleCode,
-                    });
+                      roleCode: roleCode
+                    })
                   }}
                 />
               </>
             )}
-            {tabCheck == "tableResource" && (
+            {tabCheck === 'tableResource' && (
               <>
                 <Table
-                  style={{ width: "100%" }}
-                  size="small"
-                  rowKey="id"
+                  style={{ width: '100%' }}
+                  size='small'
+                  rowKey='id'
                   loading={isTableLoading}
                   pagination={false}
                   columns={TableResource}
                   dataSource={ResourceTableData || []}
-                  rowSelection={{
-                    selectedRowKeys:selectedRowKeys,
-                    getCheckboxProps: (record: any) => {
-                      return {
-                        disabled: true
-                      };
-                    }
-                  }}
+                  rowSelection={
+                    isResourceAction && roleCode !== 'admin'
+                      ? {
+                          checkStrictly: false,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: (selectedRowKeys: any, selectedRows: any) => {
+                            setselectedRowKeys(selectedRowKeys)
+                            setChangeActionType(false) // 是否有操作
+                            console.log(selectedRowKeys, selectedRows)
+                          }
+                        }
+                      : {
+                          selectedRowKeys: selectedRowKeys,
+                          getCheckboxProps: (record: any) => {
+                            return {
+                              disabled: true
+                            }
+                          }
+                        }
+                  }
                   expandable={{
-                    expandedRowKeys:defaultExpandedRowKeys, //defaultExpandAllRows 不走，不是初始化tab
+                    expandedRowKeys: defaultExpandedRowKeys //defaultExpandAllRows 不走，不是初始化tab
                   }}
                 />
+                {isResourceAction && roleCode !== 'admin' && (
+                  <div className='paginBox'>
+                    <Button
+                      disabled={changeActionType}
+                      onClick={() => {
+                        resourceRoleSaveAuthsFunc()
+                      }}
+                    >
+                      保存
+                    </Button>
+                  </div>
+                )}
               </>
             )}
 
-            {tabCheck == "tableEmpower" && (
+            {tabCheck === 'tableEmpower' && (
               <>
-                <QueryFilter
-                  style={{ padding: "0px" }}
-                  size="middle"
-                  onFinish={resOnFinish}
-                >
+                <QueryFilter style={{ padding: '0px' }} size='middle' onFinish={resOnFinish}>
                   <ProFormSelect
                     options={[
                       {
-                        label: "所有资源组",
-                        value: (window as any)?.g_config?.tenant?.id,
+                        label: '所有资源组',
+                        value: (window as any)?.g_config?.tenant?.id
                       },
-                      ...empowerCom?.action?.shareData?.attributeQueryListData,
+                      ...empowerCom?.action?.shareData?.attributeQueryListData
                     ]}
-                    name="groupIds"
-                    label="资源组"
+                    name='groupIds'
+                    label='资源组'
                     fieldProps={{
-                      mode: "multiple",
-                      showSearch: true,
-                      
+                      mode: 'multiple',
+                      showSearch: true
                     }}
                   />
                   <ProFormSelect
                     options={[
                       {
-                        label: "所有权限策略",
-                        value: "",
+                        label: '所有权限策略',
+                        value: ''
                       },
-                      ...empowerCom?.action?.shareData?.policQueryListData,
+                      ...empowerCom?.action?.shareData?.policQueryListData
                     ]}
-                    name="policyIds"
-                    label="权限策略"
+                    name='policyIds'
+                    label='权限策略'
                     fieldProps={{
-                      mode: "multiple",
-                      showSearch: true,
+                      mode: 'multiple',
+                      showSearch: true
                     }}
                   />
-                 
                 </QueryFilter>
                 <ProTable
-                  style={{ margin: "20px 0" }}
+                  style={{ margin: '20px 0' }}
                   toolBarRender={() => {
                     return [
                       <Button
-                        key="add"
-                        size="middle"
-                        type="primary"
+                        key='add'
+                        size='middle'
+                        type='primary'
                         onClick={() => {
-                          empowerCom?.action?.editOpenStatus(true);
+                          empowerCom?.action?.editOpenStatus(true)
                         }}
                       >
                         新增
-                      </Button>,
-                    ];
+                      </Button>
+                    ]
                   }}
                   dataSource={policy?.dataList}
                   loading={policy?.isLoading}
                   columns={TablePolicy}
                   tableAlertRender={false}
                   tableAlertOptionRender={false}
-                  rowKey="id"
+                  rowKey='id'
                   headerTitle={false}
                   options={false}
                   rowSelection={{
-                    type: "checkbox",
+                    type: 'checkbox',
                     onChange: (selectedRowKeys: any, list: any) => {
                       let data = list?.map((item: any) => {
                         return {
                           groupId: item?.groupId,
                           policyId: item?.policyId,
-                          subjectCode: item?.subjectCode,
-                        };
-                      });
-                      setRowKeys(data);
-                    },
+                          subjectCode: item?.subjectCode
+                        }
+                      })
+                      setRowKeys(data)
+                    }
                   }}
                 />
-                <div className="paginBox">
+                <div className='paginBox'>
                   <Button
                     disabled={rowKeys.length > 0 ? false : true}
                     onClick={() => {
                       Modal.confirm({
                         title: `确认批量解绑吗？`,
                         onOk: () => {
-                          DeleteFunc(rowKeys);
-                        },
-                      });
+                          DeleteFunc(rowKeys)
+                        }
+                      })
                     }}
                   >
                     批量解绑
                   </Button>
-                  <Pagination
-                    {...policy?.pagination}
-                  />
+                  <Pagination {...policy?.pagination} />
                 </div>
               </>
             )}
-            {tabCheck === "tableData" && <></>}
+            {tabCheck === 'tableData' && (
+              <>
+                <Table
+                  style={{ width: '100%' }}
+                  size='small'
+                  rowKey='bizId'
+                  loading={isTableByDataLoading}
+                  pagination={false}
+                  columns={TableResource}
+                  dataSource={ResourceData || []}
+                  rowSelection={
+                    isDataAction && roleCode !== 'admin'
+                      ? {
+                          checkStrictly: false,
+                          selectedRowKeys: selectedDataRowKeys,
+                          onChange: (selectedRowKeys: any, selectedRows: any) => {
+                            console.log(selectedRowKeys, 'selectedRowKeys')
+                            setselectedDataRowKeys(selectedRowKeys)
+                            setChangeDataActionType(false) // 是否有操作
+                          }
+                        }
+                      : {
+                          selectedRowKeys: selectedDataRowKeys,
+                          getCheckboxProps: (record: any) => {
+                            return {
+                              disabled: true
+                            }
+                          }
+                        }
+                  }
+                  expandable={{
+                    expandedRowKeys: defaultExpandedDataRowKeys //defaultExpandAllRows 不走，不是初始化tab
+                  }}
+                />
+                {isDataAction && roleCode !== 'admin' && (
+                  <div className='paginBox'>
+                    <Button
+                      disabled={changeDataActionType}
+                      onClick={() => {
+                        dataPermissionSaveAuthsFunc()
+                      }}
+                    >
+                      保存
+                    </Button>
+                  </div>
+                )}
+              </>
+            )}
           </div>
         </div>
       </Spin>
@@ -660,15 +753,17 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
         roleBoundAccountsFunc={roleBoundAccountsFunc}
         queryByKeywordFunc={queryByKeywordFunc} //搜索事件
       ></EditAccountDrawer>
-      <empowerCom.drawer
-        {...empowerCom?.action}
-        actionFunc={(data: any) => {
-          return empowerCom?.action?.actionFunc(data).then(() => {
-            message.success("新增成功");
-            policy?.execute();
-          });
-        }}
-      />
+      {empowerCom.drawer && (
+        <empowerCom.drawer
+          {...empowerCom?.action}
+          actionFunc={(data: any) => {
+            return empowerCom?.action?.actionFunc(data).then(() => {
+              message.success('新增成功')
+              policy?.execute()
+            })
+          }}
+        />
+      )}
     </PageContainer>
-  );
+  )
 }