@riil-frontend/component-topology 2.15.7 → 2.15.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/build/index.js +1 -1
  2. package/es/core/models/TopoApp.js +1 -1
  3. package/es/models/iconManage.js +26 -13
  4. package/lib/core/models/TopoApp.js +1 -1
  5. package/lib/models/iconManage.js +28 -13
  6. package/package.json +3 -3
package/es/core/models/TopoApp.js CHANGED
@@ -19,7 +19,7 @@ import GraphDataModel from "./GraphDataModel";
19
19
  import { updateEdgeExpanded } from "../utils/edgeUtil";
20
20
  import PluginManager from "./PluginManager"; // eslint-disable-next-line no-undef
21
21
 
22
- var version = typeof "2.15.7" === 'string' ? "2.15.7" : null;
22
+ var version = typeof "2.15.8" === 'string' ? "2.15.8" : null;
23
23
  console.info("\u62D3\u6251\u7248\u672C: " + version);
24
24
  var topoDebug = {};
25
25
  window.topoDebug = topoDebug;
package/es/models/iconManage.js CHANGED
@@ -9,6 +9,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
9
9
  */
10
10
  import rlog from '@riil-frontend/component-topology-utils/es/rlog';
11
11
  import topoService from '@riil-frontend/component-topology-common/es/services/topo';
12
+ import { iconFactory } from '@riil-frontend/component-topology-graph';
12
13
  import { getCustomIconHtId, getCustomIconIdFromHtId, getEditorIcons, transformCustomIcon2HtIcon, transformCustomIcons2HtIcons } from "../core/common/icons/icon";
13
14
 
14
15
  function addIconUrlData(icon) {
@@ -215,32 +216,44 @@ export default function (engine) {
215
216
  case 3:
216
217
  success = _context5.sent;
217
218
 
218
- if (success) {
219
- _Message.success('删除成功');
220
-
221
- engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
222
- } else {
223
- _Message.error('删除失败');
219
+ if (!success) {
220
+ _context5.next = 12;
221
+ break;
224
222
  }
225
223
 
226
- _context5.next = 10;
227
- break;
224
+ _context5.next = 7;
225
+ return _this4.loadCustomIcons();
228
226
 
229
227
  case 7:
230
- _context5.prev = 7;
228
+ _Message.success('删除成功');
229
+
230
+ iconFactory.remove(getCustomIconHtId(id));
231
+ engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
232
+ _context5.next = 13;
233
+ break;
234
+
235
+ case 12:
236
+ _Message.error('删除失败');
237
+
238
+ case 13:
239
+ _context5.next = 18;
240
+ break;
241
+
242
+ case 15:
243
+ _context5.prev = 15;
231
244
  _context5.t0 = _context5["catch"](0);
232
245
  rlog.warn('删除图标失败', _context5.t0);
233
246
 
234
- case 10:
235
- _context5.next = 12;
247
+ case 18:
248
+ _context5.next = 20;
236
249
  return _this4.loadCustomIcons();
237
250
 
238
- case 12:
251
+ case 20:
239
252
  case "end":
240
253
  return _context5.stop();
241
254
  }
242
255
  }
243
- }, _callee5, null, [[0, 7]]);
256
+ }, _callee5, null, [[0, 15]]);
244
257
  }));
245
258
 
246
259
  function onOk() {
package/lib/core/models/TopoApp.js CHANGED
@@ -46,7 +46,7 @@ var _edgeUtil = require("../utils/edgeUtil");
46
46
  var _PluginManager = _interopRequireDefault(require("./PluginManager"));
47
47
 
48
48
  // eslint-disable-next-line no-undef
49
- var version = typeof "2.15.7" === 'string' ? "2.15.7" : null;
49
+ var version = typeof "2.15.8" === 'string' ? "2.15.8" : null;
50
50
  console.info("\u62D3\u6251\u7248\u672C: " + version);
51
51
  var topoDebug = {};
52
52
  window.topoDebug = topoDebug;
package/lib/models/iconManage.js CHANGED
@@ -19,6 +19,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
19
19
 
20
20
  var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
21
21
 
22
+ var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
23
+
22
24
  var _icon = require("../core/common/icons/icon");
23
25
 
24
26
  /**
@@ -230,33 +232,46 @@ function _default(engine) {
230
232
  case 3:
231
233
  success = _context5.sent;
232
234
 
233
- if (success) {
234
- _message["default"].success('删除成功');
235
-
236
- engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
237
- } else {
238
- _message["default"].error('删除失败');
235
+ if (!success) {
236
+ _context5.next = 12;
237
+ break;
239
238
  }
240
239
 
241
- _context5.next = 10;
242
- break;
240
+ _context5.next = 7;
241
+ return _this4.loadCustomIcons();
243
242
 
244
243
  case 7:
245
- _context5.prev = 7;
244
+ _message["default"].success('删除成功');
245
+
246
+ _componentTopologyGraph.iconFactory.remove((0, _icon.getCustomIconHtId)(id));
247
+
248
+ engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
249
+ _context5.next = 13;
250
+ break;
251
+
252
+ case 12:
253
+ _message["default"].error('删除失败');
254
+
255
+ case 13:
256
+ _context5.next = 18;
257
+ break;
258
+
259
+ case 15:
260
+ _context5.prev = 15;
246
261
  _context5.t0 = _context5["catch"](0);
247
262
 
248
263
  _rlog["default"].warn('删除图标失败', _context5.t0);
249
264
 
250
- case 10:
251
- _context5.next = 12;
265
+ case 18:
266
+ _context5.next = 20;
252
267
  return _this4.loadCustomIcons();
253
268
 
254
- case 12:
269
+ case 20:
255
270
  case "end":
256
271
  return _context5.stop();
257
272
  }
258
273
  }
259
- }, _callee5, null, [[0, 7]]);
274
+ }, _callee5, null, [[0, 15]]);
260
275
  }));
261
276
 
262
277
  function onOk() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "2.15.7",
3
+ "version": "2.15.8",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -69,7 +69,7 @@
69
69
  "@riil-frontend/component-table-filter-tags": "latest",
70
70
  "@riil-frontend/component-table-layout": "^2.0.2",
71
71
  "@riil-frontend/component-topology-common": "^1.0.9",
72
- "@riil-frontend/component-topology-graph": "^2.5.1",
72
+ "@riil-frontend/component-topology-graph": "^2.5.2",
73
73
  "@riil-frontend/css": "^2.0.2",
74
74
  "@riil-frontend/hooks": "latest",
75
75
  "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -111,6 +111,6 @@
111
111
  "access": "public"
112
112
  },
113
113
  "license": "MIT",
114
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.7/build/index.html",
114
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.8/build/index.html",
115
115
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
116
116
  }