cfel-base-components 2.5.12 → 2.5.13

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

@@ -1,31 +1,44 @@
-import React, { useEffect, useRef, useState } from 'react';
+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 { ProFormText, } from '@ant-design/pro-components';
-import { Space, Button, message,Modal } from 'antd';
-import { get } from 'lodash';
-import { timeFormatter } from '../../../utils';
 import useTableHooks from "../../../hooks/useTableHooks"
+import { timeFormatter, getUrlParams } from '../../../utils';
+
+import { ProFormText } from '@ant-design/pro-components'
+import { Space, Button, message, Modal } from 'antd'
+import { get } from 'lodash'
+
+import { FormOutlined } from '@ant-design/icons'
 import {
-  accountPage, accountCreateAccount,
-  accountUpdateAccount, accountDeleteAccount
-} from "./api"
+  accountPage,
+  accountCreateAccount,
+  accountUpdateAccount,
+  accountDeleteAccount,
+  accountGetAccount,
+  accountGetAccountPassword,
+  accountResetPw
+} from './api'
 import AddModal from './AddModal'
-import "./index.scss"
+import ResetModal from './ResetModal'
+
+import './index.scss'
 
 export interface AccountProps {
-  historyAction: any;
+  historyAction: any
 }
 
-export default function Account({
-  historyAction
-}: AccountProps) {
+export default function Account({ historyAction }: AccountProps) {
   const searchFormRef: any = useRef()
 
   const [ModalOpen, setModalOpen] = useState(false)
-  const [editingData, setEditingData] = useState(null);//编辑数据
+  const [id, setId] = useState(null)
+  const [editingData, setEditingData]: any = useState(null) //编辑数据
+
+  const [resetModalOpen, setResetModalOpen] = useState(false)
+  const [resetEditingData, setResetEditingData]: any = useState(null) //编辑数据
 
   useEffect(() => {
     execute()
@@ -38,41 +51,29 @@ export default function Account({
       key: 'name',
       render: (text: any, data: any) => {
         return (
-          <span
-            style={{ cursor: "pointer", color: "#1677ff" }}
-            onClick={() => {
-              historyAction?.push({
-                pathname: `/account-info`,
-                search: `?id=${data.id}`,
-              });
-            }}
-          >
-            {data?.name}
-          </span>
-        );
-      },
+          <>
+            <span
+              style={{ cursor: 'pointer', color: '#1677ff' }}
+              onClick={() => {
+                historyAction?.push({
+                  pathname: `/account-info`,
+                  search: `?id=${data.id}`
+                })
+              }}
+            >
+              {data?.name}
+              <FormOutlined />
+            </span>
+          </>
+        )
+      }
     },
     {
       title: '账号',
       dataIndex: 'account',
-      key: 'account',
-    },
-    {
-      title: '工号',
-      dataIndex: 'jobNumber',
-      key: 'jobNumber',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'mobile',
-      key: 'mobile',
-    },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      key: 'email',
-      ellipsis: true,
+      key: 'account'
     },
+
     {
       title: '是否主账号',
       dataIndex: 'isAdmin',
@@ -107,39 +108,48 @@ export default function Account({
       fixed: 'right',
       width: 150,
       render: (rowdata: any) => (
-
         <Space>
-          <a onClick={() => {
-            setEditingData(rowdata)
-            setModalOpen(true)
-          }} >编辑</a>
+          <a
+            onClick={() => {
+              setResetEditingData(rowdata)
+              setResetModalOpen(true)
+            }}
+          >
+            重置密码
+          </a>
           <a
             onClick={() => {
               historyAction?.push({
                 pathname: `/account-info`,
-                search: `?id=${rowdata.id}`,
-              });
+                search: `?id=${rowdata.id}`
+              })
             }}
           >
             配置
           </a>
-          <a onClick={() => {
-            Modal.confirm({
-              title: `确认删除${rowdata?.name}吗？`,
-              onOk: () => {
-                DeleteFunc(rowdata?.id)
-              }
-            })
-          }} >删除</a>
+          {rowdata.isAdmin ? null : (
+            <a
+              onClick={() => {
+                Modal.confirm({
+                  title: `确认删除${rowdata?.name}吗？`,
+                  onOk: () => {
+                    DeleteFunc(rowdata?.id)
+                  }
+                })
+              }}
+            >
+              删除
+            </a>
+          )}
         </Space>
-      ),
-    },
-  ];
+      )
+    }
+  ]
 
   const handleOnReset: any = async (values: any) => {
     searchFormRef.current = { ...values }
     execute({
-      innerPageNo: 1,
+      innerPageNo: 1
     })
   }
 
@@ -148,17 +158,14 @@ export default function Account({
     execute()
   }
 
-  const readDataList = ({
-    innerPageNo,
-    innerPageSize,
-  }: any) => {
+  const readDataList = ({ innerPageNo, innerPageSize }: any) => {
     return accountPage({
       currentPage: innerPageNo,
       pageSize: innerPageSize,
-      ...searchFormRef.current,
+      ...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,
@@ -177,65 +184,93 @@ export default function Account({
   const setModalOpenFunc = (type: boolean) => {
     setModalOpen(type)
     setEditingData(null)
+    setId(null)
   }
   const actionFunc = (data: any, type: string) => {
-    return (type == 'add' ? accountCreateAccount : accountUpdateAccount)({ ...data }).then((res) => {
-      message.success(`${type == 'add' ? '新增' : '更新'}成功`)
-      setModalOpen(false)
-      setEditingData(null)
+    return accountCreateAccount({ ...data }).then((res: any) => {
+      message.success(`新增成功`)
+      setId(res)
+      accountGetAccountFunc(res)
       execute()
     })
   }
-  const DeleteFunc = (id:any)=>{
+  const accountGetAccountFunc = (id: any) => {
+    accountGetAccount({
+      id
+    }).then((res: any) => {
+      setEditingData(res)
+    })
+  }
+  const DeleteFunc = (id: any) => {
     accountDeleteAccount({
-        id,
+      id
     }).then((res: any) => {
-        message.success('删除成功')
-        execute()
-      })
-}
+      message.success('删除成功')
+      execute()
+    })
+  }
+  const accountGetAccountPasswordFunc = (data: any) => {
+    return accountGetAccountPassword(data)
+  }
+
+  const actionResetFunc = (data: any) => {
+    return accountResetPw({ ...data }).then((res: any) => {
+      message.success(`重置成功`)
+    })
+  }
+  const setResetModalOpenFunc = (type: boolean) => {
+    setResetModalOpen(type)
+    setResetEditingData(null)
+  }
   return (
     <PageContainer>
-      <QueryFilter
-        onReset={handleOnReset}
-        onFinish={handleOnFinish}
-      >
-        <ProFormText name="name" label="名称" />
-        <ProFormText name="account" label="账号" />
+      <QueryFilter onReset={handleOnReset} onFinish={handleOnFinish}>
+        <ProFormText name='name' label='名称' />
+        <ProFormText name='account' label='账号' />
       </QueryFilter>
       <ProTable
-      columnsState={{
-        persistenceKey: 'base_cpcAccount',
-        persistenceType: 'localStorage'
-      }}
+        columnsState={{
+          persistenceKey: 'base_cpcAccount',
+          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} />
+      <ResetModal
+        ModalOpen={resetModalOpen} //弹框状态
+        editOpenStatus={setResetModalOpenFunc} //关闭弹框
+        editingData={resetEditingData} //编辑数据
+        actionFunc={actionResetFunc} //新增事件
+        accountGetAccountPasswordFunc={accountGetAccountPasswordFunc}
+      />
       <AddModal
         ModalOpen={ModalOpen}
         editOpenStatus={setModalOpenFunc} //修改状态事件
         editingData={editingData} //当前数据
-        actionFunc={actionFunc}//事件
+        actionFunc={actionFunc} //事件
+        accountGetAccountPasswordFunc={accountGetAccountPasswordFunc}
       />
-      <Pagination  {...pagination} />
     </PageContainer>
   )
 }

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

@@ -130,6 +130,7 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
       fixed: 'right',
       render: (rowdata: any) => (
         <Space>
+        {accountInfo?.isAdmin && rowdata.roleCode === 'admin' ? null : (
           <a
             onClick={() => {
               Modal.confirm({
@@ -143,7 +144,8 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
           >
             解绑
           </a>
-        </Space>
+        )}
+      </Space>
       )
     }
   ]

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

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import {
     Button, Modal, Form, Input,
 } from 'antd';
-export default function index({
+export default function Index({
     ModalOpen, //弹框状态
     editOpenStatus, //关闭弹框
     editingData, //编辑数据

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>
   )
-};
+}