@riil-frontend/component-topology 7.0.0-dev.9 → 7.0.2

package/lib/utils/topoData.js

@@ -13,9 +13,7 @@ exports.getCiModSet = getCiModSet;
 exports.getCiTypes = getCiTypes;
 exports.getCiTypesFromCiElements = getCiTypesFromCiElements;
 exports.getLinksBetweenTwoNodes = getLinksBetweenTwoNodes;
-exports.getMonitorTemplateCodes = getMonitorTemplateCodes;
 exports.parseTopoData = parseTopoData;
-exports.sortList = void 0;
 exports.transtormElementsToMap = transtormElementsToMap;
 exports.updateCiDoc = exports.updateAllCiDoc = void 0;
 
@@ -25,8 +23,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _utils = require("@riil-frontend/utils");
-
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _topoPermissionUtil = _interopRequireDefault(require("./topoPermissionUtil"));
@@ -55,64 +51,21 @@ var _excluded = ["extraConfig"];
  * @returns {*}
  */
 var findItem = function findItem(arr, key, value) {
-  if ((0, _utils.isAvailableArray)(arr)) {
-    var result;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = item;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return undefined;
-  }
+  return (arr || []).find(function (item) {
+    return item[key] && item[key] === value;
+  });
 };
 
 exports.findItem = findItem;
 
 var findItemIndex = function findItemIndex(arr, key, value) {
-  if ((0, _utils.isAvailableArray)(arr)) {
-    var result = -1;
-
-    for (var i = 0; i < arr.length; i++) {
-      var item = arr[i];
-
-      if (item[key] && item[key] === value) {
-        result = i;
-        break;
-      }
-    }
-
-    return result;
-  } else {
-    return -1;
-  }
-};
-/**
- * 告警列表排序
- * @param {} a
- * @param {*} b
- * @returns
- */
-
-
-exports.findItemIndex = findItemIndex;
-
-var sortList = function sortList(a, b) {
-  if (a.level === b.level) {
-    return a.obj.createTime - b.obj.createTime;
-  } else {
-    return a.level - b.level;
-  }
+  return (arr || []).findIndex(function (item) {
+    return item[key] && item[key] === value;
+  });
 }; // 格式化容器
 
 
-exports.sortList = sortList;
+exports.findItemIndex = findItemIndex;
 
 function formatGroup(group) {
   return (0, _extends2["default"])({}, group, {
@@ -184,27 +137,6 @@ function getCiTypes(topoData) {
   var allCi = [].concat(topoData.nodes, topoData.links, topoData.linkGroups);
   return getCiTypesFromCiElements(allCi);
 }
-/**
- * 获得监控模板code列表
- * @param {*} cis 
- * @returns 
- */
-
-
-function getMonitorTemplateCodes(cis) {
-  var codes = [];
-  cis.forEach(function (element) {
-    var _element$attributes;
-
-    // eslint-disable-next-line camelcase
-    var code = (_element$attributes = element.attributes) === null || _element$attributes === void 0 ? void 0 : _element$attributes.support_templates;
-
-    if (code && codes.indexOf(code) < 0) {
-      codes.push(code);
-    }
-  });
-  return codes;
-}
 /**
  * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
  * @param {} ciTypeObj

package/lib/utils/tree.js

@@ -46,6 +46,7 @@ function formatTree(json, funcPermissions) {
       }
 
       return {
+        data: node,
         id: "" + id,
         label: name,
         parentId: parentId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.9",
+  "version": "7.0.2",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -60,7 +60,7 @@
     "@formily/next-components": "1.3.13",
     "@iceworks/spec": "^1.0.0",
     "@riil-frontend/component-action-tree": "^1.0.13",
-    "@riil-frontend/component-common-res-list": "^1.0.13",
+    "@riil-frontend/component-common-res-list": "^1.0.26",
     "@riil-frontend/component-condition-res-list": "^1.0.18",
     "@riil-frontend/component-crucial-link-topo": "0.1.0",
     "@riil-frontend/component-extra-title": "^1.0.3",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.9/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/components/DisplaySettingDrawer/EditorDisplaySetting.js

@@ -1,122 +0,0 @@
-import _Box from "@alifd/next/es/box";
-import _Form from "@alifd/next/es/form";
-import _extends from "@babel/runtime/helpers/extends";
-import _Field from "@alifd/next/es/field";
-import React, { useEffect, useImperativeHandle, useState } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import NodeTag from "./NodeTag";
-import EdgeFlow from "./EdgeFlow";
-import NodeTip from "./NodeTip";
-import LineExpandAllRadioGroup from "./LineExpandAllRadioGroup";
-import EdgeFlowDirection from "./EdgeFlowDirection";
-import BooleanRadio from "../../../components/BooleanRadio";
-/**
- * 显示设置
- * 
- * @param {*} props 
- * @returns 
- */
-
-function EditorDisplaySetting(props, ref) {
-  var topo = props.topo,
-      displaySettingProps = props.displaySettingProps;
-  var displayConfig = topo.store.getModelState('displayConfig');
-
-  var _ref = displaySettingProps || {},
-      linkTagConfig = _ref.linkTagConfig,
-      linkTipConfig = _ref.linkTipConfig,
-      showEdgeExpandConfig = _ref.showEdgeExpandConfig,
-      extraConfig = _ref.extraConfig,
-      showLinkConfig = _ref.showLinkConfig,
-      nodeTagProps = _ref.nodeTagProps,
-      nodeTipProps = _ref.nodeTipProps,
-      isNetworkTopo = _ref.isNetworkTopo;
-
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: {
-      alarmSwitch: displayConfig.alarmSwitch,
-      alarmListDefaultOpen: displayConfig.alarmListDefaultOpen,
-      nodeTag: displayConfig.nodeTag,
-      nodeTip: displayConfig.nodeTip,
-      linkTag: displayConfig.linkTag,
-      linkTip: displayConfig.linkTip,
-      expandAllEdges: displayConfig.expandAllEdges,
-      edgeFlow: displayConfig.edgeFlow,
-      edgeFlowDirection: displayConfig.edgeFlowDirection
-    },
-    onChange: function onChange(name, value) {
-      rlog.debug('DisplaySetting-onChange', name, value); // 告警静默设置
-
-      if (name === 'alarmSwitch') {
-        field.setValue('alarmListDefaultOpen', !!value);
-      }
-    }
-  });
-
-  useImperativeHandle(ref, function () {
-    return field;
-  });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Form, {
-    field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(Label, {
-      label: "\u8D44\u6E90\u6807\u6CE8",
-      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90093\u9879"
-    })
-  }, /*#__PURE__*/React.createElement(NodeTag, _extends({}, nodeTagProps, {
-    name: "nodeTag",
-    topo: topo
-  }))), linkTagConfig && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(Label, {
-      label: "\u94FE\u8DEF\u6807\u6CE8",
-      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90092\u9879"
-    }),
-    patternTrigger: "onChange"
-  }, linkTagConfig({
-    name: "linkTag",
-    topo: topo
-  })), /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(Label, {
-      label: "\u8D44\u6E90\u60AC\u6D6E\u6846",
-      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
-    }),
-    patternTrigger: "onChange"
-  }, /*#__PURE__*/React.createElement(NodeTip, _extends({}, nodeTipProps, {
-    name: "nodeTip",
-    topo: topo
-  }))), linkTipConfig && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(Label, {
-      label: "\u94FE\u8DEF\u60AC\u6D6E\u6846",
-      helpText: "\u6700\u591A\u652F\u6301\u52FE\u90094\u9879"
-    }),
-    patternTrigger: "onChange"
-  }, linkTipConfig({
-    name: "linkTip",
-    topo: topo
-  })), showEdgeExpandConfig && /*#__PURE__*/React.createElement(_Form.Item, {
-    label: /*#__PURE__*/React.createElement(LineExpandAllRadioGroup.Label, null),
-    patternTrigger: "onChange"
-  }, /*#__PURE__*/React.createElement(LineExpandAllRadioGroup, {
-    name: "expandAllEdges",
-    isNetworkTopo: isNetworkTopo
-  }))));
-}
-
-;
-
-function Label(props) {
-  var label = props.label,
-      helpText = props.helpText;
-  return /*#__PURE__*/React.createElement(_Box, {
-    direction: "row",
-    spacing: 12
-  }, /*#__PURE__*/React.createElement("div", null, label), /*#__PURE__*/React.createElement("div", {
-    style: {
-      color: '#638DB7'
-    }
-  }, helpText));
-}
-
-export default /*#__PURE__*/React.forwardRef(EditorDisplaySetting);

package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -1,10 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-export default function addEdgeProps(Component) {
-  return function AdapterEdgeProps(props) {
-    var selectionElement = props.selectionElement;
-    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
-      edge: selectionElement
-    }));
-  };
-}

package/es/networkTopo/components/Topology.js

@@ -1,28 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from "react";
-import TopoView from "./TopoView";
-import useTopoEdit from "../hooks/useTopoEdit";
-import useEditorProps from "./editor/useEditorProps";
-export default function NetworkTopologyFull(props) {
-  var topo = props.topo,
-      showTools = props.showTools;
-  var topoEdit = useTopoEdit({
-    topo: topo
-  });
-  var editorProps = useEditorProps(props);
-  return /*#__PURE__*/React.createElement(TopoView, _extends({}, props, {
-    editorProps: editorProps,
-    graphViewProps: _extends({}, props.graphViewProps, {
-      onElementsDelete: topoEdit.onElementsDelete,
-      createHtTopoProps: {
-        showTools: showTools,
-        elementChangeLayerByDrag: true,
-        editor: {
-          useNewElementsDeleteEvent: true,
-          // 通过数仓【添加资源】权限控制 是否启用新建链路功能，
-          enableRelateResource: topoEdit.canAddLink
-        }
-      }
-    })
-  }));
-}

package/es/networkTopo/components/editor/plugins/LayerConfigPlugin.js

@@ -1,22 +0,0 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-/**
- * 分层拓扑：横向分层、纵向分层
- * @param {*} props 
- * @returns 
- */
-
-export default function LayerConfigPlugin(props) {
-  var topo = props.topo,
-      topoContext = props.topoContext,
-      topoEdit = props.topoEdit,
-      editorProps = props.editorProps;
-  useEffect(function () {
-    var notifier = topo.view.topoClient.notifier;
-    notifier.on('topo_layer_add', topoEdit.onLayerAdded);
-    return function () {
-      notifier.off('topo_layer_add', topoEdit.onLayerAdded);
-    };
-  }, []);
-  return null;
-}
-;

package/es/networkTopo/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -1,48 +0,0 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
-import { iconFactory } from '@riil-frontend/component-topology-graph';
-import ResourceList from "../../../../core/editor/components/settings/common/GroupNodeList/ResourceList";
-import { getLayerChildren } from "../../../../utils/htElementUtils";
-
-function getResourceNodes(store, htNodes) {
-  var _store$getModelState = store.getModelState('topoMod'),
-      data = _store$getModelState.data;
-
-  var list = [];
-  ((data === null || data === void 0 ? void 0 : data.nodes) || []).forEach(function (resource) {
-    var htNode = htNodes.filter(function (node) {
-      return node.getTag() === resource.id;
-    })[0];
-
-    if (htNode) {
-      list.push({
-        resource: resource,
-        node: htNode
-      });
-    }
-  });
-  return list;
-}
-/**
- * 分层关联资源列表
- */
-
-
-export default function LayerResourceList(props) {
-  var topo = props.topo,
-      layer = props.layer;
-  var nodes = getLayerChildren(layer);
-  var resourceNodes = getResourceNodes(topo.store, nodes);
-  var data = resourceNodes.map(function (_ref) {
-    var node = _ref.node,
-        resource = _ref.resource;
-    return {
-      title: resource.name,
-      img: iconFactory.getIconImageUrl(node.getImage())
-    };
-  }); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
-
-  return /*#__PURE__*/React.createElement(ResourceList, {
-    data: data
-  });
-}
-;

package/es/networkTopo/components/editor/propertyViews/edge/EdgeGroupPropertyView.js

@@ -1,35 +0,0 @@
-import _Tab from "@alifd/next/es/tab";
-import React, { useState, useEffect } from 'react';
-import TabView from "../../../../../core/editor/components/settings/common/tab/TabView";
-import EdgeGroupSetting from "../../../../../core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting";
-import LindInfoPreview from "./link/LinkInfoPreview"; // V1.2 废弃
-
-export default function EdgeGroupPropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      onChange = props.onChange,
-      editorProps = props.editorProps; // 查询是否有聚合链路
-
-  var source = edge.getSource().getTag();
-  var target = edge.getTarget().getTag();
-  var linkGroups = topo.store.useModelState('topoMod').data.linkGroups;
-  var aggLink = linkGroups.find(function (link) {
-    return link.source === source && link.target === target || link.target === source && link.source === target;
-  });
-
-  if (aggLink) {
-    return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-      title: "\u6570\u636E",
-      key: "1"
-    }, /*#__PURE__*/React.createElement(LindInfoPreview, {
-      data: aggLink,
-      topo: topo
-    })), /*#__PURE__*/React.createElement(_Tab.Item, {
-      title: "\u8BBE\u7F6E",
-      key: "2"
-    }, /*#__PURE__*/React.createElement(EdgeGroupSetting, props)));
-  }
-
-  return /*#__PURE__*/React.createElement(EdgeGroupSetting, props);
-}

package/es/networkTopo/components/editor/propertyViews/edge/EdgePropertyView.js

@@ -1,43 +0,0 @@
-import _Form from "@alifd/next/es/form";
-import _Field from "@alifd/next/es/field";
-import _extends from "@babel/runtime/helpers/extends";
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import React, { useEffect } from 'react';
-import BindExitLinkSelect from "./link/BindExitLinkSelect";
-
-function parseValues(values, edge) {
-  return _extends({}, values);
-}
-
-export default function EdgePropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      _onChange = props.onChange,
-      editorProps = props.editorProps,
-      extraDisplaySetting = props.extraDisplaySetting;
-  var store = topo.store;
-
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: parseValues(values, edge),
-    onChange: function onChange(name, value) {
-      rlog.debug('CommonEdgePropertyView', name, value);
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  useEffect(function () {
-    field.setValues(parseValues(values, edge));
-  }, [values]);
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      margin: '12px 0 0 32px'
-    }
-  }, /*#__PURE__*/React.createElement(_Form, {
-    field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(BindExitLinkSelect, props))));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -1,39 +0,0 @@
-import _Button from "@alifd/next/es/button";
-import React from "react";
-import LindInfoPreview from "../../link/LinkInfoPreview";
-import styles from "../../link/LinkInfoPreview.module.scss";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { useState, useEffect } from "react";
-export default function LinkDataTab(props) {
-  var _link$permission;
-
-  var topo = props.topo,
-      edge = props.edge,
-      link = props.link;
-
-  var _topo$store$useModel = topo.store.useModel("topoConfig"),
-      editState = _topo$store$useModel[0],
-      editDispatchers = _topo$store$useModel[1];
-
-  var openEditLinkDrawer = function openEditLinkDrawer() {
-    editDispatchers.update({
-      addLinkIsOpen: true,
-      currentLink: link
-    });
-  };
-
-  return /*#__PURE__*/React.createElement("div", {
-    className: styles.panelFullHeight
-  }, /*#__PURE__*/React.createElement(LindInfoPreview, {
-    className: styles.lindInfoPreview,
-    data: link,
-    topo: topo
-  }), /*#__PURE__*/React.createElement("div", {
-    className: styles.footer
-  }, /*#__PURE__*/React.createElement(_Button, {
-    className: styles.button,
-    type: "primary",
-    disabled: !(link !== null && link !== void 0 && (_link$permission = link.permission) !== null && _link$permission !== void 0 && _link$permission.writeable),
-    onClick: openEditLinkDrawer
-  }, "\u7F16\u8F91")));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js

@@ -1,31 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import NoDataPage from '@riil-frontend/component-no-data-page';
-import React from 'react';
-import Data from "./Data";
-export default function LinkPropertyView(props) {
-  var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  });
-
-  if (link) {
-    var readable = link.permission.readable;
-
-    if (!readable) {
-      return /*#__PURE__*/React.createElement(NoDataPage, {
-        statusCode: "\u6CA1\u6709\u67E5\u770B\u6743\u9650"
-      });
-    }
-  } else {
-    return null;
-  }
-
-  return /*#__PURE__*/React.createElement(Data, _extends({}, props, {
-    link: link
-  }));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyViewV1.js

@@ -1,37 +0,0 @@
-import _Tab from "@alifd/next/es/tab";
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import TabView from "../../../../../../core/editor/components/settings/common/tab/TabView";
-import Data from "./Data";
-import Setting from "./Setting";
-export default function LinkPropertyView(props) {
-  var edge = props.edge,
-      topo = props.topo; // 无权限不显示数据页签
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod').data,
-      links = _topo$store$useModelS.links,
-      linkGroups = _topo$store$useModelS.linkGroups;
-  var link = [].concat(links, linkGroups).find(function (item) {
-    return item.id === edge.getTag();
-  }); // console.log('LinkPropertyView',link)
-
-  if (link) {
-    var readable = link.permission.readable;
-
-    if (!readable) {
-      return /*#__PURE__*/React.createElement(Setting, props);
-    }
-  } else {
-    return /*#__PURE__*/React.createElement(Setting, props);
-  }
-
-  return /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, /*#__PURE__*/React.createElement(Data, _extends({}, props, {
-    link: link
-  }))), /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, /*#__PURE__*/React.createElement(Setting, props)));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js

@@ -1,49 +0,0 @@
-import _Form from "@alifd/next/es/form";
-import _Field from "@alifd/next/es/field";
-import _extends from "@babel/runtime/helpers/extends";
-import _Collapse from "@alifd/next/es/collapse";
-import React, { useEffect } from "react";
-import LineType from "../../../../../../../core/editor/components/settings/common/LineType";
-var CollapsePanel = _Collapse.Panel;
-
-function parseValues(values) {
-  return _extends({}, values);
-}
-
-export default function LinkSetting(props) {
-  var topo = props.topo,
-      values = props.values,
-      _onChange = props.onChange,
-      edge = props.edge;
-
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: parseValues(values),
-    onChange: function onChange(name, value) {
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  useEffect(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
-  return /*#__PURE__*/React.createElement(_Form, {
-    field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ["线形"],
-    style: {
-      border: "none"
-    }
-  }, /*#__PURE__*/React.createElement(CollapsePanel, {
-    key: "\u7EBF\u5F62",
-    title: "\u7EBF\u5F62"
-  }, /*#__PURE__*/React.createElement(LineType, {
-    topo: topo,
-    getEdges: function getEdges() {
-      return [edge];
-    }
-  })))));
-}

package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/index.js

@@ -1,2 +0,0 @@
-import LinkPropertyView from "./LinkPropertyView";
-export default LinkPropertyView;