@riil-frontend/component-topology 5.0.1 → 5.0.3

package/lib/core/hooks/useSelectionListener.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = useSelectionListener;
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+var _react = require("react");
+
+var _useSelection2 = _interopRequireDefault(require("./useSelection"));
+
+function useSelectionListener(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
+      graphLoaded = _topo$store$useModelS.graphLoaded,
+      graphLoaded2 = _topo$store$useModelS.graphLoaded2,
+      viewState = _topo$store$useModelS.viewState;
+
+  var isEditMode = viewState === 'edit'; // TODO 临时放这里，当前监听内容较多
+
+  var _useSelection = (0, _useSelection2["default"])({
+    topo: topo
+  }),
+      initSelection = _useSelection.initSelection,
+      destroySelection = _useSelection.destroySelection;
+
+  (0, _react.useEffect)(function () {
+    var inited = false;
+    var loaded = graphLoaded || graphLoaded2;
+
+    if (isEditMode && loaded) {
+      initSelection();
+      inited = true;
+    }
+
+    return function () {
+      if (inited) {
+        destroySelection();
+      }
+    };
+  }, [graphLoaded, graphLoaded2, isEditMode]);
+}

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "5.0.1" === 'string' ? "5.0.1" : null;
+var version = typeof "5.0.3" === 'string' ? "5.0.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js

@@ -3,16 +3,16 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = ClusterChildrenTable;
+exports["default"] = ClusterMemberTableContainer;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _componentTableLayout = _interopRequireDefault(require("@riil-frontend/component-table-layout"));
@@ -31,7 +31,79 @@ var _ClusterMemberTableModule = _interopRequireDefault(require("./ClusterMemberT
 
 var _Link = _interopRequireDefault(require("../../../../../../components/Link"));
 
-function ClusterChildrenTable(props) {
+function ClusterMemberTable(props) {
+  var tableProps = props.tableProps,
+      paginationProps = props.paginationProps; // url 处理，UICBB 的地址需截取前缀
+
+  function formatUrl(url) {
+    var _window, _window$location;
+
+    var prefix = '/default/pagecenter';
+
+    if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+      return url.split(prefix)[1];
+    } else {
+      return url;
+    }
+  }
+  /**
+  * Table列数据
+  */
+
+
+  var columns = [{
+    id: '1',
+    title: '显示名称',
+    dataIndex: 'attributes.display_name',
+    // sortable: true,
+    lock: true,
+    width: 160,
+    cell: function cell(vallue, index, item) {
+      var link = "/default/pagecenter/resDetail/view/" + item.id + "?resId=" + item.id + "&domainCode=" + item.typeObject.domain + "&title=" + vallue + "&ciCode=" + item.typeCode; // 资源跳转链接
+
+      return /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        title: vallue || "",
+        to: formatUrl(link)
+      }, vallue || "-");
+    }
+  }, {
+    id: '2',
+    title: 'IP地址',
+    dataIndex: 'attributes.ipv4_address',
+    width: 120
+  }, {
+    id: '3',
+    title: '成员角色',
+    dataIndex: 'memberRole',
+    width: 120
+  }, {
+    id: '4',
+    title: '资源类型',
+    dataIndex: 'typeObject.displayName',
+    width: 120
+  }];
+  return /*#__PURE__*/_react["default"].createElement(_componentTableLayout["default"], {
+    wrapProps: {
+      style: {}
+    },
+    table: /*#__PURE__*/_react["default"].createElement(_table["default"], (0, _extends2["default"])({}, tableProps, {
+      hasBorder: false,
+      fixedHeader: true,
+      emptyContent: "\u6682\u65E0\u6570\u636E"
+    }), columns.map(function (columnItem) {
+      return /*#__PURE__*/_react["default"].createElement(_table["default"].Column, (0, _extends2["default"])({
+        key: columnItem.dataIndex
+      }, columnItem));
+    })),
+    pagination: /*#__PURE__*/_react["default"].createElement(_componentPager["default"], (0, _extends2["default"])({}, paginationProps, {
+      type: "simple",
+      useDefaultConfig: false,
+      showChecked: false
+    }))
+  });
+}
+
+function ClusterMemberTableContainer(props) {
   var data = props.data,
       topo = props.topo;
   var datas = topo.dataModel.useDatas();
@@ -76,12 +148,12 @@ function ClusterChildrenTable(props) {
                     });
                     return (0, _extends2["default"])({}, ci, {
                       typeObject: ciTypeMap[ci.typeCode],
-                      memberRole: topo.dictCache.dictObject.member_role[memberRoleMetric.metricValue]
+                      memberRole: topo.dictCache.dictObject.member_role[memberRoleMetric === null || memberRoleMetric === void 0 ? void 0 : memberRoleMetric.metricValue]
                     });
                   }),
                   total: ciDataResult.totalRecord,
-                  current: 1,
-                  pageSize: 20
+                  current: ciDataResult.pageIndex,
+                  pageSize: pageSize
                 }
               });
 
@@ -105,81 +177,11 @@ function ClusterChildrenTable(props) {
     }
   }) // useFilterPlugin(),
   ];
-
-  var _useNextTable = (0, _nextTable["default"])(getTableData, {
+  var tableProps = (0, _nextTable["default"])(getTableData, {
     refreshDeps: [data],
     plugins: plugins
-  }),
-      tableProps = _useNextTable.tableProps,
-      paginationProps = _useNextTable.paginationProps; // url 处理，UICBB 的地址需截取前缀
-
-
-  function formatUrl(url) {
-    var _window, _window$location;
-
-    var prefix = '/default/pagecenter';
-
-    if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
-      return url.split(prefix)[1];
-    } else {
-      return url;
-    }
-  }
-  /**
-  * Table列数据
-  */
-
-
-  var columns = [{
-    id: '1',
-    title: '显示名称',
-    dataIndex: 'attributes.display_name',
-    // sortable: true,
-    lock: true,
-    width: 160,
-    cell: function cell(vallue, index, item) {
-      var link = "/default/pagecenter/resDetail/view/" + item.id + "?resId=" + item.id + "&domainCode=" + item.typeObject.domain + "&title=" + vallue + "&ciCode=" + item.typeCode; // 资源跳转链接
-
-      return /*#__PURE__*/_react["default"].createElement(_Link["default"], {
-        title: vallue || "",
-        to: formatUrl(link)
-      }, vallue || "-");
-    }
-  }, {
-    id: '2',
-    title: 'IP地址',
-    dataIndex: 'attributes.ipv4_address',
-    width: 120
-  }, {
-    id: '3',
-    title: '成员角色',
-    dataIndex: 'memberRole',
-    width: 120
-  }, {
-    id: '4',
-    title: '资源类型',
-    dataIndex: 'typeObject.displayName',
-    width: 120
-  }];
+  });
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _ClusterMemberTableModule["default"].container
-  }, /*#__PURE__*/_react["default"].createElement(_componentTableLayout["default"], {
-    wrapProps: {
-      style: {}
-    },
-    table: /*#__PURE__*/_react["default"].createElement(_table["default"], (0, _extends2["default"])({}, tableProps, {
-      hasBorder: false,
-      fixedHeader: true,
-      emptyContent: "\u6682\u65E0\u6570\u636E"
-    }), columns.map(function (columnItem) {
-      return /*#__PURE__*/_react["default"].createElement(_table["default"].Column, (0, _extends2["default"])({
-        key: columnItem.dataIndex
-      }, columnItem));
-    })),
-    pagination: /*#__PURE__*/_react["default"].createElement(_componentPager["default"], (0, _extends2["default"])({}, paginationProps, {
-      type: "simple",
-      useDefaultConfig: false,
-      showChecked: false
-    }))
-  }));
+  }, /*#__PURE__*/_react["default"].createElement(ClusterMemberTable, tableProps));
 }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js

@@ -86,7 +86,6 @@ function ResourceOverviewMetric(props) {
     var code = itemData.code,
         metricItem = itemData.metricItem,
         list = itemData.list;
-    console.log('formatValue', itemData);
     var format = (0, _utils.metricValueFormat)({
       value: (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.metricValue,
       dataType: metricItem.dataType,
@@ -108,9 +107,9 @@ function ResourceOverviewMetric(props) {
         value: item.metricValue == -2 ? null : Number(item.metricValue)
       };
     });
-  }
+  } // console.log('ResourceOverviewMetric', data);
+
 
-  console.log('ResourceOverviewMetric', data);
   var content;
 
   if (data.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -115,6 +115,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.1/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@5.0.3/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }