@riil-frontend/component-topology 2.15.16 → 2.15.19

package/demo-mock/basic/topo/v1/api/background/all

@@ -0,0 +1 @@
+[{"id":10000,"isSystem":1,"fileCode":"chinamap_light"},{"id":10001,"isSystem":1,"fileCode":"chinamap_dark"},{"id":10002,"isSystem":1,"fileCode":"test"}]

package/es/core/components/TopoView/topoView.js

@@ -240,9 +240,7 @@ var TopoView = function TopoView(props) {
     className: classnames(styles.viewPanel, (_classnames = {}, _classnames[styles.viewPanelEditMode] = isEditMode, _classnames))
   }, /*#__PURE__*/React.createElement(TopoGraph, _extends({}, graphViewProps, {
     createHtTopoProps: _extends({}, graphViewProps.createHtTopoProps, {
-      editor: _extends({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {}, {
-        useNewElementsDeleteEvent: true
-      })
+      editor: _extends({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
     }),
     data: tData,
     defaultEnterEditMode: defaultEnterEditMode,

package/es/core/editor/components/settings/Settings.module.scss

@@ -38,6 +38,10 @@
       border-top: none;
     }
 
+    .#{$css-prefix}collapse-panel-title:hover {
+      background: none;
+    }
+
     .#{$css-prefix}collapse-panel-title {
       background: none;
       font-size: 12px;

package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -8,8 +8,11 @@ import ColorPicker from "../../../../../../common/components/ColorPicker";
 import LineType from "../../common/LineType";
 var CollapsePanel = _Collapse.Panel;
 
-function parseValues(values) {
-  return _extends({}, values);
+function parseValues(values, edge) {
+  return _extends({}, values, {
+    'styleMap.edge.width': edge.s('edge.width') // element.getStyleMap() 如果是默认值则不返回
+
+  });
 }
 
 export default function CommonEdgePropertyView(props) {
@@ -21,7 +24,7 @@ export default function CommonEdgePropertyView(props) {
 
   var field = _Field.useField({
     autoUnmount: false,
-    values: parseValues(values),
+    values: parseValues(values, edge),
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
@@ -32,7 +35,7 @@ export default function CommonEdgePropertyView(props) {
   });
 
   useEffect(function () {
-    field.setValues(parseValues(values));
+    field.setValues(parseValues(values, edge));
   }, [values]);
 
   var setLineColor = function setLineColor(color) {

package/es/core/models/AttributeMetricDisplay.js

@@ -486,7 +486,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -526,12 +526,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               });
-              refIds = Object.keys(refIdMap); // 查询引用对象
+              refIds = Object.keys(refIdMap);
 
-              _context3.next = 6;
-              return queryCisByIds(refIds);
+              if (refIds.length) {
+                _context3.next = 6;
+                break;
+              }
+
+              return _context3.abrupt("return", ciDatas);
 
             case 6:
+              _context3.next = 8;
+              return queryCisByIds(refIds);
+
+            case 8:
               refCis = _context3.sent;
               refCiMap = keyBy(refCis, 'id');
               rlog.debug('translateRefAttribute', {
@@ -559,7 +567,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 10:
+            case 12:
             case "end":
               return _context3.stop();
           }

package/es/core/models/TopoApp.js

@@ -17,15 +17,11 @@ import AttributeMetricDisplay from "./AttributeMetricDisplay";
 import DataModel from "./DataModel";
 import GraphDataModel from "./GraphDataModel";
 import { updateEdgeExpanded } from "../utils/edgeUtil";
-import PluginManager from "./PluginManager"; // eslint-disable-next-line no-undef
+import PluginManager from "./PluginManager";
+import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.16" === 'string' ? "2.15.16" : null;
+var version = typeof "2.15.19" === 'string' ? "2.15.19" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
-var topoDebug = {};
-window.topoDebug = topoDebug;
-var htTopo = {};
-window.htTopo = htTopo;
-var n = 0;
 /**
  * 拓扑显示和编辑
  */
@@ -35,7 +31,6 @@ var Topo = /*#__PURE__*/function () {
    * @type TopoGraphView
    */
   function Topo(options) {
-    this.version = version;
     this.options = void 0;
     this.id = void 0;
     this.view = void 0;
@@ -46,6 +41,8 @@ var Topo = /*#__PURE__*/function () {
     this.ciTyeCache = CiTyeCache;
     this.dictCache = DictCache;
     this.test = void 0;
+    this.uid = void 0;
+    this.version = version;
     this.options = _extends({
       enableDefaultAlarmLoader: true,
       enableDefaultMetricLoader: true,
@@ -58,9 +55,6 @@ var Topo = /*#__PURE__*/function () {
     }
 
     this.initialize(options);
-    this.debugId = options.name || "t" + n++;
-    topoDebug[this.debugId] = this;
-    htTopo[this.debugId] = this.getHtTopo.bind(this);
   }
 
   var _proto = Topo.prototype;
@@ -80,6 +74,7 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.init(this); // 指标
 
     this.test = new Test(this);
+    this.uid = topoFactory.add(options.name, this);
   }
   /**
    * TODO 移除
@@ -100,10 +95,9 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              delete topoDebug[this.debugId];
-              delete htTopo[this.debugId];
+              topoFactory.remove(this.uid);
 
-            case 5:
+            case 4:
             case "end":
               return _context.stop();
           }

package/es/core/models/topoFactory.js

@@ -0,0 +1,25 @@
+var n = 0;
+
+var TopoFactory = /*#__PURE__*/function () {
+  function TopoFactory() {
+    this.map = {};
+  }
+
+  var _proto = TopoFactory.prototype;
+
+  _proto.add = function add(name, topo) {
+    var uid = name || "" + n++;
+    this.map[uid] = topo;
+    return uid;
+  };
+
+  _proto.remove = function remove(name) {
+    delete this.map[name];
+  };
+
+  return TopoFactory;
+}();
+
+var topoFactory = new TopoFactory();
+window.topoFactory = topoFactory;
+export default topoFactory;

package/es/topoCenter/components/Topology.js

@@ -43,7 +43,10 @@ export default function NetworkTopologyFull(props) {
     graphViewProps: _extends({}, props.graphViewProps, {
       onElementsDelete: topoEdit.onElementsDelete,
       createHtTopoProps: {
-        elementChangeLayerByDrag: true
+        elementChangeLayerByDrag: true,
+        editor: {
+          useNewElementsDeleteEvent: true
+        }
       }
     })
   }));

package/lib/core/components/TopoView/topoView.js

@@ -276,9 +276,7 @@ var TopoView = function TopoView(props) {
     className: (0, _classnames2["default"])(_TopoViewModule["default"].viewPanel, (_classnames = {}, _classnames[_TopoViewModule["default"].viewPanelEditMode] = isEditMode, _classnames))
   }, /*#__PURE__*/_react["default"].createElement(_componentTopologyGraph["default"], (0, _extends2["default"])({}, graphViewProps, {
     createHtTopoProps: (0, _extends2["default"])({}, graphViewProps.createHtTopoProps, {
-      editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {}, {
-        useNewElementsDeleteEvent: true
-      })
+      editor: (0, _extends2["default"])({}, ((_graphViewProps$creat = graphViewProps.createHtTopoProps) === null || _graphViewProps$creat === void 0 ? void 0 : _graphViewProps$creat.editor) || {})
     }),
     data: tData,
     defaultEnterEditMode: defaultEnterEditMode,

package/lib/core/editor/components/settings/Settings.module.scss

@@ -38,6 +38,10 @@
       border-top: none;
     }
 
+    .#{$css-prefix}collapse-panel-title:hover {
+      background: none;
+    }
+
     .#{$css-prefix}collapse-panel-title {
       background: none;
       font-size: 12px;

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -27,8 +27,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var CollapsePanel = _collapse["default"].Panel;
 
-function parseValues(values) {
-  return (0, _extends2["default"])({}, values);
+function parseValues(values, edge) {
+  return (0, _extends2["default"])({}, values, {
+    'styleMap.edge.width': edge.s('edge.width') // element.getStyleMap() 如果是默认值则不返回
+
+  });
 }
 
 function CommonEdgePropertyView(props) {
@@ -40,7 +43,7 @@ function CommonEdgePropertyView(props) {
 
   var field = _field["default"].useField({
     autoUnmount: false,
-    values: parseValues(values),
+    values: parseValues(values, edge),
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
@@ -51,7 +54,7 @@ function CommonEdgePropertyView(props) {
   });
 
   (0, _react.useEffect)(function () {
-    field.setValues(parseValues(values));
+    field.setValues(parseValues(values, edge));
   }, [values]);
 
   var setLineColor = function setLineColor(color) {

package/lib/core/models/AttributeMetricDisplay.js

@@ -505,7 +505,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   }()
   /**
    * 临时由前端翻译引用属性名称
-   * @param {*} ciDatas 
+   * @param {array} ciDatas 
    * @returns 
    */
   ;
@@ -545,12 +545,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   });
                 });
               });
-              refIds = Object.keys(refIdMap); // 查询引用对象
+              refIds = Object.keys(refIdMap);
 
-              _context3.next = 6;
-              return (0, _services.queryCisByIds)(refIds);
+              if (refIds.length) {
+                _context3.next = 6;
+                break;
+              }
+
+              return _context3.abrupt("return", ciDatas);
 
             case 6:
+              _context3.next = 8;
+              return (0, _services.queryCisByIds)(refIds);
+
+            case 8:
               refCis = _context3.sent;
               refCiMap = (0, _lodash.keyBy)(refCis, 'id');
 
@@ -578,7 +586,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               }));
 
-            case 10:
+            case 12:
             case "end":
               return _context3.stop();
           }

package/lib/core/models/TopoApp.js

@@ -45,14 +45,11 @@ var _edgeUtil = require("../utils/edgeUtil");
 
 var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 
+var _topoFactory = _interopRequireDefault(require("./topoFactory"));
+
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.16" === 'string' ? "2.15.16" : null;
+var version = typeof "2.15.19" === 'string' ? "2.15.19" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
-var topoDebug = {};
-window.topoDebug = topoDebug;
-var htTopo = {};
-window.htTopo = htTopo;
-var n = 0;
 /**
  * 拓扑显示和编辑
  */
@@ -62,7 +59,6 @@ var Topo = /*#__PURE__*/function () {
    * @type TopoGraphView
    */
   function Topo(options) {
-    this.version = version;
     this.options = void 0;
     this.id = void 0;
     this.view = void 0;
@@ -73,6 +69,8 @@ var Topo = /*#__PURE__*/function () {
     this.ciTyeCache = _CiTyeCache["default"];
     this.dictCache = _DictCache["default"];
     this.test = void 0;
+    this.uid = void 0;
+    this.version = version;
     this.options = (0, _extends2["default"])({
       enableDefaultAlarmLoader: true,
       enableDefaultMetricLoader: true,
@@ -85,9 +83,6 @@ var Topo = /*#__PURE__*/function () {
     }
 
     this.initialize(options);
-    this.debugId = options.name || "t" + n++;
-    topoDebug[this.debugId] = this;
-    htTopo[this.debugId] = this.getHtTopo.bind(this);
   }
 
   var _proto = Topo.prototype;
@@ -107,6 +102,7 @@ var Topo = /*#__PURE__*/function () {
     this.alarm.init(this); // 指标
 
     this.test = new _Test["default"](this);
+    this.uid = _topoFactory["default"].add(options.name, this);
   }
   /**
    * TODO 移除
@@ -127,10 +123,9 @@ var Topo = /*#__PURE__*/function () {
               return topoDispatchers.exit();
 
             case 3:
-              delete topoDebug[this.debugId];
-              delete htTopo[this.debugId];
+              _topoFactory["default"].remove(this.uid);
 
-            case 5:
+            case 4:
             case "end":
               return _context.stop();
           }

package/lib/core/models/topoFactory.js

@@ -0,0 +1,30 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = void 0;
+var n = 0;
+
+var TopoFactory = /*#__PURE__*/function () {
+  function TopoFactory() {
+    this.map = {};
+  }
+
+  var _proto = TopoFactory.prototype;
+
+  _proto.add = function add(name, topo) {
+    var uid = name || "" + n++;
+    this.map[uid] = topo;
+    return uid;
+  };
+
+  _proto.remove = function remove(name) {
+    delete this.map[name];
+  };
+
+  return TopoFactory;
+}();
+
+var topoFactory = new TopoFactory();
+window.topoFactory = topoFactory;
+var _default = topoFactory;
+exports["default"] = _default;

package/lib/topoCenter/components/Topology.js

@@ -63,7 +63,10 @@ function NetworkTopologyFull(props) {
     graphViewProps: (0, _extends2["default"])({}, props.graphViewProps, {
       onElementsDelete: topoEdit.onElementsDelete,
       createHtTopoProps: {
-        elementChangeLayerByDrag: true
+        elementChangeLayerByDrag: true,
+        editor: {
+          useNewElementsDeleteEvent: true
+        }
       }
     })
   }));

package/package.json

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