@riil-frontend/component-topology 7.0.0-dev.17 → 7.0.0-dev.19

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

@@ -6,9 +6,9 @@ import _Collapse from "@alifd/next/es/collapse";
 import _Select from "@alifd/next/es/select";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect } from "react";
-import useHtElement from "../../../../../../common/hooks/useHtElement";
 import textStyles from "../../../../../../common/text.module.scss";
 import NodeRelateResourceButton from "./NodeRelateResourceButton";
+import PlatformDisplay from "./PlatformDisplay";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
@@ -150,5 +150,7 @@ export default function Data(props) {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })))));
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u6240\u5C5E\u5E73\u53F0"
+  }, /*#__PURE__*/React.createElement(PlatformDisplay, props)))));
 }

package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js

@@ -0,0 +1,10 @@
+import React from 'react';
+
+function PlatformDisplay(props) {
+  var topo = props.topo,
+      node = props.node;
+  var data = topo.dataModel.useDataById(node.getTag());
+  return data.isSubResource ? data.attributes.platform : '本级平台';
+}
+
+export default PlatformDisplay;

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.0-dev.17" === 'string' ? "7.0.0-dev.17" : null;
+var version = typeof "7.0.0-dev.19" === 'string' ? "7.0.0-dev.19" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -9,7 +9,10 @@ export default function LinkDataTab(props) {
 
   var topo = props.topo,
       edge = props.edge,
-      link = props.link;
+      link = props.link,
+      source = props.source,
+      target = props.target,
+      editorProps = props.editorProps;
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
@@ -26,8 +29,11 @@ export default function LinkDataTab(props) {
     className: styles.panelFullHeight
   }, /*#__PURE__*/React.createElement(LindInfoPreview, {
     className: styles.lindInfoPreview,
+    topo: topo,
     data: link,
-    topo: topo
+    source: source,
+    target: target,
+    isCmpTopo: (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo'
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.footer
   }, /*#__PURE__*/React.createElement(_Button, {

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -4,14 +4,10 @@ import React from 'react';
 import Data from "./Data";
 export default function LinkPropertyView(props) {
   var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  });
+      topo = props.topo;
+  var link = topo.dataModel.useDataById(edge.getTag());
+  var source = topo.dataModel.useDataById(link.source);
+  var target = topo.dataModel.useDataById(link.target); // 无权限不显示数据页签
 
   if (link) {
     var readable = link.permission.readable;
@@ -26,6 +22,8 @@ export default function LinkPropertyView(props) {
   }
 
   return /*#__PURE__*/React.createElement(Data, _extends({}, props, {
-    link: link
+    link: link,
+    source: source,
+    target: target
   }));
 }

package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _Box from "@alifd/next/es/box";
 import _Collapse from "@alifd/next/es/collapse";
 import React, { useEffect } from "react";
@@ -5,9 +6,40 @@ import styles from "./LinkInfoPreview.module.scss";
 import { formatMetric } from "../../../../../../core/models/attributeFormatter";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 var CollapsePanel = _Collapse.Panel;
+
+function Item(props) {
+  return /*#__PURE__*/React.createElement(_Box, {
+    key: props.name,
+    direction: "row",
+    spacing: 8,
+    className: styles.row
+  }, /*#__PURE__*/React.createElement(_Box, {
+    className: styles.label
+  }, props.label), /*#__PURE__*/React.createElement(_Box, {
+    className: props.name === "use" ? styles.uselabelValue : styles.labelValue,
+    flex: 1
+  }, props.content));
+}
+
 export default function LindInfoPreview(props) {
   var topo = props.topo,
-      data = props.data;
+      data = props.data,
+      isCmpTopo = props.isCmpTopo,
+      target = props.target;
+  var cmpFields = [];
+  var cmpFieldsSource = []; // 分级拓扑逻辑
+
+  if (isCmpTopo && target.id.indexOf("sub") >= 0) {
+    cmpFields.push({
+      label: "所属平台",
+      content: target.attributes.platform
+    });
+    cmpFieldsSource.push({
+      label: "所属平台",
+      content: '本级平台'
+    });
+  }
+
   var fields = [{
     label: "链路名称",
     name: "display_name"
@@ -23,7 +55,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "源端IP",
     name: "network_link.source_ipv4"
-  }, {
+  }].concat(cmpFieldsSource, [{
     label: "目的节点名称",
     name: "network_link.destination_device_id"
   }, {
@@ -35,7 +67,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "目的端IP",
     name: "network_link.destination_ipv4"
-  }, {
+  }], cmpFields, [{
     label: "取值端口",
     name: "network_link.value_port"
   }, {
@@ -44,7 +76,7 @@ export default function LindInfoPreview(props) {
   }, {
     label: "用途",
     name: "use"
-  }];
+  }]);
 
   var getValue = function getValue(name) {
     var value; // console.log('LindInfoPreview-getValue',data,name)
@@ -69,18 +101,12 @@ export default function LindInfoPreview(props) {
     return value;
   };
 
-  return fields.map(function (field) {
-    return /*#__PURE__*/React.createElement(_Box, {
-      key: field.name,
-      direction: "row",
-      spacing: 8,
-      className: styles.row
-    }, /*#__PURE__*/React.createElement(_Box, {
-      className: styles.label
-    }, field.label), /*#__PURE__*/React.createElement(_Box, {
-      className: field.name === "use" ? styles.uselabelValue : styles.labelValue,
-      flex: 1
-    }, getValue(field.name)));
+  return fields.map(function (field, index) {
+    return /*#__PURE__*/React.createElement(Item, _extends({
+      key: index
+    }, field, {
+      content: field.content || getValue(field.name)
+    }));
   }); // <Collapse
   //   defaultExpandedKeys={["相关资源"]}
   //   style={{ border: "none" }}

package/es/networkTopo/hooks/editor/useDeleteEdges.js

@@ -32,6 +32,11 @@ export default (function (_ref) {
 
     if (deleteable) {
       return deleteable;
+    } // 分级管理 下级链路禁用删除
+
+
+    if (link.isSubResource) {
+      return false;
     }
 
     _Message.notice('无删除权限');

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

@@ -21,12 +21,12 @@ 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"));
 
+var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
+
 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; }
@@ -172,5 +172,7 @@ function Data(props) {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })))));
+  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u6240\u5C5E\u5E73\u53F0"
+  }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
 }

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

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+function PlatformDisplay(props) {
+  var topo = props.topo,
+      node = props.node;
+  var data = topo.dataModel.useDataById(node.getTag());
+  return data.isSubResource ? data.attributes.platform : '本级平台';
+}
+
+var _default = PlatformDisplay;
+exports["default"] = _default;

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.17" === 'string' ? "7.0.0-dev.17" : null;
+var version = typeof "7.0.0-dev.19" === 'string' ? "7.0.0-dev.19" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -24,7 +24,10 @@ function LinkDataTab(props) {
 
   var topo = props.topo,
       edge = props.edge,
-      link = props.link;
+      link = props.link,
+      source = props.source,
+      target = props.target,
+      editorProps = props.editorProps;
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
@@ -41,8 +44,11 @@ function LinkDataTab(props) {
     className: _LinkInfoPreviewModule["default"].panelFullHeight
   }, /*#__PURE__*/_react["default"].createElement(_LinkInfoPreview["default"], {
     className: _LinkInfoPreviewModule["default"].lindInfoPreview,
+    topo: topo,
     data: link,
-    topo: topo
+    source: source,
+    target: target,
+    isCmpTopo: (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo'
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _LinkInfoPreviewModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -15,14 +15,10 @@ var _Data = _interopRequireDefault(require("./Data"));
 
 function LinkPropertyView(props) {
   var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  });
+      topo = props.topo;
+  var link = topo.dataModel.useDataById(edge.getTag());
+  var source = topo.dataModel.useDataById(link.source);
+  var target = topo.dataModel.useDataById(link.target); // 无权限不显示数据页签
 
   if (link) {
     var readable = link.permission.readable;
@@ -37,6 +33,8 @@ function LinkPropertyView(props) {
   }
 
   return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
-    link: link
+    link: link,
+    source: source,
+    target: target
   }));
 }

package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LindInfoPreview;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
 var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
@@ -23,9 +25,39 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var CollapsePanel = _collapse["default"].Panel;
 
+function Item(props) {
+  return /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    key: props.name,
+    direction: "row",
+    spacing: 8,
+    className: _LinkInfoPreviewModule["default"].row
+  }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    className: _LinkInfoPreviewModule["default"].label
+  }, props.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
+    className: props.name === "use" ? _LinkInfoPreviewModule["default"].uselabelValue : _LinkInfoPreviewModule["default"].labelValue,
+    flex: 1
+  }, props.content));
+}
+
 function LindInfoPreview(props) {
   var topo = props.topo,
-      data = props.data;
+      data = props.data,
+      isCmpTopo = props.isCmpTopo,
+      target = props.target;
+  var cmpFields = [];
+  var cmpFieldsSource = []; // 分级拓扑逻辑
+
+  if (isCmpTopo && target.id.indexOf("sub") >= 0) {
+    cmpFields.push({
+      label: "所属平台",
+      content: target.attributes.platform
+    });
+    cmpFieldsSource.push({
+      label: "所属平台",
+      content: '本级平台'
+    });
+  }
+
   var fields = [{
     label: "链路名称",
     name: "display_name"
@@ -41,7 +73,7 @@ function LindInfoPreview(props) {
   }, {
     label: "源端IP",
     name: "network_link.source_ipv4"
-  }, {
+  }].concat(cmpFieldsSource, [{
     label: "目的节点名称",
     name: "network_link.destination_device_id"
   }, {
@@ -53,7 +85,7 @@ function LindInfoPreview(props) {
   }, {
     label: "目的端IP",
     name: "network_link.destination_ipv4"
-  }, {
+  }], cmpFields, [{
     label: "取值端口",
     name: "network_link.value_port"
   }, {
@@ -62,7 +94,7 @@ function LindInfoPreview(props) {
   }, {
     label: "用途",
     name: "use"
-  }];
+  }]);
 
   var getValue = function getValue(name) {
     var value; // console.log('LindInfoPreview-getValue',data,name)
@@ -87,18 +119,12 @@ function LindInfoPreview(props) {
     return value;
   };
 
-  return fields.map(function (field) {
-    return /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      key: field.name,
-      direction: "row",
-      spacing: 8,
-      className: _LinkInfoPreviewModule["default"].row
-    }, /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: _LinkInfoPreviewModule["default"].label
-    }, field.label), /*#__PURE__*/_react["default"].createElement(_box["default"], {
-      className: field.name === "use" ? _LinkInfoPreviewModule["default"].uselabelValue : _LinkInfoPreviewModule["default"].labelValue,
-      flex: 1
-    }, getValue(field.name)));
+  return fields.map(function (field, index) {
+    return /*#__PURE__*/_react["default"].createElement(Item, (0, _extends2["default"])({
+      key: index
+    }, field, {
+      content: field.content || getValue(field.name)
+    }));
   }); // <Collapse
   //   defaultExpandedKeys={["相关资源"]}
   //   style={{ border: "none" }}

package/lib/networkTopo/hooks/editor/useDeleteEdges.js

@@ -46,6 +46,11 @@ var _default = function _default(_ref) {
 
     if (deleteable) {
       return deleteable;
+    } // 分级管理 下级链路禁用删除
+
+
+    if (link.isSubResource) {
+      return false;
     }
 
     _message["default"].notice('无删除权限');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.17",
+  "version": "7.0.0-dev.19",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -60,7 +60,7 @@
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
     "@riil-frontend/component-action-tree": "^1.0.13",
-    "@riil-frontend/component-common-res-list": "^1.0.13",
+    "@riil-frontend/component-common-res-list": "^1.0.26",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
     "@riil-frontend/component-crucial-link-topo": "0.1.0",
     "@riil-frontend/component-extra-title": "^1.0.3",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.17/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.19/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }