aldehyde 0.2.479 → 0.2.480

package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js

@@ -1,6 +1,12 @@
-import Konva from 'konva';
-import { nanoid } from 'nanoid';
-import { AssetType } from '../types';
+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 { RefLineDraw, PreviewDraw } from '../draws';
 export class DragOutsideHandlers {
     constructor(render) {
@@ -8,134 +14,64 @@ export class DragOutsideHandlers {
             dom: {
                 dragenter: (e) => {
                     this.render.stage.setPointersPositions(e);
-                    // 更新参考线
-                    this.render.redraw([RefLineDraw.name]);
+                    this.render.redraw([RefLineDraw.name]); // 更新参考线
                 },
                 dragover: (e) => {
                     this.render.stage.setPointersPositions(e);
-                    // 更新参考线
-                    this.render.redraw([RefLineDraw.name]);
+                    this.render.redraw([RefLineDraw.name]); // 更新参考线
                 },
-                drop: (e) => {
+                drop: (e) => __awaiter(this, void 0, void 0, function* () {
                     var _a, _b, _c, _d, _e;
-                    const src = (_a = e.dataTransfer) === null || _a === void 0 ? void 0 : _a.getData('src');
-                    const componentType = (_b = e.dataTransfer) === null || _b === void 0 ? void 0 : _b.getData('componentType'); // 组件类型
-                    // 接收连接点信息
-                    let morePoints = [];
-                    const morePointsTxt = (_d = (_c = e.dataTransfer) === null || _c === void 0 ? void 0 : _c.getData('points')) !== null && _d !== void 0 ? _d : '[]';
-                    try {
-                        morePoints = JSON.parse(morePointsTxt);
+                    const componentItem = JSON.parse(((_a = e.dataTransfer) === null || _a === void 0 ? void 0 : _a.getData('componentItem')) || '{}');
+                    const src = (_b = e.dataTransfer) === null || _b === void 0 ? void 0 : _b.getData('src');
+                    const componentType = (_c = e.dataTransfer) === null || _c === void 0 ? void 0 : _c.getData('componentType'); // 组件类型
+                    const showPoints = (_d = e.dataTransfer) === null || _d === void 0 ? void 0 : _d.getData('showPoints'); // 是否显示连接点
+                    const type = ((_e = e.dataTransfer) === null || _e === void 0 ? void 0 : _e.getData('type')) || "other";
+                    const stageState = this.render.getStageState();
+                    this.render.stage.setPointersPositions(e);
+                    const pos = this.render.stage.getPointerPosition();
+                    if (!pos)
+                        return;
+                    const factory = this.render.componentFactory;
+                    let group = null;
+                    let points = [];
+                    if (componentType) { // 指定组件类型
+                        const comGroup = yield factory.createTypedComponent({ src, type, componentType });
+                        group = comGroup.group;
+                        points = comGroup.points;
                     }
-                    catch (e) {
-                        console.error(e);
+                    else if (src && type) { // 图片或组合组件
+                        if (type === 'json') { // 组合组件
+                            const jsonGroup = yield factory.createJsonComponent({ src });
+                            group = jsonGroup.group;
+                        }
+                        else { // 图片组件
+                            const imgGroup = yield factory.createImageComponent({ src, type });
+                            group = imgGroup.group;
+                            points = imgGroup.points;
+                        }
                     }
-                    const type = (_e = e.dataTransfer) === null || _e === void 0 ? void 0 : _e.getData('type');
-                    if (src && type) {
-                        const stageState = this.render.getStageState();
-                        const { pageHeight, pageWidth } = this.render.getPageSettings();
-                        this.render.stage.setPointersPositions(e);
-                        const pos = this.render.stage.getPointerPosition();
-                        if (pos) {
-                            this.render.assetTool[type === 'json' ? 'loadJson' : ({ svg: "loadSvg", gif: "loadGif" }[type] || "loadImg")](src).then((target) => {
-                                var _a;
-                                let group = null;
-                                let width = target.width();
-                                let height = target.height();
-                                if (width > pageWidth || height > pageHeight) {
-                                    const sizeScale = Math.min(pageWidth / width, pageHeight / height);
-                                    width *= sizeScale;
-                                    height *= sizeScale;
-                                    target.setSize({ width, height });
-                                }
-                                // 默认连接点
-                                let points = [];
-                                if (target instanceof Konva.Image) { // 图片素材
-                                    group = new Konva.Group({
-                                        id: nanoid(),
-                                        width,
-                                        height,
-                                        name: 'asset',
-                                        assetType: AssetType.Image,
-                                        draggable: true,
-                                        componentType,
-                                        imageType: type !== 'json'
-                                            ? (["svg", "gif", "other"].includes(type) ? type : "other")
-                                            : undefined
-                                    });
-                                    this.render.setAssetSettings(group, this.render.getAssetSettings(), false);
-                                    group.add(target);
-                                    points = [
-                                        { x: 0, y: group.height() / 2, direction: 'left' }, // 左
-                                        { x: group.width(), y: group.height() / 2, direction: 'right' }, // 右
-                                        { x: group.width() / 2, y: 0, direction: 'top' }, // 上
-                                        { x: group.width() / 2, y: group.height(), direction: 'bottom' } // 下
-                                    ];
-                                }
-                                else { // json 素材
-                                    target.id(nanoid());
-                                    target.setAttrs({
-                                        name: 'asset',
-                                        assetType: AssetType.Json,
-                                        draggable: true
-                                    });
-                                    group = target;
-                                    this.render.linkTool.groupIdCover(group);
-                                }
-                                target.setAttrs({ x: 0, y: 0 });
-                                this.render.layer.add(group); // 组件添加到画布
-                                const x = this.render.toStageValue(pos.x - stageState.x) - group.width() / 2;
-                                const y = this.render.toStageValue(pos.y - stageState.y) - group.height() / 2;
-                                group.setAttrs({ x, y });
-                                // 更新坐标记录
-                                this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
-                                // 自定义连接点 覆盖 默认连接点
-                                if (Array.isArray(morePoints) && morePoints.length > 0) {
-                                    points = morePoints;
-                                }
-                                // 连接点信息
-                                group.setAttrs({
-                                    points: points.map((o) => (Object.assign(Object.assign({}, o), { id: nanoid(), groupId: group.id(), visible: false, pairs: [], direction: o.direction })))
-                                });
-                                // 连接点（锚点）
-                                for (const point of (_a = group.getAttr('points')) !== null && _a !== void 0 ? _a : []) {
-                                    group.add(new Konva.Circle({
-                                        name: 'link-anchor',
-                                        id: point.id,
-                                        x: point.x,
-                                        y: point.y,
-                                        radius: this.render.toStageValue(1),
-                                        stroke: 'rgba(0,0,255,1)',
-                                        strokeWidth: this.render.toStageValue(2),
-                                        visible: false,
-                                        direction: point.direction
-                                    }));
-                                }
-                                group.on('mouseenter', () => {
-                                    this.render.linkTool.pointsVisible(true, group);
-                                });
-                                // hover 框（多选时才显示）
-                                group.add(new Konva.Rect({
-                                    id: 'hoverRect',
-                                    width: target.width(),
-                                    height: target.height(),
-                                    fill: 'rgba(0,255,0,0.3)',
-                                    visible: false
-                                }));
-                                group.on('mouseleave', () => {
-                                    var _a;
-                                    // 隐藏 连接点
-                                    this.render.linkTool.pointsVisible(false, group);
-                                    // 隐藏 hover 框
-                                    (_a = group.findOne('#hoverRect')) === null || _a === void 0 ? void 0 : _a.visible(false);
-                                });
-                                // 更新历史
-                                this.render.updateHistory();
-                                // 重绘
-                                this.render.redraw([PreviewDraw.name]);
-                            });
+                    if (group) { // 存在组件，设置连接点等功能
+                        this.render.layer.add(group); // 组件添加到画布
+                        if (componentItem === null || componentItem === void 0 ? void 0 : componentItem.dataSource) { // 组件存在默认数据源，拖拽插入组件时默认设置数据源配置
+                            this.render.setAssetSettings(group, Object.assign(Object.assign({}, this.render.getAssetSettings(group)), { dataSource: componentItem.dataSource.split('@R@')[0] }), false);
                         }
+                        const x = this.render.toStageValue(pos.x - stageState.x) - group.width() / 2;
+                        const y = this.render.toStageValue(pos.y - stageState.y) - group.height() / 2;
+                        group.setAttrs({ x, y });
+                        // 更新坐标记录
+                        this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
+                        // 设置连接点
+                        this.render.componentFactory.createComponentLinkPoints({ group, points, showPoints });
+                        // 组件鼠标移入移出事件
+                        this.render.componentFactory.groupMouseenter({ group });
+                        this.render.componentFactory.groupMouseleave({ group });
+                        // 更新历史
+                        this.render.updateHistory();
+                        // 重绘
+                        this.render.redraw([PreviewDraw.name]);
                     }
-                }
+                })
             }
         };
         this.render = render;

package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"drag-outside-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"drag-outside-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts"],"names":[],"mappings":"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"}

package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-handlers.d.ts","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,SAAS,EAAqC,MAAM,WAAW,CAAC;AAGzE,qBAAa,aAAc,YAAW,OAAO;IAC3C,OAAO,CAAC,MAAM,CAAS;gBACX,MAAM,EAAE,MAAM;IAG1B,QAAQ,UAAS;IACjB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IAEpC;;;;OAIG;IACH,aAAa,CAAC,OAAO,UAAQ;;;;IAoB7B,QAAQ;;2BAEW,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;MA+DlF;CACF"}
+{"version":3,"file":"graph-handlers.d.ts","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,SAAS,EAAqC,MAAM,WAAW,CAAC;AAGzE,qBAAa,aAAc,YAAW,OAAO;IAC3C,OAAO,CAAC,MAAM,CAAS;gBACX,MAAM,EAAE,MAAM;IAG1B,QAAQ,UAAS;IACjB,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IAEpC;;;;OAIG;IACH,aAAa,CAAC,OAAO,UAAQ;;;;IAoB7B,QAAQ;;2BAEW,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;MAqElF;CACF"}

package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js

@@ -35,7 +35,8 @@ export class GraphHandlers {
                                 }
                                 // 初始化设置信息
                                 if (this.currentGraph) {
-                                    this.render.setAssetSettings(this.currentGraph.group, this.render.getAssetSettings(this.currentGraph.group), false);
+                                    const temSetting = this.render.getAssetSettings(this.currentGraph.group);
+                                    this.render.setAssetSettings(this.currentGraph.group, Object.assign(Object.assign({}, temSetting), { stroke: temSetting.stroke || "#000000", strokeWidth: temSetting.strokeWidth || 1, fill: temSetting.fill || (["Circle", "Rect"].includes(this.render.graphType) ? "transparent" : "#000000") }), false);
                                 }
                             }
                         }

package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"graph-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts"],"names":[],"mappings":"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"}

package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selection-handlers.d.ts","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAA0E,MAAM,UAAU,CAAC;AAG3G,qBAAa,iBAAkB,YAAW,OAAO;IAC/C,OAAO,CAAC,MAAM,CAAS;gBACX,MAAM,EAAE,MAAM;IAI1B,gBAAgB,SAAK;IACrB,gBAAgB,SAAK;IACrB,cAAc,SAAK;IACnB,cAAc,SAAK;IACnB,SAAS,UAAS;IAClB,uBAAuB,EAAE,KAAK,CAAC,QAAQ,CAAkB;IACzD,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,CAAM;IAC9B,eAAe;IAOf,8BAA8B,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ;IAWrD,2BAA2B;IAS3B,qBAAqB;IAiBrB,KAAK;IAML;;;;;;;;;;;;;OAaG;IAGH,OAAO,CAAC,wBAAwB;IAsBhC,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;IAQjF,YAAY,SAAK;IAEjB,QAAQ;;2BAEW,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;;2BA8EhE,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;;;;;;;MAiKjF;IAEF,iBAAiB;sCAEe,KAAK,CAAC,QAAQ,UAAU,KAAK,CAAC,QAAQ;MA4BpE;CACH"}
+{"version":3,"file":"selection-handlers.d.ts","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAA0E,MAAM,UAAU,CAAC;AAG3G,qBAAa,iBAAkB,YAAW,OAAO;IAC/C,OAAO,CAAC,MAAM,CAAS;gBACX,MAAM,EAAE,MAAM;IAI1B,gBAAgB,SAAK;IACrB,gBAAgB,SAAK;IACrB,cAAc,SAAK;IACnB,cAAc,SAAK;IACnB,SAAS,UAAS;IAClB,uBAAuB,EAAE,KAAK,CAAC,QAAQ,CAAkB;IACzD,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE,CAAM;IAC9B,eAAe;IAOf,8BAA8B,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ;IAWrD,2BAA2B;IAS3B,qBAAqB;IAiBrB,KAAK;IAML;;;;;;;;;;;;;OAaG;IAGH,OAAO,CAAC,wBAAwB;IAsBhC,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;IAQjF,YAAY,SAAK;IAEjB,QAAQ;;2BAEW,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;;2BAkFhE,KAAK,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;;;;;;;;;;MAmKjF;IAEF,iBAAiB;sCAEe,KAAK,CAAC,QAAQ,UAAU,KAAK,CAAC,QAAQ;MA4BpE;CACH"}

package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js

@@ -44,6 +44,10 @@ export class SelectionHandlers {
                             // （判断 ctrlKey 为了排查 mac 拖动快捷键）
                             if (e.evt.button === MouseButton["左键"] && !e.evt.ctrlKey) {
                                 if (!this.render.ignore(parent) && !this.render.ignoreDraw(e.target)) {
+                                    // 锁定节点：在 select 之前先禁用 Konva 内置拖拽，防止 race condition
+                                    if (parent.attrs.locked) {
+                                        parent.draggable(false);
+                                    }
                                     if (e.evt.ctrlKey || e.evt.metaKey) { // 新增多选
                                         this.render.selectionTool.select([...this.render.selectionTool.selectingNodes, parent]);
                                     }
@@ -157,6 +161,7 @@ export class SelectionHandlers {
                     }
                 },
                 transform: () => {
+                    var _a;
                     const back = this.render.transformer.findOne('.back');
                     if (back) {
                         const stageState = this.render.getStageState();
@@ -184,9 +189,11 @@ export class SelectionHandlers {
                                 }
                             }
                         }
-                        // 更新坐标记录
+                        // 更新坐标记录（仅记录属性，不干预Konva位置，避免toFixed截断与Konva精确值冲突累积）
                         for (const group of groups) {
-                            this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
+                            group.setAttr('assetSettings', this.render.getAssetSettings(group));
+                            // 存在tooltip，则tooltip始终箭头朝下，不受group旋转影响
+                            (_a = group.findOne('.tooltip')) === null || _a === void 0 ? void 0 : _a.rotation(-group.rotation());
                         }
                         this.render.emit('asset-position-change', groups);
                         this.render.emit('asset-rotation-change', groups);
@@ -219,8 +226,8 @@ export class SelectionHandlers {
                         this.updateManualPointsByDrag(rect, undefined, false);
                     }
                     const groups = this.render.transformer.nodes();
-                    for (const group of groups) { // 更新坐标记录
-                        this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
+                    for (const group of groups) { // 更新坐标记录（仅记录属性，不干预Konva位置）
+                        group.setAttr('assetSettings', this.render.getAssetSettings(group));
                     }
                     this.render.emit('asset-position-change', groups);
                     this.render.redraw([GraphDraw.name, LinkDraw.name, RulerDraw.name, PreviewDraw.name]);

package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"selection-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"selection-handlers.js","sourceRoot":"","sources":["../../../../../../../src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts"],"names":[],"mappings":"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"}

package/lib/draw-canvas-edit/components/render/index.d.ts

@@ -1,6 +1,6 @@
 import Konva from 'konva';
 import { GraphType, AssetType, RenderConfig, Draw, Handler, RenderEvents, PageSettings, AssetSettings, LinkSettings } from './types';
-import { AssetTool, SelectionTool, CopyTool, PositionTool, ZIndexTool, ImportExportTool, AlignTool, LinkTool, AttractTool } from './tools';
+import { AssetTool, SelectionTool, CopyTool, PositionTool, ZIndexTool, ImportExportTool, AlignTool, LinkTool, AttractTool, ComponentFactory } from './tools';
 export declare class Render {
     stage: Konva.Stage;
     layer: Konva.Layer;
@@ -19,6 +19,7 @@ export declare class Render {
     alignTool: AlignTool;
     linkTool: LinkTool;
     attractTool: AttractTool;
+    componentFactory: ComponentFactory;
     groupTransformer: Konva.Group;
     transformer: Konva.Transformer;
     selectRect: Konva.Rect;
@@ -87,6 +88,7 @@ export declare class Render {
         id: string;
         assetType: AssetType;
         settings: AssetSettings;
+        componentType?: string;
     }>;
     updateAssetById(id: string, settings: Partial<AssetSettings>): void;
     static LinkSettingsDefault: LinkSettings;

package/lib/draw-canvas-edit/components/render/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/aldehyde/draw-canvas-edit/components/render/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/aldehyde/draw-canvas-edit/components/render/index.ts"],"names":[],"mappings":"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"}

package/lib/draw-canvas-edit/components/render/index.js

@@ -12,7 +12,7 @@ import Konva from 'konva';
 import { GraphDraw, LinkDraw, RulerDraw, PreviewDraw, RefLineDraw, BgDraw, ContextmenuDraw } from './draws';
 import { AssetType, ImageType } from './types';
 import { DragHandlers, ZoomHandlers, DragOutsideHandlers, SelectionHandlers, KeyMoveHandlers, ShutcutHandlers, LinkHandlers, GraphHandlers, TextHandlers } from './handlers';
-import { AssetTool, SelectionTool, CopyTool, PositionTool, ZIndexTool, ImportExportTool, AlignTool, LinkTool, AttractTool } from './tools';
+import { AssetTool, SelectionTool, CopyTool, PositionTool, ZIndexTool, ImportExportTool, AlignTool, LinkTool, AttractTool, ComponentFactory } from './tools';
 // 简单的事件系统替代 mitt
 class SimpleEventEmitter {
     constructor() {
@@ -124,6 +124,7 @@ export class Render {
         this.alignTool = new AlignTool(this); // 对齐工具
         this.linkTool = new LinkTool(this); // 对齐工具
         this.attractTool = new AttractTool(this); // 磁贴工具
+        this.componentFactory = new ComponentFactory(this); // 统一组件渲染
         // 事件处理
         this.handlers[DragHandlers.name] = new DragHandlers(this);
         this.handlers[ZoomHandlers.name] = new ZoomHandlers(this);
@@ -394,7 +395,8 @@ export class Render {
     }
     changeDraggable(disabled) {
         this.layer.children.forEach((asset) => {
-            asset.draggable(disabled);
+            // 锁定节点始终保持不可拖拽
+            asset.draggable(disabled && !asset.attrs.locked);
         });
     }
     // 改变画图类型
@@ -463,12 +465,9 @@ export class Render {
         const base = (_a = asset === null || asset === void 0 ? void 0 : asset.attrs.assetSettings) !== null && _a !== void 0 ? _a : Object.assign({}, Render.AssetSettingsDefault);
         return Object.assign(Object.assign({}, base), { 
             // 继承全局
-            stroke: base.stroke || this.getPageSettings().stroke, strokeWidth: base.strokeWidth || this.getPageSettings().strokeWidth, fontSize: base.fontSize || this.getPageSettings().fontSize, textFill: base.textFill || this.getPageSettings().textFill, 
+            stroke: base.stroke, strokeWidth: base.strokeWidth, fontSize: base.fontSize || this.getPageSettings().fontSize, textFill: base.textFill || this.getPageSettings().textFill, 
             // 绘制图形，默认不填充
-            fill: base.fill ||
-                ((asset === null || asset === void 0 ? void 0 : asset.attrs.assetType) === AssetType.Graph
-                    ? 'transparent'
-                    : this.getPageSettings().fill), x: parseFloat(((_b = asset === null || asset === void 0 ? void 0 : asset.position().x) !== null && _b !== void 0 ? _b : 0).toFixed(1)), y: parseFloat(((_c = asset === null || asset === void 0 ? void 0 : asset.position().y) !== null && _c !== void 0 ? _c : 0).toFixed(1)), rotation: parseFloat(((_d = asset === null || asset === void 0 ? void 0 : asset.rotation()) !== null && _d !== void 0 ? _d : 0).toFixed(1)), tension: (asset === null || asset === void 0 ? void 0 : asset.attrs.assetType) === AssetType.Graph &&
+            fill: base.fill || "transparent", x: parseFloat(((_b = asset === null || asset === void 0 ? void 0 : asset.position().x) !== null && _b !== void 0 ? _b : 0).toFixed(1)), y: parseFloat(((_c = asset === null || asset === void 0 ? void 0 : asset.position().y) !== null && _c !== void 0 ? _c : 0).toFixed(1)), rotation: parseFloat(((_d = asset === null || asset === void 0 ? void 0 : asset.rotation()) !== null && _d !== void 0 ? _d : 0).toFixed(1)), tension: (asset === null || asset === void 0 ? void 0 : asset.attrs.assetType) === AssetType.Graph &&
                 (asset === null || asset === void 0 ? void 0 : asset.attrs.graphType) === "Curve"
                 ? base.tension
                 : undefined });
@@ -519,18 +518,30 @@ export class Render {
     // 更新素材设置
     setAssetSettings(asset_1, settings_1) {
         return __awaiter(this, arguments, void 0, function* (asset, settings, update = false) {
-            var _a, _b, _c, _d, _e;
-            asset.setAttr('assetSettings', settings);
+            var _a, _b, _c, _d, _e, _f;
             if (asset instanceof Konva.Group) {
+                this.componentFactory.updateComponentSetting({ node: asset, settings }); // 更新组件配置
                 if (asset.attrs.imageType === ImageType.svg) {
                     const node = asset.children[0];
                     if (node instanceof Konva.Image) {
                         if (node.attrs.svgXML) {
-                            const n = yield this.assetTool.loadSvgXML(this.setSvgXMLSettings(node.attrs.svgXML, settings));
-                            (_a = node.parent) === null || _a === void 0 ? void 0 : _a.add(n);
-                            node.remove();
-                            node.destroy();
-                            n.zIndex(0);
+                            // 仅在 stroke/fill 变化时才重建 SVG 节点
+                            const currentSettings = asset.attrs.assetSettings;
+                            const strokeChanged = settings.stroke !== (currentSettings === null || currentSettings === void 0 ? void 0 : currentSettings.stroke);
+                            const fillChanged = settings.fill !== (currentSettings === null || currentSettings === void 0 ? void 0 : currentSettings.fill);
+                            if (strokeChanged || fillChanged) {
+                                const n = yield this.assetTool.loadSvgXML(this.setSvgXMLSettings(node.attrs.svgXML, settings));
+                                // 保留旧节点的变换状态
+                                n.x(node.x());
+                                n.y(node.y());
+                                n.scaleX(node.scaleX());
+                                n.scaleY(node.scaleY());
+                                n.rotation(node.rotation());
+                                (_a = node.parent) === null || _a === void 0 ? void 0 : _a.add(n);
+                                node.remove();
+                                node.destroy();
+                                n.zIndex(0);
+                            }
                         }
                     }
                 }
@@ -577,10 +588,11 @@ export class Render {
                     }
                 }
                 // rotate 会影响 position，不能同时改变
-                // 区分属性面板正在调整
                 if (Math.abs(settings.rotation - asset.rotation()) >= 0.1) {
                     this.rotateAroundCenter(asset, settings.rotation);
-                    // 同步 position 的变化
+                    // tooltip 始终箭头朝下，不受 group 旋转影响
+                    (_b = asset.findOne('.tooltip')) === null || _b === void 0 ? void 0 : _b.rotation(-asset.rotation());
+                    // 同步 position 的变化     
                     this.emit('asset-position-change', [asset]);
                 }
                 else {
@@ -595,14 +607,15 @@ export class Render {
                     }
                 }
             }
+            asset.setAttr('assetSettings', settings);
             if (update) {
                 // 更新历史
                 this.updateHistory();
             }
-            (_b = this.draws[BgDraw.name]) === null || _b === void 0 ? void 0 : _b.draw();
-            (_c = this.draws[GraphDraw.name]) === null || _c === void 0 ? void 0 : _c.draw();
-            (_d = this.draws[LinkDraw.name]) === null || _d === void 0 ? void 0 : _d.draw();
-            (_e = this.draws[PreviewDraw.name]) === null || _e === void 0 ? void 0 : _e.draw();
+            (_c = this.draws[BgDraw.name]) === null || _c === void 0 ? void 0 : _c.draw();
+            (_d = this.draws[GraphDraw.name]) === null || _d === void 0 ? void 0 : _d.draw();
+            (_e = this.draws[LinkDraw.name]) === null || _e === void 0 ? void 0 : _e.draw();
+            (_f = this.draws[PreviewDraw.name]) === null || _f === void 0 ? void 0 : _f.draw();
         });
     }
     // 获取画布上所有素材节点及其配置
@@ -611,6 +624,7 @@ export class Render {
         return nodes.map((node) => ({
             id: node.id(),
             assetType: node.attrs.assetType,
+            componentType: node.attrs.componentType,
             settings: this.getAssetSettings(node)
         }));
     }
@@ -680,9 +694,6 @@ Render.PageSettingsDefault = {
     pageHeight: 720,
     // 样式默认值
     background: undefined,
-    stroke: 'rgb(0,0,0)',
-    strokeWidth: 1,
-    fill: 'rgb(0,0,0)',
     linkStroke: 'rgb(0,0,0)',
     linkStrokeWidth: 1,
     fontSize: 24,
@@ -690,9 +701,9 @@ Render.PageSettingsDefault = {
 };
 // 素材设置 默认值
 Render.AssetSettingsDefault = {
-    stroke: '',
-    strokeWidth: 0,
-    fill: '',
+    // stroke: '',
+    // strokeWidth: 0,
+    // fill: '',
     arrowStart: false,
     arrowEnd: false,
     fontSize: 0,