@riil-frontend/component-topology 12.0.0-dev.1 → 12.0.0-dev.2

package/es/core/editor/utils/copyElementUtil.js

@@ -1,11 +1,12 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { clipboard } from "../../../utils/clipboardUtil";
 export function handleCopyHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
 
   if (tagName !== 'BODY') {
-    copy(options);
+    copy(options.topo);
   }
 }
 export function handlePasteHotkey(event, options) {
@@ -17,8 +18,7 @@ export function handlePasteHotkey(event, options) {
   }
 }
 
-function copy(options) {
-  var topo = options.topo;
+function copy(topo) {
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   var sm = dm.sm();
@@ -102,14 +102,14 @@ function doPaste(topo, clipboardText) {
   var parseDm = new ht.DataModel();
   var parseSerializer = new ht.JSONSerializer(parseDm);
   parseSerializer.deserialize(clipboardText);
-  var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
+  var elements = parseDm.getDatas().toArray();
+  parseDm.clear(); // 添加到拓扑图
 
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   elements.forEach(function (d) {
     dm.add(d);
-  });
-  parseDm.clear(); // 粘贴之后进行处理
+  }); // 粘贴之后进行处理
 
   var sm = dm.sm();
   sm.cs();
@@ -123,6 +123,8 @@ function doPaste(topo, clipboardText) {
   // TODO
   // gv.translate(-60, -60)
 
+
+  copy(topo);
 }
 
 function isPasetToOriginTopo() {
@@ -139,9 +141,10 @@ function _writeClipboard() {
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          navigator.clipboard.writeText(text);
+          localStorage.setItem('topo.copy.text', text);
+          clipboard.writeText(text);
 
-        case 1:
+        case 2:
         case "end":
           return _context2.stop();
       }
@@ -159,7 +162,7 @@ function _readClipboard() {
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", navigator.clipboard.readText());
+          return _context3.abrupt("return", localStorage.getItem('topo.copy.text'));
 
         case 1:
         case "end":

package/es/core/hooks/useCiAttributeChange.js

@@ -4,15 +4,18 @@ import CiCache from "../models/cache/CiCache";
 import useTopoEventListener from "./useTopoEventListener";
 
 function mergeData(cis, ciChangeData) {
-  if (!cis.find(function (item) {
+  var matchData = function matchData(item) {
     return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
-  })) {
+  };
+
+  if (!cis.find(matchData)) {
     return cis;
   }
 
   return cis.map(function (ci) {
-    if (ci.id === ciChangeData.id) {
+    if (matchData(ci)) {
       return _extends({}, ci, {
+        id: ci.id,
         attributes: _extends({}, ci.attributes, ciChangeData.attributes)
       });
     }

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.0.0-dev.1" === 'string' ? "12.0.0-dev.1" : null;
+var version = typeof "12.0.0-dev.2" === 'string' ? "12.0.0-dev.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/attributeFormatter/formatter/commonTransform.js

@@ -13,11 +13,6 @@ export default function commonTransform(options) {
     if (ciData[attrType + "Map"][fieldCode + "_object"]) {
       fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
     }
-  } // 分级字典特殊处理
-
-
-  if (fieldMeta.dict) {
-    fieldValue = fieldMeta.dict[fieldValue];
   }
 
   return {

package/es/core/utils/metricUtil.js

@@ -13,6 +13,13 @@ export function formatMetric(val, metricModel) {
   }
 
   if (metricModel) {
+    var _result$value;
+
+    // 分级字典特殊处理
+    if (metricModel.dict && !DictCache.getDictObject()[metricModel.code]) {
+      val = metricModel.dict[fieldValue];
+    }
+
     var result = metricValueFormat({
       value: val,
       dataType: metricModel.dataType,
@@ -21,7 +28,7 @@ export function formatMetric(val, metricModel) {
       unit: metricModel.unit,
       code: metricModel.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return ((_result$value = result.value) !== null && _result$value !== void 0 ? _result$value : '') + " " + (result.value === '-' ? '' : result.unit);
   } else {
     return "" + val;
   }

package/es/utils/clipboardUtil.d.ts

@@ -0,0 +1,7 @@
+declare function writeText(text: string): Promise<void>;
+declare function readText(): Promise<string>;
+export declare const clipboard: {
+    readText: typeof readText;
+    writeText: typeof writeText;
+};
+export {};

package/es/utils/clipboardUtil.js

@@ -0,0 +1,104 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+function writeText(_x) {
+  return _writeText.apply(this, arguments);
+}
+
+function _writeText() {
+  _writeText = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(text) {
+    var success, textArea;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          success = false;
+          _context.prev = 1;
+
+          if (!navigator.clipboard) {
+            _context.next = 5;
+            break;
+          }
+
+          _context.next = 5;
+          return navigator.clipboard.writeText(text);
+
+        case 5:
+          success = true;
+          _context.next = 10;
+          break;
+
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](1);
+
+        case 10:
+          if (!success) {
+            // 创建text area
+            textArea = document.createElement('textarea');
+            textArea.value = text; // 使text area不在viewport，同时设置不可见
+
+            document.body.appendChild(textArea);
+            textArea.focus();
+            textArea.select();
+            document.execCommand('copy');
+            textArea.remove();
+          }
+
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 8]]);
+  }));
+  return _writeText.apply(this, arguments);
+}
+
+function readText() {
+  return _readText.apply(this, arguments);
+}
+
+function _readText() {
+  _readText = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var text, textareaElement, _text;
+
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (!navigator.clipboard) {
+            _context2.next = 7;
+            break;
+          }
+
+          _context2.next = 3;
+          return navigator.clipboard.readText();
+
+        case 3:
+          text = _context2.sent;
+          return _context2.abrupt("return", text);
+
+        case 7:
+          textareaElement = document.createElement('textarea');
+          document.body.appendChild(textareaElement);
+          textareaElement.innerText = '';
+          textareaElement.focus();
+          textareaElement.select();
+          document.execCommand('paste');
+          _text = textareaElement.innerText; // 从该元素中读取内容
+
+          document.body.removeChild(textareaElement); // 移除元素
+
+          return _context2.abrupt("return", _text);
+
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _readText.apply(this, arguments);
+}
+
+export var clipboard = {
+  readText: readText,
+  writeText: writeText
+};

package/lib/core/editor/utils/copyElementUtil.js

@@ -10,12 +10,14 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _clipboardUtil = require("../../../utils/clipboardUtil");
+
 function handleCopyHotkey(event, options) {
   var target = event.target || event.srcElement;
   var tagName = target.tagName;
 
   if (tagName !== 'BODY') {
-    copy(options);
+    copy(options.topo);
   }
 }
 
@@ -28,8 +30,7 @@ function handlePasteHotkey(event, options) {
   }
 }
 
-function copy(options) {
-  var topo = options.topo;
+function copy(topo) {
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   var sm = dm.sm();
@@ -113,14 +114,14 @@ function doPaste(topo, clipboardText) {
   var parseDm = new ht.DataModel();
   var parseSerializer = new ht.JSONSerializer(parseDm);
   parseSerializer.deserialize(clipboardText);
-  var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
+  var elements = parseDm.getDatas().toArray();
+  parseDm.clear(); // 添加到拓扑图
 
   var gv = topo.getHtTopo().getGraphView();
   var dm = gv.dm();
   elements.forEach(function (d) {
     dm.add(d);
-  });
-  parseDm.clear(); // 粘贴之后进行处理
+  }); // 粘贴之后进行处理
 
   var sm = dm.sm();
   sm.cs();
@@ -134,6 +135,8 @@ function doPaste(topo, clipboardText) {
   // TODO
   // gv.translate(-60, -60)
 
+
+  copy(topo);
 }
 
 function isPasetToOriginTopo() {
@@ -150,9 +153,11 @@ function _writeClipboard() {
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          navigator.clipboard.writeText(text);
+          localStorage.setItem('topo.copy.text', text);
 
-        case 1:
+          _clipboardUtil.clipboard.writeText(text);
+
+        case 2:
         case "end":
           return _context2.stop();
       }
@@ -170,7 +175,7 @@ function _readClipboard() {
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", navigator.clipboard.readText());
+          return _context3.abrupt("return", localStorage.getItem('topo.copy.text'));
 
         case 1:
         case "end":

package/lib/core/hooks/useCiAttributeChange.js

@@ -14,15 +14,18 @@ var _CiCache = _interopRequireDefault(require("../models/cache/CiCache"));
 var _useTopoEventListener = _interopRequireDefault(require("./useTopoEventListener"));
 
 function mergeData(cis, ciChangeData) {
-  if (!cis.find(function (item) {
+  var matchData = function matchData(item) {
     return item.id === ciChangeData.id || item.ciId === ciChangeData.id;
-  })) {
+  };
+
+  if (!cis.find(matchData)) {
     return cis;
   }
 
   return cis.map(function (ci) {
-    if (ci.id === ciChangeData.id) {
+    if (matchData(ci)) {
       return (0, _extends2["default"])({}, ci, {
+        id: ci.id,
         attributes: (0, _extends2["default"])({}, ci.attributes, ciChangeData.attributes)
       });
     }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.1" === 'string' ? "12.0.0-dev.1" : null;
+var version = typeof "12.0.0-dev.2" === 'string' ? "12.0.0-dev.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/attributeFormatter/formatter/commonTransform.js

@@ -19,11 +19,6 @@ function commonTransform(options) {
     if (ciData[attrType + "Map"][fieldCode + "_object"]) {
       fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
     }
-  } // 分级字典特殊处理
-
-
-  if (fieldMeta.dict) {
-    fieldValue = fieldMeta.dict[fieldValue];
   }
 
   return {

package/lib/core/utils/metricUtil.js

@@ -21,6 +21,13 @@ function formatMetric(val, metricModel) {
   }
 
   if (metricModel) {
+    var _result$value;
+
+    // 分级字典特殊处理
+    if (metricModel.dict && !_DictCache["default"].getDictObject()[metricModel.code]) {
+      val = metricModel.dict[fieldValue];
+    }
+
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
@@ -29,7 +36,7 @@ function formatMetric(val, metricModel) {
       unit: metricModel.unit,
       code: metricModel.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return ((_result$value = result.value) !== null && _result$value !== void 0 ? _result$value : '') + " " + (result.value === '-' ? '' : result.unit);
   } else {
     return "" + val;
   }

package/lib/utils/clipboardUtil.d.ts

@@ -0,0 +1,7 @@
+declare function writeText(text: string): Promise<void>;
+declare function readText(): Promise<string>;
+export declare const clipboard: {
+    readText: typeof readText;
+    writeText: typeof writeText;
+};
+export {};

package/lib/utils/clipboardUtil.js

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.clipboard = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+function writeText(_x) {
+  return _writeText.apply(this, arguments);
+}
+
+function _writeText() {
+  _writeText = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(text) {
+    var success, textArea;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          success = false;
+          _context.prev = 1;
+
+          if (!navigator.clipboard) {
+            _context.next = 5;
+            break;
+          }
+
+          _context.next = 5;
+          return navigator.clipboard.writeText(text);
+
+        case 5:
+          success = true;
+          _context.next = 10;
+          break;
+
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](1);
+
+        case 10:
+          if (!success) {
+            // 创建text area
+            textArea = document.createElement('textarea');
+            textArea.value = text; // 使text area不在viewport，同时设置不可见
+
+            document.body.appendChild(textArea);
+            textArea.focus();
+            textArea.select();
+            document.execCommand('copy');
+            textArea.remove();
+          }
+
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 8]]);
+  }));
+  return _writeText.apply(this, arguments);
+}
+
+function readText() {
+  return _readText.apply(this, arguments);
+}
+
+function _readText() {
+  _readText = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var text, textareaElement, _text;
+
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (!navigator.clipboard) {
+            _context2.next = 7;
+            break;
+          }
+
+          _context2.next = 3;
+          return navigator.clipboard.readText();
+
+        case 3:
+          text = _context2.sent;
+          return _context2.abrupt("return", text);
+
+        case 7:
+          textareaElement = document.createElement('textarea');
+          document.body.appendChild(textareaElement);
+          textareaElement.innerText = '';
+          textareaElement.focus();
+          textareaElement.select();
+          document.execCommand('paste');
+          _text = textareaElement.innerText; // 从该元素中读取内容
+
+          document.body.removeChild(textareaElement); // 移除元素
+
+          return _context2.abrupt("return", _text);
+
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _readText.apply(this, arguments);
+}
+
+var clipboard = {
+  readText: readText,
+  writeText: writeText
+};
+exports.clipboard = clipboard;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.1",
+  "version": "12.0.0-dev.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }