cfel-base-components 2.3.5 → 2.4.0

package/.vscode/settings.json

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

package/demo/src/index.jsx

@@ -1,74 +1,103 @@
-import React from "react"
-import { createRoot } from 'react-dom/client';
-import style from './index.module.less';
-import { SwapOutlined, } from '@ant-design/icons';
-import { ConfigProvider } from "antd"
-import './index.scss';
-import PageContainer from '../../src/components/base-component/PageContainer';
-import Layout from '../../src/components/layout';
+import React from "react";
+import { createRoot } from "react-dom/client";
+import style from "./index.module.less";
+import { SwapOutlined } from "@ant-design/icons";
+import { ConfigProvider } from "antd";
+import "./index.scss";
+import PageContainer from "../../src/components/base-component/PageContainer";
+import Layout from "../../src/components/layout";
 // import Account from '../../src/components/universal-pages/account';
 // import AccountInfo from '../../src/components/universal-pages/accountInfo';
-import CpcRole from '../../src/components/universal-pages/cpcRole';
-import CpcRoleInfo from '../../src/components/universal-pages/cpcRoleInfo';
+import CpcRole from "../../src/components/universal-pages/cpcRole";
+import CpcRoleInfo from "../../src/components/universal-pages/cpcRoleInfo";
+import ProTable from "../../src/components/base-component/ProTable";
 
 const App = () => {
-  return <ConfigProvider
-    theme={{
-      token: {
-        fontSize: 12
-      },
-      components: {
-        Form: {
-          itemMarginBottom: 12,
-        },
-        Descriptions: {
-          /* 这里是你的组件 token */
+  const columns = [
+    {
+      title: "名称",
+      dataIndex: "name",
+      key: "name",
+    },
+    {
+      title: "描述",
+      dataIndex: "description",
+      key: "description",
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      key: "status",
+    },
+  ];
+
+  return (
+    <ConfigProvider
+      theme={{
+        token: {
+          fontSize: 12,
         },
-      },
-    }}>
-    <Layout
-      appName="控制台"
-      productList={false}
-      menuList={[
-        {
-          label: '设备中心',
-          key: 'device',
-          icon: <SwapOutlined />,
-          children: [
-            {
-              label: '设备管理',
-              key: 'device-list',
-            },
-          ],
+        components: {
+          Form: {
+            itemMarginBottom: 12,
+          },
+          Descriptions: {
+            /* 这里是你的组件 token */
+          },
         },
-      ]}
-      logoUrl={"https://cdn.chengfengerlai.com/logo/company-logo/chengfengerlai-puhui.png"}
-      user={{
-        name: (window)?.g_config?.user?.name,
-        avatar: (window)?.g_config?.user?.avatar,
-        tenantName: (window)?.g_config?.tenant?.name,
-        role: (window)?.g_config?.user?.roleInfo,
       }}
-      custom={{
-        type: (window)?.g_config?.custom?.type,
-        isCompleted: (window)?.g_config?.custom?.isCompleted,
-        isAudited: (window)?.g_config?.custom?.isAudited,
-        hrefUrl: '/web/user-info',
-        historyAction: history
-      }}
-      logoutUrl={(window)?.g_config?.logoutUrl}
-      switchTenantUrl={(window)?.g_config?.switchTenantUrl}
     >
-      <CpcRoleInfo
+      <Layout
+        appName="控制台"
+        productList={false}
+        menuList={[
+          {
+            label: "设备中心",
+            key: "device",
+            icon: <SwapOutlined />,
+            children: [
+              {
+                label: "设备管理",
+                key: "device-list",
+              },
+            ],
+          },
+        ]}
+        logoUrl={
+          "https://cdn.chengfengerlai.com/logo/company-logo/chengfengerlai-puhui.png"
+        }
+        user={{
+          name: window?.g_config?.user?.name,
+          avatar: window?.g_config?.user?.avatar,
+          tenantName: window?.g_config?.tenant?.name,
+          role: window?.g_config?.user?.roleInfo,
+        }}
+        custom={{
+          type: window?.g_config?.custom?.type,
+          isCompleted: window?.g_config?.custom?.isCompleted,
+          isAudited: window?.g_config?.custom?.isAudited,
+          hrefUrl: "/web/user-info",
+          historyAction: history,
+        }}
+        logoutUrl={window?.g_config?.logoutUrl}
+        switchTenantUrl={window?.g_config?.switchTenantUrl}
+      >
+        {/* <CpcRoleInfo
       isShowTab={{
         main: true,
         tableResource: true,
         tableEmpower: true,
         tableData: false,
-      }}></CpcRoleInfo>
-    </Layout>
-  </ConfigProvider>
-}
-const container = document.getElementById('root');
+      }}></CpcRoleInfo> */}
+
+        <ProTable
+          columns={columns}
+          dataSource={[{ name: "1", description: "1", status: "1" }]}
+        />
+      </Layout>
+    </ConfigProvider>
+  );
+};
+const container = document.getElementById("root");
 const root = createRoot(container);
-root.render(<App />);
+root.render(<App />);

package/package.json

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

package/src/components/base-component/ProTable/index.tsx

@@ -1,29 +1,50 @@
-import React from 'react';
-import {
-  ProTable,
-  ProTableProps
-} from '@ant-design/pro-components';
-import classnames from 'classnames/bind';
-import styles from "./index.module.less"
+import React, { useState } from "react";
+import { ProTable, ProTableProps } from "@ant-design/pro-components";
+import classnames from "classnames/bind";
+import styles from "./index.module.less";
 const cx = classnames.bind(styles);
 
 export default function ProTableComponent({
   className,
+  nameSpace,
   ...restFileds
 }: ProTableProps<any, any> | any) {
+  const tableColumnsConfig = JSON.parse(
+    localStorage.getItem("TABLE_COLUMNS_CONFIG")!
+  );
+  const currentConfig = tableColumnsConfig?.[nameSpace];
+  const [columnsStateMap, setColumnsStateMap]: any = useState(
+    currentConfig || {}
+  );
+
   return (
     <ProTable
       className={cx({
         "pro-table": true,
-        [className]: true
+        [className]: true,
       })}
       search={false}
       pagination={false}
       scroll={{
-        x: 'max-content'
+        x: "max-content",
+      }}
+      columnsState={{
+        value: columnsStateMap,
+        onChange: (v) => {
+          setColumnsStateMap(v);
+          if (!nameSpace || typeof nameSpace !== "string") {
+            return;
+          }
+          localStorage.setItem(
+            "TABLE_COLUMNS_CONFIG",
+            JSON.stringify({
+              ...tableColumnsConfig,
+              [nameSpace]: v,
+            })
+          );
+        },
       }}
       {...restFileds}
     />
-  )
-
-}
+  );
+}

package/src/components/layout/index.tsx

@@ -246,10 +246,6 @@ export default function LiosLayout(props: LiosLayoutlProps) {
         !isHideHeader &&
         <div className="layout-header">
 
-          <div className="background">
-            <img className="background-img" src="https://pic.imgdb.cn/item/64813de01ddac507cc192a6e.jpg" alt="" />
-            <div className="background-mask" />
-          </div>
 
           <strong className="layout-header-logo">
             {logoUrl && <img className="logo-img" src={logoUrl || ''} />}
@@ -300,6 +296,7 @@ export default function LiosLayout(props: LiosLayoutlProps) {
 
             <Menu
               mode="inline"
+              theme="dark"
               openKeys={openKeys}
               onOpenChange={onOpenChange}
               items={menuList}

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

@@ -58,7 +58,7 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
   ]); //tab 数据
   const TableResource: any = [
     {
-      title: "资源名称",
+      title: "菜单名称",
       dataIndex: "name",
       key: "name",
     },
@@ -166,7 +166,7 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
     let data: any = [];
     if (isShowTab?.tableResource) {
       data.push({
-        label: "关联资源",
+        label: "关联菜单",
         key: "tableResource",
         icon: <InteractionOutlined />,
       });

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

@@ -147,7 +147,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
 
   const TableResource: any = [
     {
-      title: "资源名称",
+      title: "菜单名称",
       dataIndex: "name",
       key: "name",
     },
@@ -238,7 +238,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
     let data: any = [];
     if (isShowTab?.tableResource) {
       data.push({
-        label: "关联资源",
+        label: "关联菜单",
         key: "tableResource",
         icon: <InteractionOutlined />,
       });

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

@@ -1,10 +0,0 @@
-// @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

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