aldehyde 0.2.305 → 0.2.309

package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx

@@ -8,8 +8,10 @@ import { DataConfigProps } from "../data";
 const defData = [{ name: '北京', value: [116.41, 40.19, 100] }];
 
 const defOption = {
+    animationDurationUpdate: 0, // 重要：禁用动画更新，防止缩放卡顿和不同步
     tooltip: {
         trigger: 'item',
+        triggerOn: "mousemove",
     },
     geo: [
         { // 边框 map
@@ -154,7 +156,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
             name: config.v1,
             data: temVal.map(v => {
                 const lonLat = v["v2"].split(",") || []; // 坐标经纬度；value:[经度，纬度，数值]
-                return { name: v["d1"], value: [lonLat[0], lonLat[1], v["v1"]] };
+                return { name: v["d1"], value: [lonLat[0], lonLat[1], v["v1"]], itemData: { config, value: v } };
             })
         };
     });
@@ -162,7 +164,7 @@ const handleData = (data: { config: { [key: string]: string }, value: { [key: st
 };
 
 export interface ComponentStyle {
-    tooltip?: { show: boolean };
+    tooltip?: { show: boolean, triggerOn: string, type: string, customize: { [key: string]: any } };
     effectScatter?: { [key: string]: any };
     areaColor?: string;
     backgroundColor?: string;
@@ -170,6 +172,8 @@ export interface ComponentStyle {
     borderWidth?: number;
     borderType?: string;
     label?: { [key: string]: any };
+    roam?: boolean;
+    zoom?: number;
 }
 
 export interface ComponentProps {
@@ -218,6 +222,20 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
     useEffect(() => {
         echarts.registerMap('china', chinaJson as any);
         chart.current = echarts.init(chartRef.current, null, { renderer: "svg" });
+        chart.current.on('georoam', () => { // 地图拖拽时，同步其他层级地图的缩放和中心点
+            const currentOption = chart.current.getOption();
+            // 获取主 geo (数组中的第一个) 当前的缩放和中心点
+            const masterZoom = currentOption.geo[0].zoom;
+            const masterCenter = currentOption.geo[0].center;
+            // 遍历并同步所有其他的 geo 组件（从第二个开始）
+            for (let i = 1; i < currentOption.geo.length; i++) {
+                currentOption.geo[i].zoom = masterZoom; // 同步缩放等级
+                currentOption.geo[i].center = masterCenter; // 同步中心位置
+            }
+            // 使用 setOption 更新所有从 geo 的配置
+            // 注意：这里只更新需要变化的 geo 数组，避免不必要的重绘
+            chart.current.setOption({ geo: currentOption.geo });
+        });
         window.addEventListener('resize', handleResize);
         return () => {
             handleDestroy();
@@ -260,24 +278,49 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         }
     }, [dataConfig?.sourceType, dataConfig?.sourceId]);
 
+    // 自定义弹窗渲染
+    const customizeTooltipConfig = (config) => {
+        const { title, width, height, padding, backgroundColor, backgroundImage, content } = config;
+        return {
+            padding: 0,
+            borderWidth: 0,
+            enterable: true,
+            backgroundColor: "rgba(0,0,0,0)",
+            formatter: (params) => {
+                const itemData = params.data.itemData;
+                const dom = document.createElement("div");
+                const bgImg = `background-image: url(${backgroundImage});background-size: 100% 100%;background-repeat: no-repeat;background-position: center;`;
+                dom.style = `width:${width}px;height:${height}px;${backgroundImage ? bgImg : `background:${backgroundColor}`}`;
+                dom.innerHTML = `<div style="padding:${padding}px;width:100%;height:100%">
+                    ${title?.text ? `<div style="width:100%;margin-bottom:4px; font-size: ${title.fontSize}px; color: ${title.color}; text-align: ${title.position}">${title?.text}</div>` : ""}
+                    ${content?.value?.map(r => itemData?.config?.[r] && `<div style="width:100%;display:flex;justify-content:space-between;align-items:center; font-size: ${content.fontSize}px; color: ${content.color};">
+                        <div style="width:60%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${itemData?.config?.[r] || ""}</div>
+                        <div style="width:40%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:right">${itemData?.value?.[r] || ""}</div>
+                        </div>`)?.filter(Boolean)?.join("")}
+                </div>`;
+                return dom;
+            }
+        }
+    };
+
     const renderChart = () => {
-        const { tooltip, areaColor, backgroundColor, borderColor, borderWidth, borderType, label, effectScatter } = config
+        const { roam, zoom, tooltip, areaColor, backgroundColor, borderColor, borderWidth, borderType, label, effectScatter } = config;
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
         const temData = isDesignMode && !data?.length ? defData : data;
-        option.tooltip = { trigger: "item", ...tooltip };
+        option.tooltip = { trigger: "item", ...tooltip, ...(tooltip.type === "customize" ? customizeTooltipConfig(tooltip.customize || {}) : {}) };
         option.geo = option.geo.map((r, index) => {
             switch (index) {
                 case 0:
-                    return { ...r, label, itemStyle: { ...r.itemStyle, borderWidth, borderColor, shadowColor: borderColor, borderType } };
+                    return { ...r, roam, zoom, label, itemStyle: { ...r.itemStyle, borderWidth, borderColor, shadowColor: borderColor, borderType } };
                 case 1:
-                    return { ...r, itemStyle: { areaColor } };
+                    return { ...r, roam: false, zoom, itemStyle: { areaColor } };
                 case 2:
                 case 3:
                 case 4:
-                    return { ...r, itemStyle: { ...r.itemStyle, areaColor: backgroundColor } };
+                    return { ...r, roam: false, zoom, itemStyle: { ...r.itemStyle, areaColor: backgroundColor } };
                 default:
-                    return r;
+                    return { ...r, roam: false, zoom };
             }
         }) as any;
         option.series = option.series.map((item: any) => ({ ...item, ...effectScatter, data: temData }));

package/src/aldehyde/lowcode-components/index.ts

@@ -47,6 +47,8 @@ import LineBarChart from "./line-bar-chart";
 import Column3dChart from "./column-3d-chart";
 import StrokeAnimation from "./stroke-animation";
 import EffectScatterMap3D from "./effectScatter-map-3d";
+import BaseButton from "./base-button";
+import BaseTabs from "./base-tabs";
 
 
 type CompoundedComponent = {
@@ -98,7 +100,9 @@ type CompoundedComponent = {
     LineBarChart?: typeof LineBarChart,
     Column3dChart?: typeof Column3dChart,
     StrokeAnimation?: typeof StrokeAnimation,
-    EffectScatterMap3D?: typeof EffectScatterMap3D
+    EffectScatterMap3D?: typeof EffectScatterMap3D,
+    BaseButton?: typeof BaseButton,
+    BaseTabs?: typeof BaseTabs
 };
 
 const LowcodeComponents: CompoundedComponent = {
@@ -110,7 +114,7 @@ const LowcodeComponents: CompoundedComponent = {
     Decoration1, Decoration2, Decoration3, Decoration4, Decoration5,
     Decoration6, Decoration7, Decoration8, Decoration9, Decoration10, Decoration11,
     BaseTable, TextScroller, CapsuleBarChart, CircularProgressChart, ActTable, ProgressChart,
-    LineBarChart, Column3dChart, StrokeAnimation, EffectScatterMap3D
+    LineBarChart, Column3dChart, StrokeAnimation, EffectScatterMap3D, BaseButton, BaseTabs
 };
 
 export default LowcodeComponents;

package/src/aldehyde/lowcode-components/lowcode-view/component/assets.ts

@@ -48,6 +48,8 @@ import LineBarChart from "../../line-bar-chart";
 import Column3dChart from "../../column-3d-chart";
 import StrokeAnimation from "../../stroke-animation";
 import EffectScatterMap3D from "../../effectScatter-map-3d";
+import BaseButton from "../../base-button";
+import BaseTabs from "../../base-tabs";
 
 interface ComponentItemConfig {
     baseInfo: BaseInfoType, // 基础信息
@@ -419,5 +421,19 @@ export const compsConfig: { [key: string]: ComponentItemConfig } = {
             compName: "立体散点地图",
             compKey: "EffectScatterMap3D"
         }
+    },
+    BaseButton: {
+        componentNode: BaseButton,
+        baseInfo: {
+            compName: "基础按钮",
+            compKey: "BaseButton"
+        }
+    },
+    BaseTabs: {
+        componentNode: BaseTabs,
+        baseInfo: {
+            compName: "选项卡",
+            compKey: "BaseTabs"
+        }
     }
 };

package/src/aldehyde/lowcode-components/lowcode-view/component/util.ts

@@ -0,0 +1,27 @@
+
+export const merge = (originalData: any, newData: any): any => {
+    if (!originalData && newData)
+        return newData;
+    if (originalData && !newData)
+        return originalData;
+    Object.keys(newData).forEach(key => {
+        const newValue = newData[key];
+        if (originalData.hasOwnProperty(key)) {
+            if (Array.isArray(newValue)) {
+                originalData[key] = newValue;
+            } else if (newValue
+                && typeof newValue === "object"
+                && Object.keys(newValue).length > 0
+                && originalData[key]
+                && typeof originalData[key] === "object"
+                && !!originalData[key]) {
+                merge(originalData[key], newValue);
+            } else {
+                originalData[key] = newValue;
+            }
+        } else {
+            originalData[key] = newValue;
+        }
+    });
+    return originalData;
+}

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -1,12 +1,14 @@
 import React, { CSSProperties, useEffect, useState, useRef } from 'react'
 import { useParams } from 'react-router-dom';
+import isEqual from "lodash/isEqual";
 import Loading from "./component/loading";
 import layerBuilder from "./component/layer-builder";
 import './component/font/FontGlobal.css';
 import ScreenFit from "./component/screen-fit";
-import { LayerManagerDataType, CanvasConfig } from "./interface";
+import { LayerManagerDataType, CanvasConfig, ILayerItem } from "./interface";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import abstractDesignerLoader from "./component/abstract-designer-loader";
+import { merge } from "./component/util";
 import "./index.less";
 
 const fromBase64 = (base64: string) => {
@@ -56,6 +58,33 @@ const LowcodeView = (props: Props) => {
         setLoading(false);
     }
 
+    // 更新画面，显隐
+    const updateLayer = (items: ILayerItem[]) => {
+        const { layerConfigs } = layerManager;
+        const temObj = {}
+        for (const item of items) {
+            const oldItem = layerConfigs[item.id + ""];
+            if (!isEqual(oldItem, item)) {
+                const temData = { ...merge(oldItem, item) };
+                temObj[item.id + ""] = temData;
+            }
+        }
+        setLayerManager({ ...layerManager, layerConfigs: { ...layerConfigs, ...temObj } });
+    }
+
+    useEffect(() => {
+        if (layerManager?.layerConfigs) {
+            // @ts-ignore
+            window.LC_VIEW = {
+                layerManager: { ...layerManager, updateLayer }
+            }
+        }
+        return () => {
+            // @ts-ignore
+            window.LC_VIEW = undefined;
+        }
+    }, [layerManager]);
+
     useEffect(() => {
         if (ddpageId) {
             getViewData();

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -325,7 +325,11 @@ export default class DtmplEditPage extends React.PureComponent<
 
     let title1 = title ? title : dtmplConfig ? dtmplConfig.title : "";
     const { translate } = this.context;
-    title1=translate("${" + title1 + "}");
+    //判断是不是 字符串
+    if (typeof title1 === "string"){
+      title1=translate("${" + title1 + "}");
+    }
+
 
     //根据 parentFormInstance 完善 dtmplConfig
     if(parentFormInstance && dtmplConfig){//

package/lib/layout3/components/user-button.d.ts

@@ -1,5 +0,0 @@
-import React from "react";
-import { ButtonProps } from "antd";
-declare const UserButton: React.FC<ButtonProps>;
-export default UserButton;
-//# sourceMappingURL=user-button.d.ts.map

package/lib/layout3/components/user-button.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout3/components/user-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAmBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA6JrC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/layout3/components/user-button.js

@@ -1,146 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import React, { useEffect, useState } from "react";
-import { CaretDownOutlined, ClearOutlined, LoginOutlined, LogoutOutlined, MenuFoldOutlined, MenuUnfoldOutlined, SettingOutlined, UnlockOutlined, UserOutlined, } from "@ant-design/icons";
-import { Button, Dropdown } from "antd";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import UserInfoBar from "../../layout/menu/userinfo-bar";
-import { useLocale } from "../../locale/useLocale";
-import { NavLink, useNavigate } from "react-router-dom";
-import ResetPassword from "../../layout/menu/reset-password";
-import HCDataSource from "../../tmpl/hc-data-source";
-import { useSessionStorageState } from 'ahooks';
-import Units from "../../units";
-const UserButton = (props) => {
-    // translate
-    const { translate, changeSiderCollapsed, getSiderCollapsed } = useLocale();
-    const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
-        defaultValue: [],
-    });
-    // navigation
-    const navigate = useNavigate();
-    // 用户配置信息
-    const [userConfig, setUserConfig] = useState({
-        id: undefined,
-        name: undefined,
-    });
-    const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
-        const userInfo = yield Units.getUserInfo();
-        setUserConfig(userInfo);
-    });
-    useEffect(() => { }, [userConfig]);
-    // 上下文配置信息
-    const [globalContext, setGlobalContext] = useState();
-    const initContext = () => __awaiter(void 0, void 0, void 0, function* () {
-        let context = yield HcserviceV3.getContextSourceValue();
-        setGlobalContext(context);
-    });
-    useEffect(() => {
-        initContext();
-    }, []);
-    // 用户是否登录
-    const [isLogin, setIsLogin] = useState(false);
-    useEffect(() => {
-        if ((userConfig === null || userConfig === void 0 ? void 0 : userConfig.name) !== undefined && (userConfig === null || userConfig === void 0 ? void 0 : userConfig.name) !== null)
-            setIsLogin(true);
-        else
-            setIsLogin(false);
-    }, [userConfig]);
-    useEffect(() => {
-        initUserConfig();
-    }, []);
-    // logout
-    const logout = () => __awaiter(void 0, void 0, void 0, function* () {
-        setKeepAliveTabs([]);
-        yield HcserviceV3.logout2();
-        navigate("/login2");
-    });
-    // dropdown menu
-    const onClick = ({ key }) => { };
-    const dropdownMenuList = [
-        {
-            label: React.createElement(NavLink, { to: "/login2" }, translate("${登录}")),
-            key: "login",
-            icon: React.createElement(LoginOutlined, null),
-            show: () => {
-                return !isLogin;
-            },
-        },
-        {
-            label: (React.createElement(UserInfoBar, { gtmplSourceId: userConfig === null || userConfig === void 0 ? void 0 : userConfig.gtmplSourceId, editable: userConfig === null || userConfig === void 0 ? void 0 : userConfig.changePersonalInfoable, userCode: userConfig === null || userConfig === void 0 ? void 0 : userConfig.id })),
-            key: "userInfo",
-            icon: React.createElement(UserOutlined, null),
-            show: () => {
-                return isLogin && (userConfig === null || userConfig === void 0 ? void 0 : userConfig.viewPersonalInfoable);
-            },
-        },
-        {
-            label: React.createElement(NavLink, { to: "/context-setter" }, translate("${全局配置}")),
-            key: "globalContext",
-            icon: React.createElement(SettingOutlined, null),
-            show: () => {
-                return (isLogin && Array.isArray(globalContext) && globalContext.length > 0);
-            },
-        },
-        {
-            label: React.createElement(ResetPassword, null),
-            key: "resetPwd",
-            icon: React.createElement(UnlockOutlined, null),
-            show: () => {
-                return isLogin && userConfig.changePasswordable;
-            },
-        },
-        {
-            label: (React.createElement("span", { onClick: () => HCDataSource.reload([]) }, translate("${清空缓存}"))),
-            key: "cleanCache",
-            icon: React.createElement(ClearOutlined, null),
-            show: () => {
-                return isLogin && userConfig.cleanCachable;
-            },
-        }, {
-            label: (React.createElement("span", { onClick: () => changeSiderCollapsed() }, getSiderCollapsed() ? translate("${显示侧边栏}") : translate("${隐藏侧边栏}"))),
-            key: "collapseSider",
-            icon: React.createElement("span", null, getSiderCollapsed() ? React.createElement(MenuUnfoldOutlined, null) : React.createElement(MenuFoldOutlined, null)),
-            show: () => {
-                return isLogin;
-            },
-        },
-        {
-            label: React.createElement("span", { onClick: logout }, translate("${退出}")),
-            key: "logout",
-            icon: React.createElement(LogoutOutlined, null),
-            show: () => {
-                return isLogin;
-            },
-        },
-    ];
-    const cleanDropdownMenuList = dropdownMenuList
-        .filter((item) => {
-        if (!item.show)
-            return true;
-        return item.show();
-    })
-        .map(({ label, key, icon }) => {
-        return {
-            label,
-            key,
-            icon,
-        };
-    });
-    return (React.createElement(Dropdown, { overlayClassName: "localeButton", menu: { items: cleanDropdownMenuList, onClick } },
-        React.createElement(Button, Object.assign({ type: "text", icon: React.createElement(CaretDownOutlined, null), style: {
-                width: "100%",
-                height: "100%",
-                borderRadius: 0,
-                color: "#fff",
-            } }, props), isLogin ? userConfig === null || userConfig === void 0 ? void 0 : userConfig.name : translate("${请登录}"))));
-};
-export default UserButton;
-//# sourceMappingURL=user-button.js.map

package/lib/layout3/components/user-button.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout3/components/user-button.tsx"],"names":[],"mappings":"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"}

package/src/aldehyde/layout3/components/user-button.tsx

@@ -1,189 +0,0 @@
-import React, { ReactNode, useEffect, useState } from "react";
-import {
-  CaretDownOutlined,
-  ClearOutlined,
-  LoginOutlined,
-  LogoutOutlined, MenuFoldOutlined, MenuUnfoldOutlined,
-  SettingOutlined,
-  UnlockOutlined,
-  UserOutlined,
-} from "@ant-design/icons";
-import { Button, ButtonProps, Dropdown, GetProp, MenuProps } from "antd";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import { UserInfo } from "../../tmpl/interface";
-import UserInfoBar from "../../layout/menu/userinfo-bar";
-import { useLocale } from "../../locale/useLocale";
-import { NavLink, useNavigate } from "react-router-dom";
-import ResetPassword from "../../layout/menu/reset-password";
-import HCDataSource from "../../tmpl/hc-data-source";
-import { useSessionStorageState } from 'ahooks';
-import {KeepAliveTab} from "../../hooks/use-tabs";
-import Units from "../../units";
-
-type DropDownMenuType = {
-  label: string | number | ReactNode;
-  key: string;
-  icon?: ReactNode;
-  show?: () => boolean;
-};
-
-const UserButton: React.FC<ButtonProps> = (props) => {
-  // translate
-  const { translate,changeSiderCollapsed,getSiderCollapsed } = useLocale();
-  const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', {
-    defaultValue: [],
-  });
-  // navigation
-  const navigate = useNavigate();
-
-  // 用户配置信息
-  const [userConfig, setUserConfig] = useState<UserInfo>({
-    id: undefined,
-    name: undefined,
-  });
-  const initUserConfig = async () => {
-    const userInfo: UserInfo = await Units.getUserInfo();
-    setUserConfig(userInfo);
-  };
-  useEffect(() => {}, [userConfig]);
-
-  // 上下文配置信息
-  const [globalContext, setGlobalContext] = useState<any[]>();
-  const initContext = async () => {
-    let context = await HcserviceV3.getContextSourceValue();
-    setGlobalContext(context);
-  };
-  useEffect(() => {
-    initContext();
-  }, []);
-
-  // 用户是否登录
-  const [isLogin, setIsLogin] = useState<boolean>(false);
-  useEffect(() => {
-    if (userConfig?.name !== undefined && userConfig?.name !== null)
-      setIsLogin(true);
-    else setIsLogin(false);
-  }, [userConfig]);
-  useEffect(() => {
-    initUserConfig();
-  }, []);
-
-  // logout
-  const logout = async () => {
-    setKeepAliveTabs([]);
-    await HcserviceV3.logout2();
-    navigate("/login2");
-  };
-
-  // dropdown menu
-  const onClick: MenuProps["onClick"] = ({ key }) => {};
-  const dropdownMenuList: DropDownMenuType[] = [
-    {
-      label: <NavLink to="/login2">{translate("${登录}")}</NavLink>,
-      key: "login",
-      icon: <LoginOutlined />,
-      show: () => {
-        return !isLogin;
-      },
-    },
-    {
-      label: (
-        <UserInfoBar
-          gtmplSourceId={userConfig?.gtmplSourceId}
-          editable={userConfig?.changePersonalInfoable}
-          userCode={userConfig?.id}
-        />
-      ),
-      key: "userInfo",
-      icon: <UserOutlined />,
-      show: () => {
-        return isLogin && userConfig?.viewPersonalInfoable;
-      },
-    },
-    {
-      label: <NavLink to="/context-setter">{translate("${全局配置}")}</NavLink>,
-      key: "globalContext",
-      icon: <SettingOutlined />,
-      show: () => {
-        return (
-          isLogin && Array.isArray(globalContext) && globalContext.length > 0
-        );
-      },
-    },
-    {
-      label: <ResetPassword></ResetPassword>,
-      key: "resetPwd",
-      icon: <UnlockOutlined />,
-      show: () => {
-        return isLogin && userConfig.changePasswordable;
-      },
-    },
-    {
-      label: (
-        <span onClick={() => HCDataSource.reload([])}>
-          {translate("${清空缓存}")}
-        </span>
-      ),
-      key: "cleanCache",
-      icon: <ClearOutlined />,
-      show: () => {
-        return isLogin && userConfig.cleanCachable;
-      },
-    },{
-      label: (
-          <span onClick={() => changeSiderCollapsed()}>
-          {getSiderCollapsed()?translate("${显示侧边栏}"):translate("${隐藏侧边栏}")}
-        </span>
-      ),
-      key: "collapseSider",
-      icon: <span>{getSiderCollapsed()? <MenuUnfoldOutlined /> :<MenuFoldOutlined /> }</span>,
-      show: () => {
-        return isLogin ;
-      },
-    },
-    {
-      label: <span onClick={logout}>{translate("${退出}")}</span>,
-      key: "logout",
-      icon: <LogoutOutlined />,
-      show: () => {
-        return isLogin;
-      },
-    },
-
-  ];
-  const cleanDropdownMenuList: GetProp<MenuProps, "items"> = dropdownMenuList
-    .filter((item) => {
-      if (!item.show) return true;
-      return item.show();
-    })
-    .map(({ label, key, icon }) => {
-      return {
-        label,
-        key,
-        icon,
-      };
-    });
-
-  return (
-    <Dropdown
-      overlayClassName="localeButton"
-      menu={{ items: cleanDropdownMenuList, onClick }}
-    >
-      <Button
-        type="text"
-        icon={<CaretDownOutlined />}
-        style={{
-          width: "100%",
-          height: "100%",
-          borderRadius: 0,
-          color: "#fff",
-        }}
-        {...props}
-      >
-        {isLogin ? userConfig?.name : translate("${请登录}")}
-      </Button>
-    </Dropdown>
-  );
-};
-
-export default UserButton;