@mx-sose-front/mx-sose-graph 1.1.9 → 1.2.2

package/src/store/graphStore.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, computed, shallowReactive, nextTick, type Ref } from 'vue'
-import type { Shape, OwnerPayload, ShapeSizeUpdatePayload } from '../types'
+import type { Shape, OwnerPayload, ShapeSizeUpdatePayload, Matrix } from '../types'
+
 import { eventBus } from './eventBus'
 import { getPolicy, checkNestViaFront, } from '../utils/policy'
 import _ from "lodash";
@@ -119,6 +120,23 @@ export const useGraphStore = defineStore('graph', () => {
   const cutShapeIds = ref<Set<string>>(new Set())
   // 剪贴板中图元的数量（用于工具栏按钮状态同步）
   const copiedShapesCount = ref<number>(0)
+  /** 矩阵视图缓存：与 Matrix 组件收到的 matrix-data-change 同步 */
+  const matrixData = ref<Matrix>({
+    rowTree: [],
+    columnTree: [],
+    crossData: [],
+    relationModelIcon: '',
+    relationModelName: '',
+  })
+  const setMatrixData = (payload: Matrix) => {
+    matrixData.value = {
+      rowTree: payload.rowTree,
+      columnTree: payload.columnTree,
+      crossData: payload.crossData,
+      relationModelIcon: payload.relationModelIcon,
+      relationModelName: payload.relationModelName,
+    }
+  }
   // 计算属性
   const shapeCount = computed(() => shapes.value.length)
   const hasSelectedShape = computed(() => selectedShape.value !== null)
@@ -1073,6 +1091,7 @@ export const useGraphStore = defineStore('graph', () => {
     canOperate,
     cutShapeIds, // 剪切状态的图元 ID 集合
     copiedShapesCount, // 剪贴板中图元的数量
+    matrixData,
     //图元shapeKey
     taggedValueLabels,
     packagesTypes,
@@ -1130,5 +1149,6 @@ export const useGraphStore = defineStore('graph', () => {
     setCutShapeIds,
     clearCutShapeIds,
     setCopiedShapesCount,
+    setMatrixData,
   }
 })

package/src/types/index.ts

@@ -265,6 +265,7 @@ export interface TreeNode {
   isCreate?: boolean; //是否可以创建图表
   isCanvas?: string; //是否可以拖拽到画布
   icon?: string; // 图标文件名，用于 getIcon 加载
+  modelRelationld?: string;
 }
 
 export interface Matrix {

package/src/utils/keyboardUtils.ts

@@ -3,6 +3,7 @@ import { eventBus } from '../store';
 import _ from 'lodash';
 import { guardOperate } from './license-guard';
 import { ContextMenuUtils } from './contextMenuUtils';
+import { adjustCanvasToFitAllShapes } from './diagram';
 
 // 定义快捷键处理函数类型
 type KeyboardEventHandler = (e: KeyboardEvent) => void;
@@ -303,6 +304,7 @@ export const createKeyboardHandler = (config: KeyboardConfig): KeyboardEventHand
       const selectedShapes = graphStore.selectedIds
         .map(id => graphStore.shapeMap.get(id))
         .filter((shape): shape is NonNullable<typeof shape> => shape != null);
+      const hasNestedSelection = selectedShapes.some(shape => Boolean(shape.parenShapeId));
 
       // ==================== 防抖机制:记录初始状态 ====================
       // 在第一次移动时记录初始bounds
@@ -407,6 +409,17 @@ export const createKeyboardHandler = (config: KeyboardConfig): KeyboardEventHand
 
       // ==================== 防抖机制:重置定时器 ====================
       // 清除之前的定时器
+      // 键盘移动嵌套图元后，也要同步扩展父图元，保持与鼠标拖拽行为一致。
+      if (hasNestedSelection) {
+        selectedShapes.forEach(shape => {
+          const currentShape = graphStore.shapeMap.get(shape.id);
+          if (currentShape?.parenShapeId) {
+            graphStore.expandParentAndEmitSizeUpdateByChild(currentShape);
+          }
+        });
+        adjustCanvasToFitAllShapes();
+      }
+
       if (keyboardMoveTimer !== null) {
         window.clearTimeout(keyboardMoveTimer);
       }