@riil-frontend/component-topology 2.7.1 → 2.7.5

package/es/models/topoCreateMod.js

@@ -264,68 +264,27 @@ export default function (topoApp) {
     },
     effects: function effects(dispatch) {
       return {
-        getResourceList: function getResourceList(payload) {
+        getConditions: function getConditions() {
           var _this = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            var _payload$index, index, resources, conditions, data;
-
+            var data, groupTopo, resources, groups;
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
-                    _payload$index = payload.index, index = _payload$index === void 0 ? -1 : _payload$index, resources = payload.resources;
-                    conditions = resToConditions(resources) || {};
-
-                    if (!(conditions.dynamic || conditions["static"])) {
-                      _context.next = 7;
-                      break;
-                    }
-
-                    _context.next = 5;
-                    return topoService.getResourceList(conditions);
-
-                  case 5:
-                    data = _context.sent;
-
-                    if (index < 0) {
-                      _this.updateResList(data);
-                    } else {
-                      _this.updateGroupResList({
-                        index: index,
-                        data: data
-                      });
-                    }
-
-                  case 7:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }))();
-        },
-        getConditions: function getConditions() {
-          var _this2 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var data, groupTopo, resources, groups;
-            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
+                    _context.next = 2;
                     return topoService.getConditions(topoApp.id);
 
                   case 2:
-                    data = _context2.sent;
+                    data = _context.sent;
 
                     if (isAvailableArray(data)) {
-                      _context2.next = 5;
+                      _context.next = 5;
                       break;
                     }
 
-                    return _context2.abrupt("return");
+                    return _context.abrupt("return");
 
                   case 5:
                     // 视图
@@ -358,28 +317,28 @@ export default function (topoApp) {
                       };
                     });
 
-                    _this2.update({
+                    _this.update({
                       resources: resources,
                       groups: groups
                     });
 
                   case 9:
                   case "end":
-                    return _context2.stop();
+                    return _context.stop();
                 }
               }
-            }, _callee2);
+            }, _callee);
           }))();
         },
         fetchData: function fetchData(params, rootState) {
-          var _this3 = this;
+          var _this2 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
             var editState, resources, _editState$groups, groups, query, data;
 
-            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     editState = rootState.topoCreateMod;
                     resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
@@ -388,30 +347,30 @@ export default function (topoApp) {
                       resources: resources,
                       groups: groups
                     };
-                    _context3.next = 5;
-                    return _this3.getTopoByConditions(query);
+                    _context2.next = 5;
+                    return _this2.getTopoByConditions(query);
 
                   case 5:
-                    data = _context3.sent;
-                    return _context3.abrupt("return", data);
+                    data = _context2.sent;
+                    return _context2.abrupt("return", data);
 
                   case 7:
                   case "end":
-                    return _context3.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee3);
+            }, _callee2);
           }))();
         },
         getTopoByConditions: function getTopoByConditions(params, state) {
-          var _this4 = this;
+          var _this3 = this;
 
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
             var topoId, resources, groups, conditions, groupInfo, data, _yield$Promise$all, ciTypeMap, links, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
-            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
               while (1) {
-                switch (_context4.prev = _context4.next) {
+                switch (_context3.prev = _context3.next) {
                   case 0:
                     rlog.debug('getTopoByConditions--------', params);
                     topoId = params.id, resources = params.resources, groups = params.groups;
@@ -422,17 +381,17 @@ export default function (topoApp) {
                         resources: resToConditions(group.resources)
                       });
                     });
-                    _context4.next = 6;
+                    _context3.next = 6;
                     return topoService.getTopoDataByResource(topoId, conditions, groupInfo);
 
                   case 6:
-                    data = _context4.sent;
+                    data = _context3.sent;
                     rlog.debug('getTopoByConditions--------', data, groupInfo);
-                    _context4.next = 10;
+                    _context3.next = 10;
                     return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), getLinksDetail(data.links), dispatch.iconManage.getIcons()]);
 
                   case 10:
-                    _yield$Promise$all = _context4.sent;
+                    _yield$Promise$all = _context3.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     links = _yield$Promise$all[1];
                     _combTopoData = combTopoData({
@@ -445,13 +404,13 @@ export default function (topoApp) {
                       ciTypeMap: ciTypeMap
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
 
-                    _this4.update({
+                    _this3.update({
                       elements: topoData
                     });
 
                     topoDataTrans = transformTopoElements(topoData);
 
-                    _this4.updateTopo(topoDataTrans); // const allCiSet = state.topoBizMod.allCiSet;
+                    _this3.updateTopo(topoDataTrans); // const allCiSet = state.topoBizMod.allCiSet;
                     // rlog.debug(
                     //   '新添加资源什么情况-topoData-resAndMetrics-allCiSet',
                     //   topoData,
@@ -466,41 +425,41 @@ export default function (topoApp) {
                     // });
                     // 返回查询后的数据，便于外部获取到数据后像HT通知更新
 
-                    return _context4.abrupt("return", topoDataTrans);
+                    return _context3.abrupt("return", topoDataTrans);
 
                   case 19:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
         saveTopo: function saveTopo(data, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
             var topoId, template, layout, global, resources, groups, serialize, layoutId, conditions, groupInfo;
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
-                switch (_context5.prev = _context5.next) {
+                switch (_context4.prev = _context4.next) {
                   case 0:
                     topoId = data.id, template = data.template, layout = data.layout, global = data.global, resources = data.resources, groups = data.groups, serialize = data.serialize; // 保存布局
 
                     if (!(template && layout)) {
-                      _context5.next = 5;
+                      _context4.next = 5;
                       break;
                     }
 
                     layoutId = getLayoutId(layout);
-                    _context5.next = 5;
+                    _context4.next = 5;
                     return topoService.changeLayout(topoId, template, layoutId);
 
                   case 5:
                     if (!global) {
-                      _context5.next = 8;
+                      _context4.next = 8;
                       break;
                     }
 
-                    _context5.next = 8;
+                    _context4.next = 8;
                     return topoService.saveTopoSettings(topoId, combSaveTopoData({
                       global: global,
                       ciSetDoc: state.topoBizMod.ciSetDoc,
@@ -509,16 +468,16 @@ export default function (topoApp) {
 
                   case 8:
                     if (!serialize) {
-                      _context5.next = 11;
+                      _context4.next = 11;
                       break;
                     }
 
-                    _context5.next = 11;
+                    _context4.next = 11;
                     return topoService.saveSerializeData(topoId, serialize);
 
                   case 11:
                     if (!(resources || groups)) {
-                      _context5.next = 16;
+                      _context4.next = 16;
                       break;
                     }
 
@@ -529,34 +488,34 @@ export default function (topoApp) {
                         resources: resToConditions(group.resources, true)
                       });
                     });
-                    _context5.next = 16;
+                    _context4.next = 16;
                     return topoService.bindResourceToTopo(topoId, conditions, groupInfo);
 
                   case 16:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }
-            }, _callee5);
+            }, _callee4);
           }))();
         },
         addToBlockList: function addToBlockList(data) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
             var topoId, ciIdList;
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
               while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context5.prev = _context5.next) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
-                    _context6.next = 3;
+                    _context5.next = 3;
                     return topoService.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":
-                    return _context6.stop();
+                    return _context5.stop();
                 }
               }
-            }, _callee6);
+            }, _callee5);
           }))();
         },
         switchToEditMode: function switchToEditMode() {},

package/es/models/topoMod.js

@@ -19,14 +19,13 @@ export default function (topoApp) {
       urlParams: {},
       topoLoading: true,
       topoLoadError: false,
-      topoId: '',
-      topoName: '',
-      topoPermission: undefined,
       viewState: 'view',
       // view, create, 2种模式
-      // lastRefresh: undefined,
+      topoId: '',
+      topoName: '',
       topoData: null,
       currentTopo: undefined,
+      topoPermission: undefined,
       currentNode: {
         id: '',
         name: '无数据'
@@ -175,7 +174,10 @@ export default function (topoApp) {
         },
         clearData: function clearData() {
           this.update({
-            topoData: null
+            topoId: '',
+            topoName: '',
+            topoData: null,
+            currentTopo: undefined
           });
         },
         switchToViewMode: function switchToViewMode(playload, rootState) {

package/es/topoCenter/store/topoTreeMod.js

@@ -24,7 +24,9 @@ function findSelectedParentIds(data, selectedId) {
   if (!node.item) return [];
 
   if (node.pid != -1 && node.item.id) {
-    return node.item.type === 0 ? ["" + node.item.id].concat(findSelectedParentIds(data, node.pid)) : [].concat(findSelectedParentIds(data, node.pid));
+    var _node$children;
+
+    return (_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length ? ["" + node.item.id].concat(findSelectedParentIds(data, node.pid)) : [].concat(findSelectedParentIds(data, node.pid));
   } else {
     return ["" + node.item.id];
   }
@@ -369,7 +371,7 @@ export default function (topoApp) {
           var parentIds = findSelectedParentIds(treeState.treeData, id);
           expandedKeys.push.apply(expandedKeys, parentIds);
           this.update({
-            selectedNode: [id],
+            selectedNode: ["" + id],
             expandedKeys: expandedKeys
           });
         }

package/es/utils/template.js

@@ -32,7 +32,7 @@ export var INIT_STATIC_STATE = {
  */
 
 export var DEFAULT_LAYOUT = {
-  id: 'circular'
+  id: 'hierarchical'
 };
 /**
  * 默认容器数据

package/lib/components/ResourceList/ResourceSelect.js

@@ -46,7 +46,7 @@ var getTableData = /*#__PURE__*/function () {
         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\')';
+            condition = 'type(\'common_network\',\'switch\',\'switch_cluster\',\'linux\',\'windows\',\'oracle\',\'oracle.asm_disk_group\',\'tomcat\',\'application\',\'service\') && category(\'resource\')';
 
             if (like) {
               condition = {
@@ -90,7 +90,7 @@ var getTableData = /*#__PURE__*/function () {
 
               };
             });
-            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.total, data.page, data.pageSize));
+            return _context.abrupt("return", (0, _format.formatDataForTable)(dataSource, data.totalRecord, data.pageIndex, data.pageSize));
 
           case 9:
           case "end":
@@ -172,7 +172,7 @@ var ResourceList = function ResourceList(props, ref) {
 
   };
   var defaultColumns = [{
-    title: '设备名称',
+    title: '资源名称',
     dataIndex: 'displayName',
     sortable: true,
     cell: _table.getTitleCell
@@ -184,7 +184,7 @@ var ResourceList = function ResourceList(props, ref) {
       return (0, _table.getTitleCell)((0, _format.getIp)(ip));
     }
   }, {
-    title: '类型',
+    title: '资源类型',
     dataIndex: 'typeCode',
     filters: filters.typeCode,
     cell: function cell(code) {
@@ -194,17 +194,17 @@ var ResourceList = function ResourceList(props, ref) {
       var name = dict && dict.label || code;
       return (0, _table.getTitleCell)(name);
     }
-  }, {
-    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);
-    }
-  }];
+  } // {
+  //   title: '厂商',
+  //   sortable: true,
+  //   dataIndex: 'company',
+  //   cell: (code) => {
+  //     const dict = DICT.get(code);
+  //     const name = (dict && dict.name) || code;
+  //     return getTitleCell(name);
+  //   },
+  // }
+  ];
   return /*#__PURE__*/_react["default"].createElement(_FormTable["default"], {
     className: className || _ResourceSelectModule["default"].table,
     formProps: formProps,

package/lib/components/TagSelect/index.js

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _tag = _interopRequireDefault(require("@alifd/next/lib/tag"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+require("./index.scss");
+
+var SelectableTag = _tag["default"].Selectable;
+
+var TagSelect = function TagSelect(props) {
+  var _onChange = props.onChange,
+      value = props.value,
+      dataSource = props.dataSource,
+      defaultValue = props.defaultValue,
+      boxProps = props.boxProps,
+      tagProps = props.tagProps;
+
+  var _useState = (0, _react.useState)(value || defaultValue),
+      current = _useState[0],
+      setCurrent = _useState[1];
+
+  (0, _react.useEffect)(function () {
+    if (value) {
+      setCurrent(value);
+    }
+  }, [value]);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "tag-select-wrap"
+  }, /*#__PURE__*/_react["default"].createElement(_box["default"], (0, _extends2["default"])({
+    spacing: 8,
+    wrap: true,
+    direction: "row"
+  }, boxProps), dataSource.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "tag-select-item",
+      key: "wrap-" + item.key
+    }, /*#__PURE__*/_react["default"].createElement(SelectableTag, (0, _extends2["default"])({
+      key: item.key,
+      checked: current === item.key,
+      onChange: function onChange(checked) {
+        _onChange && _onChange(item.key);
+
+        if (!('value' in props)) {
+          setCurrent(item.key);
+        }
+      }
+    }, tagProps), item.content));
+  })));
+};
+
+TagSelect.propTypes = {
+  onChange: _propTypes["default"].func,
+  value: _propTypes["default"].string,
+  defaultValue: _propTypes["default"].string,
+  dataSource: _propTypes["default"].array,
+  boxProps: _propTypes["default"].any
+};
+TagSelect.defaultProps = {
+  boxProps: {}
+};
+var _default = TagSelect;
+exports["default"] = _default;

package/lib/components/TagSelect/index.scss

@@ -0,0 +1,27 @@
+/* write style here */
+@import '@alifd/next/variables.scss';
+.tag-select-wrap {
+	.tag-select-item {
+		text-align: -webkit-center;
+		.#{$css-prefix}tag {
+			height: auto;
+			line-height: 0;
+			&::before {
+				z-index: 1;
+			}
+			&::after {
+				z-index: 1;
+			}
+			.#{$css-prefix}tag-body {
+        width: 100%;
+				padding: 0;
+				.tag-select-img {
+				}
+			}
+		}
+		.tag-select-label {
+			margin-top: 4px;
+			max-width: fit-content;
+		}
+	}
+}

package/lib/components/TemplateButton/index.js

@@ -11,7 +11,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireDefault(require("react"));
 
-var _classnames2 = _interopRequireDefault(require("classnames"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
 var _Icon = _interopRequireDefault(require("./Icon"));
 
@@ -20,8 +20,6 @@ var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 var _excluded = ["className", "children", "icon", "id", "selected", "onSelect", "size"];
 
 var TemplateButton = function TemplateButton(props) {
-  var _classnames;
-
   var className = props.className,
       children = props.children,
       icon = props.icon,
@@ -37,7 +35,18 @@ var TemplateButton = function TemplateButton(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames2["default"])(_indexModule["default"].card, className, (_classnames = {}, _classnames[_indexModule["default"].selected] = selected, _classnames[_indexModule["default"].sizeSmall] = size === 'small', _classnames[_indexModule["default"].sizeLarge] = size === 'large', _classnames)),
+    className: (0, _classnames["default"])(_indexModule["default"].card, className),
+    onClick: handleClick
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].iconWrapper
+  }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], (0, _extends2["default"])({
+    className: _indexModule["default"].icon,
+    type: icon
+  }, rest))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].text
+  }, children));
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(_indexModule["default"].card, className),
     onClick: handleClick
   }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], (0, _extends2["default"])({
     className: _indexModule["default"].icon,

package/lib/components/TemplateButton/index.module.scss

@@ -1,41 +1,28 @@
 @import "@alifd/next/variables";
 
 .card {
-  display: inline-flex;
+  display: flex;
   flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  border: 1px solid #c4c6cf;
-  width: 120px;
-  height: 136px;
-  background-color: #fff;
-  text-align: center;
+  width: 100%;
+  height: 100%;
   cursor: pointer;
-  vertical-align: middle;
-  margin-right: 12px;
-
-  &:hover, &:focus, &.selected {
-    border-color: $color-brand1-5;
-  }
-
-  &.sizeNormal {
-    width: 120px;
-    height: 136px;
-  }
+}
 
-  &.sizeSmall {
-    width: 50px;
-    height: 50px;
-  }
+.iconWrapper {
+  display: flex;
+  flex: 1;
+  justify-content: center;
+  align-items: center;
 }
 
 .icon {
-  width: 50%;
+  width: 120px;
 }
 
 .text {
-  font-size: $font-size-body-1;
-  margin-top: 10px;
+  font-size: 18px;
+  margin-top: 16px;
+  padding-bottom: 24px;
   color: $color-text1-3;
   outline: none;
 }