@riil-frontend/component-topology 11.0.25 → 11.0.27

package/es/core/models/Alarm.js

@@ -468,12 +468,12 @@ var Alarm = /*#__PURE__*/function () {
             sendAl = [];
             idsList = [].concat(nodeIdsList, linkIdsList);
             operations = [];
-            idsList.map(function (idItem) {
+            idsList.forEach(function (idItem) {
               if (idItem.operation === null) {
                 operations.push(idItem.ciId);
               }
             });
-            alertData.map(function (item, index) {
+            alertData.forEach(function (item, index) {
               var _item$resourceId;
               var ciId = (_item$resourceId = item.resourceId) !== null && _item$resourceId !== void 0 ? _item$resourceId : item.ciId;
               var obj = {
@@ -489,7 +489,6 @@ var Alarm = /*#__PURE__*/function () {
               if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
                 sendAl.push(obj);
               }
-              return obj;
             });
 
             // console.log("before-combAlarmData", sendAl, idsList);

package/es/core/models/TopoApp.js

@@ -25,7 +25,7 @@ import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache";
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.25" === 'string' ? "11.0.25" : null;
+var version = typeof "11.0.27" === 'string' ? "11.0.27" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 
 /**

package/es/core/models/topoData.js

@@ -92,7 +92,7 @@ function _saveTopo() {
           return topoService.bindResourceToTopo(topoId, {
             groups: groupInfo,
             linkIps: linkIps,
-            exportLinkIdList: exportLinkIdList,
+            // exportLinkIdList,
             relateTopoIdList: relateTopoIdList
           });
         case 16:

package/es/core/models/utils/linkUtils.js

@@ -158,7 +158,7 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var showAgg = types.indexOf("agg") >= 0;
   // console.log("edges----types",showType, types,showPhy, showAgg);
   if (Array.isArray(edges) && edges.length > 0) {
-    edges.map(function (edge) {
+    edges.forEach(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);

package/es/core/store/models/topoConfig.js

@@ -230,7 +230,7 @@ export default function (topoApp) {
                     id: rootState.topoMod.topoId,
                     resources: resources,
                     groups: groups,
-                    exportLinkIdList: exportLinkIdList,
+                    // exportLinkIdList,
                     ipNodes: ipNodes
                   };
                   _context2.next = 5;

package/lib/common/components/ResourceTable/ResourceTable.module.scss

@@ -1,7 +1,3 @@
 .container {
   height: 100%;
-  :global {
-    .next-table-body {
-    }
-  }
 }

package/lib/components/BatchAttrMetric/index.js

@@ -28,13 +28,11 @@ var BatchAttrMetricDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref,
     setTrue = _useBoolean$.setTrue,
     setFalse = _useBoolean$.setFalse;
   // 选择类型，single/batch
-  var _useState = (0, _react.useState)('batch'),
-    selectType = _useState[0],
-    setSelectType = _useState[1];
+  var selectType = 'batch';
   // 数据类型，tip/tag
-  var _useState2 = (0, _react.useState)(),
-    showType = _useState2[0],
-    setShowType = _useState2[1];
+  var _useState = (0, _react.useState)(),
+    showType = _useState[0],
+    setShowType = _useState[1];
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       /**

package/lib/components/BatchAttrMetric/utils.js

@@ -6,7 +6,6 @@ exports.updateCiSetSeleted = exports.treeDs = exports.saveTransform = exports.in
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
-var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 var _excluded = ["list"];
 /**
@@ -35,7 +34,7 @@ var toId = function toId(_ref) {
 
 // id反解析回对象
 var reverseToId = function reverseToId(id) {
-  var _id$split = id.split("-"),
+  var _id$split = id.split('-'),
     code = _id$split[0],
     type = _id$split[1];
   return {
@@ -91,20 +90,20 @@ var saveTransform = function saveTransform(submit) {
  */
 exports.saveTransform = saveTransform;
 var initSelected = function initSelected(allCiSet, showType) {
-  _rlog["default"].debug("initSelected-allCiSet, dataType", allCiSet, showType);
+  _rlog["default"].debug('initSelected-allCiSet, dataType', allCiSet, showType);
   var values = {};
-  Object.keys(allCiSet).map(function (key) {
+  Object.keys(allCiSet).forEach(function (key) {
     var _value$list;
     var value = allCiSet[key];
     var result = [];
-    (_value$list = value.list) === null || _value$list === void 0 ? void 0 : _value$list.map(function (item) {
+    (_value$list = value.list) === null || _value$list === void 0 ? void 0 : _value$list.forEach(function (item) {
       if (item[showType]) {
         result.push(item.id);
       }
     });
     values[key] = result;
   });
-  _rlog["default"].debug("initSelected-allCiSet-result, dataType", values);
+  _rlog["default"].debug('initSelected-allCiSet-result, dataType', values);
   return values;
 };
 
@@ -117,7 +116,7 @@ var initSelected = function initSelected(allCiSet, showType) {
 exports.initSelected = initSelected;
 var updateCiSetSeleted = function updateCiSetSeleted(selected, allCiSet, showType) {
   var newCiSet = (0, _extends2["default"])({}, allCiSet);
-  Object.keys(selected).map(function (key) {
+  Object.keys(selected).forEach(function (key) {
     var selectedArr = selected[key];
     var list = allCiSet[key].list.map(function (item) {
       var obj = showType === 'tag' ? (0, _extends2["default"])({}, item, {
@@ -131,7 +130,7 @@ var updateCiSetSeleted = function updateCiSetSeleted(selected, allCiSet, showTyp
       list: list
     });
   });
-  _rlog["default"].debug("updateCiSetSeleted-selected,newCiSet", selected, newCiSet);
+  _rlog["default"].debug('updateCiSetSeleted-selected,newCiSet', selected, newCiSet);
   return newCiSet;
 };
 
@@ -168,12 +167,12 @@ var defaultSelected = function defaultSelected(allCiSet, defaultSet, dataType) {
 };
 exports.defaultSelected = defaultSelected;
 var typeCell = function typeCell(text) {
-  if (text === "attribute") {
-    return "属性";
-  } else if (text === "metric") {
-    return "指标";
+  if (text === 'attribute') {
+    return '属性';
+  } else if (text === 'metric') {
+    return '指标';
   }
-  return "-";
+  return '-';
 };
 
 /**
@@ -187,9 +186,9 @@ var columns = function columns(dataType, showCiNum) {
   // const ciNumKey = `ci${dataTypeUp}Num`;
   // const ciArrKey = `ci${dataTypeUp}Arr`;
   var values = [{
-    width: "100%",
-    dataIndex: "name",
-    title: "数据",
+    width: '100%',
+    dataIndex: 'name',
+    title: '数据',
     cellOption: {
       nowrap: true
     }
@@ -221,9 +220,9 @@ var columns = function columns(dataType, showCiNum) {
   //   },
   // },
   {
-    width: "70px",
-    dataIndex: "type",
-    title: "类型",
+    width: '70px',
+    dataIndex: 'type',
+    title: '类型',
     cellOption: {
       nowrap: {
         nowrapCell: typeCell,

package/lib/components/BatchAttrMetric2/setting.js

@@ -93,7 +93,6 @@ var Setting = function Setting(_ref) {
   };
   var tableData = (0, _react.useMemo)(function () {
     var _allCiSet$ciType;
-    // console.log('allCiSet,ciType,search', allCiSet, ciType, search);
     var list = ((_allCiSet$ciType = allCiSet[ciType]) === null || _allCiSet$ciType === void 0 ? void 0 : _allCiSet$ciType.list) || [];
     if (search) {
       list = list.filter(function (item) {
@@ -103,9 +102,8 @@ var Setting = function Setting(_ref) {
     }
     return list;
   }, [allCiSet, ciType, search]);
-  function onSearch(value) {
-    // console.log('search', search);
-    setSearch(value);
+  function onSearch(searchValue) {
+    setSearch(searchValue);
   }
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"].layout

package/lib/components/BatchAttrMetric2/utils.js

@@ -1,13 +1,8 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.defaultSelected = void 0;
 exports.getDefaultSelectedCiType = getDefaultSelectedCiType;
 exports.typeCell = exports.treeDs = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _indexModule = _interopRequireDefault(require("./index.module.scss"));
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 var _treeUtil = require("../../utils/treeUtil");
 /**
  * 获取树结构数据源
@@ -24,64 +19,14 @@ var treeDs = function treeDs(allCiSet) {
     };
   });
 };
-
-// 由于属性和指标code存在重复，拼接code与类型作为id
 exports.treeDs = treeDs;
-var toId = function toId(_ref) {
-  var code = _ref.code,
-    type = _ref.type;
-  return type ? code + "-" + type : code;
-};
-
-// id反解析回对象
-var reverseToId = function reverseToId(id) {
-  var _id$split = id.split("-"),
-    code = _id$split[0],
-    type = _id$split[1];
-  return {
-    code: code,
-    type: type
-  };
-};
-
-/**
- * 获取默认选择项，用于重置
- * @param {*} allCiSet 数据源
- * @param {*} defaultSet 默认选择项数据源
- * @param {*} dataType 数据类型
- * @returns
- */
-var defaultSelected = function defaultSelected(allCiSet, defaultSet, dataType) {
-  if (defaultSet === void 0) {
-    defaultSet = {};
-  }
-  var values = {};
-  Object.keys(allCiSet).forEach(function (key) {
-    var ciTypeSelected = defaultSet[key] || defaultSet[allCiSet[key].code];
-    // 没有ci类型对应的默认配置 ->  使用通用的配置项
-    // const selected = (ciTypeSelected || defaultSet['common'])[dataType] || [];
-    var selected = [];
-    var selectedIds = selected.map(function (item) {
-      return toId(item);
-    });
-    var data = allCiSet[key].list;
-    var selectedData = data === null || data === void 0 ? void 0 : data.filter(function (item) {
-      return selectedIds.includes(item.id);
-    });
-    values[key] = selectedData.map(function (item) {
-      return item.id;
-    }) || [];
-  });
-  return values;
-};
-exports.defaultSelected = defaultSelected;
 var typeCell = function typeCell(text) {
-  if (text === "attribute") {
-    return "属性";
-  } else if (text === "metric") {
-    return "指标";
+  if (text === 'attribute') {
+    return '属性';
+  } else if (text === 'metric') {
+    return '指标';
   }
-  return "-";
+  return '-';
 };
 
 /**

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

@@ -7,8 +7,6 @@
   }
 
   :global {
-    .#{$css-prefix}drawer-header {
-    }
     .#{$css-prefix}drawer-body {
       flex: 1;
       display: flex;

package/lib/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js

@@ -52,8 +52,8 @@ var MultipleTypeAttributeSelectDrawer = /*#__PURE__*/(0, _react.forwardRef)(func
   });
 
   // 保存指标设置
-  var save = function save(showType, parm) {
-    _rlog["default"].debug('saveMarkSetting', showType, parm);
+  var save = function save(xx, parm) {
+    _rlog["default"].debug('saveMarkSetting', parm);
     var newSelected = {};
     Object.keys(parm).forEach(function (ciType) {
       newSelected[ciType] = parm[ciType].map(function (id) {

package/lib/components/MultiResourceDrawer/ResourceSelect.js

@@ -11,8 +11,7 @@ function ResourceSelect(props, ref) {
   var store = props.store,
     initialData = props.initialData,
     totalSelection = props.totalSelection;
-  var dynamicRes = initialData.dynamic,
-    staticRes = initialData["static"];
+  var staticRes = initialData["static"];
   var staticRef = (0, _react.useRef)();
   (0, _react.useImperativeHandle)(ref, function () {
     return {

package/lib/components/ResourceList/ResourceSelect.module.scss

@@ -1,7 +1,3 @@
 .table {
   height: 100%;
-  :global {
-    .next-table-body {
-    }
-  }
 }

package/lib/components/TagSelect/index.js

@@ -17,7 +17,6 @@ var TagSelect = function TagSelect(props) {
     value = props.value,
     defaultValue = props.defaultValue,
     dataSource = props.dataSource,
-    size = props.size,
     boxProps = props.boxProps,
     tagProps = props.tagProps;
   var _useState = (0, _react.useState)(value || defaultValue),

package/lib/components/TagSelect/index.scss

@@ -20,8 +20,6 @@
       .#{$css-prefix}tag-body {
         width: 100%;
         padding: 0;
-
-        .tag-select-img {}
       }
     }
   }

package/lib/components/VerticalIconTab/VerticalIconTab.js

@@ -56,10 +56,10 @@ function VerticalIconTab(props) {
   return /*#__PURE__*/_react["default"].createElement(_tab["default"], (0, _extends2["default"])({
     shape: "wrapped",
     tabPosition: "left",
-    tabRender: function tabRender(key, props) {
+    tabRender: function tabRender(key, tabProps) {
       return /*#__PURE__*/_react["default"].createElement(CustomTabItem, (0, _extends2["default"])({
         key: key
-      }, props));
+      }, tabProps));
     }
   }, props, {
     className: _VerticalIconTabModule["default"].tabs,

package/lib/core/components/AlarmListPanel/index.module.scss

@@ -64,21 +64,8 @@
       box-shadow: 0px 1px 0px 0px #E4E9EE;
     }
 
-    .#{$css-prefix}list-header {
-      padding: 8px 16px 12px 16px !important;
-      border-bottom: none;
-      height: 44px;
-      box-shadow: 0px 1px 0px 0px #E4E9EE;
-    }
-
     .#{$css-prefix}list-empty {
       padding: 1px;
-
-    }
-
-    .#{$css-prefix}list-items {
-      // max-height: 230px;
-      // overflow-y: auto;
     }
 
     .#{$css-prefix}list-item {

package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -25,18 +25,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 function DisplaySetting(props, ref) {
   var topo = props.topo,
-    displaySettingProps = props.displaySettingProps,
-    isEditor = props.isEditor;
+    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;
+    nodeTipProps = _ref.nodeTipProps;
   var field = _field["default"].useField({
     autoUnmount: false,
     values: {

package/lib/core/editor/components/BottomFloatTool/HelpIcon.js

@@ -8,6 +8,7 @@ var _grid = _interopRequireDefault(require("@alifd/next/lib/grid"));
 var _react = _interopRequireWildcard(require("react"));
 var _HelpIconModule = _interopRequireDefault(require("./HelpIcon.module.scss"));
 var _useCanvasThemeConfig2 = _interopRequireDefault(require("../../../hooks/useCanvasThemeConfig"));
+var _classnames = _interopRequireDefault(require("classnames"));
 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 Row = _grid["default"].Row,
@@ -24,6 +25,7 @@ function HelpIcon(props) {
     }),
     themeConfig = _useCanvasThemeConfig.themeConfig;
   var helpIconNames = themeConfig.editor.helpIcon;
+  var helpIconName = themeConfig.editor.helpIconName;
   var onChange = function onChange(visible, type) {
     if (type != 'docClick') {
       setHelpBoxIsShow(visible);
@@ -53,12 +55,12 @@ function HelpIcon(props) {
     align: "t",
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       ref: topoViewerRef,
-      className: _HelpIconModule["default"].topoHelpIconBtn,
+      className: (0, _classnames["default"])(_HelpIconModule["default"].topoHelpIconBtn, _HelpIconModule["default"]["topoHelpIconBtn-" + helpIconNames]),
       onClick: function onClick() {
         open;
       }
     }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: "/img/topo/editor/bottomFloatTool/default.svg",
+      src: "/img/topo/editor/bottomTool/help_icon_" + helpIconName + ".svg",
       alt: ""
     })),
     closable: true,
@@ -69,7 +71,7 @@ function HelpIcon(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: _HelpIconModule["default"].topoHelpIcon
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _HelpIconModule["default"][helpIconNames + 'Box']
+    className: _HelpIconModule["default"][helpIconNames + "Box"]
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: _HelpIconModule["default"].title
   }, "\u5FEB\u6377\u952E"), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/core/editor/components/BottomFloatTool/HelpIcon.module.scss

@@ -8,6 +8,13 @@
     margin-top: -1px;
     margin-left: -1px;
 }
+.topoHelpIconBtn-white {
+    color:$color-text1-4;
+}
+.topoHelpIconBtn-dark {
+    color:$color-text1-5;
+}
+
 :global{
     .white.next-overlay-inner{
         padding: 10px;

package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/EdgeType.js

@@ -97,7 +97,7 @@ function getValuesByEdges(topo) {
     return edgeValues;
   }
   var selectionEdges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-  var edgeValues = getEdgesValues(selectionEdges, topo);
+  var edgeValues = getEdgesValues(selectionEdges);
   var values = {
     baseAgreement: false,
     lineButton: undefined,

package/lib/core/hooks/useCanvasThemeConfig.js

@@ -11,7 +11,8 @@ var themeMap = [{
   color: '#FFFFFF',
   editor: {
     // 快捷帮助
-    helpIcon: 'white'
+    helpIcon: 'white',
+    helpIconName: 'dark'
   }
 }, {
   name: 'lightblue',
@@ -19,7 +20,8 @@ var themeMap = [{
   color: '#F9FBFF',
   editor: {
     // 快捷帮助
-    helpIcon: 'white'
+    helpIcon: 'white',
+    helpIconName: 'dark'
   }
 },
 // {
@@ -38,7 +40,8 @@ var themeMap = [{
   color: '#031425',
   editor: {
     // 快捷帮助
-    helpIcon: 'dark'
+    helpIcon: 'dark',
+    helpIconName: 'light'
   }
 }, {
   name: 'poly',
@@ -46,7 +49,8 @@ var themeMap = [{
   backgroundImage: '/img/topo/themes/poly.png',
   editor: {
     // 快捷帮助
-    helpIcon: 'dark'
+    helpIcon: 'dark',
+    helpIconName: 'light'
   }
 }].reduce(function (map, item) {
   var _extends2;