cfel-base-components 2.4.3 → 2.5.0

package/config/webpack.dev.config.js

@@ -42,6 +42,7 @@ const devConfig = {
                     { loader: 'sass-loader' }
                 ]
             },
+           
             {
                 test: /.min.css$/,
                 use: [

package/demo/src/index.html

@@ -21,14 +21,13 @@
                 source: "\u9489\u9489",
                 name: "\u8FDC\u822A\u8DE8\u56FD\u63A7\u80A1\u96C6\u56E2",
                 shortName: "\u8FDC\u822A\u8DE8\u56FD\u63A7\u80A1\u96C6\u56E2",
-                logo: ""
             },
             user: {
                 id: 1676424765496406018,
                 userId: "01436565094521893533",
                 unionId: "xsU4QrgEfZxxj8YxEWAYJAiEiE",
-                name: "\u5434\u91D1\u521A",
-                avatar: "https:\/\/pic.imgdb.cn\/item\/64a520d21ddac507cc4653d3.jpg",
+                name: "\u5434\u5434\u5434\u5434",
+                avatar: "https://static-legacy.dingtalk.com/media/lQLPM5AkqOufBy7NAyDNAyCwJZ592czMOC4EeIgNJAAGAA_800_800.png",
                 account: "15957797376",
                 roleInfo: []
             },
@@ -42,6 +41,7 @@
             logoutUrl: "\/sso\/logout?back=http%3A%2F%2Flios-iot-obee-daily.chengfengerlai.com%2Fdelivery",
             switchTenantUrl: "https:\/\/cfel-sso-daily.chengfengerlai.com\/tenant\/switch?fakeAccountId=1676424765496406018\u0026redirect=http:\/\/lios-iot-obee-daily.chengfengerlai.com\/sso\/login?back=http%3A%2F%2Flios-iot-obee-daily.chengfengerlai.com%2Fdelivery",
             productCode: "lios-iot-obee",
+            logo: "https://cdn.chengfengerlai.com/logo/company-logo/cfel-logo-white.png",
             env: "daily"
         };
     </script>

package/demo/src/index.jsx

@@ -1,16 +1,133 @@
 import React from "react";
 import { createRoot } from "react-dom/client";
 import style from "./index.module.less";
-import { SwapOutlined } from "@ant-design/icons";
+import { SwapOutlined, QqOutlined, WeiboOutlined } 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 ProTable from "../../src/components/base-component/ProTable";
+import PageContainer from "../../src/components/base-component/PageContainer";
+
+const menuList = [
+  {
+    label: "目录1",
+    key: "a",
+    icon: <QqOutlined />,
+    children: [
+      {
+        label: "目录1-子目录1",
+        key: "a-1",
+      },
+      {
+        label: "目录1-子目录2",
+        key: "a-2",
+      },
+    ],
+  },
+  {
+    label: "目录2",
+    key: "b",
+    icon: <WeiboOutlined />,
+    children: [
+      {
+        label: "目录2-子目录1",
+        key: "b-1",
+      },
+    ],
+  },
+  {
+    label: "目录1",
+    key: "c",
+    icon: <QqOutlined />,
+    children: [
+      {
+        label: "目录1-子目录1",
+        key: "c-1",
+      },
+    ],
+  },
+  {
+    label: "目录2",
+    key: "d",
+    icon: <WeiboOutlined />,
+    children: [
+      {
+        label: "目录2-子目录1",
+        key: "d-1",
+      },
+    ],
+  },
+  {
+    label: "目录1",
+    key: "e",
+    icon: <QqOutlined />,
+    children: [
+      {
+        label: "目录1-子目录1",
+        key: "e-1",
+      },
+    ],
+  },
+  {
+    label: "目录2",
+    key: "f",
+    icon: <WeiboOutlined />,
+    children: [
+      {
+        label: "目录2-子目录1",
+        key: "f-1",
+      },
+    ],
+  },
+  {
+    label: "目录1",
+    key: "g",
+    icon: <QqOutlined />,
+    children: [
+      {
+        label: "目录1-子目录1",
+        key: "g-1",
+      },
+    ],
+  },
+  {
+    label: "目录2",
+    key: "h",
+    icon: <WeiboOutlined />,
+    children: [
+      {
+        label: "目录2-子目录1",
+        key: "h-1",
+      },
+    ],
+  },
+  {
+    label: "目录1",
+    key: "i",
+    icon: <QqOutlined />,
+    children: [
+      {
+        label: "目录1-子目录1",
+        key: "i-1",
+      },
+    ],
+  },
+  {
+    label: "目录2",
+    key: "j",
+    icon: <WeiboOutlined />,
+    children: [
+      {
+        label: "目录2-子目录1",
+        key: "j-1",
+      },
+    ],
+  },
+];
 
 const App = () => {
   const columns = [
@@ -65,37 +182,11 @@ const App = () => {
       <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,
+        menuList={menuList}
+        customAction={()=>{
+          history.push("/web/user-info")
         }}
-        logoutUrl={window?.g_config?.logoutUrl}
-        switchTenantUrl={window?.g_config?.switchTenantUrl}
+        actions={["动作1","动作2"]}
       >
         {/* <CpcRoleInfo
       isShowTab={{
@@ -104,12 +195,13 @@ const App = () => {
         tableEmpower: true,
         tableData: false,
       }}></CpcRoleInfo> */}
-
-        <ProTable
-          columns={columns}
-          nameSpace="device"
-          dataSource={[{ name: "1", description: "1", status: "1" }]}
-        />
+        <PageContainer>
+          <ProTable
+            columns={columns}
+            nameSpace="device"
+            dataSource={[{ name: "1", description: "1", status: "1" }]}
+          />
+        </PageContainer>
       </Layout>
     </ConfigProvider>
   );

package/package.json

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

package/src/components/base-component/PageContainer/index.module.less

@@ -1,7 +1,7 @@
 .page-wraper {
   height: 100%;
   overflow-y: auto;
-  padding: 12px 12px 0;
+  padding: 8px 8px 0;
   display: flex;
   flex-direction: column;
 }

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

@@ -21,10 +21,6 @@ export default function ProTableComponent({
       scroll={{
         x: "max-content",
       }}
-      columnsState={{
-        persistenceKey: nameSpace,
-        persistenceType: "localStorage",
-      }}
       {...restFileds}
     />
   );