@riil-frontend/component-topology 11.0.32 → 11.0.33

package/lib/core/services/topo/basic.js

@@ -3,43 +3,182 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
+exports["default"] = exports.TOPO_PARENT_ID = exports.TOPO_GROUP_ID = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
 var _constants = require("./constants");
 
+var API_ROOT = _constants.TOPO_API_ROOT;
+/**
+ * 拓扑图（看做一个容器）的“父容器”ID
+ */
+
+var TOPO_PARENT_ID = -2;
+/**
+ * 拓扑图（看做一个容器）的容器ID
+ */
+
+exports.TOPO_PARENT_ID = TOPO_PARENT_ID;
+var TOPO_GROUP_ID = -1;
+exports.TOPO_GROUP_ID = TOPO_GROUP_ID;
+var DEFAULT_QUERY = {
+  current: 1,
+  pageSize: 200,
+  sortBy: 'name',
+  sortOrder: 'asc'
+};
+
+function prepareResourceParams(conditions, query) {
+  if (query === void 0) {
+    query = DEFAULT_QUERY;
+  }
+
+  var dynamicRes = conditions.dynamic,
+      staticRes = conditions["static"],
+      stateValue = conditions.stateValue;
+  var dynamicCondition = dynamicRes && {
+    stateValue: stateValue,
+    condition: dynamicRes
+  } || undefined;
+
+  if (dynamicCondition && query) {
+    dynamicCondition.currentPage = query.current;
+    dynamicCondition.pageSize = query.pageSize;
+    dynamicCondition.sort = query.sortBy + " " + query.sortOrder;
+  }
+
+  return {
+    dynamicCondition: dynamicCondition,
+    fixedConditionIdList: (staticRes || []).filter(function (ciId) {
+      return !ciId.startsWith('ip:');
+    }),
+    linkIps: (staticRes || []).filter(function (ciId) {
+      return ciId.startsWith('ip:');
+    }).map(function (ciId) {
+      return ciId.replace('ip:', '');
+    })
+  };
+}
+
+function prepareGroupParams(modifiedGroups) {
+  if (modifiedGroups === void 0) {
+    modifiedGroups = [];
+  }
+
+  var groups = modifiedGroups.map(function (group, index) {
+    var id = group.id,
+        layout = group.layout,
+        _group$parentId = group.parentId,
+        parentId = _group$parentId === void 0 ? TOPO_GROUP_ID : _group$parentId,
+        _group$name = group.name,
+        name = _group$name === void 0 ? '' : _group$name,
+        expanded = group.expanded,
+        _group$styles = group.styles,
+        styles = _group$styles === void 0 ? {} : _group$styles,
+        resources = group.resources,
+        tag = group.tag;
+
+    if (!resources) {
+      return null;
+    }
+
+    var topoGroup = {
+      id: id,
+      layout: layout,
+      parentId: parentId,
+      name: name,
+      styles: JSON.stringify(expanded !== undefined ? (0, _extends2["default"])({}, styles, {
+        showExpanded: expanded
+      }) : styles),
+      order: index,
+      tag: tag
+    };
+    return {
+      topoGroup: topoGroup,
+      condition: prepareResourceParams(resources)
+    };
+  }).filter(Boolean);
+  return {
+    groups: groups
+  };
+}
+
 var _default = {
   /**
-  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * 查询拓扑数据
   * @param {Number} id Topo ID
-  * @param {String} data ht拓扑序列化数据
+  * @param {Object} resources
+  * @param {Array} groups
   * @returns
   */
-  saveSerializeData: function saveSerializeData(id, data) {
+  getTopoDataByResource: function getTopoDataByResource(id, resources, groups, exportLinkIdList) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var data, obj;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              data = Array.isArray(groups) ? groups : [];
+
+              if (resources) {
+                data.push({
+                  parentId: TOPO_PARENT_ID,
+                  order: 100,
+                  resources: resources
+                });
+              }
+
+              obj = prepareGroupParams(data);
+              _context.next = 5;
+              return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
+                exportLinkIdList: exportLinkIdList
+              }));
+
+            case 5:
+              return _context.abrupt("return", _context.sent);
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  },
+
+  /**
+  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * @param {Number} id Topo ID
+  * @param {String} data ht拓扑序列化数据
+  * @returns
+  */
+  saveSerializeData: function saveSerializeData(id, data) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
               return _componentTopologyUtils.request.post(_constants.TOPO_API_ROOT + "/structure/" + id, {
                 data: data
               });
 
             case 2:
-              return _context.abrupt("return", _context.sent);
+              return _context2.abrupt("return", _context2.sent);
 
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }))();
   }
 };

package/lib/core/store/models/topoBizMod.js

@@ -65,40 +65,6 @@ function _default(engine) {
             }, _callee);
           }))();
         },
-        // 根据ci的id获取属性的值
-        getCiArrByIds: function getCiArrByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var resIdsList, result;
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
-                    // const ciIds = encodeURIComponent(resIdsList);
-
-                    _context2.prev = 1;
-                    _context2.next = 4;
-                    return _topo["default"].getBatchCiArr({
-                      ids: resIdsList
-                    });
-
-                  case 4:
-                    result = _context2.sent;
-                    return _context2.abrupt("return", result.content);
-
-                  case 8:
-                    _context2.prev = 8;
-                    _context2.t0 = _context2["catch"](1);
-                    return _context2.abrupt("return", null);
-
-                  case 11:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2, null, [[1, 8]]);
-          }))();
-        },
 
         /**
         * 设置属性和指标

package/lib/networkTopo/services/topo/basic.js

@@ -21,8 +21,6 @@ var _blacklist = _interopRequireDefault(require("./blacklist"));
 
 var _constants = require("./constants");
 
-var _cmdb = require("../cmdb");
-
 var _model = require("../model");
 
 var _exitLinkUtil = require("../../utils/exitLinkUtil");
@@ -48,10 +46,6 @@ var DEFAULT_QUERY = {
   sortOrder: 'asc'
 };
 
-function isAvailableArray(arr) {
-  return arr && Array.isArray(arr) && arr.length > 0;
-}
-
 function prepareResourceParams(conditions, query) {
   if (query === void 0) {
     query = DEFAULT_QUERY;
@@ -59,10 +53,7 @@ function prepareResourceParams(conditions, query) {
 
   var dynamicRes = conditions.dynamic,
       staticRes = conditions["static"],
-      stateValue = conditions.stateValue; // if (isNull(dynamicRes) && isNull(staticRes)) {
-  //   return null;
-  // }
-
+      stateValue = conditions.stateValue;
   var dynamicCondition = dynamicRes && {
     stateValue: stateValue,
     condition: dynamicRes
@@ -474,7 +465,7 @@ var _default = (0, _extends2["default"])({
         while (1) {
           switch (_context13.prev = _context13.next) {
             case 0:
-              data = isAvailableArray(groups) ? groups : [];
+              data = Array.isArray(groups) ? groups : [];
 
               if (resources) {
                 data.push({
@@ -523,7 +514,7 @@ var _default = (0, _extends2["default"])({
           switch (_context14.prev = _context14.next) {
             case 0:
               groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
-              newGroups = isAvailableArray(groups) ? groups : [];
+              newGroups = Array.isArray(groups) ? groups : [];
 
               if (resources) {
                 // 新建拓扑时
@@ -659,48 +650,6 @@ var _default = (0, _extends2["default"])({
     }))();
   },
 
-  /**
-  * 根据资源id获取属性及属性值
-  * @param {*} params Topo ID
-  */
-  getAttributesByIds: function getAttributesByIds(params) {
-    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19() {
-      var _params$ids;
-
-      var param;
-      return _regenerator["default"].wrap(function _callee19$(_context19) {
-        while (1) {
-          switch (_context19.prev = _context19.next) {
-            case 0:
-              if (!(((_params$ids = params.ids) === null || _params$ids === void 0 ? void 0 : _params$ids.length) > 0)) {
-                _context19.next = 6;
-                break;
-              }
-
-              param = {
-                condition: "id('" + params.ids.join("','") + "')",
-                sort: 'index DESC',
-                currentPage: 1,
-                pageSize: params.ids.length > 10 ? params.ids.length : 10
-              };
-
-              _rlog["default"].debug('getAttributesByIds', param);
-
-              _context19.next = 5;
-              return (0, _cmdb.commonQuery)(param);
-
-            case 5:
-              return _context19.abrupt("return", _context19.sent);
-
-            case 6:
-            case "end":
-              return _context19.stop();
-          }
-        }
-      }, _callee19);
-    }))();
-  },
-
   /**
   * 批量查询ci信息接口
   * @param {*} params Topo ID
@@ -725,47 +674,28 @@ var _default = (0, _extends2["default"])({
     }
   },
 
-  /**
-  * 批量查询ci属性
-  * @param {*} params Topo ID
-  */
-  getBatchCiArr: function getBatchCiArr(params) {
-    var _params$ids2;
-
-    if (((_params$ids2 = params.ids) === null || _params$ids2 === void 0 ? void 0 : _params$ids2.length) > 0) {
-      var param = {
-        condition: "id('" + params.ids.join("','") + "')",
-        sort: 'name asc',
-        currentPage: 1,
-        pageSize: 999
-      }; // rlog.debug('getBatchCi', param);
-
-      return (0, _cmdb.commonQuery)(param);
-    }
-  },
-
   /**
   * 批量查询ci指标属性
   * @param {*} params Topo ID
   */
   getBatchCiPolling: function getBatchCiPolling(params) {
-    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee20() {
-      return _regenerator["default"].wrap(function _callee20$(_context20) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee19() {
+      return _regenerator["default"].wrap(function _callee19$(_context19) {
         while (1) {
-          switch (_context20.prev = _context20.next) {
+          switch (_context19.prev = _context19.next) {
             case 0:
-              _context20.next = 2;
+              _context19.next = 2;
               return _componentTopologyUtils.request.post(_constants.TOPO_API_ROOT + "/attributes/polling", params);
 
             case 2:
-              return _context20.abrupt("return", _context20.sent);
+              return _context19.abrupt("return", _context19.sent);
 
             case 3:
             case "end":
-              return _context20.stop();
+              return _context19.stop();
           }
         }
-      }, _callee20);
+      }, _callee19);
     }))();
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.32",
+  "version": "11.0.33",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -80,8 +80,9 @@
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
     "@riil-frontend/utils": "^1.0.20",
+    "@types/jest": "^29.5.4",
     "axios": "^0.21.1",
-    "build-plugin-component": "^1.9.2",
+    "build-plugin-component": "^1.12.1",
     "build-plugin-fusion": "^0.1.0",
     "build-plugin-moment-locales": "^0.1.0",
     "build-scripts": "^1.1.1",
@@ -92,7 +93,9 @@
     "enzyme-adapter-react-16": "^1.15.4",
     "eslint": "^6.0.1",
     "html2canvas": "^1.3.2",
-    "jest": "^29.6.2",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^24.9.0",
+    "jest-environment-jsdom": "^24.9.0",
     "jspdf": "^2.3.1",
     "lnk-cli": "^1.0.1",
     "lodash": "^4.17.19",
@@ -118,6 +121,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.32/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.33/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

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

@@ -1,102 +0,0 @@
-import _Button from "@alifd/next/es/button";
-import _Input from "@alifd/next/es/input";
-import _Form from "@alifd/next/es/form";
-import React, { useState, useEffect } from "react";
-import { isUniqueIp } from "../../../../../../../networkTopo/utils/exitLinkUtil";
-var FormItem = _Form.Item;
-/**
- * @return {React.ReactNode | null}
- */
-
-export default function BindIpInput(props) {
-  var _values$attrObjectBi;
-
-  var nodeElement = props.nodeElement,
-      topo = props.topo,
-      topoEditApi = props.topoEditApi,
-      values = props.values,
-      onChange = props.onChange,
-      fieldItem = props.fieldItem; // const currentResId = node.tag;
-  // console.log(
-  //   "nodeElement, topo, topoEditApi, node",
-  //   nodeElement,
-  //   topo,
-  //   topoEditApi,
-  //   values
-  // );
-
-  var _useState = useState(""),
-      error = _useState[0],
-      setError = _useState[1];
-
-  var _useState2 = useState((_values$attrObjectBi = values["attrObject.bindIp"]) !== null && _values$attrObjectBi !== void 0 ? _values$attrObjectBi : ""),
-      txtValue = _useState2[0],
-      setTxtValue = _useState2[1];
-
-  var saveIp = function saveIp(v) {
-    fieldItem.validate(function (errors, vals) {
-      if (errors) {
-        console.error("saveIp-error", errors, vals);
-      } else {
-        setError("");
-        onChange(txtValue);
-        topoEditApi.relateNodeIp(txtValue, nodeElement);
-      }
-    });
-  };
-
-  useEffect(function () {
-    fieldItem.reset();
-    setTxtValue(values["attrObject.bindIp"]);
-  }, [values]);
-
-  var inputChange = function inputChange(v) {
-    setTxtValue(v); // onChange(v);
-  }; // 图片节点验证ip唯一性
-
-
-  var checkIp = function checkIp(rule, value, callback) {
-    var dm = topo.getDataModel();
-    var isUnique = isUniqueIp(dm, value, nodeElement); // console.log("checkIp", isUnique);
-
-    if (!isUnique) {
-      return callback("ip不能重复");
-    } else {
-      return callback();
-    }
-  };
-
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: "flex",
-      width: "100%"
-    }
-  }, /*#__PURE__*/React.createElement(FormItem, {
-    label: "\u5173\u8054IP",
-    pattern: /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/,
-    patternTrigger: "onBlur",
-    patternMessage: "IP\u5730\u5740\u683C\u5F0F\u4E0D\u6B63\u786E",
-    validator: checkIp,
-    style: {
-      width: "100%"
-    }
-  }, /*#__PURE__*/React.createElement(_Input, {
-    placeholder: "\u8BF7\u8F93\u5165IP\u5730\u5740",
-    name: "attrObject.bindIp",
-    state: error,
-    value: txtValue,
-    maxLength: 128,
-    onChange: inputChange,
-    style: {
-      width: 200
-    }
-  })), /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    text: true,
-    onClick: saveIp,
-    style: {
-      marginLeft: 8,
-      marginTop: 27
-    }
-  }, "\u4FDD\u5B58"));
-}

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

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

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

@@ -1,118 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = BindIpInput;
-
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
-var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _exitLinkUtil = require("../../../../../../../networkTopo/utils/exitLinkUtil");
-
-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 FormItem = _form["default"].Item;
-/**
- * @return {React.ReactNode | null}
- */
-
-function BindIpInput(props) {
-  var _values$attrObjectBi;
-
-  var nodeElement = props.nodeElement,
-      topo = props.topo,
-      topoEditApi = props.topoEditApi,
-      values = props.values,
-      onChange = props.onChange,
-      fieldItem = props.fieldItem; // const currentResId = node.tag;
-  // console.log(
-  //   "nodeElement, topo, topoEditApi, node",
-  //   nodeElement,
-  //   topo,
-  //   topoEditApi,
-  //   values
-  // );
-
-  var _useState = (0, _react.useState)(""),
-      error = _useState[0],
-      setError = _useState[1];
-
-  var _useState2 = (0, _react.useState)((_values$attrObjectBi = values["attrObject.bindIp"]) !== null && _values$attrObjectBi !== void 0 ? _values$attrObjectBi : ""),
-      txtValue = _useState2[0],
-      setTxtValue = _useState2[1];
-
-  var saveIp = function saveIp(v) {
-    fieldItem.validate(function (errors, vals) {
-      if (errors) {
-        console.error("saveIp-error", errors, vals);
-      } else {
-        setError("");
-        onChange(txtValue);
-        topoEditApi.relateNodeIp(txtValue, nodeElement);
-      }
-    });
-  };
-
-  (0, _react.useEffect)(function () {
-    fieldItem.reset();
-    setTxtValue(values["attrObject.bindIp"]);
-  }, [values]);
-
-  var inputChange = function inputChange(v) {
-    setTxtValue(v); // onChange(v);
-  }; // 图片节点验证ip唯一性
-
-
-  var checkIp = function checkIp(rule, value, callback) {
-    var dm = topo.getDataModel();
-    var isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, value, nodeElement); // console.log("checkIp", isUnique);
-
-    if (!isUnique) {
-      return callback("ip不能重复");
-    } else {
-      return callback();
-    }
-  };
-
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      display: "flex",
-      width: "100%"
-    }
-  }, /*#__PURE__*/_react["default"].createElement(FormItem, {
-    label: "\u5173\u8054IP",
-    pattern: /^((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))$/,
-    patternTrigger: "onBlur",
-    patternMessage: "IP\u5730\u5740\u683C\u5F0F\u4E0D\u6B63\u786E",
-    validator: checkIp,
-    style: {
-      width: "100%"
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
-    placeholder: "\u8BF7\u8F93\u5165IP\u5730\u5740",
-    name: "attrObject.bindIp",
-    state: error,
-    value: txtValue,
-    maxLength: 128,
-    onChange: inputChange,
-    style: {
-      width: 200
-    }
-  })), /*#__PURE__*/_react["default"].createElement(_button["default"], {
-    type: "primary",
-    text: true,
-    onClick: saveIp,
-    style: {
-      marginLeft: 8,
-      marginTop: 27
-    }
-  }, "\u4FDD\u5B58"));
-}

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

@@ -1,23 +0,0 @@
-"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());
-
-  if (!data) {
-    return '';
-  }
-
-  return data.level === '0' ? data.sourceName : '本级平台';
-}
-
-var _default = PlatformDisplay;
-exports["default"] = _default;