@riil-frontend/component-topology 6.0.0-alpha.5 → 6.0.0-alpha.51

package/demo/CHANGELOG/CHANGELOG.md

@@ -1,3 +1,8 @@
+## V1.2 (6.X)
+
+移除参数：
+- editorProps.getEdgeGroupPropertyViewType
+
 
 ## v3.2.0 `2022-4-22 14:44:37`
 

package/es/components/ColorPanel/components/ColorBlock/index.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from "./index.module.scss";
+/**
+ * 颜色选择
+ *
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+
+function ColorBlock(props) {
+  var color = props.color,
+      onChange = props.onChange,
+      index = props.index;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      background: color.color,
+      borderColor: color.borderColor
+    },
+    className: styles.content,
+    onClick: function onClick() {
+      onChange(color.color, 'select', index);
+    }
+  }, "\xA0");
+}
+
+ColorBlock.propTypes = {
+  color: PropTypes.object,
+  // eslint-disable-next-line react/no-unused-prop-types
+  onChange: PropTypes.func
+};
+ColorBlock.defaultProps = {
+  color: {},
+  onChange: function onChange() {}
+};
+export default ColorBlock;

package/es/components/ColorPanel/components/ColorBlock/index.module.scss

@@ -0,0 +1,9 @@
+@import '~@alifd/next/variables.scss';
+ 
+.content{
+    width: 25px;
+    height: 25px;
+    border-radius: 50%;
+    border: 1px solid;
+    cursor: pointer;
+}

package/es/components/ColorPanel/components/FontColorRange/index.js

@@ -0,0 +1,35 @@
+import _Range from "@alifd/next/es/range";
+import React, { useState } from 'react';
+import styles from "./index.module.scss";
+
+function FontColorRange(props) {
+  var onChange = props.onChange,
+      _props$unit = props.unit,
+      unit = _props$unit === void 0 ? 'px' : _props$unit,
+      list = props.list,
+      max = props.max,
+      min = props.min,
+      defaultValue = props.defaultValue;
+
+  var _useState = useState(defaultValue),
+      value = _useState[0],
+      setValue = _useState[1];
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.range
+  }, /*#__PURE__*/React.createElement(_Range, {
+    defaultValue: value,
+    min: min,
+    max: max,
+    marks: list,
+    hasTip: false,
+    onChange: onChange,
+    onProcess: setValue
+  })), /*#__PURE__*/React.createElement("div", {
+    className: styles.unit
+  }, value, unit));
+}
+
+export default FontColorRange;

package/es/components/ColorPanel/components/FontColorRange/index.module.scss

@@ -0,0 +1,25 @@
+@import '~@alifd/next/variables.scss';
+
+
+.content {
+  display: flex;
+  flex-direction: row;
+  flex:1;
+  margin-left: 22px;
+  .range {
+    flex: 1;
+  }
+
+  .unit {
+    margin-left: 14px;
+    margin-right: 8px;
+    width: 32px;
+    text-align: right;
+  }
+
+  :global {
+    .#{$css-prefix}range .#{$css-prefix}range-mark {
+      display: none;
+    }
+  }
+}

package/es/components/ColorPanel/index.js

@@ -0,0 +1,241 @@
+import _Balloon from "@alifd/next/es/balloon";
+
+/* eslint-disable eqeqeq */
+
+/* eslint-disable jsx-a11y/alt-text */
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import classnames from 'classnames';
+import { SketchPicker } from 'react-color';
+import ColorBlock from "./components/ColorBlock";
+import styles from "./index.module.scss";
+/**
+ * 颜色选择
+ *
+ * @param props
+ * @return {*}
+ * @constructor
+ */
+
+function ColorPanel(props) {
+  var _classnames2, _classnames3;
+
+  var value = props.value,
+      showClear = props.showClear,
+      dataSource = props.dataSource,
+      onChange = props.onChange,
+      onPickerFocus = props.onPickerFocus,
+      onPickerBlur = props.onPickerBlur;
+
+  var _useState = useState(value),
+      data = _useState[0],
+      setData = _useState[1];
+
+  var _useState2 = useState(),
+      active = _useState2[0],
+      setActive = _useState2[1];
+
+  var colorChange = function colorChange(value, type, key) {
+    setActive(key);
+    onChange(getColor16(value), type);
+  };
+
+  var changClick = function changClick(key) {
+    setActive(key);
+  };
+
+  var setColors = function setColors() {
+    // eslint-disable-next-line array-callback-return
+    return dataSource.map(function (item, index) {
+      // eslint-disable-next-line eqeqeq
+      if (showClear && index != 1 || !showClear) {
+        var _classnames;
+
+        // eslint-disable-next-line eqeqeq
+        return /*#__PURE__*/React.createElement("li", {
+          key: index,
+          className: classnames(styles.li, (_classnames = {}, _classnames[styles.marginTop] = index == 6 || index == 12, _classnames[styles.active] = index == active, _classnames))
+        }, /*#__PURE__*/React.createElement("div", {
+          className: styles.liBox
+        }, /*#__PURE__*/React.createElement(ColorBlock, {
+          color: item,
+          onChange: colorChange,
+          index: index
+        })));
+      }
+    });
+  };
+
+  var handleChange = function handleChange(color) {
+    var prevValue = color.hex;
+    var rgb = color.rgb;
+    var rgba = "rgba(" + rgb.r + "," + rgb.g + "," + rgb.b + "," + rgb.a + ")";
+
+    if (data !== prevValue) {
+      setData({
+        hex: prevValue,
+        rgb: rgb
+      });
+    }
+  };
+
+  var pickerBlur = function pickerBlur() {
+    onChange(data, 'change');
+    onPickerBlur();
+  };
+
+  var getColor16 = function getColor16(color) {
+    var that = color;
+
+    if (/^(rgba|RGBA)/.test(color)) {
+      var aColor = that.replace(/(?:\(|\)|rgba|RGBA)*/g, '').split(',');
+      var strHex = '#';
+
+      for (var i = 0; i < 3; i++) {
+        var hex = Number(aColor[i]).toString(16);
+
+        if (hex.length < 2) {
+          hex = "0" + hex;
+        }
+
+        strHex += hex;
+      }
+
+      if (strHex.length !== 7) {
+        strHex = that;
+      }
+
+      return {
+        hex: strHex,
+        rgb: {
+          r: aColor[0],
+          g: aColor[1],
+          b: aColor[2],
+          a: aColor[3]
+        }
+      };
+    }
+
+    return that;
+  };
+
+  var defaultTrigger = /*#__PURE__*/React.createElement("div", {
+    className: styles.swatch,
+    style: {
+      background: value
+    }
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u66F4\u591A\u989C\u8272.svg",
+    alt: ""
+  }));
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("ul", {
+    className: styles.ul
+  }, showClear && /*#__PURE__*/React.createElement("li", {
+    className: classnames(styles.li, (_classnames2 = {}, _classnames2[styles.active] = active == '-1', _classnames2))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.liBox
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.swatch,
+    onClick: function onClick() {
+      colorChange(null, 'select', '-1');
+    }
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/\u80CC\u666F\u900F\u660E.svg",
+    alt: ""
+  })))), setColors(), /*#__PURE__*/React.createElement("li", {
+    className: classnames(styles.li, (_classnames3 = {}, _classnames3[styles.active] = active == '17', _classnames3))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.liBox,
+    onClick: function onClick() {
+      changClick('17');
+    }
+  }, /*#__PURE__*/React.createElement(_Balloon, {
+    trigger: defaultTrigger,
+    closable: false,
+    triggerType: "click",
+    animation: false,
+    followTrigger: true,
+    align: "rt",
+    alignEdge: true,
+    style: {
+      paddingBottom: 0
+    },
+    onBlur: pickerBlur,
+    onFocus: onPickerFocus
+  }, /*#__PURE__*/React.createElement(SketchPicker, {
+    color: data // width={230}
+    ,
+    disableAlpha: true,
+    styles: {
+      'default': {
+        picker: {
+          boxShadow: 'none',
+          padding: 0
+        }
+      }
+    },
+    onChange: handleChange
+  }))))));
+}
+
+ColorPanel.defaultProps = {
+  value: undefined,
+  showClear: false,
+  dataSource: [{
+    color: 'rgba(255, 255, 255, 1)',
+    borderColor: 'rgba(219, 219, 219, 1)'
+  }, {
+    color: 'rgba(245, 245, 245, 1)',
+    borderColor: 'rgba(208, 208, 208, 1)'
+  }, {
+    color: 'rgba(230, 230, 230, 1)',
+    borderColor: 'rgba(196, 196, 196, 1)'
+  }, {
+    color: 'rgba(168, 168, 168, 1)',
+    borderColor: 'rgba(146, 146, 146, 1)'
+  }, {
+    color: 'rgba(97, 97, 97, 1)',
+    borderColor: 'rgba(85, 85, 85, 1)'
+  }, {
+    color: 'rgba(49, 49, 49, 1)',
+    borderColor: 'rgba(43, 43, 43, 1)'
+  }, {
+    color: 'rgba(251, 115, 80, 1)',
+    borderColor: 'rgba(213, 98, 69, 1)'
+  }, {
+    color: 'rgba(255, 166, 41, 1)',
+    borderColor: 'rgba(219, 144, 45, 1)'
+  }, {
+    color: 'rgba(255, 205, 42, 1)',
+    borderColor: 'rgba(216, 175, 37, 1)'
+  }, {
+    color: 'rgba(18, 174, 92, 1)',
+    borderColor: 'rgba(23, 148, 79, 1)'
+  }, {
+    color: 'rgba(83, 184, 255, 1)',
+    borderColor: 'rgba(74, 156, 217, 1)'
+  }, {
+    color: 'rgba(183, 128, 255, 1)',
+    borderColor: 'rgba(155, 109, 216, 1)'
+  }, {
+    color: 'rgba(254, 192, 174, 1)',
+    borderColor: 'rgba(217, 163, 148, 1)'
+  }, {
+    color: 'rgba(252, 209, 156, 1)',
+    borderColor: 'rgba(215, 178, 133, 1)'
+  }, {
+    color: 'rgba(255, 232, 163, 1)',
+    borderColor: 'rgba(217, 198, 139, 1)'
+  }, {
+    color: 'rgba(176, 244, 197, 1)',
+    borderColor: 'rgba(153, 209, 171, 1)'
+  }, {
+    color: 'rgba(189, 227, 255, 1)',
+    borderColor: 'rgba(161, 193, 217, 1)'
+  }],
+  onChange: function onChange() {},
+  onPickerFocus: function onPickerFocus() {},
+  onPickerBlur: function onPickerBlur() {}
+};
+export default ColorPanel;

package/es/components/ColorPanel/index.module.scss

@@ -0,0 +1,35 @@
+@import '~@alifd/next/variables.scss';
+
+.content{
+  width: 201px;
+  .ul{
+    width: 100%;
+    .li{
+      display: inline-block;
+      width: 33px;
+      line-height: 38px;
+      .liBox{
+        width: 31px;
+        height: 31px;
+        border-radius: 50%;
+        padding: 1px;
+        border: 2px solid #fff;
+      }
+    }
+    .li.active{
+      .liBox{
+        border-color: #4C89FF;
+      }
+    }
+    .marginTop{
+      margin-top: 6px;
+    }
+  }
+}
+.swatch{
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  overflow: hidden;
+  cursor: pointer;
+}

package/es/components/VerticalIconTab/VerticalIconTab.js

@@ -1,5 +1,6 @@
 import _Tab from "@alifd/next/es/tab";
 import _extends from "@babel/runtime/helpers/extends";
+import _Balloon from "@alifd/next/es/balloon";
 import React, { useState } from 'react';
 import classNames from 'classnames';
 import styles from "./VerticalIconTab.module.scss";
@@ -11,8 +12,9 @@ import styles from "./VerticalIconTab.module.scss";
 
 function CustomTabItem(_ref) {
   var title = _ref.title,
+      titleTootip = _ref.titleTootip,
       icon = _ref.icon;
-  return /*#__PURE__*/React.createElement("div", {
+  var tabItem = /*#__PURE__*/React.createElement("div", {
     className: "v-icon-tab-item"
   }, /*#__PURE__*/React.createElement("img", {
     src: icon,
@@ -20,6 +22,14 @@ function CustomTabItem(_ref) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "tab-title"
   }, title));
+  return /*#__PURE__*/React.createElement(_Balloon.Tooltip, {
+    trigger: tabItem,
+    align: "r" // 解决遮挡下拉浮层问题
+    ,
+    popupStyle: {
+      zIndex: 1000
+    }
+  }, titleTootip);
 }
 /**
  * 竖向

package/es/components/VerticalIconTab/VerticalIconTab.module.scss

@@ -33,10 +33,16 @@
       justify-content: center;
       margin: 0 4px;
       border-radius: 4px;
+      user-select: none;
 
       &:hover {
         background-color: rgba(76, 137, 255, 0.1);
       }
+      
+      .tab-title {
+        margin-top: 3px;
+        font-weight: normal;
+      }
     }
   }
 }

package/es/components/collapse/Collapse.js

@@ -1,7 +1,26 @@
+import _Collapse from "@alifd/next/es/collapse";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["className", "accordion", "fullheight", "noContentPadding"];
 import React from 'react';
+import classNames from 'classnames';
+import Panel from "./Panel";
+import styles from "./Collapse.module.scss";
 
-function Collapse(props) {
-  return /*#__PURE__*/React.createElement("div", null, "Collapse");
+function CollapseWrapper(props) {
+  var _classNames;
+
+  var className = props.className,
+      accordion = props.accordion,
+      fullheight = props.fullheight,
+      noContentPadding = props.noContentPadding,
+      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  return /*#__PURE__*/React.createElement(_Collapse, _extends({}, otherProps, {
+    accordion: accordion,
+    className: classNames(className, styles.collapse, (_classNames = {}, _classNames[styles.fullheight] = accordion && fullheight, _classNames[styles.contentNoPadding] = noContentPadding, _classNames))
+  }));
 }
 
-export default Collapse;
+CollapseWrapper.Panel = Panel;
+export default CollapseWrapper;

package/es/components/collapse/Collapse.module.scss

@@ -31,6 +31,30 @@
     }
   }
 
+  &.fullheight {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    :global {
+      .#{$css-prefix}collapse-panel.#{$css-prefix}collapse-panel-expanded {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        overflow: auto;
+        
+        .#{$css-prefix}collapse-panel-content {
+          flex: 1;
+          overflow: auto;
+        }
+      }
+      .#{$css-prefix}collapse-panel-content {
+        flex: 1;
+        overflow: auto;
+      }
+    }
+  }
+
   &.contentNoPadding {
 
     :global {

package/es/components/collapse/index.js

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

package/es/core/common/hooks/useHtElements.js

@@ -0,0 +1,21 @@
+import { useEffect, useMemo, useState } from "react";
+export default function useHtElements(props) {
+  var topo = props.topo,
+      ids = props.ids;
+
+  var _useState = useState(ids),
+      idList = _useState[0],
+      setIdList = _useState[1];
+
+  useEffect(function () {
+    if (ids.join(',') !== idList.join(',')) {
+      setIdList(ids);
+    }
+  }, [ids, idList]);
+  var elements = useMemo(function () {
+    return idList.map(function (id) {
+      return topo.getDataModel().getDataById(id);
+    });
+  }, [topo, idList]);
+  return elements;
+}

package/es/core/common/icons/icon.js

@@ -1,5 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import topoManager from '@riil-frontend/component-topology-graph/es/manager';
+import { getModelTreeCache } from '@riil-frontend/component-topology-graph/es/iconConfig/services/topoCiModel';
+import { getCiModels } from "../../../constants/ResourceTypeLimit";
 /**
  * 获取默认图标
  * @param {*} topo 
@@ -9,6 +11,45 @@ import topoManager from '@riil-frontend/component-topology-graph/es/manager';
 export function getNodeDefaultIcons(topo) {
   return [].concat(topoManager.iconLibManager.getNodeIcons(), topo.options.icons || []);
 }
+/**
+ * 获取资源图标列表
+ * 模型树可监控的模型图标
+ * 
+ * @param {*} topo 
+ */
+
+export function getResourceIcons(topo) {
+  // 获取模型树缓存
+  var modelTree = getModelTreeCache(); // 过滤出克监控的模型
+
+  var models = getCiModels(modelTree).filter(function (model) {
+    return !!model.icon;
+  }); // 获得图标
+
+  var icons = models.map(function (model) {
+    return topoManager.iconFactory.getIcon("ciType." + model.code);
+  });
+  return [].concat(icons, topo.options.icons || []);
+}
+/**
+ * 获取基础图标列表。排除模型图标
+ * @param {*} topo 
+ */
+
+export function getBasicIcons(topo, containsGroupIcon) {
+  var icons = topoManager.iconLibManager.getIcons();
+  icons = icons.filter(function (icon) {
+    return !icon.ciType;
+  });
+
+  if (containsGroupIcon === false) {
+    icons = icons.filter(function (icon) {
+      return icon.type !== 'group';
+    });
+  }
+
+  return icons;
+}
 export function getGroupDefaultIcons(topo) {
   return [].concat(topoManager.iconLibManager.getIcons());
 }

package/es/core/common/icons/useIcons.js

@@ -1,4 +1,5 @@
-import { getGroupDefaultIcons, getNodeDefaultIcons, transformCustomIcon2HtIcon } from "./icon";
+import topoManager from '@riil-frontend/component-topology-graph/es/manager';
+import { getBasicIcons, getGroupDefaultIcons, getResourceIcons, transformCustomIcon2HtIcon } from "./icon";
 
 function useCustomIcons(topo) {
   var _topo$store$useModelS = topo.store.useModelState('customIcon'),
@@ -11,8 +12,11 @@ function useCustomIcons(topo) {
 export function useNodeIcons(topo) {
   var customIcons = useCustomIcons(topo);
   var groups = [{
-    name: '默认',
-    icons: getNodeDefaultIcons(topo)
+    name: '资源图片',
+    icons: getResourceIcons(topo)
+  }, {
+    name: '基础图片',
+    icons: getBasicIcons(topo)
   }];
 
   if (customIcons.length) {
@@ -25,18 +29,6 @@ export function useNodeIcons(topo) {
   return groups;
 }
 export function useGroupIcons(topo) {
-  var customIcons = useCustomIcons(topo);
-  var groups = [{
-    name: '默认',
-    icons: getGroupDefaultIcons(topo)
-  }];
-
-  if (customIcons.length) {
-    groups.push({
-      name: '自定义',
-      icons: customIcons
-    });
-  }
-
+  var groups = useNodeIcons(topo);
   return groups;
 }

package/es/core/components/AlarmListPanel/components/AlarmListItem.js

@@ -13,19 +13,16 @@ var alarmLink = function alarmLink(alarmInfo) {
 var getNode = function getNode(topo, alarmInfo) {
   var id = alarmInfo.resourceId || alarmInfo.ciId;
   var node = topo.getHtTopo().getGraphView().dm().getDataByTag(id);
+  var ele = getNodeParents(node);
+  topo.getHtTopo().getGraphView().fitData(ele, true, 20, true);
+  topo.getHtTopo().getGraphView().dm().getSelectionModel().setSelection(ele);
+};
 
-  if (node.getParent()) {
-    var data = node.getParent();
-    topo.getHtTopo().getGraphView().fitData(data, true, 20, true); // eslint-disable-next-line no-underscore-dangle, eqeqeq
-
-    if (data._animation.start[0] != 'hide') {
-      topo.getHtTopo().getGraphView().dm().getSelectionModel().setSelection(node);
-    } else {
-      topo.getHtTopo().getGraphView().dm().getSelectionModel().setSelection(data);
-    }
+var getNodeParents = function getNodeParents(node) {
+  if (node.getParent() && node.getParent().isExpanded && !node.getParent().isExpanded()) {
+    return getNodeParents(node.getParent());
   } else {
-    topo.getHtTopo().getGraphView().fitData(node, true, 20, true);
-    topo.getHtTopo().getGraphView().dm().getSelectionModel().setSelection(node);
+    return node;
   }
 };
 
@@ -41,7 +38,9 @@ function AlarmListItem(props) {
       size: "xs",
       className: styles['alarm-color-icon'] + " alarm-color-icon-lv" + alarmInfo.alertLevel
     })
-  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
     className: styles.list,
     onClick: function onClick() {
       getNode(topo, alarmInfo);
@@ -71,7 +70,9 @@ function RiskListItem(props) {
       size: "xs",
       className: styles['alarm-color-icon'] + " alarm-color-icon-lv2"
     })
-  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement("div", {
     className: styles.list,
     onClick: function onClick() {
       getNode(topo, alarmInfo);