cfel-base-components 2.5.12 → 2.5.14

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

@@ -1,39 +1,34 @@
-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 { get } from 'lodash';
-import { Space, Button,message,Modal,Popover } from 'antd';
-import { pageRequest,
-  create,
-  remove,
-  update
- } from "./api"
+import useTableHooks from "../../../hooks/useTableHooks"
+
+import { timeFormatter, getUrlParams } from '../../../utils';
+import { get } from 'lodash'
+import { Space, Button, message, Modal, Popover } from 'antd'
+import { pageRequest, create, remove, update } from './api'
+
+import { ProFormText } from '@ant-design/pro-components'
 
-import { ProFormText, } from '@ant-design/pro-components';
-import { timeFormatter } from '../../../utils';
 import AddModal from './AddModal'
-import "./index.scss"
+import './index.scss'
 export interface RoleProps {
-  historyAction: any;
+  historyAction: any
 }
-export default function Role({
-  historyAction
-}: RoleProps) {
+export default function Role({ historyAction }: RoleProps) {
   const searchFormRef: any = useRef()
 
   const [ModalOpen, setModalOpen] = useState(false)
-  const [editingData, setEditingData] = useState(null);//编辑数据
+  const [editingData, setEditingData] = useState(null) //编辑数据
   useEffect(() => {
     init()
     execute()
   }, [])
 
-  const init = () => {
-  }
+  const init = () => {}
 
   const columns: any = [
     {
@@ -43,37 +38,37 @@ export default function Role({
       render: (text: any, data: any) => {
         return (
           <span
-            style={{ cursor: "pointer", color: "#1677ff" }}
+            style={{ cursor: 'pointer', color: '#1677ff' }}
             onClick={() => {
               historyAction?.push({
                 pathname: `/role-info`,
-                search: `?roleCode=${data.roleCode}`,
-              });
+                search: `?roleCode=${data.roleCode}`
+              })
             }}
           >
             {data?.roleName}
           </span>
-        );
-      },
+        )
+      }
     },
     {
       title: '角色编码',
       dataIndex: 'roleCode',
-      key: 'roleCode',
+      key: 'roleCode'
     },
     {
-      title: "来源",
-      dataIndex: "source",
-      key: "source",
+      title: '来源',
+      dataIndex: 'source',
+      key: 'source',
       render: (cell: any) => {
-        if (cell == "system") {
-          return "系统创建";
-        } else if (cell == "user") {
-          return "用户自建";
-        } else{
-          return "未知";
+        if (cell === 'system') {
+          return '系统创建'
+        } else if (cell === 'user') {
+          return '用户自建'
+        } else {
+          return '未知'
         }
-      },
+      }
     },
     {
       title: '角色描述',
@@ -115,41 +110,53 @@ export default function Role({
     {
       title: '操作',
       width: 180,
-      fixed: "right",
-      render: (rowdata: any,) => <Space>
-        {
-          rowdata.source !== "system"  && 
-          <a onClick={() => {
-            setEditingData(rowdata)
-            setModalOpen(true)
-          }}>编辑</a>
-        }
-        <a onClick={() => {
-          historyAction?.push({
-            pathname: `/role-info`,
-            search: `?roleCode=${rowdata.roleCode}`,
-          });
-        }}>配置</a>
-        {
-          rowdata.source !== "system"  && 
-          <a onClick={() => {
-            Modal.confirm({
-              title: `确认删除${rowdata?.roleName}吗？`,
-              content: '',
-              onOk: () => {
-                DeleteFunc(rowdata?.roleCode)
-              }
-            })
-          }} >删除</a>
-        }
-      </Space>
-    },
-  ];
+      fixed: 'right',
+      render: (rowdata: any) => (
+        <Space>
+          {rowdata.source !== 'system' && (
+            <a
+              onClick={() => {
+                setEditingData(rowdata)
+                setModalOpen(true)
+              }}
+            >
+              编辑
+            </a>
+          )}
+          <a
+            onClick={() => {
+              historyAction?.push({
+                pathname: `/role-info`,
+                search: `?roleCode=${rowdata.roleCode}`
+              })
+            }}
+          >
+            配置
+          </a>
+          {rowdata.source !== 'system' && (
+            <a
+              onClick={() => {
+                Modal.confirm({
+                  title: `确认删除${rowdata?.roleName}吗？`,
+                  content: '',
+                  onOk: () => {
+                    DeleteFunc(rowdata?.roleCode)
+                  }
+                })
+              }}
+            >
+              删除
+            </a>
+          )}
+        </Space>
+      )
+    }
+  ]
 
   const handleOnReset: any = async (values: any) => {
     searchFormRef.current = { ...values }
     execute({
-      innerPageNo: 1,
+      innerPageNo: 1
     })
   }
 
@@ -158,17 +165,14 @@ export default function Role({
     execute()
   }
 
-  const readDataList = ({
-    innerPageNo,
-    innerPageSize,
-  }: any) => {
+  const readDataList = ({ innerPageNo, innerPageSize }: any) => {
     return pageRequest({
       currentPage: innerPageNo,
       pageSize: innerPageSize,
       ...searchFormRef.current
     }).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,
@@ -191,63 +195,61 @@ export default function Role({
   }
 
   const actionFunc = (data: any, type: string) => {
-    return  (type == 'add' ? create : update)({ ...data }).then((res) => {
-      message.success(`${type == 'add' ? '新增' : '更新'}成功`)
+    return (type === 'add' ? create : update)({ ...data }).then((res: any) => {
+      message.success(`${type === 'add' ? '新增' : '更新'}成功`)
       setModalOpen(false)
       setEditingData(null)
       execute()
     })
   }
-  const DeleteFunc = (roleCode:any)=>{
+  const DeleteFunc = (roleCode: any) => {
     remove({
-      roleCode,
+      roleCode
     }).then((res: any) => {
-        message.success('删除成功')
-        execute()
-      })
-}
+      message.success('删除成功')
+      execute()
+    })
+  }
   return (
-    <PageContainer >
-      <QueryFilter
-        onReset={handleOnReset}
-        onFinish={handleOnFinish}
-      >
-        <ProFormText name="roleName" label="角色名称" />
+    <PageContainer>
+      <QueryFilter onReset={handleOnReset} onFinish={handleOnFinish}>
+        <ProFormText name='roleName' label='角色名称' />
       </QueryFilter>
 
       <ProTable
-      columnsState={{
-        persistenceKey: 'base_cpcRole',
-        persistenceType: 'localStorage'
-      }}
+        columnsState={{
+          persistenceKey: 'base_cpcRole',
+          persistenceType: 'localStorage'
+        }}
         toolBarRender={() => {
           return [
             <Button
-              type="primary"
+              key='add'
+              type='primary'
               onClick={() => {
                 setModalOpen(true)
               }}
             >
               新增角色
-            </Button>,
-          ];
+            </Button>
+          ]
         }}
-        headerTitle={"角色列表"}
+        headerTitle={'角色列表'}
         dataSource={dataList}
         loading={isLoading}
         columns={columns}
-        rowKey="id"
+        rowKey='id'
         options={{
           reload: handleRoload
         }}
       />
-      <Pagination  {...pagination} />
+      <Pagination {...pagination} />
       <AddModal
         ModalOpen={ModalOpen}
         editOpenStatus={setModalOpenFunc} //修改状态事件
         editingData={editingData} //当前数据
-        actionFunc={actionFunc}//事件
+        actionFunc={actionFunc} //事件
       />
-    </PageContainer >
+    </PageContainer>
   )
-};
+}

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

@@ -86,22 +86,7 @@ export default function RoleInfo({
       dataIndex: 'account',
       key: 'account'
     },
-    {
-      title: '工号',
-      dataIndex: 'jobNumber',
-      key: 'jobNumber'
-    },
-    {
-      title: '手机号',
-      dataIndex: 'mobile',
-      key: 'mobile'
-    },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      key: 'email',
-      copyable: true
-    },
+    
     {
       title: '是否主账号',
       dataIndex: 'isAdmin',
@@ -136,20 +121,22 @@ export default function RoleInfo({
       fixed: 'right',
       render: (rowdata: any) => (
         <Space>
+        {rowdata?.isAdmin && roleInfo?.roleCode === 'admin'  ? null : (
           <a
-            onClick={() => {
-              Modal.confirm({
-                title: '确认解绑吗？',
-                content: '',
-                onOk: () => {
-                  roleUnboundAccountsFunc(rowdata.id)
-                }
-              })
-            }}
-          >
-            解绑
-          </a>
-        </Space>
+          onClick={() => {
+            Modal.confirm({
+              title: '确认解绑吗？',
+              content: '',
+              onOk: () => {
+                roleUnboundAccountsFunc(rowdata.id)
+              }
+            })
+          }}
+        >
+          解绑
+        </a>
+        )}
+      </Space>
       )
     }
   ]