@riil-frontend/component-topology 2.1.5-dev.3 → 2.1.9

package/es/models/topoMod.js

@@ -336,32 +336,44 @@ export default function (topoApp) {
 
                   case 15:
                     if (!data) {
-                      _context6.next = 22;
+                      _context6.next = 26;
                       break;
                     }
 
-                    _context6.next = 18;
+                    if (!topoId) {
+                      _context6.next = 23;
+                      break;
+                    }
+
+                    _context6.next = 19;
                     return topoApp.options.loadData(topoId);
 
-                  case 18:
+                  case 19:
                     topoConfig = _context6.sent;
                     result = _extends({}, data, {
                       global: topoConfig.global,
                       serialize: topoConfig.serialize
                     });
-                    _context6.next = 25;
+                    _context6.next = 24;
                     break;
 
-                  case 22:
-                    _context6.next = 24;
-                    return topoApp.options.loadData(topoId);
+                  case 23:
+                    result = _extends({}, data);
 
                   case 24:
+                    _context6.next = 29;
+                    break;
+
+                  case 26:
+                    _context6.next = 28;
+                    return topoApp.options.loadData(topoId);
+
+                  case 28:
                     result = _context6.sent;
 
-                  case 25:
+                  case 29:
                     if (result) {
-                      _context6.next = 29;
+                      _context6.next = 33;
                       break;
                     }
 
@@ -373,12 +385,12 @@ export default function (topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 29:
+                  case 33:
                     rlog.debug('topoMod.initTopoData 获取拓扑数据', topoId, linkTo, result);
-                    _context6.next = 32;
+                    _context6.next = 36;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)), dispatch.iconManage.getIcons()]);
 
-                  case 32:
+                  case 36:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
@@ -415,7 +427,7 @@ export default function (topoApp) {
                     rlog.info('topoMod.initTopoData 初始化拓扑图数据. 耗时: ', endTime.diff(startTime, 'seconds', true));
                     topoApp.options.onLoad();
 
-                  case 46:
+                  case 50:
                   case "end":
                     return _context6.stop();
                 }
@@ -529,6 +541,8 @@ export default function (topoApp) {
 
         /**
          * 查询最近一个月的告警
+         *
+         * TODO 迁移
          */
         getAlarmById: function getAlarmById(conditions, state) {
           var _this8 = this;

package/es/style.js

@@ -36,7 +36,5 @@ import '@alifd/next/es/radio/style';
 import '@alifd/next/es/collapse/style';
 import '@alifd/next/es/list/style';
 import '@alifd/next/es/avatar/style';
-import '@alifd/next/es/cascader-select/style';
-import '@riil-frontend/component-no-data-page/es/style';
 import '@riil-frontend/component-topology-utils/es/style';
 import './index.scss';

package/es/utils/htElementUtils.js

@@ -22,9 +22,26 @@ function getElementData(element) {
 }
 
 export function getElements(dataModel) {
-  console.error(111, dataModel.getDatas().getArray());
+  // console.error(111, dataModel.getDatas().getArray())
   return dataModel.getDatas().getArray();
 }
+export function getGroups(dataModel) {
+  return getElements(dataModel).filter(function (element) {
+    return element.getClassName() === 'ht.Grid' || element.getClassName() === 'ht.Group';
+  }).filter(function (element) {
+    return !!element.getTag();
+  }).map(function (element) {
+    var host = element.getHost();
+    return _extends({
+      name: element.getStyleMap().label
+    }, element.getAttrObject(), {
+      id: element.getTag(),
+      tag: element.getId(),
+      image: element.getImage(),
+      groupTag: host ? host.getId() : undefined
+    });
+  });
+}
 export function getNodes(dataModel) {
   return getElements(dataModel).filter(function (element) {
     return element.getClassName() === 'ht.Node';

package/es/utils/topoData.js

@@ -562,6 +562,8 @@ export var combTopoData = function combTopoData(_ref3) {
     // ci类型集合
     ciTypesDoc: ciTypesDoc,
     // 每种ci含有的ci
+    ciTypeMap: ciTypeMap,
+    // ci类型模型map
     metrics: metrics,
     // 所有指标
     metricsDoc: metricsDoc,

package/lib/common/components/ResourceTable/ResourceTable.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _ResourceSelect = _interopRequireDefault(require("../../../components/ResourceList/ResourceSelect"));
+
+var _ResourceTableModule = _interopRequireDefault(require("./ResourceTable.module.scss"));
+
+var _excluded = ["selectionMode", "defaultSelected", "disabledKeys", "typeDicts", "getTableData"];
+
+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; }
+
+function ResourceTable(props, ref) {
+  var selectionMode = props.selectionMode,
+      _props$defaultSelecte = props.defaultSelected,
+      defaultSelected = _props$defaultSelecte === void 0 ? [] : _props$defaultSelecte,
+      disabledKeys = props.disabledKeys,
+      typeDicts = props.typeDicts,
+      getTableData = props.getTableData,
+      otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+  var initialData = {
+    selected: defaultSelected,
+    total: []
+  };
+  return /*#__PURE__*/_react["default"].createElement(_ResourceSelect["default"], (0, _extends2["default"])({
+    ref: ref,
+    className: _ResourceTableModule["default"].container,
+    selectionMode: selectionMode,
+    getTableData: getTableData,
+    initialData: initialData,
+    typeDicts: typeDicts
+  }, otherProps));
+}
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(ResourceTable);
+
+exports["default"] = _default;

package/lib/common/components/ResourceTable/ResourceTable.module.scss

@@ -0,0 +1,9 @@
+.container {
+  height: 100%;
+  :global {
+    .next-table-body {
+      height: 480px !important;
+      max-height: 480px !important;
+    }
+  }
+}

package/lib/components/ResourceList/ResourceSelect.js

@@ -0,0 +1,228 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _utils = require("@riil-frontend/utils");
+
+var _nextFormTable = _interopRequireDefault(require("@ahooksjs/next-form-table"));
+
+var _useFilterPlugin = _interopRequireDefault(require("@ahooksjs/use-filter-plugin"));
+
+var _useSortablePlugin = _interopRequireDefault(require("@ahooksjs/use-sortable-plugin"));
+
+var _useSelectionPlugin = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/plugins/useSelectionPlugin"));
+
+var _cmdb = require("@riil-frontend/component-topology-utils/es/services/cmdb");
+
+var _table = require("@riil-frontend/component-topology-utils/es/utils/table");
+
+var _storage = require("@riil-frontend/component-topology-utils/es/utils/storage");
+
+var _format = require("../../utils/format");
+
+var _FormTable = _interopRequireDefault(require("../FormTable"));
+
+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; }
+
+var PRIMARY_KEY = 'id';
+
+var getTableData = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+    var _params$current, current, _params$pageSize, pageSize, _params$sortBy, sortBy, _params$sortOrder, sortOrder, like, typeCode, condition, ciType, data, dataSource;
+
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _params$current = params.current, current = _params$current === void 0 ? 1 : _params$current, _params$pageSize = params.pageSize, pageSize = _params$pageSize === void 0 ? 20 : _params$pageSize, _params$sortBy = params.sortBy, sortBy = _params$sortBy === void 0 ? 'displayName' : _params$sortBy, _params$sortOrder = params.sortOrder, sortOrder = _params$sortOrder === void 0 ? 'asc' : _params$sortOrder, like = params.like, typeCode = params.typeCode;
+            condition = 'category(\'resource\')';
+
+            if (like) {
+              condition = {
+                conditions: condition,
+                searchValue: like,
+                searchIndexArray: ['displayName', 'ipAddress']
+              };
+            }
+
+            if (typeCode) {
+              ciType = typeCode.split(',');
+
+              if (typeof condition === 'string') {
+                condition = {
+                  conditions: condition,
+                  ciType: ciType
+                };
+              } else {
+                condition.ciType = ciType;
+              }
+            }
+
+            _context.next = 6;
+            return (0, _cmdb.fetchCommonQuery)(condition, sortBy, sortOrder, current, pageSize, '', {
+              usingExtraConditions: false // 绕过权限过滤
+
+            });
+
+          case 6:
+            data = _context.sent;
+            dataSource = data.content && data.content.map(function (item) {
+              var _item$operation;
+
+              return {
+                id: item.id,
+                displayName: item.attributes.displayName,
+                ipAddress: item.attributes.ipAddress,
+                company: item.attributes.company,
+                typeCode: item.typeCode,
+                operation: (_item$operation = item.operation) !== null && _item$operation !== void 0 ? _item$operation : null // 权限字段
+
+              };
+            });
+            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.total, data.page, data.pageSize));
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getTableData(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var ResourceList = function ResourceList(props, ref) {
+  var customGetTableData = props.getTableData,
+      initialData = props.initialData,
+      selectionMode = props.selectionMode,
+      typeDicts = props.typeDicts,
+      className = props.className,
+      _props$showCompanyCol = props.showCompanyColumn,
+      showCompanyColumn = _props$showCompanyCol === void 0 ? true : _props$showCompanyCol,
+      children = props.children;
+  var _initialData$selected = initialData.selected,
+      selectedByMe = _initialData$selected === void 0 ? [] : _initialData$selected,
+      _initialData$total = initialData.total,
+      total = _initialData$total === void 0 ? selectedByMe : _initialData$total;
+
+  var disabledKeys = _lodash["default"].difference(total, selectedByMe);
+
+  var plugins = [(0, _useSortablePlugin["default"])({
+    resetWhenQuery: false,
+    defaultValue: {
+      displayName: 'asc'
+    }
+  }), (0, _useFilterPlugin["default"])(), (0, _useSelectionPlugin["default"])({
+    primaryKey: PRIMARY_KEY,
+    mode: selectionMode,
+    checkIsNeedReset: function checkIsNeedReset() {
+      return false;
+    },
+    checkIsDisabled: function checkIsDisabled(record) {
+      return disabledKeys.some(function (item) {
+        return item === record[PRIMARY_KEY];
+      });
+    }
+  })];
+
+  var _useNextFormTable = (0, _nextFormTable["default"])(customGetTableData || getTableData, {
+    plugins: plugins
+  }),
+      formProps = _useNextFormTable.formProps,
+      tableProps = _useNextFormTable.tableProps,
+      paginationProps = _useNextFormTable.paginationProps,
+      getSelectedRowKeys = _useNextFormTable.getSelectedRowKeys,
+      setSelectedRowKeys = _useNextFormTable.setSelectedRowKeys;
+
+  (0, _react.useEffect)(function () {
+    if (setSelectedRowKeys) {
+      setSelectedRowKeys(selectedByMe);
+    }
+  }, [selectedByMe]);
+  var selectedKeys = getSelectedRowKeys && getSelectedRowKeys();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getSelectedData: function getSelectedData() {
+        return selectedKeys;
+      }
+    };
+  });
+
+  if (selectedKeys) {
+    paginationProps.checkedLen = selectedKeys.length;
+  }
+
+  var filters = {
+    typeCode: typeDicts // company: [],
+
+  };
+  var columns = [{
+    title: '设备名称',
+    dataIndex: 'displayName',
+    sortable: true,
+    cell: _table.getTitleCell
+  }, {
+    title: 'IP地址',
+    dataIndex: 'ipAddress',
+    sortable: true,
+    cell: function cell(ip) {
+      return (0, _table.getTitleCell)((0, _format.getIp)(ip));
+    }
+  }, {
+    title: '类型',
+    dataIndex: 'typeCode',
+    filters: filters.typeCode,
+    cell: function cell(code) {
+      var dict = typeDicts && typeDicts.find(function (item) {
+        return item.value === code;
+      });
+      var name = dict && dict.label || code;
+      return (0, _table.getTitleCell)(name);
+    }
+  }];
+
+  if (showCompanyColumn) {
+    columns.push({
+      title: '厂商',
+      sortable: true,
+      dataIndex: 'company',
+      cell: function cell(code) {
+        var dict = _storage.DICT.get(code);
+
+        var name = dict && dict.name || code;
+        return (0, _table.getTitleCell)(name);
+      }
+    });
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_FormTable["default"], {
+    className: className,
+    formProps: formProps,
+    tableProps: tableProps,
+    paginationProps: paginationProps,
+    filters: filters,
+    columns: columns,
+    showChecked: !!selectionMode,
+    showPageSizeSelector: true
+  }, children);
+};
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(ResourceList);
+
+exports["default"] = _default;

package/lib/components/ResourceList/ResourceSelectConnect.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _utils = require("@riil-frontend/utils");
+
+var _ResourceSelect = _interopRequireDefault(require("./ResourceSelect"));
+
+var _excluded = ["store"];
+
+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; }
+
+function ResourceSelectConnect(props, ref) {
+  var pageStore = props.store,
+      otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+
+  var _pageStore$useModel = pageStore.useModel('ciModel'),
+      pageState = _pageStore$useModel[0],
+      pageDispatchers = _pageStore$useModel[1];
+
+  var typeDicts = pageState.typeDicts;
+  (0, _react.useEffect)(function () {
+    if (!(0, _utils.isAvailableArray)(typeDicts)) {
+      pageDispatchers.getTypeDicts();
+    }
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement(_ResourceSelect["default"], (0, _extends2["default"])({
+    ref: ref
+  }, otherProps, {
+    typeDicts: typeDicts
+  }));
+}
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(ResourceSelectConnect);
+
+exports["default"] = _default;