@riil-frontend/component-topology 4.0.24 → 4.0.26

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 (10) hide show
  1. package/build/index.js +1 -1
  2. package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  3. package/es/core/models/TopoApp.js +1 -1
  4. package/es/core/models/utils/linkUtils.js +1 -1
  5. package/es/core/utils/edgeUtil.js +14 -6
  6. package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
  7. package/lib/core/models/TopoApp.js +1 -1
  8. package/lib/core/models/utils/linkUtils.js +1 -1
  9. package/lib/core/utils/edgeUtil.js +14 -6
  10. package/package.json +2 -2
package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js CHANGED
@@ -19,17 +19,17 @@ function GlobalEdgeToggle(props) {
19
19
  console.log("handleChange---expanded-expandAllEdges", expanded, expandAllEdges);
20
20
 
21
21
  if (expanded !== 1) {
22
- topo.getHtTopo().expandAllEdgeGroups();
23
22
  showLinkByConfig({
24
23
  topo: topo,
25
24
  showType: 4
26
25
  });
26
+ topo.getHtTopo().expandAllEdgeGroups();
27
27
  } else {
28
- topo.getHtTopo().collapseAllEdgeGroups();
29
28
  showLinkByConfig({
30
29
  topo: topo,
31
30
  showType: 1
32
31
  });
32
+ topo.getHtTopo().collapseAllEdgeGroups();
33
33
  }
34
34
 
35
35
  displayConfigDispatchers.update({
package/es/core/models/TopoApp.js CHANGED
@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
21
21
  import topoFactory from "./topoFactory";
22
22
  import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
23
23
 
24
- var version = typeof "4.0.24" === 'string' ? "4.0.24" : null;
24
+ var version = typeof "4.0.26" === 'string' ? "4.0.26" : null;
25
25
  console.info("\u62D3\u6251\u7248\u672C: " + version);
26
26
  /**
27
27
  * 拓扑显示和编辑
package/es/core/models/utils/linkUtils.js CHANGED
@@ -198,7 +198,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
198
198
  var d = topo.dataModel.getDataById(edge.getTag());
199
199
  console.log("edge", edge, d); // 判断是否聚合链路
200
200
 
201
- if (((_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && ((_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
201
+ if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
202
202
  edge.s("2d.visible", showAgg);
203
203
  } else {
204
204
  edge.s("2d.visible", showPhy);
package/es/core/utils/edgeUtil.js CHANGED
@@ -7,25 +7,33 @@ import { showLinkByConfig } from "../models/utils/linkUtils";
7
7
  */
8
8
 
9
9
  export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
10
+ var _topo$store$getModelS = topo.store.getModelState("topoMod"),
11
+ viewState = _topo$store$getModelS.viewState;
12
+
13
+ var isEditMode = viewState === "edit";
10
14
  var htTopo = topo.getHtTopo();
11
15
 
12
16
  if (!htTopo) {
13
17
  return;
14
18
  }
15
19
 
16
- var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
17
- expandAllEdges = _topo$store$getModelS.expandAllEdges;
20
+ var _topo$store$getModelS2 = topo.store.getModelState('displayConfig'),
21
+ expandAllEdges = _topo$store$getModelS2.expandAllEdges;
18
22
 
19
23
  console.log("expandAllEdges----------", expandAllEdges);
20
- showLinkByConfig({
21
- topo: topo,
22
- showType: expandAllEdges
23
- });
24
24
 
25
25
  if (expandAllEdges === 1) {
26
+ showLinkByConfig({
27
+ topo: topo,
28
+ showType: 1
29
+ });
26
30
  htTopo.collapseAllEdgeGroups();
27
31
  rlog.debug('updateEdgeExpanded 折叠');
28
32
  } else {
33
+ showLinkByConfig({
34
+ topo: topo,
35
+ showType: isEditMode ? 4 : expandAllEdges
36
+ });
29
37
  htTopo.expandAllEdgeGroups();
30
38
  rlog.debug('updateEdgeExpanded 展开');
31
39
  }
package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js CHANGED
@@ -28,17 +28,17 @@ function GlobalEdgeToggle(props) {
28
28
  console.log("handleChange---expanded-expandAllEdges", expanded, expandAllEdges);
29
29
 
30
30
  if (expanded !== 1) {
31
- topo.getHtTopo().expandAllEdgeGroups();
32
31
  (0, _linkUtils.showLinkByConfig)({
33
32
  topo: topo,
34
33
  showType: 4
35
34
  });
35
+ topo.getHtTopo().expandAllEdgeGroups();
36
36
  } else {
37
- topo.getHtTopo().collapseAllEdgeGroups();
38
37
  (0, _linkUtils.showLinkByConfig)({
39
38
  topo: topo,
40
39
  showType: 1
41
40
  });
41
+ topo.getHtTopo().collapseAllEdgeGroups();
42
42
  }
43
43
 
44
44
  displayConfigDispatchers.update({
package/lib/core/models/TopoApp.js CHANGED
@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
50
50
  var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
51
51
 
52
52
  // eslint-disable-next-line no-undef
53
- var version = typeof "4.0.24" === 'string' ? "4.0.24" : null;
53
+ var version = typeof "4.0.26" === 'string' ? "4.0.26" : null;
54
54
  console.info("\u62D3\u6251\u7248\u672C: " + version);
55
55
  /**
56
56
  * 拓扑显示和编辑
package/lib/core/models/utils/linkUtils.js CHANGED
@@ -224,7 +224,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
224
224
  var d = topo.dataModel.getDataById(edge.getTag());
225
225
  console.log("edge", edge, d); // 判断是否聚合链路
226
226
 
227
- if (((_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && ((_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
227
+ if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
228
228
  edge.s("2d.visible", showAgg);
229
229
  } else {
230
230
  edge.s("2d.visible", showPhy);
package/lib/core/utils/edgeUtil.js CHANGED
@@ -15,26 +15,34 @@ var _linkUtils = require("../models/utils/linkUtils");
15
15
  * @param {*} topo
16
16
  */
17
17
  var updateEdgeExpanded = function updateEdgeExpanded(topo) {
18
+ var _topo$store$getModelS = topo.store.getModelState("topoMod"),
19
+ viewState = _topo$store$getModelS.viewState;
20
+
21
+ var isEditMode = viewState === "edit";
18
22
  var htTopo = topo.getHtTopo();
19
23
 
20
24
  if (!htTopo) {
21
25
  return;
22
26
  }
23
27
 
24
- var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
25
- expandAllEdges = _topo$store$getModelS.expandAllEdges;
28
+ var _topo$store$getModelS2 = topo.store.getModelState('displayConfig'),
29
+ expandAllEdges = _topo$store$getModelS2.expandAllEdges;
26
30
 
27
31
  console.log("expandAllEdges----------", expandAllEdges);
28
- (0, _linkUtils.showLinkByConfig)({
29
- topo: topo,
30
- showType: expandAllEdges
31
- });
32
32
 
33
33
  if (expandAllEdges === 1) {
34
+ (0, _linkUtils.showLinkByConfig)({
35
+ topo: topo,
36
+ showType: 1
37
+ });
34
38
  htTopo.collapseAllEdgeGroups();
35
39
 
36
40
  _rlog["default"].debug('updateEdgeExpanded 折叠');
37
41
  } else {
42
+ (0, _linkUtils.showLinkByConfig)({
43
+ topo: topo,
44
+ showType: isEditMode ? 4 : expandAllEdges
45
+ });
38
46
  htTopo.expandAllEdgeGroups();
39
47
 
40
48
  _rlog["default"].debug('updateEdgeExpanded 展开');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "4.0.24",
3
+ "version": "4.0.26",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -114,6 +114,6 @@
114
114
  "access": "public"
115
115
  },
116
116
  "license": "MIT",
117
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.24/build/index.html",
117
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@4.0.26/build/index.html",
118
118
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
119
119
  }