cfel-base-components 2.5.5 → 2.5.7

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/.umi/core/helmet.ts

@@ -0,0 +1,10 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+import React from 'react';
+import { HelmetProvider } from '/Users/wujingang/Desktop/workspace/base-components/node_modules/@umijs/renderer-react';
+import { context } from './helmetContext';
+
+export const innerProvider = (container) => {
+  return React.createElement(HelmetProvider, { context }, container);
+}

package/src/.umi/core/helmetContext.ts

@@ -0,0 +1,4 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+export const context = {};

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

@@ -130,6 +130,7 @@ export default function Account({
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -154,6 +155,10 @@ export default function Account({
         <ProFormText name="account" label="账号" />
       </QueryFilter>
       <ProTable
+        columnsState={{
+          persistenceKey: 'base_account',
+          persistenceType: 'localStorage'
+        }}
         headerTitle={"账号列表"}
         dataSource={dataList}
         loading={isLoading}

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

@@ -129,6 +129,7 @@ export default function AccountInfo() {
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -198,6 +199,10 @@ export default function AccountInfo() {
       </Descriptions>
 
       <ProTable
+        columnsState={{
+          persistenceKey: 'base_accountInfo',
+          persistenceType: 'localStorage'
+        }}
         headerTitle={"绑定的角色"}
         dataSource={dataList}
         loading={isLoading}

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

@@ -160,6 +160,7 @@ export default function Account({
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -203,6 +204,10 @@ export default function Account({
         <ProFormText name="account" label="账号" />
       </QueryFilter>
       <ProTable
+      columnsState={{
+        persistenceKey: 'base_cpcAccount',
+        persistenceType: 'localStorage'
+      }}
         toolBarRender={() => {
           return [
             <Button

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

@@ -428,16 +428,19 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
                   columns={columns}
                   pagination={false}
                 />
-                <Pagination
-                  {...pagination}
-                  onChange={(innerPageNo: number, innerPageSize: number) => {
-                    execute({
-                      innerPageNo,
-                      innerPageSize,
-                      accountId: pageId
-                    })
-                  }}
-                />
+                <div className='paginBox'>
+                  <span></span>
+                  <Pagination
+                    {...pagination}
+                    onChange={(innerPageNo: number, innerPageSize: number) => {
+                      execute({
+                        innerPageNo,
+                        innerPageSize,
+                        accountId: pageId
+                      })
+                    }}
+                  />
+                </div>
               </>
             )}
             {tabCheck === 'tableResource' && (
@@ -476,7 +479,9 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
                   columns={TablePolicy}
                   pagination={false}
                 />
-                <Pagination
+                <div className='paginBox'>
+                  <span></span>
+                  <Pagination
                   {...policy?.pagination}
                   onChange={(innerPageNo: number, innerPageSize: number) => {
                     policy?.execute({
@@ -486,6 +491,7 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
                     })
                   }}
                 />
+                </div>
               </>
             )}
             {tabCheck === 'tableData' && (

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

@@ -6,7 +6,7 @@ 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 } from 'antd';
+import { Space, Button,message,Modal,Popover } from 'antd';
 import { pageRequest,
   create,
   remove,
@@ -79,6 +79,22 @@ export default function Role({
       title: '角色描述',
       dataIndex: 'description',
       key: 'description',
+      render: (text: any) => {
+        if (text?.length > 30) {
+          let sliceText = text.slice(0, 30)
+          return (
+            <Popover
+              content={<div style={{ width: '300px', wordWrap: 'break-word' }}>{text}</div>}
+              trigger='hover'
+            >
+              {sliceText}
+              <a>更多</a>
+            </Popover>
+          )
+        } else {
+          return text
+        }
+      }
     },
     {
       title: '创建时间',
@@ -154,6 +170,7 @@ export default function Role({
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -199,6 +216,10 @@ export default function Role({
       </QueryFilter>
 
       <ProTable
+      columnsState={{
+        persistenceKey: 'base_cpcRole',
+        persistenceType: 'localStorage'
+      }}
         toolBarRender={() => {
           return [
             <Button

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

@@ -521,6 +521,10 @@ export default function RoleInfo({
                   <ProFormText name='keyword' label='关键词' />
                 </QueryFilter>
                 <ProTable
+                columnsState={{
+                  persistenceKey: 'base_cpcRoleInfoMain',
+                  persistenceType: 'localStorage'
+                }}
                   size='small'
                   dataSource={dataList}
                   loading={isLoading}
@@ -543,17 +547,20 @@ export default function RoleInfo({
                     ]
                   }}
                 />
-
-                <Pagination
-                  {...pagination}
-                  onChange={(innerPageNo: number, innerPageSize: number) => {
-                    execute({
-                      innerPageNo,
-                      innerPageSize,
-                      roleCode: roleCode
-                    })
-                  }}
-                />
+                <div className='paginBox'>
+                  <span></span>
+                  <Pagination
+                    {...pagination}
+                    onChange={(innerPageNo: number, innerPageSize: number) => {
+                      execute({
+                        innerPageNo,
+                        innerPageSize,
+                        roleCode: roleCode
+                      })
+                    }}
+                  />
+                </div>
+                
               </>
             )}
             {tabCheck === 'tableResource' && (
@@ -640,9 +647,27 @@ export default function RoleInfo({
                   />
                 </QueryFilter>
                 <ProTable
+                columnsState={{
+                  persistenceKey: 'base_cpcRoleInfoEmpower',
+                  persistenceType: 'localStorage'
+                }}
                   style={{ margin: '20px 0' }}
                   toolBarRender={() => {
                     return [
+                      <Button
+                      key="del"
+                    disabled={rowKeys.length > 0 ? false : true}
+                    onClick={() => {
+                      Modal.confirm({
+                        title: `确认批量解绑吗？`,
+                        onOk: () => {
+                          DeleteFunc(rowKeys)
+                        }
+                      })
+                    }}
+                  >
+                    批量解绑
+                  </Button>,
                       <Button
                         key='add'
                         size='middle'
@@ -678,19 +703,7 @@ export default function RoleInfo({
                   }}
                 />
                 <div className='paginBox'>
-                  <Button
-                    disabled={rowKeys.length > 0 ? false : true}
-                    onClick={() => {
-                      Modal.confirm({
-                        title: `确认批量解绑吗？`,
-                        onOk: () => {
-                          DeleteFunc(rowKeys)
-                        }
-                      })
-                    }}
-                  >
-                    批量解绑
-                  </Button>
+                  <span></span>
                   <Pagination {...policy?.pagination} />
                 </div>
               </>

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

@@ -101,6 +101,7 @@ export default function Role({
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -125,6 +126,10 @@ export default function Role({
       </QueryFilter>
 
       <ProTable
+        columnsState={{
+          persistenceKey: 'base_role',
+          persistenceType: 'localStorage'
+        }}
         headerTitle={"角色列表"}
         dataSource={dataList}
         loading={isLoading}

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

@@ -144,6 +144,7 @@ export default function RoleInfo() {
       let records = get(res, "records", [])
       let total = get(res, "total", 0)
       return {
+        ...res,
         dataList: records,
         totalCount: total
       }
@@ -209,6 +210,10 @@ export default function RoleInfo() {
       </QueryFilter>
 
       <ProTable
+        columnsState={{
+          persistenceKey: 'base_roleInfo',
+          persistenceType: 'localStorage'
+        }}
         headerTitle={"角色下绑定的账号"}
         dataSource={dataList}
         loading={isLoading}