aldehyde 0.2.514 → 0.2.516

package/src/aldehyde/draw-canvas-edit/components/render/utils/bezier-scene-func.ts

@@ -1,73 +1,73 @@
-import Konva from 'konva';
-
-function rotatePoint(x1: number, y1: number, x2: number, y2: number, angleInDegrees: number) {
-  const radians = angleInDegrees * (Math.PI / 180);
-  const cosTheta = Math.cos(radians);
-  const sinTheta = Math.sin(radians);
-
-  // Translate point (x2, y2) to be relative to (x1, y1)
-  const x = x2 - x1;
-  const y = y2 - y1;
-
-  // Rotate point
-  const xPrime = cosTheta * x - sinTheta * y;
-  const yPrime = sinTheta * x + cosTheta * y;
-
-  // Translate back
-  const xNew = xPrime + x1;
-  const yNew = yPrime + y1;
-
-  return { x: xNew, y: yNew };
-}
-
-function drawPointer(ctx: Konva.Context, shape: Konva.Shape, startX: number, startY: number, ctrlX: number, ctrlY: number) {
-  const x2 = startX + 12;
-  const y2 = startY - 6;
-  const x3 = startX + 12;
-  const y3 = startY + 6;
-  const angle = (Math.atan2(ctrlY - startY, ctrlX - startX) * 180) / Math.PI;
-  const p2 = rotatePoint(startX, startY, x2, y2, angle);
-  const p3 = rotatePoint(startX, startY, x3, y3, angle);
-  ctx.beginPath();
-  ctx.moveTo(startX, startY);
-  ctx.lineTo(p2.x, p2.y);
-  ctx.lineTo(p3.x, p3.y);
-  ctx.lineTo(startX, startY);
-  ctx.lineTo(p2.x, p2.y);
-  ctx.strokeShape(shape);
-  ctx.fillShape(shape);
-}
-
-export function BezierSceneFunc(ctx: Konva.Context, shape: Konva.Shape) {
-  if (shape instanceof Konva.Arrow) {
-    const ps = shape.points();
-    if (ps.length / 2 === 4) {
-      // 三次
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.bezierCurveTo(ps[2], ps[3], ps[4], ps[5], ps[6], ps[7]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[6], ps[7], ps[4], ps[5]);
-    } else if (ps.length / 2 === 3) {
-      // 二次
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.quadraticCurveTo(ps[2], ps[3], ps[4], ps[5]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[4], ps[5], ps[2], ps[3]);
-    } else {
-      // 直线
-      ctx.beginPath();
-      ctx.moveTo(ps[0], ps[1]);
-      ctx.lineTo(ps[2], ps[3]);
-      ctx.strokeShape(shape);
-      ctx.closePath();
-      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
-      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[2], ps[3], ps[0], ps[1]);
-    }
-  }
+import Konva from 'konva';
+
+function rotatePoint(x1: number, y1: number, x2: number, y2: number, angleInDegrees: number) {
+  const radians = angleInDegrees * (Math.PI / 180);
+  const cosTheta = Math.cos(radians);
+  const sinTheta = Math.sin(radians);
+
+  // Translate point (x2, y2) to be relative to (x1, y1)
+  const x = x2 - x1;
+  const y = y2 - y1;
+
+  // Rotate point
+  const xPrime = cosTheta * x - sinTheta * y;
+  const yPrime = sinTheta * x + cosTheta * y;
+
+  // Translate back
+  const xNew = xPrime + x1;
+  const yNew = yPrime + y1;
+
+  return { x: xNew, y: yNew };
+}
+
+function drawPointer(ctx: Konva.Context, shape: Konva.Shape, startX: number, startY: number, ctrlX: number, ctrlY: number) {
+  const x2 = startX + 12;
+  const y2 = startY - 6;
+  const x3 = startX + 12;
+  const y3 = startY + 6;
+  const angle = (Math.atan2(ctrlY - startY, ctrlX - startX) * 180) / Math.PI;
+  const p2 = rotatePoint(startX, startY, x2, y2, angle);
+  const p3 = rotatePoint(startX, startY, x3, y3, angle);
+  ctx.beginPath();
+  ctx.moveTo(startX, startY);
+  ctx.lineTo(p2.x, p2.y);
+  ctx.lineTo(p3.x, p3.y);
+  ctx.lineTo(startX, startY);
+  ctx.lineTo(p2.x, p2.y);
+  ctx.strokeShape(shape);
+  ctx.fillShape(shape);
+}
+
+export function BezierSceneFunc(ctx: Konva.Context, shape: Konva.Shape) {
+  if (shape instanceof Konva.Arrow) {
+    const ps = shape.points();
+    if (ps.length / 2 === 4) {
+      // 三次
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.bezierCurveTo(ps[2], ps[3], ps[4], ps[5], ps[6], ps[7]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[6], ps[7], ps[4], ps[5]);
+    } else if (ps.length / 2 === 3) {
+      // 二次
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.quadraticCurveTo(ps[2], ps[3], ps[4], ps[5]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[4], ps[5], ps[2], ps[3]);
+    } else {
+      // 直线
+      ctx.beginPath();
+      ctx.moveTo(ps[0], ps[1]);
+      ctx.lineTo(ps[2], ps[3]);
+      ctx.strokeShape(shape);
+      ctx.closePath();
+      shape.pointerAtBeginning() && drawPointer(ctx, shape, ps[0], ps[1], ps[2], ps[3]);
+      shape.pointerAtEnding() && drawPointer(ctx, shape, ps[2], ps[3], ps[0], ps[1]);
+    }
+  }
 }

package/src/aldehyde/draw-canvas-edit/components/setting-form/imag-upload.tsx

@@ -1,119 +1,119 @@
-import React, { useEffect, useState } from "react";
-import { Upload as AntdUpLoad, UploadFile, message } from "antd";
-import { RcFile } from "antd/es/upload";
-import { PlusOutlined } from "@ant-design/icons";
-import { HydrocarbonService, Superagent, ProgramConfig } from "../../../index";
-import { fileUpload } from "../../constant";
-import { useLocale } from "../../../locale/useLocale";
-
-const { sourceId, serverKey } = fileUpload;
-
-// 本地文件上传，处理url
-const handleImgUrl = (basePath: string) => {
-    if (basePath.startsWith("http")) {
-        return basePath;
-    }
-    const url = encodeURI(ProgramConfig.joinPath(
-        ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
-        basePath
-    )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode(serverKey)}&@applicationToken=${ProgramConfig.applicationCode(serverKey)}`;
-    return url;
-}
-
-const fileInfo = {
-    uid: '-1',
-    name: 'image.png',
-    status: 'done',
-};
-
-export interface CommonFilePath {
-    fileName?: string;
-    contentType?: string;//文件类型
-    path?: string;
-    iconPath?: string;
-    valid?: string;
-    baseType?: string;
-    basePath?: string;
-};
-
-
-export interface UploadProps {
-    accept?: string;
-    size?: number;
-    onChange?: (data: { src: string, code: string }) => void;
-    value?: { src: string, code: string };
-    recordCode?: string; // 当前画面关联数据code,用于图片命名区分
-}
-
-const ImageUpload: React.FC<UploadProps> = (props) => {
-    const { onChange, accept, size, recordCode, value } = props;
-    const [fileList, setFileList] = useState([]);
-    const [imgCode, setImgCode] = useState<string>(); // 本地图片code
-    const { translate } = useLocale();
-
-    useEffect(() => {
-        setFileList(value?.src ? [{ ...fileInfo, url: handleImgUrl(value?.src) }] : []);
-        setImgCode(value?.code);
-    }, [value]);
-
-    const beforeUpload = async (file: RcFile) => {
-        if (size && file.size > size * 1024 * 1024) {
-            message.warning(translate("${文件大小不能超过}") + `${size}M`);
-            return false;
-        }
-        return true;
-    }
-
-    const handleChange = async (info) => {
-        if (info.file.status == "done") {
-            const fileKey = info.file.response.fileKey;
-            const fileName = info.file.name;
-            const data = { valid: "new", fileKey, fileName };
-            const result = { 描述: `${recordCode || ""}-${fileName}`, 文件: JSON.stringify(data) };
-            const { code } = await HydrocarbonService.postMstrucDtmplData(serverKey, sourceId, result, message);
-            setImgCode(code);
-            const imgData = await HydrocarbonService.requestMstrucDtmplData(serverKey, sourceId, code, null);
-            const basePath = JSON.parse(imgData.fieldMap["文件"] || "{}").base?.path;
-            if (basePath) {
-                const url = handleImgUrl(basePath);
-                setFileList([{ ...info.file, url }]);
-                // onChange?.(url);
-                onChange?.({ src: basePath, code });
-            } else {
-                setFileList([...info.fileList]);
-            }
-        } else {
-            setFileList([...info.fileList]);
-        }
-    };
-
-    const handleDelete = async () => {
-        await HydrocarbonService.deleteByCode(serverKey, sourceId, [imgCode]);
-        setFileList([]);
-        onChange?.(null);
-    };
-
-    return (
-        <AntdUpLoad
-            action={(file) => HydrocarbonService.postFileAction(serverKey, file)}
-            headers={Superagent.getHeaderObj(serverKey)}
-            name={'file'}
-            beforeUpload={beforeUpload}
-            listType={'picture-card'}
-            fileList={fileList?.length ? fileList as Array<UploadFile> : undefined}
-            accept={accept}
-            onChange={handleChange}
-            onRemove={handleDelete}
-            onPreview={() => window.open(fileList[0].url)}
-            styles={{ root: { overflow: "hidden" } }}
-        >
-            {fileList.length > 0 ? null : <div className={'upload-btn'}>
-                <PlusOutlined />
-                <div style={{ marginTop: 8 }}>{translate("${上传图片}")}</div>
-            </div>}
-        </AntdUpLoad>
-    )
-};
-
-export default ImageUpload;
+import React, { useEffect, useState } from "react";
+import { Upload as AntdUpLoad, UploadFile, message } from "antd";
+import { RcFile } from "antd/es/upload";
+import { PlusOutlined } from "@ant-design/icons";
+import { HydrocarbonService, Superagent, ProgramConfig } from "../../../index";
+import { fileUpload } from "../../constant";
+import { useLocale } from "../../../locale/useLocale";
+
+const { sourceId, serverKey } = fileUpload;
+
+// 本地文件上传，处理url
+const handleImgUrl = (basePath: string) => {
+    if (basePath.startsWith("http")) {
+        return basePath;
+    }
+    const url = encodeURI(ProgramConfig.joinPath(
+        ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
+        basePath
+    )) +
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode(serverKey)}&@applicationToken=${ProgramConfig.applicationCode(serverKey)}`;
+    return url;
+}
+
+const fileInfo = {
+    uid: '-1',
+    name: 'image.png',
+    status: 'done',
+};
+
+export interface CommonFilePath {
+    fileName?: string;
+    contentType?: string;//文件类型
+    path?: string;
+    iconPath?: string;
+    valid?: string;
+    baseType?: string;
+    basePath?: string;
+};
+
+
+export interface UploadProps {
+    accept?: string;
+    size?: number;
+    onChange?: (data: { src: string, code: string }) => void;
+    value?: { src: string, code: string };
+    recordCode?: string; // 当前画面关联数据code,用于图片命名区分
+}
+
+const ImageUpload: React.FC<UploadProps> = (props) => {
+    const { onChange, accept, size, recordCode, value } = props;
+    const [fileList, setFileList] = useState([]);
+    const [imgCode, setImgCode] = useState<string>(); // 本地图片code
+    const { translate } = useLocale();
+
+    useEffect(() => {
+        setFileList(value?.src ? [{ ...fileInfo, url: handleImgUrl(value?.src) }] : []);
+        setImgCode(value?.code);
+    }, [value]);
+
+    const beforeUpload = async (file: RcFile) => {
+        if (size && file.size > size * 1024 * 1024) {
+            message.warning(translate("${文件大小不能超过}") + `${size}M`);
+            return false;
+        }
+        return true;
+    }
+
+    const handleChange = async (info) => {
+        if (info.file.status == "done") {
+            const fileKey = info.file.response.fileKey;
+            const fileName = info.file.name;
+            const data = { valid: "new", fileKey, fileName };
+            const result = { 描述: `${recordCode || ""}-${fileName}`, 文件: JSON.stringify(data) };
+            const { code } = await HydrocarbonService.postMstrucDtmplData(serverKey, sourceId, result, message);
+            setImgCode(code);
+            const imgData = await HydrocarbonService.requestMstrucDtmplData(serverKey, sourceId, code, null);
+            const basePath = JSON.parse(imgData.fieldMap["文件"] || "{}").base?.path;
+            if (basePath) {
+                const url = handleImgUrl(basePath);
+                setFileList([{ ...info.file, url }]);
+                // onChange?.(url);
+                onChange?.({ src: basePath, code });
+            } else {
+                setFileList([...info.fileList]);
+            }
+        } else {
+            setFileList([...info.fileList]);
+        }
+    };
+
+    const handleDelete = async () => {
+        await HydrocarbonService.deleteByCode(serverKey, sourceId, [imgCode]);
+        setFileList([]);
+        onChange?.(null);
+    };
+
+    return (
+        <AntdUpLoad
+            action={(file) => HydrocarbonService.postFileAction(serverKey, file)}
+            headers={Superagent.getHeaderObj(serverKey)}
+            name={'file'}
+            beforeUpload={beforeUpload}
+            listType={'picture-card'}
+            fileList={fileList?.length ? fileList as Array<UploadFile> : undefined}
+            accept={accept}
+            onChange={handleChange}
+            onRemove={handleDelete}
+            onPreview={() => window.open(fileList[0].url)}
+            styles={{ root: { overflow: "hidden" } }}
+        >
+            {fileList.length > 0 ? null : <div className={'upload-btn'}>
+                <PlusOutlined />
+                <div style={{ marginTop: 8 }}>{translate("${上传图片}")}</div>
+            </div>}
+        </AntdUpLoad>
+    )
+};
+
+export default ImageUpload;

package/src/aldehyde/index.tsx

@@ -51,6 +51,7 @@ import ImportRoute from "./routable/import-route";
 //     import("./routable/import-route"), {fallback: Loading});
 import LtmplRoute from "./routable/ltmpl-route";
 import TtmplRoute from "./routable/ttmpl-route";
+import TtmplTableRoute from "./routable/ttmpl-table-route";
 // const LtmplRoute = loadable(() =>
 //     import("./routable/ltmpl-route"), {fallback: Loading});
 import DtmplViewCard from "./module/dtmpl-view-card";
@@ -216,5 +217,6 @@ export {
   NavigationTree,
   Edit2D,
   View2D,
-  TtmplTree
+  TtmplTree,
+  TtmplTableRoute
 };

package/src/aldehyde/layout2/page.tsx

@@ -122,6 +122,9 @@ export const handleMenuItemUrl = (
     case "日历":
       routePath = "calendar";
       break;
+    case "可展开列表":
+      routePath = "tree-act-table";
+      break;
     default:
       routePath = "";
   }

package/src/aldehyde/layout3/css/main.less

@@ -1,3 +1,18 @@
+.v3-antd-table {
+  .ant-table-css-var {
+    --ant-table-border-color: #15325b;
+  }
+
+  .ant-table {
+    background: transparent;
+    scrollbar-color: var(--ant-table-header-bg) transparent;
+  }
+
+  .ant-table-tbody .ant-table-cell {
+    background: var(--ant-color-bg-base) !important;
+  }
+}
+
 .v3-main {
   width: 100%;
   height: 100%;
@@ -55,11 +70,11 @@
 
   .ant-table-tbody,
   .ant-table-summary {
-    .ant-table-cell:has(.xiaoji) {
+    .ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.xiaoji) {
       background-color: var(--color-5) !important;
     }
 
-    .ant-table-cell:has(.heji) {
+    .ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.heji) {
       background-color: var(--color-7) !important;
     }
 
@@ -105,21 +120,6 @@
   }
 }
 
-.v3-antd-table {
-  .ant-table-css-var {
-    --ant-table-border-color: #15325b;
-  }
-
-  .ant-table {
-    background: transparent;
-    scrollbar-color: var(--ant-table-header-bg) transparent;
-  }
-
-  .ant-table-tbody .ant-table-cell {
-    background: var(--ant-color-bg-base) !important;
-  }
-}
-
 .v3-antd-drawer,
 .v3-antd-modal {
   .ant-table-css-var {

package/src/aldehyde/layout4/css/main.less

@@ -1,3 +1,18 @@
+.v4-antd-table {
+  .ant-table-css-var {
+    --ant-table-border-color: #15325b;
+  }
+
+  .ant-table {
+    background: transparent;
+    scrollbar-color: var(--ant-table-header-bg) transparent;
+  }
+
+  .ant-table-tbody .ant-table-cell {
+    background: var(--ant-color-bg-base) !important;
+  }
+}
+
 .v4-main {
   width: 100%;
   height: 100%;
@@ -47,11 +62,12 @@
 
   .ant-table-tbody,
   .ant-table-summary {
-    .ant-table-cell:has(.xiaoji) {
+
+    .ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.xiaoji) {
       background-color: var(--color-5) !important;
     }
 
-    .ant-table-cell:has(.heji) {
+    .ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.heji) {
       background-color: var(--color-8) !important;
     }
 
@@ -98,21 +114,6 @@
   }
 }
 
-.v4-antd-table {
-  .ant-table-css-var {
-    --ant-table-border-color: #15325b;
-  }
-
-  .ant-table {
-    background: transparent;
-    scrollbar-color: var(--ant-table-header-bg) transparent;
-  }
-
-  .ant-table-tbody .ant-table-cell {
-    background: var(--ant-color-bg-base) !important;
-  }
-}
-
 .v4-antd-drawer,
 .v4-antd-modal {
   .ant-table-css-var {

package/src/aldehyde/layout4/imgs/user.svg

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="75px" height="50px" viewBox="0 0 75 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 28@2x</title>
-    <defs>
-        <linearGradient x1="56.7868058%" y1="100%" x2="56.7868058%" y2="0%" id="linearGradient-1">
-            <stop stop-color="#90DCFE" offset="0%"></stop>
-            <stop stop-color="#141F34" offset="100%"></stop>
-        </linearGradient>
-        <radialGradient cx="50%" cy="30.3951181%" fx="50%" fy="30.3951181%" r="135.534427%" gradientTransform="translate(0.500000,0.303951),scale(0.171272,1.000000),rotate(90.000000),scale(1.000000,2.145743),translate(-0.500000,-0.303951)" id="radialGradient-2">
-            <stop stop-color="#ACF4F7" offset="0%"></stop>
-            <stop stop-color="#96EEF2" stop-opacity="0.600017604" offset="75.2832594%"></stop>
-            <stop stop-color="#74E5EB" stop-opacity="0" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="2025-02-28-西安航天-导航" transform="translate(-1816.000000, -11.000000)">
-            <g id="编组-28" transform="translate(1816.900000, 11.000000)">
-                <rect id="矩形" fill="url(#linearGradient-1)" opacity="0.586283366" x="0" y="0" width="74" height="46" rx="23"></rect>
-                <path d="M52,44.0516405 L52,46.0516405 L40.137,46.0516405 L37,49.1897883 L33.862,46.0516405 L22,46.0516405 L22,44.0516405 L52,44.0516405 Z" id="形状结合" fill="url(#radialGradient-2)" fill-rule="nonzero"></path>
-                <g id="账号中心-账号管理" transform="translate(22.939298, 9.939298)" fill="#FFFFFF" fill-rule="nonzero">
-                    <rect id="矩形" opacity="0" x="0" y="0" width="28.121403" height="28.121403"></rect>
-                    <path d="M14.6998318,15.2110976 C16.6171677,14.0607015 17.8954283,12.0155285 17.8954283,9.71468147 C17.8954283,6.13560131 14.9554784,3.19565143 11.3763982,3.19565143 C7.79731808,3.19565143 4.60169411,6.13557384 4.60169411,9.71465401 C4.60169411,12.0155011 5.87992722,14.0607015 7.79729061,15.211125 C4.34604749,16.4893581 1.91736339,19.8128191 1.91736339,23.7753555 C1.91736339,24.4144858 2.42865664,24.925779 3.06778692,24.925779 C3.70691721,24.925779 4.21821045,24.4144858 4.21821045,23.775383 C4.21821045,19.9406287 7.41383441,16.7450322 11.2485612,16.7450322 C15.2110976,16.7450322 18.278912,19.9406287 18.278912,23.775383 C18.278912,24.4144858 18.7902052,24.925779 19.429308,24.925779 C20.0684108,24.925779 20.579759,24.4144858 20.579759,23.775383 C20.579759,19.9406287 18.1510749,16.6171952 14.6998043,15.211125 L14.6998318,15.2110976 Z M11.2485612,14.0607015 C8.81990456,14.0607015 6.90251371,12.1433381 6.90251371,9.71465401 C6.90251371,7.28596991 8.81990456,5.36863398 11.2485612,5.36863398 C13.6772178,5.36863398 15.5946087,7.28599737 15.5946087,9.71465401 C15.5946087,12.1433106 13.6772178,14.0607015 11.2485612,14.0607015 Z M20.9632152,9.45900739 L25.1814257,9.45900739 C25.8205559,9.45900739 26.2040396,8.94771414 26.2040396,8.4364209 C26.2040396,7.79729061 25.6927464,7.41383441 25.1814257,7.41383441 L20.9632152,7.41383441 C20.3241124,7.41383441 19.9406287,7.92512766 19.9406287,8.4364209 C19.8128191,8.94771414 20.3241124,9.45900739 20.9632152,9.45900739 Z M25.1814257,11.3763982 L19.8128191,11.3763982 C19.1736889,11.3763982 18.7902052,11.8876915 18.7902052,12.3989847 C18.7902052,13.038115 19.3014984,13.4215712 19.8128191,13.4215712 L25.1814257,13.4215712 C25.8205559,13.4215712 26.2040396,12.910278 26.2040396,12.3989847 C26.2040396,11.8876915 25.6927464,11.3763982 25.1814257,11.3763982 Z M25.1814257,15.4667717 L20.9632152,15.4667717 C20.3241124,15.4667717 19.9406287,15.9780649 19.9406287,16.4893581 C19.9406287,17.1284884 20.451922,17.5119721 20.9632152,17.5119721 L25.1814257,17.5119721 C25.8205559,17.5119721 26.2040396,17.0006788 26.2040396,16.4893581 C26.2040396,15.9780374 25.6927464,15.4667717 25.1814257,15.4667717 Z" id="形状"></path>
-                </g>
-            </g>
-        </g>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="75px" height="50px" viewBox="0 0 75 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 28@2x</title>
+    <defs>
+        <linearGradient x1="56.7868058%" y1="100%" x2="56.7868058%" y2="0%" id="linearGradient-1">
+            <stop stop-color="#90DCFE" offset="0%"></stop>
+            <stop stop-color="#141F34" offset="100%"></stop>
+        </linearGradient>
+        <radialGradient cx="50%" cy="30.3951181%" fx="50%" fy="30.3951181%" r="135.534427%" gradientTransform="translate(0.500000,0.303951),scale(0.171272,1.000000),rotate(90.000000),scale(1.000000,2.145743),translate(-0.500000,-0.303951)" id="radialGradient-2">
+            <stop stop-color="#ACF4F7" offset="0%"></stop>
+            <stop stop-color="#96EEF2" stop-opacity="0.600017604" offset="75.2832594%"></stop>
+            <stop stop-color="#74E5EB" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="2025-02-28-西安航天-导航" transform="translate(-1816.000000, -11.000000)">
+            <g id="编组-28" transform="translate(1816.900000, 11.000000)">
+                <rect id="矩形" fill="url(#linearGradient-1)" opacity="0.586283366" x="0" y="0" width="74" height="46" rx="23"></rect>
+                <path d="M52,44.0516405 L52,46.0516405 L40.137,46.0516405 L37,49.1897883 L33.862,46.0516405 L22,46.0516405 L22,44.0516405 L52,44.0516405 Z" id="形状结合" fill="url(#radialGradient-2)" fill-rule="nonzero"></path>
+                <g id="账号中心-账号管理" transform="translate(22.939298, 9.939298)" fill="#FFFFFF" fill-rule="nonzero">
+                    <rect id="矩形" opacity="0" x="0" y="0" width="28.121403" height="28.121403"></rect>
+                    <path d="M14.6998318,15.2110976 C16.6171677,14.0607015 17.8954283,12.0155285 17.8954283,9.71468147 C17.8954283,6.13560131 14.9554784,3.19565143 11.3763982,3.19565143 C7.79731808,3.19565143 4.60169411,6.13557384 4.60169411,9.71465401 C4.60169411,12.0155011 5.87992722,14.0607015 7.79729061,15.211125 C4.34604749,16.4893581 1.91736339,19.8128191 1.91736339,23.7753555 C1.91736339,24.4144858 2.42865664,24.925779 3.06778692,24.925779 C3.70691721,24.925779 4.21821045,24.4144858 4.21821045,23.775383 C4.21821045,19.9406287 7.41383441,16.7450322 11.2485612,16.7450322 C15.2110976,16.7450322 18.278912,19.9406287 18.278912,23.775383 C18.278912,24.4144858 18.7902052,24.925779 19.429308,24.925779 C20.0684108,24.925779 20.579759,24.4144858 20.579759,23.775383 C20.579759,19.9406287 18.1510749,16.6171952 14.6998043,15.211125 L14.6998318,15.2110976 Z M11.2485612,14.0607015 C8.81990456,14.0607015 6.90251371,12.1433381 6.90251371,9.71465401 C6.90251371,7.28596991 8.81990456,5.36863398 11.2485612,5.36863398 C13.6772178,5.36863398 15.5946087,7.28599737 15.5946087,9.71465401 C15.5946087,12.1433106 13.6772178,14.0607015 11.2485612,14.0607015 Z M20.9632152,9.45900739 L25.1814257,9.45900739 C25.8205559,9.45900739 26.2040396,8.94771414 26.2040396,8.4364209 C26.2040396,7.79729061 25.6927464,7.41383441 25.1814257,7.41383441 L20.9632152,7.41383441 C20.3241124,7.41383441 19.9406287,7.92512766 19.9406287,8.4364209 C19.8128191,8.94771414 20.3241124,9.45900739 20.9632152,9.45900739 Z M25.1814257,11.3763982 L19.8128191,11.3763982 C19.1736889,11.3763982 18.7902052,11.8876915 18.7902052,12.3989847 C18.7902052,13.038115 19.3014984,13.4215712 19.8128191,13.4215712 L25.1814257,13.4215712 C25.8205559,13.4215712 26.2040396,12.910278 26.2040396,12.3989847 C26.2040396,11.8876915 25.6927464,11.3763982 25.1814257,11.3763982 Z M25.1814257,15.4667717 L20.9632152,15.4667717 C20.3241124,15.4667717 19.9406287,15.9780649 19.9406287,16.4893581 C19.9406287,17.1284884 20.451922,17.5119721 20.9632152,17.5119721 L25.1814257,17.5119721 C25.8205559,17.5119721 26.2040396,17.0006788 26.2040396,16.4893581 C26.2040396,15.9780374 25.6927464,15.4667717 25.1814257,15.4667717 Z" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
 </svg>

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -158,10 +158,12 @@ export const LocaleProvider = (props: Props) => {
   }, [languages?.length]);
 
   useEffect(() => {
-    if ("defaultLanguage" in props && !locale) { // 判断props是否传参defaultLanguage
+    if ("defaultLanguage" in props && defaultLanguage && !locale) { // 判断props是否传参defaultLanguage
       setLocale(defaultLanguage); // 存在defaultLanguage且无本地缓存，设置defaultLanguage
     } else {
-      setLocale(localeStorageLang || getLangWithLangMp(navigatorLanguage))
+      // 当前浏览器语言环境不在可用多语言中，默认使用中文
+      const temLanguage = languages.find(r => r === navigatorLanguage);
+      setLocale(localeStorageLang || getLangWithLangMp(temLanguage || "zh"));
     }
   }, [defaultLanguage]);