@riil-frontend/component-topology 3.1.8 → 3.1.11

package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -7,60 +7,19 @@ exports["default"] = NodePropertyView;
 
 var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
-var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
-
-var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
-
-var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _NodeSizeInput = _interopRequireDefault(require("../../common/NodeSizeInput/NodeSizeInput"));
-
-var _textModule = _interopRequireDefault(require("../../../../../common/text.module.scss"));
-
-var _NodeIconSelect = _interopRequireDefault(require("./NodeIconSelect"));
-
-var _NodeRelateResourceButton = _interopRequireDefault(require("./data/NodeRelateResourceButton"));
-
-var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
-
-var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
+var _react = _interopRequireDefault(require("react"));
 
 var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var Option = _select["default"].Option;
-var CollapsePanel = _collapse["default"].Panel;
-
-function parseValues(values) {
-  return (0, _extends2["default"])({}, values, {
-    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
-    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
-
-  });
-}
+var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
 
-function getBindType(values) {
-  if (values.tag) {
-    return 'resource';
-  }
+var _Data = _interopRequireDefault(require("./data/Data"));
 
-  if (values.attrObject.bindType) {
-    return values.attrObject.bindType;
-  }
+var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
 
-  return 'none';
-}
+var _Setting = _interopRequireDefault(require("./Setting"));
 
 function NodePropertyView(props) {
   var _topo$options$editor;
@@ -68,145 +27,40 @@ function NodePropertyView(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
       values = props.values,
-      _onChange = props.onChange,
+      onChange = props.onChange,
       editorProps = props.editorProps,
       settingRuntimeState = props.settingRuntimeState;
-  var bindType = getBindType(values);
   var node = (0, _useHtElement["default"])({
     topo: topo,
     id: values.id
   });
 
-  var field = _field["default"].useField({
-    autoUnmount: false,
-    values: parseValues(values),
-    onChange: function onChange(name, value) {
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  (0, _react.useEffect)(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
-
-  var setBindType = function setBindType(newBindType) {
-    _onChange('attrObject.bindType', newBindType);
-
-    if (newBindType === 'topo') {//
-    }
-  };
-
-  var handleBindTopoChange = function handleBindTopoChange(value, data) {
-    // 设置名称为拓扑名称，清空自定义名称
-    node.a('name', data.label);
-    node.a('customName', null);
-  };
-
   var renderData = function renderData() {
-    var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
-    return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-      defaultExpandedKeys: ['相关资源'],
-      style: {
-        border: 'none'
-      }
-    }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
-      key: "\u76F8\u5173\u8D44\u6E90",
-      title: "\u76F8\u5173\u8D44\u6E90"
-    }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
-      field: field,
-      labelAlign: "top"
-    }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u7C7B\u578B"
-    }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
-      name: "bindType",
-      value: bindType,
-      style: {
-        width: '100%',
-        marginRight: 8
-      },
-      onChange: setBindType
-    }, /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "none"
-    }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "resource"
-    }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "topo"
-    }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u8D44\u6E90"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: _textModule["default"].textEllipsis,
-      style: {
-        flex: 1,
-        paddingRight: 16,
-        color: '#4D6277'
-      },
-      title: values.tag ? values.name : null
-    }, values.tag ? values.name : '—'), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
-      node: values,
-      topo: topo,
-      topoEditApi: topoEditApi
-    }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u62D3\u6251"
-    }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
-      name: "attrObject.bindTopo",
-      topo: topo,
-      onChange: handleBindTopoChange
-    })))));
+    return /*#__PURE__*/_react["default"].createElement(_Data["default"], props);
   };
 
-  var renderViewSetting = function renderViewSetting() {
-    return /*#__PURE__*/_react["default"].createElement(_form["default"], {
-      field: field,
-      labelAlign: "top"
-    }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-      defaultExpandedKeys: ['显示设置'],
-      style: {
-        border: 'none'
-      }
-    }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
-      key: "\u663E\u793A\u8BBE\u7F6E",
-      title: "\u663E\u793A\u8BBE\u7F6E"
-    }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u56FE\u7247\u540D\u79F0"
-    }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
-      name: "attrObject.customName"
-    })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u663E\u793A\u56FE\u7247"
-    }, /*#__PURE__*/_react["default"].createElement(_NodeIconSelect["default"], {
-      name: "image",
-      topo: topo
-    })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u56FE\u7247\u5C3A\u5BF8"
-    }, /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
-      node: values.id,
-      value: {
-        width: values.width,
-        height: values.height
-      },
-      onChange: function onChange(size) {
-        _onChange('width', size.width);
-
-        _onChange('height', size.height);
-      },
-      settingRuntimeState: settingRuntimeState
-    }))))));
+  var renderSetting = function renderSetting() {
+    var nodeSettingViewProps = editorProps.nodeSettingViewProps;
+    return /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({}, props, nodeSettingViewProps));
   }; // 未绑定资源的节点，根据参数控制是否可关联资源
 
 
   var showRelateResource = !!values.tag || !values.tag && ((_topo$options$editor = topo.options.editor) === null || _topo$options$editor === void 0 ? void 0 : _topo$options$editor.enableRelateResource) !== false;
+  var content;
+
+  if (showRelateResource) {
+    content = /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+      title: "\u6570\u636E",
+      key: "1"
+    }, renderData()), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+      title: "\u8BBE\u7F6E",
+      key: "2"
+    }, renderSetting()));
+  } else {
+    content = renderSetting();
+  }
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _NodePropertyViewModule["default"].NodePropertyView
-  }, showRelateResource ? /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, renderData()), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, renderViewSetting())) : renderViewSetting());
+  }, content);
 }

package/lib/core/editor/components/settings/propertyViews/node/Setting/Setting.js

@@ -0,0 +1,95 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = Setting;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _NodeSizeInput = _interopRequireDefault(require("../../../common/NodeSizeInput/NodeSizeInput"));
+
+var _NodeIconSelect = _interopRequireDefault(require("../NodeIconSelect"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var CollapsePanel = _collapse["default"].Panel;
+
+function parseValues(values) {
+  return (0, _extends2["default"])({}, values, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+function Setting(props) {
+  var topo = props.topo,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState,
+      _props$showImageSetti = props.showImageSetting,
+      showImageSetting = _props$showImageSetti === void 0 ? true : _props$showImageSetti;
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
+    defaultExpandedKeys: ['显示设置'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    key: "\u663E\u793A\u8BBE\u7F6E",
+    title: "\u663E\u793A\u8BBE\u7F6E"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u56FE\u7247\u540D\u79F01"
+  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
+    name: "attrObject.customName"
+  })), showImageSetting && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u663E\u793A\u56FE\u7247"
+  }, /*#__PURE__*/_react["default"].createElement(_NodeIconSelect["default"], {
+    name: "image",
+    topo: topo
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u56FE\u7247\u5C3A\u5BF8"
+  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
+    node: values.id,
+    value: {
+      width: values.width,
+      height: values.height
+    },
+    onChange: function onChange(size) {
+      _onChange('width', size.width);
+
+      _onChange('height', size.height);
+    },
+    settingRuntimeState: settingRuntimeState
+  }))))));
+}

package/lib/core/editor/components/settings/propertyViews/node/Setting/index.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _Setting = _interopRequireDefault(require("./Setting"));
+
+var _default = _Setting["default"];
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -0,0 +1,145 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = Data;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _useHtElement = _interopRequireDefault(require("../../../../../../common/hooks/useHtElement"));
+
+var _textModule = _interopRequireDefault(require("../../../../../../common/text.module.scss"));
+
+var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var Option = _select["default"].Option;
+var CollapsePanel = _collapse["default"].Panel;
+
+function parseValues(values) {
+  return (0, _extends2["default"])({}, values, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+function getBindType(values) {
+  if (values.tag) {
+    return 'resource';
+  }
+
+  if (values.attrObject.bindType) {
+    return values.attrObject.bindType;
+  }
+
+  return 'none';
+}
+
+function Data(props) {
+  var topo = props.topo,
+      topoEditApi = props.topoEditApi,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps;
+  var bindType = getBindType(values);
+  var node = (0, _useHtElement["default"])({
+    topo: topo,
+    id: values.id
+  });
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+
+  var setBindType = function setBindType(newBindType) {
+    _onChange('attrObject.bindType', newBindType);
+
+    if (newBindType === 'topo') {//
+    }
+  };
+
+  var handleBindTopoChange = function handleBindTopoChange(value, data) {
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
+  };
+
+  var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
+  return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
+    defaultExpandedKeys: ['相关资源'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    key: "\u76F8\u5173\u8D44\u6E90",
+    title: "\u76F8\u5173\u8D44\u6E90"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u5173\u8054\u7C7B\u578B"
+  }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
+    name: "bindType",
+    value: bindType,
+    style: {
+      width: '100%',
+      marginRight: 8
+    },
+    onChange: setBindType
+  }, /*#__PURE__*/_react["default"].createElement(Option, {
+    value: "none"
+  }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
+    value: "resource"
+  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
+    value: "topo"
+  }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u5173\u8054\u8D44\u6E90"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _textModule["default"].textEllipsis,
+    style: {
+      flex: 1,
+      paddingRight: 16,
+      color: '#4D6277'
+    },
+    title: values.tag ? values.name : null
+  }, values.tag ? values.name : '—'), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
+    node: values,
+    topo: topo,
+    topoEditApi: topoEditApi
+  }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u5173\u8054\u62D3\u6251"
+  }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
+    name: "attrObject.bindTopo",
+    topo: topo,
+    onChange: handleBindTopoChange
+  })))));
+}

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

package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailPlugin.js

@@ -14,6 +14,12 @@ var _ResourceDetail = _interopRequireDefault(require("./ResourceDetail"));
 function ResourceDetailPlugin(props) {
   var viewerProps = props.viewerProps;
   var resourceDetailProps = viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps;
+  var hideResourceDetailDrawer = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.hideResourceDetailDrawer) === true;
+
+  if (hideResourceDetailDrawer) {
+    return null;
+  }
+
   return /*#__PURE__*/_react["default"].createElement(_ResourceDetail["default"], (0, _extends2["default"])({}, props, resourceDetailProps));
 }
 

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.8",
+  "version": "3.1.11",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.1.8/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@3.1.11/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }