aldehyde 0.2.527 → 0.2.528

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;