@riil-frontend/component-topology 6.0.0-alpha.9 → 6.0.1

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

@@ -19,6 +19,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+// V1.2 废弃
 function EdgeGroupPropertyView(props) {
   var topo = props.topo,
       edge = props.edge,

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

@@ -5,18 +5,56 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = EdgePropertyView;
 
+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 _react = _interopRequireDefault(require("react"));
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _CommonEdgePropertyView = _interopRequireDefault(require("../../../../../core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _BindExitLinkSelect = _interopRequireDefault(require("./link/BindExitLinkSelect"));
 
-function EdgePropertyView(props) {
-  var extraDisplaySetting = /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props);
+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); }
 
-  return /*#__PURE__*/_react["default"].createElement(_CommonEdgePropertyView["default"], (0, _extends2["default"])({}, props, {
-    extraDisplaySetting: extraDisplaySetting
-  }));
+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; }
+
+function parseValues(values, edge) {
+  return (0, _extends2["default"])({}, values);
+}
+
+function EdgePropertyView(props) {
+  var topo = props.topo,
+      edge = props.edge,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps,
+      extraDisplaySetting = props.extraDisplaySetting;
+  var store = topo.store;
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: parseValues(values, edge),
+    onChange: function onChange(name, value) {
+      _rlog["default"].debug('CommonEdgePropertyView', name, value);
+
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values, edge));
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      margin: '12px 0 0 32px'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_BindExitLinkSelect["default"], props))));
 }

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

@@ -5,46 +5,38 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LinkPropertyView;
 
-var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _react = _interopRequireDefault(require("react"));
+var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/component-no-data-page"));
 
-var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
+var _react = _interopRequireDefault(require("react"));
 
 var _Data = _interopRequireDefault(require("./Data"));
 
-var _Setting = _interopRequireDefault(require("./Setting"));
-
 function LinkPropertyView(props) {
   var edge = props.edge,
       topo = props.topo; // 无权限不显示数据页签
 
-  var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
+  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();
-  }); // console.log('LinkPropertyView',link)
+  });
 
   if (link) {
     var readable = link.permission.readable;
 
     if (!readable) {
-      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+      return /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], {
+        statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
+      });
     }
   } else {
-    return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+    return null;
   }
 
-  return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
+  return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
     link: link
-  }))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], props)));
+  }));
 }

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

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = LinkPropertyView;
+
+var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TabView = _interopRequireDefault(require("../../../../../../core/editor/components/settings/common/tab/TabView"));
+
+var _Data = _interopRequireDefault(require("./Data"));
+
+var _Setting = _interopRequireDefault(require("./Setting"));
+
+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();
+  }); // console.log('LinkPropertyView',link)
+
+  if (link) {
+    var readable = link.permission.readable;
+
+    if (!readable) {
+      return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+    }
+  } else {
+    return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+    title: "\u6570\u636E",
+    key: "1"
+  }, /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
+    link: link
+  }))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+    title: "\u8BBE\u7F6E",
+    key: "2"
+  }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], props)));
+}

package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.module.scss

@@ -53,7 +53,7 @@
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding-top: 8px;
+  padding-top: 12px;
   padding-left: 16px;
 
   :global {

package/lib/networkTopo/components/editor/useEditorProps.js

@@ -13,8 +13,6 @@ var _LayerConfigPlugin = _interopRequireDefault(require("./plugins/LayerConfigPl
 
 var _AddLinkDrawer = _interopRequireDefault(require("./propertyViews/edge/addLinkDrawer/AddLinkDrawer"));
 
-var _EdgeGroupPropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgeGroupPropertyView"));
-
 var _EdgePropertyView = _interopRequireDefault(require("./propertyViews/edge/EdgePropertyView"));
 
 var _LinkPropertyView = _interopRequireDefault(require("./propertyViews/edge/LinkPropertyView"));
@@ -35,8 +33,7 @@ function useEditorProps(props) {
     // 连线属性面板
     edgePropertyViews: {
       edge: _EdgePropertyView["default"],
-      link: _LinkPropertyView["default"],
-      edgeGroup: _EdgeGroupPropertyView["default"]
+      link: _LinkPropertyView["default"]
     },
     getEdgePropertyViewType: function getEdgePropertyViewType(_ref) {
       var edge = _ref.edge;

package/lib/networkTopo/createTopo.js

@@ -10,8 +10,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _TopoCenter = _interopRequireDefault(require("./models/TopoCenter"));
 
+var _services = _interopRequireDefault(require("./services"));
+
 function createTopo(options) {
   var topoApp = new _TopoCenter["default"]((0, _extends2["default"])({}, options));
+  topoApp.serverApi = _services["default"];
   return topoApp;
 }
 

package/lib/networkTopo/models/LinkDynamicStyleExecutor.js

@@ -65,13 +65,13 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
     var _this = this;
 
     var topo = this.topo;
-    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式');
 
     var _topo$dataModel$getDa = topo.dataModel.getData(),
         links = _topo$dataModel$getDa.links,
         linkGroups = _topo$dataModel$getDa.linkGroups;
 
-    var dataModel = this.topo.getDataModel(); // 1、如果连线可见，设置线宽
+    var dataModel = this.topo.getDataModel();
+    topo.historyManager && topo.historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见，设置线宽
 
     links.forEach(function (link) {
       var edge = dataModel.getDataByTag(link.id);

package/lib/networkTopo/services/link.js

@@ -173,10 +173,10 @@ var _default = {
               // const idtxt = `'${ids[0]}','${ids[1]}'`;
               stag = ids[0];
               ttag = ids[1];
-              condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "'";
+              condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "'";
 
               if (ttag) {
-                condition = "type('network_link') && !network_link.destination_device_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
+                condition = "type('network_link') && !destination_id && network_link.source_device_id ='" + stag + "' && network_link.destination_device_id='" + ttag + "'";
               }
 
               parm = {

package/lib/networkTopo/store/topoTreeMod.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _services = _interopRequireDefault(require("../services"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _tree = require("../../utils/tree");
@@ -101,7 +99,7 @@ function _default(topoApp) {
                     }
 
                     _context2.next = 4;
-                    return _services["default"].getTopoTree();
+                    return topoApp.serverApi.getTopoTree();
 
                   case 4:
                     resTreeData = _context2.sent;
@@ -110,7 +108,7 @@ function _default(topoApp) {
 
                   case 7:
                     _context2.next = 9;
-                    return _services["default"].getTopoTreeByLoginUser();
+                    return topoApp.serverApi.getTopoTreeByLoginUser();
 
                   case 9:
                     resTreeData = _context2.sent;
@@ -177,7 +175,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('editTopoOnTree', conditions);
 
                     _context4.next = 4;
-                    return _services["default"].editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
+                    return topoApp.serverApi.editTopoonTree(parseInt(conditions.id, 10), conditions.name, conditions.type);
 
                   case 4:
                     resTreeData = _context4.sent;
@@ -263,7 +261,7 @@ function _default(topoApp) {
 
                   case 8:
                     _context5.next = 10;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 10:
                     return _context5.abrupt("return", _context5.sent);
@@ -287,7 +285,7 @@ function _default(topoApp) {
 
                   case 18:
                     _context5.next = 20;
-                    return _services["default"].deleteTopoonTree(parseInt(conditions, 10));
+                    return topoApp.serverApi.deleteTopoonTree(parseInt(conditions, 10));
 
                   case 20:
                     return _context5.abrupt("return", _context5.sent);
@@ -316,7 +314,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('setDefTopoOnTree', conditions);
 
                     _context6.next = 4;
-                    return _services["default"].setDefTopo(parseInt(conditions, 10));
+                    return topoApp.serverApi.setDefTopo(parseInt(conditions, 10));
 
                   case 4:
                     resTreeData = _context6.sent;

package/lib/style.js

@@ -1,44 +1,45 @@
 require('@riil-frontend/component-topology-graph/lib/style');
 require('@alifd/next/lib/box/style');
 require('@alifd/next/lib/message/style');
-require('@alifd/next/lib/dialog/style');
-require('@riil-frontend/component-topology-utils/lib/style');
-require('@riil-frontend/utils/lib/style');
-require('@alifd/next/lib/upload/style');
-require('@alifd/next/lib/icon/style');
-require('@alifd/next/lib/config-provider/style');
-require('@alifd/next/lib/input/style');
-require('@alifd/next/lib/field/style');
-require('@alifd/next/lib/form/style');
-require('@alifd/next/lib/loading/style');
-require('@alifd/next/lib/drawer/style');
 require('@alifd/next/lib/button/style');
-require('@riil-frontend/component-common-res-list/lib/style');
-require('@riil-frontend/component-no-data-page/lib/style');
-require('@alifd/next/lib/tab/style');
-require('@alifd/next/lib/table/style');
-require('@riil-frontend/component-table-layout/lib/style');
-require('@riil-frontend/component-pager/lib/style');
-require('@alifd/next/lib/menu-button/style');
-require('@alifd/next/lib/search/style');
-require('@alifd/next/lib/divider/style');
-
+require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/overlay/style');
-require('@alifd/next/lib/checkbox/style');
-require('@riil-frontend/component-crucial-link-topo/lib/style');
 require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/card/style');
+require('@riil-frontend/component-no-data-page/lib/style');
+require('@alifd/next/lib/drawer/style');
+require('@alifd/next/lib/form/style');
+require('@alifd/next/lib/field/style');
 require('@alifd/next/lib/radio/style');
+require('@alifd/next/lib/checkbox/style');
+require('@alifd/next/lib/table/style');
+require('@alifd/next/lib/search/style');
 require('@alifd/next/lib/grid/style');
 require('@riil-frontend/component-action-tree/lib/style');
+require('@riil-frontend/component-table-layout/lib/style');
 require('@riil-frontend/hooks/lib/style');
 require('@alifd/next/lib/balloon/style');
+require('@riil-frontend/component-topology-utils/lib/style');
 require('@alifd/next/lib/dropdown/style');
 require('@alifd/next/lib/menu/style');
-require('@alifd/next/lib/collapse/style');
-require('@alifd/next/lib/select/style');
-require('@alifd/next/lib/number-picker/style');
+require('@alifd/next/lib/dialog/style');
+require('@riil-frontend/utils/lib/style');
+require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/tab/style');
+require('@riil-frontend/component-pager/lib/style');
+require('@alifd/next/lib/menu-button/style');
+require('@alifd/next/lib/loading/style');
+require('@alifd/next/lib/divider/style');
 
+require('@riil-frontend/component-crucial-link-topo/lib/style');
+require('@alifd/next/lib/input/style');
+require('@alifd/next/lib/upload/style');
+require('@alifd/next/lib/config-provider/style');
+require('@riil-frontend/component-common-res-list/lib/style');
+require('@alifd/next/lib/range/style');
 require('@alifd/next/lib/tag/style');
-require('@riil-frontend/component-riil-event-emitter/lib/style');
+require('@alifd/next/lib/number-picker/style');
+require('@alifd/next/lib/select/style');
+require('@alifd/next/lib/collapse/style');
+
 require('./index.scss');

package/lib/utils/htElementUtils.js

@@ -31,6 +31,7 @@ exports.isExistedElement = isExistedElement;
 exports.isGroup = isGroup;
 exports.isLayer = isLayer;
 exports.isNode = isNode;
+exports.isText = isText;
 exports.isValidEdge = isValidEdge;
 exports.setElementRuntimeStyle = setElementRuntimeStyle;
 
@@ -95,6 +96,10 @@ function isLayer(element) {
   return element instanceof ht.Grid;
 }
 
+function isText(element) {
+  return element instanceof ht.Text && element.a('isText');
+}
+
 function getElements(dataModel) {
   // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();

package/lib/utils/topoData.js

@@ -366,6 +366,7 @@ function buildGlobal(_ref2) {
       showLinkName: false,
       // 是否显示链路名称
       nodeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.nodeLabelStyle,
+      defaultEdgeLabelStyle: globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.defaultEdgeLabelStyle,
       edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}, (result === null || result === void 0 ? void 0 : (_result$customGlobal2 = result.customGlobal) === null || _result$customGlobal2 === void 0 ? void 0 : _result$customGlobal2.topoDisplayConfig) || {}),
     linkTo: linkTo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "6.0.0-alpha.9",
+  "version": "6.0.1",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,6 +41,7 @@
     "@ahooksjs/use-sortable-plugin": "^0.2.1",
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
+    "color": "^4.2.3",
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.17",
     "@riil-frontend/component-topology-utils": "^2.1.0",
@@ -61,7 +62,7 @@
     "@riil-frontend/component-action-tree": "^1.0.13",
     "@riil-frontend/component-common-res-list": "^1.0.13",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
-    "@riil-frontend/component-crucial-link-topo": "0.0.1-alpha.31",
+    "@riil-frontend/component-crucial-link-topo": "0.1.0",
     "@riil-frontend/component-extra-title": "^1.0.3",
     "@riil-frontend/component-more-buttons-menu": "^2.0.1",
     "@riil-frontend/component-no-data-page": "^3.0.4",
@@ -73,7 +74,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.1.2",
-    "@riil-frontend/component-topology-graph": "^2.7.2",
+    "@riil-frontend/component-topology-graph": "^2.8.0",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -115,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.0-alpha.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@6.0.1/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }