@riil-frontend/component-topology 12.0.0-dev.19 → 12.0.0-dev.20

package/es/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
 import { getEdgesBySelection } from "../../../../utils/edgeTypeStyleUtil";
+import { isCustomEdge } from "../../../../../utils/edgeUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
 import Content from "./Content";
@@ -36,15 +37,7 @@ function EdgeColorButton(props) {
   };
 
   var getLines = function getLines(list) {
-    // eslint-disable-next-line prefer-const
-    var arr = [];
-    loopEdges(list, function (edge) {
-      // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
-        arr.push(edge);
-      }
-    });
-    return arr;
+    return list.filter(isCustomEdge);
   };
 
   useEffect(function () {
@@ -53,7 +46,7 @@ function EdgeColorButton(props) {
       var list = getLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
-      if (selection.length == 1 && selection[0].a('type') == 'line') {
+      if (selection.length == 1 && list.length === 1) {
         setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
       }
 
@@ -67,7 +60,7 @@ function EdgeColorButton(props) {
     var edges = getEdgesBySelection(topo);
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if (isCustomEdge(edge)) {
         var color = colors.hex;
         edge.s('edge.color', color);
         edge.s('edge.dash.color', color);
@@ -95,7 +88,7 @@ function EdgeColorButton(props) {
     topo.historyManager.beginTransaction();
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if (isCustomEdge(edge)) {
         edge.s('edge.dash.width', width);
         edge.s('edge.width', width);
         var style = edge.a('styles') || {};

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -3,7 +3,7 @@ import _Field from "@alifd/next/es/field";
 import _Select from "@alifd/next/es/select";
 import _Form from "@alifd/next/es/form";
 import React, { useEffect, useState } from 'react';
-import { getEdgesBySelection, loopEdgesAndChildren, isNodeAllEdges } from "../../../../utils/edgeTypeStyleUtil";
+import { getEdgesBySelection, isNodeAllEdges } from "../../../../utils/edgeTypeStyleUtil";
 import styles from "./EdgeType.module.scss";
 import LineType from "./LineType";
 var FormItem = _Form.Item;

package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect, useState } from 'react';
-import { getEdgesBySelection, setEdgesAndChildren, setEdgesType } from "../../../../utils/edgeTypeStyleUtil";
+import { getEdgesBySelection, setEdgesType, updateEdgesData } from "../../../../utils/edgeTypeStyleUtil";
 import DropdownButton from "../components/DropdownButton";
 import WidgetBox from "../WidgetBox";
 import { EDGE_END_POINT_TYPE_MAP, LINE_MOLD_MAP } from "./constants";
@@ -52,7 +52,7 @@ function EdgeTypeButton(props) {
       return;
     }
 
-    setEdgesAndChildren(topo, edges, function (edge) {
+    updateEdgesData(topo, edges, function (edge) {
       if (name === 'startPoint') {
         // 删除设置
         ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {

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

@@ -1,5 +1,4 @@
-import { getEdges } from "../../../utils/htElementUtils";
-import { getEdgesBetweenNodes } from "../../../utils/htElementUtils";
+import { getEdges, getEdgesBetweenNodes } from "../../../utils/htElementUtils";
 var ht = window.ht;
 export function getEdgesBySelection(topo) {
   var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
@@ -105,16 +104,18 @@ export function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 
  * @param {*} edges 
- * @param {*} operateEdgeFn 
+ * @param {*} updateEdgeFn 
  */
 
-export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+export function updateEdgesData(topo, edges, updateEdgeFn) {
   topo.historyManager.beginTransaction();
-  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  edges.forEach(function (edge) {
+    updateEdgeFn(edge);
+  });
   topo.historyManager.endTransaction();
 }
 /**
- * 批量设置连线线形
+ * 批量设置连线线形。带回退事务控制
  * 
  * @param {*} edges 
  * @param {*} type 
@@ -123,7 +124,7 @@ export function setEdgesAndChildren(topo, edges, operateEdgeFn) {
 
 export function setEdgesType(edges, type, topo) {
   var htTopo = topo.getHtTopo();
-  setEdgesAndChildren(topo, edges, function (edge) {
+  updateEdgesData(topo, edges, function (edge) {
     htTopo.setGraphLinear(edge, {
       type: type
     });

package/es/core/models/AttributeMetricDisplay.js

@@ -525,15 +525,21 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return _extends({}, item, {
         tags: tags
       });
-    }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
-
+    });
+    rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
       var _topo$historyManager, _topo$historyManager2;
 
       (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
-      htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+
+      try {
+        htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      } catch (error) {
+        rlog.error('推送标注 => ht 失败', error);
+      }
+
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }

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.19" === 'string' ? "12.0.0-dev.19" : null;
+var version = typeof "12.0.0-dev.20" === 'string' ? "12.0.0-dev.20" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/utils/edgeUtil.js

@@ -1,5 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
+/**
+ * 是否手工连线
+ * @param {*} edge 
+ */
+
+export function isCustomEdge(edge) {
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+}
 /**
  * 根据配置更新连线展开折叠状态
  *

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
+var _edgeUtil = require("../../../../../utils/edgeUtil");
+
 var _DropdownButton = _interopRequireDefault(require("../components/DropdownButton"));
 
 var _WidgetBox = _interopRequireDefault(require("../WidgetBox"));
@@ -52,15 +54,7 @@ function EdgeColorButton(props) {
   };
 
   var getLines = function getLines(list) {
-    // eslint-disable-next-line prefer-const
-    var arr = [];
-    loopEdges(list, function (edge) {
-      // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
-        arr.push(edge);
-      }
-    });
-    return arr;
+    return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
@@ -69,7 +63,7 @@ function EdgeColorButton(props) {
       var list = getLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
-      if (selection.length == 1 && selection[0].a('type') == 'line') {
+      if (selection.length == 1 && list.length === 1) {
         setLineWidth(list[0] && (list[0].a('styles') && list[0].a('styles').width || list[0].getStyleMap()['edge.width']) || 2);
       }
 
@@ -83,7 +77,7 @@ function EdgeColorButton(props) {
     var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         var color = colors.hex;
         edge.s('edge.color', color);
         edge.s('edge.dash.color', color);
@@ -111,7 +105,7 @@ function EdgeColorButton(props) {
     topo.historyManager.beginTransaction();
     loopEdges(edges, function (edge) {
       // eslint-disable-next-line eqeqeq
-      if (edge.getAttrObject().type == 'line') {
+      if ((0, _edgeUtil.isCustomEdge)(edge)) {
         edge.s('edge.dash.width', width);
         edge.s('edge.width', width);
         var style = edge.a('styles') || {};

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/index.js

@@ -69,7 +69,7 @@ function EdgeTypeButton(props) {
       return;
     }
 
-    (0, _edgeTypeStyleUtil.setEdgesAndChildren)(topo, edges, function (edge) {
+    (0, _edgeTypeStyleUtil.updateEdgesData)(topo, edges, function (edge) {
       if (name === 'startPoint') {
         // 删除设置
         ['sourceArrow', 'sourceSolidCircle', 'sourceNoneCircle'].forEach(function (iconName) {

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

@@ -4,8 +4,8 @@ exports.__esModule = true;
 exports.getEdgesBySelection = getEdgesBySelection;
 exports.isNodeAllEdges = isNodeAllEdges;
 exports.loopEdgesAndChildren = loopEdgesAndChildren;
-exports.setEdgesAndChildren = setEdgesAndChildren;
 exports.setEdgesType = setEdgesType;
+exports.updateEdgesData = updateEdgesData;
 
 var _htElementUtils = require("../../../utils/htElementUtils");
 
@@ -117,17 +117,19 @@ function loopEdgesAndChildren(topo, edges, operateEdgeFn) {
  * 设置连线及子连线。带回退事务控制
  * @param {*} topo 
  * @param {*} edges 
- * @param {*} operateEdgeFn 
+ * @param {*} updateEdgeFn 
  */
 
 
-function setEdgesAndChildren(topo, edges, operateEdgeFn) {
+function updateEdgesData(topo, edges, updateEdgeFn) {
   topo.historyManager.beginTransaction();
-  loopEdgesAndChildren(topo, edges, operateEdgeFn);
+  edges.forEach(function (edge) {
+    updateEdgeFn(edge);
+  });
   topo.historyManager.endTransaction();
 }
 /**
- * 批量设置连线线形
+ * 批量设置连线线形。带回退事务控制
  * 
  * @param {*} edges 
  * @param {*} type 
@@ -137,7 +139,7 @@ function setEdgesAndChildren(topo, edges, operateEdgeFn) {
 
 function setEdgesType(edges, type, topo) {
   var htTopo = topo.getHtTopo();
-  setEdgesAndChildren(topo, edges, function (edge) {
+  updateEdgesData(topo, edges, function (edge) {
     htTopo.setGraphLinear(edge, {
       type: type
     });

package/lib/core/models/AttributeMetricDisplay.js

@@ -539,7 +539,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       return (0, _extends2["default"])({}, item, {
         tags: tags
       });
-    }); // rlog.debug(`AttributeMetricDisplay.updateTagsTips ${new Date().toLocaleString()}`, elementTagsAndTips);
+    });
+
+    _componentTopologyUtils.rlog.debug('推送标注 => ht 失败', elementTagsAndTips);
 
     var htTopo = topo.getHtTopo();
 
@@ -547,7 +549,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       var _topo$historyManager, _topo$historyManager2;
 
       (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '加载标注');
-      htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+
+      try {
+        htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
+      } catch (error) {
+        _componentTopologyUtils.rlog.error('推送标注 => ht 失败', error);
+      }
+
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
     }
   }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,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.19" === 'string' ? "12.0.0-dev.19" : null;
+var version = typeof "12.0.0-dev.20" === 'string' ? "12.0.0-dev.20" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/utils/edgeUtil.js

@@ -3,17 +3,27 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.isCustomEdge = isCustomEdge;
 exports.updateEdgeExpanded = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _linkUtils = require("../models/utils/linkUtils");
 
+/**
+ * 是否手工连线
+ * @param {*} edge 
+ */
+function isCustomEdge(edge) {
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+}
 /**
  * 根据配置更新连线展开折叠状态
  *
  * @param {*} topo
  */
+
+
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   var _topo$historyManager, _topo$historyManager2;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.0.0-dev.19",
+  "version": "12.0.0-dev.20",
   "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.19/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.0.0-dev.20/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }