cfel-base-components 2.5.8 → 2.5.10

package/package.json

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

package/src/apiRequest/config.ts

@@ -1,8 +1,7 @@
-import axios, { AxiosRequestHeaders } from 'axios';
-import { notification } from 'antd';
+import axios, { AxiosRequestHeaders } from "axios";
+import { notification } from "antd";
 
-
-let UMI_APP_BASEURL: any = window.location.origin || process.env
+let UMI_APP_BASEURL: any = window.location.origin || process.env;
 const instance = axios.create({ baseURL: UMI_APP_BASEURL });
 
 instance.interceptors.request.use(
@@ -14,7 +13,7 @@ instance.interceptors.request.use(
     config.params = {
       ...config.params,
       productCode: (window as any)?.g_config?.productCode,
-    }
+    };
 
     return config;
   },
@@ -29,7 +28,7 @@ instance.interceptors.response.use(
 
     if (!success) {
       notification.error({
-        message: errorMsg
+        message: errorMsg,
       });
       return Promise.reject(data);
     }
@@ -41,30 +40,36 @@ instance.interceptors.response.use(
     const { response = {} } = error;
     const { status } = response;
 
+    if (error.code === "ERR_CANCELED") {
+      return Promise.reject(error);
+    }
+
     enum CodeMessage {
-      '发出的请求有错误，服务器没有进行新建或修改数据的操作。' = 400,
-      '用户未登录。' = 401,
-      '用户得到授权，但是访问是被禁止的。' = 403,
-      '发出的请求针对的是不存在的记录，服务器没有进行操作。' = 404,
-      '请求的格式不可得。' = 406,
-      '请求的资源被永久删除，且不会再得到的。' = 410,
-      '当创建一个对象时，发生一个验证错误。' = 422,
-      '服务器发生错误，请检查服务器。' = 500,
-      '网关错误。' = 502,
-      '服务不可用，服务器暂时过载或维护。' = 503,
-      '网关超时。' = 504
+      "发出的请求有错误，服务器没有进行新建或修改数据的操作。" = 400,
+      "用户未登录。" = 401,
+      "用户得到授权，但是访问是被禁止的。" = 403,
+      "发出的请求针对的是不存在的记录，服务器没有进行操作。" = 404,
+      "请求的格式不可得。" = 406,
+      "请求的资源被永久删除，且不会再得到的。" = 410,
+      "当创建一个对象时，发生一个验证错误。" = 422,
+      "服务器发生错误，请检查服务器。" = 500,
+      "网关错误。" = 502,
+      "服务不可用，服务器暂时过载或维护。" = 503,
+      "网关超时。" = 504,
     }
 
     notification.error({
-      message: response?.data?.message || CodeMessage[status] || "服务暂不可用，请检查网络"
+      message:
+        response?.data?.message ||
+        CodeMessage[status] ||
+        "服务暂不可用，请检查网络",
     });
 
     if (status === 401) {
-
     }
 
     return Promise.reject(error);
   }
 );
 
-export default instance;
+export default instance;

package/src/components/layout/index.tsx

@@ -56,11 +56,19 @@ export default function LiosLayout(props: LiosLayoutlProps) {
   const [collapsed, setCollapsed] = useState(
     localStorage.getItem("layout_collapsed") === "true"
   );
+  const [isCopied, setIsCopied] = useState(false);
 
   const onOpenChange: MenuProps["onOpenChange"] = (keys) => {
     setOpenKeys(keys);
   };
 
+  const copyTextToClipboard = async (text:string) => {
+    try {
+      await navigator.clipboard.writeText(text);
+      setIsCopied(true);
+    } catch (err) {}
+  };
+
   return (
     <Layout className="layout-warp">
       {Array.isArray(menuList) && menuList.length > 0 && (
@@ -143,12 +151,15 @@ export default function LiosLayout(props: LiosLayoutlProps) {
                   myWalletInfo={myWalletInfo}
                   amountInfo={amountInfo}
                   customAction={customAction}
+                  isCopied={isCopied}
+                  copyTextToClipboard={copyTextToClipboard}
                 />
               }
               arrow={false}
               trigger="click"
               onOpenChange={(e) => {
                 if (!e) return;
+                setIsCopied(false);
                 myWalletInfoAction && myWalletInfoAction();
               }}
             >

package/src/components/layout/user-card/index.scss

@@ -81,22 +81,30 @@
 
     .li-flex {
       display: flex;
-
+      .lios-keyMare {
+        width: 40px;
+      }
       .lios-value {
         flex: 1;
       }
+      .lios-valueMare {
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      
     }
 
     .lios-li {
       line-height: 22px;
 
-      .lios-key {
+      .lios-key, .lios-keyMare  {
         font-size: 12px;
         color: rgba(0, 0, 0, 0.5);
         display: inline-block;
       }
 
-      .lios-value {
+      .lios-value, .lios-valueMare {
         padding-left: 8px;
         display: inline-block;
         font-size: 12px;
@@ -106,7 +114,12 @@
           padding-left: 5px;
         }
       }
-
+      .lios-iconDone {
+        width: 40px;
+        text-align: center;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 10px;
+      }
       .lios-icon {
         width: 40px;
         text-align: center;

package/src/components/layout/user-card/index.tsx

@@ -1,11 +1,13 @@
 import React from "react";
-import { SwapOutlined, FormOutlined } from "@ant-design/icons";
+import { SwapOutlined, FormOutlined,CopyOutlined } from "@ant-design/icons";
 import "./index.scss";
 
 interface UserType {
   name: string;
   avatar: string;
   roleInfo: any[];
+  id: string;
+  account: string;
 }
 interface CustomType {
   type: string;
@@ -42,11 +44,12 @@ export default function UserCard({
   myWalletInfo,
   amountInfo,
   customAction,
+  isCopied,
+  copyTextToClipboard
 }: any) {
-  const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)
-    ?.g_config;
+  const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)?.g_config;
 
-  const { name, avatar, roleInfo }: UserType = user || {};
+  const { name, avatar, roleInfo , id , account }: UserType = user || {};
 
   const { isCompleted, isAudited }: CustomType = custom || {};
 
@@ -70,7 +73,28 @@ export default function UserCard({
             </div>
           </div>
         </div>
-
+          <div className="lios-userInfo">
+            <div className="lios-li  li-flex">
+              <div className="lios-keyMare">账号</div>
+              <div className="lios-valueMare" title={account}>{account}</div>
+              <div
+                className={
+                  isCopied ? 'lios-iconDone' : 'lios-icon'
+                }
+                onClick={() => {
+                  copyTextToClipboard(account)
+                }}>
+                {
+                  isCopied ? '已复制' : <CopyOutlined />
+                }
+              </div>
+            </div>
+            <div className="lios-li li-flex">
+              <div className="lios-keyMare">账号ID</div>
+              <div className="lios-value">{id}
+              </div>
+            </div>
+          </div>
         {myWalletInfo && (
           <div className="lios-userInfo">
             <div className="lios-li">

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

@@ -56,7 +56,7 @@ export default function Account({
       ellipsis: true,
     },
     {
-      title: '是否企业管理员',
+      title: '是否主账号',
       dataIndex: 'isAdmin',
       key: 'isAdmin',
       render: (text: any, rowData: any) => {

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

@@ -193,7 +193,7 @@ export default function AccountInfo() {
         <Descriptions.Item label="名称">{accountInfo?.name || ''}</Descriptions.Item>
         <Descriptions.Item label="手机号">{accountInfo?.mobile || ''}</Descriptions.Item>
         <Descriptions.Item label="邮箱">{accountInfo?.email || ''}</Descriptions.Item>
-        <Descriptions.Item label="是否企业管理员">{accountInfo?.isAdmin ? '是' : '否'}</Descriptions.Item>
+        <Descriptions.Item label="是否主账号">{accountInfo?.isAdmin ? '是' : '否'}</Descriptions.Item>
         <Descriptions.Item label="创建时间">{timeFormatter(accountInfo?.gmtCreate)}</Descriptions.Item>
         <Descriptions.Item label="修改时间">{timeFormatter(accountInfo?.gmtModified)}</Descriptions.Item>
       </Descriptions>

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

@@ -74,7 +74,7 @@ export default function Account({
       ellipsis: true,
     },
     {
-      title: '是否企业管理员',
+      title: '是否主账号',
       dataIndex: 'isAdmin',
       key: 'isAdmin',
       render: (text: any, rowData: any) => {

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

@@ -386,7 +386,7 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
           <Descriptions.Item label='名称'>{accountInfo?.name || ''}</Descriptions.Item>
           <Descriptions.Item label='手机号'>{accountInfo?.mobile || ''}</Descriptions.Item>
           <Descriptions.Item label='邮箱'>{accountInfo?.email || ''}</Descriptions.Item>
-          <Descriptions.Item label='是否企业管理员'>
+          <Descriptions.Item label='是否主账号'>
             {accountInfo?.isAdmin ? '是' : '否'}
           </Descriptions.Item>
           <Descriptions.Item label='创建时间'>

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

@@ -103,7 +103,7 @@ export default function RoleInfo({
       copyable: true
     },
     {
-      title: '是否企业管理员',
+      title: '是否主账号',
       dataIndex: 'isAdmin',
       key: 'isAdmin',
       render: (cell: any) => {

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

@@ -53,7 +53,7 @@ export default function RoleInfo() {
       copyable: true,
     },
     {
-      title: '是否企业管理员',
+      title: '是否主账号',
       dataIndex: 'isAdmin',
       key: 'isAdmin',
       render: (cell: any) => {