@riil-frontend/component-topology 11.0.32 → 11.0.33

package/es/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -33,7 +33,7 @@
       font-size: 12px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
-      color: #4D6277;
+      color:$color-text1-4;
       line-height: 17px;
     }
 

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

@@ -9,9 +9,6 @@ import React, { useEffect } from 'react';
 import variables from '@alifd/theme-19926/variables.js';
 import textStyles from "../../../../../../common/text.module.scss";
 import NodeRelateResourceButton from "./NodeRelateResourceButton";
-import PlatformDisplay from "./PlatformDisplay";
-import BindIpInput from "./BindIpInput";
-import { isUniqueIp } from "../../../../../../../networkTopo/utils/exitLinkUtil";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
@@ -29,7 +26,7 @@ function getBindType(values) {
     return values.attrObject.bindType;
   }
 
-  if (values.tag && !values.tag.startsWith('ip:')) {
+  if (values.tag) {
     return 'resource';
   }
 
@@ -43,7 +40,7 @@ export default function Data(props) {
       values = props.values,
       _onChange = props.onChange,
       editorProps = props.editorProps;
-  var bindType = getBindType(values); // console.log("node, values", node, values);
+  var bindType = getBindType(values);
 
   var field = _Field.useField({
     autoUnmount: false,
@@ -116,7 +113,7 @@ export default function Data(props) {
   }, /*#__PURE__*/React.createElement(_Form, {
     field: field,
     labelAlign: "top"
-  }, (!values.tag || bindType === 'ip') && /*#__PURE__*/React.createElement(_Form.Item, {
+  }, !values.tag && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5173\u8054\u7C7B\u578B"
   }, /*#__PURE__*/React.createElement(_Select, {
     name: "bindType",
@@ -130,9 +127,7 @@ export default function Data(props) {
     value: "none"
   }, "\u672A\u5173\u8054"), /*#__PURE__*/React.createElement(Option, {
     value: "resource"
-  }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/React.createElement(Option, {
-    value: "ip"
-  }, "\u5173\u8054IP"), RelateTopoTree && /*#__PURE__*/React.createElement(Option, {
+  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/React.createElement(Option, {
     value: "topo"
   }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5173\u8054\u8D44\u6E90"
@@ -156,35 +151,11 @@ export default function Data(props) {
     topo: topo,
     topoEditApi: topoEditApi,
     nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
-  }))), bindType === 'ip' &&
-  /*#__PURE__*/
-  // <Form.Item
-  //   label="关联IP"
-  //   // style={{ display: "flex" }}
-  //   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地址格式不正确"
-  // >
-  React.createElement(BindIpInput, {
-    nodeElement: node,
-    values: values,
-    topo: topo,
-    fieldItem: field,
-    topoEditApi: topoEditApi,
-    placeholder: "\u8BF7\u8F93\u5165",
-    name: "attrObject.bindIp",
-    onChange: _onChange,
-    maxLength: 128
-  }) // </Form.Item>
-  , bindType === 'topo' && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
+  }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/React.createElement(RelateTopoTree, {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: "\u6240\u5C5E\u5E73\u53F0"
-  }, /*#__PURE__*/React.createElement(PlatformDisplay, props)))));
+  })))));
 }

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "11.0.32" === 'string' ? "11.0.32" : null;
+var version = typeof "11.0.33" === 'string' ? "11.0.33" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -1,34 +1,170 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@riil-frontend/component-topology-utils';
 import { TOPO_API_ROOT } from "./constants";
+var API_ROOT = TOPO_API_ROOT;
+/**
+ * 拓扑图（看做一个容器）的“父容器”ID
+ */
+
+export var TOPO_PARENT_ID = -2;
+/**
+ * 拓扑图（看做一个容器）的容器ID
+ */
+
+export var TOPO_GROUP_ID = -1;
+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 ? _extends({}, styles, {
+        showExpanded: expanded
+      }) : styles),
+      order: index,
+      tag: tag
+    };
+    return {
+      topoGroup: topoGroup,
+      condition: prepareResourceParams(resources)
+    };
+  }).filter(Boolean);
+  return {
+    groups: groups
+  };
+}
+
 export 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var data, obj;
       return _regeneratorRuntime.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 request.post(API_ROOT + "/structure/byCondition/" + id, _extends({}, 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 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
               return request.post(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/es/core/store/models/topoBizMod.js

@@ -53,40 +53,6 @@ export default function (engine) {
             }, _callee);
           }))();
         },
-        // 根据ci的id获取属性的值
-        getCiArrByIds: function getCiArrByIds(conditions, state) {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-            var resIdsList, result;
-            return _regeneratorRuntime.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 topoServer.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/es/networkTopo/services/topo/basic.js

@@ -7,7 +7,6 @@ import { request } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import blackList from "./blacklist";
 import { TOPO_API_ROOT } from "./constants";
-import { commonQuery } from "../cmdb";
 import { getBatchCi as _getBatchCi, getBatchCiMetric as _getBatchCiMetric } from "../model";
 import { processByConditionResult, processExitLink } from "../../utils/exitLinkUtil";
 var API_ROOT = TOPO_API_ROOT;
@@ -28,10 +27,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;
@@ -39,10 +34,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
@@ -454,7 +446,7 @@ export default _extends({
         while (1) {
           switch (_context13.prev = _context13.next) {
             case 0:
-              data = isAvailableArray(groups) ? groups : [];
+              data = Array.isArray(groups) ? groups : [];
 
               if (resources) {
                 data.push({
@@ -503,7 +495,7 @@ export default _extends({
           switch (_context14.prev = _context14.next) {
             case 0:
               groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = _objectWithoutPropertiesLoose(config, _excluded);
-              newGroups = isAvailableArray(groups) ? groups : [];
+              newGroups = Array.isArray(groups) ? groups : [];
 
               if (resources) {
                 // 新建拓扑时
@@ -638,46 +630,6 @@ export default _extends({
     }))();
   },
 
-  /**
-  * 根据资源id获取属性及属性值
-  * @param {*} params Topo ID
-  */
-  getAttributesByIds: function getAttributesByIds(params) {
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
-      var _params$ids;
-
-      var param;
-      return _regeneratorRuntime.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.debug('getAttributesByIds', param);
-              _context19.next = 5;
-              return commonQuery(param);
-
-            case 5:
-              return _context19.abrupt("return", _context19.sent);
-
-            case 6:
-            case "end":
-              return _context19.stop();
-          }
-        }
-      }, _callee19);
-    }))();
-  },
-
   /**
   * 批量查询ci信息接口
   * @param {*} params Topo ID
@@ -702,47 +654,28 @@ export default _extends({
     }
   },
 
-  /**
-  * 批量查询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 commonQuery(param);
-    }
-  },
-
   /**
   * 批量查询ci指标属性
   * @param {*} params Topo ID
   */
   getBatchCiPolling: function getBatchCiPolling(params) {
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20() {
-      return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
+      return _regeneratorRuntime.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 request.post(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/lib/core/editor/components/Toolbar/widgets/IconSelect/index.module.scss

@@ -33,7 +33,7 @@
       font-size: 12px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
-      color: #4D6277;
+      color:$color-text1-4;
       line-height: 17px;
     }
 

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

@@ -27,12 +27,6 @@ var _textModule = _interopRequireDefault(require("../../../../../../common/text.
 
 var _NodeRelateResourceButton = _interopRequireDefault(require("./NodeRelateResourceButton"));
 
-var _PlatformDisplay = _interopRequireDefault(require("./PlatformDisplay"));
-
-var _BindIpInput = _interopRequireDefault(require("./BindIpInput"));
-
-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; }
@@ -54,7 +48,7 @@ function getBindType(values) {
     return values.attrObject.bindType;
   }
 
-  if (values.tag && !values.tag.startsWith('ip:')) {
+  if (values.tag) {
     return 'resource';
   }
 
@@ -68,7 +62,7 @@ function Data(props) {
       values = props.values,
       _onChange = props.onChange,
       editorProps = props.editorProps;
-  var bindType = getBindType(values); // console.log("node, values", node, values);
+  var bindType = getBindType(values);
 
   var field = _field["default"].useField({
     autoUnmount: false,
@@ -141,7 +135,7 @@ function Data(props) {
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
     labelAlign: "top"
-  }, (!values.tag || bindType === 'ip') && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u7C7B\u578B"
   }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
     name: "bindType",
@@ -155,9 +149,7 @@ function Data(props) {
     value: "none"
   }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
     value: "resource"
-  }, "\u5173\u8054\u8D44\u6E90"), /*#__PURE__*/_react["default"].createElement(Option, {
-    value: "ip"
-  }, "\u5173\u8054IP"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
+  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
     value: "topo"
   }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u8D44\u6E90"
@@ -181,35 +173,11 @@ function Data(props) {
     topo: topo,
     topoEditApi: topoEditApi,
     nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
-  }))), bindType === 'ip' &&
-  /*#__PURE__*/
-  // <Form.Item
-  //   label="关联IP"
-  //   // style={{ display: "flex" }}
-  //   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地址格式不正确"
-  // >
-  _react["default"].createElement(_BindIpInput["default"], {
-    nodeElement: node,
-    values: values,
-    topo: topo,
-    fieldItem: field,
-    topoEditApi: topoEditApi,
-    placeholder: "\u8BF7\u8F93\u5165",
-    name: "attrObject.bindIp",
-    onChange: _onChange,
-    maxLength: 128
-  }) // </Form.Item>
-  , bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
     name: "attrObject.bindTopo",
     topo: topo,
     onChange: handleBindTopoChange
-  })), (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo' && node.getTag() && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-    label: "\u6240\u5C5E\u5E73\u53F0"
-  }, /*#__PURE__*/_react["default"].createElement(_PlatformDisplay["default"], props)))));
+  })))));
 }

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.32" === 'string' ? "11.0.32" : null;
+var version = typeof "11.0.33" === 'string' ? "11.0.33" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑