@riil-frontend/component-topology 3.1.9 → 3.1.10

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.1.9" === 'string' ? "3.1.9" : null;
+var version = typeof "3.1.10" === 'string' ? "3.1.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/models/customIcon.js

@@ -153,7 +153,7 @@ export default function (engine) {
           var _this3 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var data;
+            var data, allIcons, newIcons;
             return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
@@ -161,25 +161,30 @@ export default function (engine) {
                     data = payload.data;
 
                     _this3.update({
-                      visible: false,
-                      icons: {
-                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
-                        container: []
-                      }
-                    });
+                      visible: false
+                    }); // 注册
+
 
                     data.forEach(function (icon) {
                       var iconUrl = topoService.icon.getIconImageUrl(icon.id);
                       window.ht.Default.setImage(getCustomIconHtId(icon.id), iconUrl);
+                    });
+                    _context4.next = 5;
+                    return _this3.loadCustomIcons();
+
+                  case 5:
+                    allIcons = _context4.sent;
+                    newIcons = allIcons.node.filter(function (icon) {
+                      return !!data.find(function (item) {
+                        return item.id === icon.id;
+                      });
                     }); // 通知ht
 
                     engine.view.topoClient.emitEvent('topo_shape_upload_finish', _extends({}, payload, {
-                      data: transformCustomIcons2HtIcons(data)
+                      data: transformCustomIcons2HtIcons(newIcons)
                     }));
-                    _context4.next = 6;
-                    return _this3.loadCustomIcons();
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context4.stop();
                 }

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.1.9" === 'string' ? "3.1.9" : null;
+var version = typeof "3.1.10" === 'string' ? "3.1.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/models/customIcon.js

@@ -167,7 +167,7 @@ function _default(engine) {
           var _this3 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var data;
+            var data, allIcons, newIcons;
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
@@ -175,26 +175,31 @@ function _default(engine) {
                     data = payload.data;
 
                     _this3.update({
-                      visible: false,
-                      icons: {
-                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
-                        container: []
-                      }
-                    });
+                      visible: false
+                    }); // 注册
+
 
                     data.forEach(function (icon) {
                       var iconUrl = _topo["default"].icon.getIconImageUrl(icon.id);
 
                       window.ht.Default.setImage((0, _icon.getCustomIconHtId)(icon.id), iconUrl);
+                    });
+                    _context4.next = 5;
+                    return _this3.loadCustomIcons();
+
+                  case 5:
+                    allIcons = _context4.sent;
+                    newIcons = allIcons.node.filter(function (icon) {
+                      return !!data.find(function (item) {
+                        return item.id === icon.id;
+                      });
                     }); // 通知ht
 
                     engine.view.topoClient.emitEvent('topo_shape_upload_finish', (0, _extends2["default"])({}, payload, {
-                      data: (0, _icon.transformCustomIcons2HtIcons)(data)
+                      data: (0, _icon.transformCustomIcons2HtIcons)(newIcons)
                     }));
-                    _context4.next = 6;
-                    return _this3.loadCustomIcons();
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context4.stop();
                 }

package/package.json

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