@riil-frontend/component-topology 9.0.15 → 9.0.17

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 (11) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +1 -1
  4. package/build/index.js +17 -17
  5. package/es/core/models/TopoApp.js +1 -1
  6. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js +5 -5
  7. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +2 -1
  8. package/lib/core/models/TopoApp.js +1 -1
  9. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js +5 -5
  10. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +2 -1
  11. package/package.json +2 -2
package/es/core/models/TopoApp.js CHANGED
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
24
24
  import SelectionModel from "./SelectionModel";
25
25
  import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
26
26
 
27
- var version = typeof "9.0.15" === 'string' ? "9.0.15" : null;
27
+ var version = typeof "9.0.17" === 'string' ? "9.0.17" : null;
28
28
  console.info("\u62D3\u6251\u7248\u672C: " + version);
29
29
  /**
30
30
  * 拓扑显示和编辑
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js CHANGED
@@ -25,7 +25,7 @@ export default function NetworkBaseInfo(props) {
25
25
  name = data.name;
26
26
  var edge = topo.dataModel.getDataById(id);
27
27
 
28
- var _useState = useState(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']),
28
+ var _useState = useState(!!edge.attributes['network_link.is_crucial']),
29
29
  defaultChecked = _useState[0],
30
30
  setDefaultChecked = _useState[1];
31
31
 
@@ -34,7 +34,7 @@ export default function NetworkBaseInfo(props) {
34
34
  }
35
35
 
36
36
  var onChanges = function onChanges(checked) {
37
- var defaultCheck = topo.topoCrucialLinkFn([data.id], !checked, setDefaultChecked);
37
+ var defaultCheck = topo.topoCrucialLinkFn([data.id], !checked);
38
38
  };
39
39
 
40
40
  var creatCruialSwitch = function creatCruialSwitch() {
@@ -47,17 +47,17 @@ export default function NetworkBaseInfo(props) {
47
47
 
48
48
  useEffect(function () {
49
49
  setDefaultChecked(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']);
50
- }, [id, topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']]);
50
+ }, [id, edge.attributes['network_link.is_crucial']]);
51
51
  var crucialLinkField = null;
52
52
 
53
53
  if (edge) {
54
54
  var targetNode = topo.dataModel.getDataById(edge.target);
55
55
  var sourceNode = topo.dataModel.getDataById(edge.source);
56
- var updateCrucialPermission = sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable);
56
+ var updateCrucialPermission = !!!edge.attributes['network_link.is_crucial'] && sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable) || !!edge.attributes['network_link.is_crucial'] && edge.permission.deleteable;
57
57
 
58
58
  if (updateCrucialPermission) {
59
59
  crucialLinkField = {
60
- contentTitle: topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial'] ? '是' : '否',
60
+ contentTitle: edge.attributes['network_link.is_crucial'] ? '是' : '否',
61
61
  dataIndex: 'isCrucial',
62
62
  disabledHide: false,
63
63
  hidden: false,
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -857,7 +857,8 @@ export default function ResourceOverview(props) {
857
857
  support_templates: support_templates,
858
858
  defaultCols: defaultCols,
859
859
  baseInfoCol: baseInfoCol,
860
- baseInfoColChange: baseInfoColChange
860
+ baseInfoColChange: baseInfoColChange,
861
+ topoId: topoId
861
862
  }) : /*#__PURE__*/React.createElement(BaseInfoBlock, _extends({}, resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.baseInfoProps, {
862
863
  loading: baseInfoInitLoading,
863
864
  data: elementData,
package/lib/core/models/TopoApp.js CHANGED
@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
56
56
  var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
57
57
 
58
58
  // eslint-disable-next-line no-undef
59
- var version = typeof "9.0.15" === 'string' ? "9.0.15" : null;
59
+ var version = typeof "9.0.17" === 'string' ? "9.0.17" : null;
60
60
  console.info("\u62D3\u6251\u7248\u672C: " + version);
61
61
  /**
62
62
  * 拓扑显示和编辑
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/NetworkBaseInfo.js CHANGED
@@ -42,7 +42,7 @@ function NetworkBaseInfo(props) {
42
42
  name = data.name;
43
43
  var edge = topo.dataModel.getDataById(id);
44
44
 
45
- var _useState = (0, _react.useState)(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']),
45
+ var _useState = (0, _react.useState)(!!edge.attributes['network_link.is_crucial']),
46
46
  defaultChecked = _useState[0],
47
47
  setDefaultChecked = _useState[1];
48
48
 
@@ -51,7 +51,7 @@ function NetworkBaseInfo(props) {
51
51
  }
52
52
 
53
53
  var onChanges = function onChanges(checked) {
54
- var defaultCheck = topo.topoCrucialLinkFn([data.id], !checked, setDefaultChecked);
54
+ var defaultCheck = topo.topoCrucialLinkFn([data.id], !checked);
55
55
  };
56
56
 
57
57
  var creatCruialSwitch = function creatCruialSwitch() {
@@ -64,17 +64,17 @@ function NetworkBaseInfo(props) {
64
64
 
65
65
  (0, _react.useEffect)(function () {
66
66
  setDefaultChecked(!!topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']);
67
- }, [id, topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial']]);
67
+ }, [id, edge.attributes['network_link.is_crucial']]);
68
68
  var crucialLinkField = null;
69
69
 
70
70
  if (edge) {
71
71
  var targetNode = topo.dataModel.getDataById(edge.target);
72
72
  var sourceNode = topo.dataModel.getDataById(edge.source);
73
- var updateCrucialPermission = sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable);
73
+ var updateCrucialPermission = !!!edge.attributes['network_link.is_crucial'] && sourceNode.permission.writeable && (isExitLink(edge) ? true : targetNode.permission.writeable) || !!edge.attributes['network_link.is_crucial'] && edge.permission.deleteable;
74
74
 
75
75
  if (updateCrucialPermission) {
76
76
  crucialLinkField = {
77
- contentTitle: topo.dataModel.getDataById(data.id).attributes['network_link.is_crucial'] ? '是' : '否',
77
+ contentTitle: edge.attributes['network_link.is_crucial'] ? '是' : '否',
78
78
  dataIndex: 'isCrucial',
79
79
  disabledHide: false,
80
80
  hidden: false,
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js CHANGED
@@ -894,7 +894,8 @@ function ResourceOverview(props) {
894
894
  support_templates: support_templates,
895
895
  defaultCols: defaultCols,
896
896
  baseInfoCol: baseInfoCol,
897
- baseInfoColChange: baseInfoColChange
897
+ baseInfoColChange: baseInfoColChange,
898
+ topoId: topoId
898
899
  }) : /*#__PURE__*/_react["default"].createElement(_BaseInfoBlock["default"], (0, _extends2["default"])({}, resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.baseInfoProps, {
899
900
  loading: baseInfoInitLoading,
900
901
  data: elementData,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riil-frontend/component-topology",
3
- "version": "9.0.15",
3
+ "version": "9.0.17",
4
4
  "description": "拓扑",
5
5
  "scripts": {
6
6
  "start": "build-scripts start",
@@ -116,6 +116,6 @@
116
116
  "access": "public"
117
117
  },
118
118
  "license": "MIT",
119
- "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.15/build/index.html",
119
+ "homepage": "https://unpkg.com/@riil-frontend/component-topology@9.0.17/build/index.html",
120
120
  "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
121
121
  }