ronds-metadata 1.3.25 → 1.3.27

package/es/comps/DynamicPorts/graph.d.ts

@@ -68,7 +68,7 @@ declare class DPGraph extends GraphCore<BaseNode, BaseEdge> {
         edges: DPEdge[];
     }): void;
     onContextMenu(data: ContextMenuInfo): any;
-    onAddCopyCells(nodes: DPNode[], edges: DPEdge[]): void;
+    onAddCopyCells(nodes: any[], edges: any[]): void;
     onCopyNodes(args: any[]): void;
     updateNodeNameById(id: string, name: string): void;
     clearContextMenuInfo: () => void;

package/es/comps/DynamicPorts/graph.js

@@ -16,7 +16,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 14:31:01
- * @LastEditTime: 2023-12-01 08:07:32
+ * @LastEditTime: 2023-12-05 10:24:27
  */
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import produce from 'immer';
@@ -30,7 +30,7 @@ import { GraphCore } from '../../framework/graph';
 import NodeElement from './comps/NodeElement';
 import { DPEdge } from './comps/shape/edge';
 import { DPNode } from './comps/shape/node';
-import { formatGraphData, formatNodeInfoToNodeMeta, formattedEdgesToEdgeMeta } from './utils';
+import { formatGraphData, copy, formatNodeInfoToNodeMeta, formattedEdgesToEdgeMeta, isClipboardEmpty, cleanClipboard, getCellsInClipboard } from './utils';
 import { deepClone, guid } from '../../utils';
 import { MetadataService } from '../../framework/metadata/MetadataService';
 import { tr } from '../../framework/locale';
@@ -734,12 +734,11 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
   }, {
     key: "onAddCopyCells",
     value: function onAddCopyCells(nodes, edges) {
-      var _this2 = this,
-        _this$graph;
+      var _this2 = this;
       var cells = [];
       var randomId = guid().substring(0, 4);
       nodes.map(function (cell) {
-        var _node = cell.getData();
+        var _node = cell.data;
         _node = _objectSpread(_objectSpread({}, _node), {}, {
           id: "".concat(_node.id, "_copy_").concat(randomId),
           x: _node.x + 30,
@@ -750,7 +749,7 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
         _this2.addNode(newNode);
       });
       edges.map(function (cell) {
-        var _edge = cell.getData();
+        var _edge = cell.data;
         _edge = _objectSpread(_objectSpread({}, _edge), {}, {
           source: "".concat(_edge.source, "_copy_").concat(randomId),
           target: "".concat(_edge.target, "_copy_").concat(randomId)
@@ -759,11 +758,11 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
         var newEdge = formattedEdgesToEdgeMeta(_edge);
         _this2.addEdge(newEdge);
       });
-      (_this$graph = this.graph) === null || _this$graph === void 0 ? void 0 : _this$graph.cleanClipboard();
+      cleanClipboard();
       // 回显选中复制的之后的节点
       nodes.map(function (cell) {
         var _this2$graph;
-        var _node = cell.getData();
+        var _node = cell.data;
         var _cell = (_this2$graph = _this2.graph) === null || _this2$graph === void 0 ? void 0 : _this2$graph.getCellById("".concat(_node.id, "_copy_").concat(randomId));
         cells.push(_cell);
       });
@@ -779,22 +778,21 @@ var DPGraph = /*#__PURE__*/function (_GraphCore) {
       switch (action) {
         case 'command+c':
         case 'ctrl+c':
-          this.graph.copy(selectedCells, {
-            useLocalStorage: true
-          });
-          _message.success(tr('复制成功'));
+          if (selectedCells && selectedCells.length > 0) {
+            copy(selectedCells, this.graph);
+          }
           break;
         case 'command+v':
         case 'ctrl+v':
-          if (this.graph.isClipboardEmpty()) {
+          if (isClipboardEmpty()) {
             _message.info(tr('剪切板为空，不可粘贴'));
           } else {
-            var clipboardCells = this.graph.getCellsInClipboard();
-            var selectedNodes = clipboardCells.filter(function (cell) {
-              return cell.isNode();
+            var clipboardCells = getCellsInClipboard();
+            var selectedNodes = clipboardCells === null || clipboardCells === void 0 ? void 0 : clipboardCells.filter(function (cell) {
+              return (cell === null || cell === void 0 ? void 0 : cell.type) === 'node';
             });
-            var selectedEdges = clipboardCells.filter(function (cell) {
-              return cell.isEdge();
+            var selectedEdges = clipboardCells === null || clipboardCells === void 0 ? void 0 : clipboardCells.filter(function (cell) {
+              return (cell === null || cell === void 0 ? void 0 : cell.shape) === 'DPEdge';
             });
             this.onAddCopyCells(selectedNodes, selectedEdges);
             _message.success(tr('粘贴成功'));

package/es/comps/DynamicPorts/utils.d.ts

@@ -147,3 +147,7 @@ export declare function formatGraphData(graphData: NDPGraph.GraphData): {
         color?: string;
     }[];
 };
+export declare function isClipboardEmpty(): boolean;
+export declare function getCellsInClipboard(): unknown;
+export declare function cleanClipboard(): void;
+export declare function copy(selectedCells: any, graph: Graph): void;

package/es/comps/DynamicPorts/utils.js

@@ -1,12 +1,16 @@
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2022-05-24 16:40:49
- * @LastEditTime: 2023-11-30 14:07:43
+ * @LastEditTime: 2023-12-05 09:56:52
  */
 import { sortBy } from 'lodash-es';
 import { NODE_HEIGHT, NODE_WIDTH } from './constant';
+import { delFromLS, getFromLS, saveToLS } from '../../utils';
+import { tr } from '../../framework/locale';
 // 将画布上的点转换成相对于 offset parent 的点
 export function graphPointToOffsetPoint(graph, graphPoint, containerElem) {
   if (graph) {
@@ -134,4 +138,28 @@ export function formatGraphData(graphData) {
     nodes: _toConsumableArray(formattedNodes),
     edges: formattedEdges
   };
+}
+var CLIPBOARD_KEY = 'x6.clipboard.cells';
+var CLIPBOARD_KEY_NEW = 'my.clipboard.cells';
+export function isClipboardEmpty() {
+  var cells = getFromLS(CLIPBOARD_KEY_NEW);
+  return cells ? false : true;
+}
+export function getCellsInClipboard() {
+  var cells = getFromLS(CLIPBOARD_KEY_NEW);
+  return cells;
+}
+export function cleanClipboard() {
+  delFromLS(CLIPBOARD_KEY_NEW);
+}
+export function copy(selectedCells, graph) {
+  graph.copy(selectedCells, {
+    useLocalStorage: true
+  });
+  var cells = getFromLS(CLIPBOARD_KEY);
+  if (cells) {
+    saveToLS(CLIPBOARD_KEY_NEW, cells);
+    delFromLS(CLIPBOARD_KEY);
+    _message.success(tr('复制成功'));
+  }
 }

package/es/utils.d.ts

@@ -30,3 +30,6 @@ export declare function getConstantValue(array: any[], key: string | number, str
  * @param fileName string
  */
 export declare function handleMd2Doc(mdText: string, fileName: string, isFirstLineCenter?: boolean): Promise<void>;
+export declare function getFromLS<T>(key: string): T | null;
+export declare function saveToLS<T>(key: string, value: T | null | undefined): void;
+export declare function delFromLS(key: string): void;

package/es/utils.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-09-27 08:03:46
+ * @LastEditTime: 2023-12-05 09:05:07
  */
 import saveAs from 'file-saver';
 import { asBlob } from 'html-docx-js-typescript';
@@ -283,4 +283,26 @@ function convertImagePathToBase64(imagePath) {
 
     return uint8Array;
   }
+}
+export function getFromLS(key) {
+  if (window.localStorage) {
+    try {
+      return JSON.parse(window.localStorage.getItem(key) || '');
+    } catch (e) {
+      /*Ignore*/
+    }
+  }
+  return null;
+}
+export function saveToLS(key, value) {
+  if (window.localStorage) {
+    if (value === null || value === undefined) {
+      window.localStorage.removeItem(key);
+    } else {
+      window.localStorage.setItem(key, JSON.stringify(value));
+    }
+  }
+}
+export function delFromLS(key) {
+  window.localStorage.removeItem(key);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",