@riil-frontend/component-topology 11.0.27 → 11.0.29

package/lib/components/BatchAttrMetric/setting.js

@@ -18,24 +18,33 @@ var _componentTableLayout = _interopRequireDefault(require("@riil-frontend/compo
 var _hooks = _interopRequireDefault(require("@riil-frontend/hooks"));
 var utils = _interopRequireWildcard(require("./utils"));
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
-var _excluded = ["value", "defaultSet", "allCiSet", "showType"];
+var _treeUtil = require("../../utils/treeUtil");
+var _excluded = ["value", "defaultSet", "dataSource"];
 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 Setting = function Setting(_ref) {
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? {} : _ref$value,
     defaultSet = _ref.defaultSet,
-    allCiSet = _ref.allCiSet,
-    showType = _ref.showType,
+    dataSource = _ref.dataSource,
     props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
-  // const allCiSet = utils.dsTransform(props.allCiSet);
-
   var limit = props.limit,
-    saveCb = props.saveCb,
-    elementType = props.elementType;
-  var _useState = (0, _react.useState)(Object.keys(allCiSet)[0]),
+    saveCb = props.saveCb;
+  var allCiSet = (0, _react.useMemo)(function () {
+    var map = {};
+    (0, _treeUtil.loopTreeNode)(dataSource, function (item) {
+      if (item.type !== 'folder') {
+        map[item.id] = item;
+      }
+    });
+    return map;
+  }, [dataSource]);
+  var _useState = (0, _react.useState)(utils.getDefaultSelectedCiType(dataSource)),
     ciType = _useState[0],
     setCiType = _useState[1];
+  (0, _react.useEffect)(function () {
+    setCiType(utils.getDefaultSelectedCiType(dataSource));
+  }, [dataSource]);
   var _useState2 = (0, _react.useState)(''),
     search = _useState2[0],
     setSearch = _useState2[1];
@@ -44,31 +53,46 @@ var Setting = function Setting(_ref) {
     setSelected = _useState3[1];
   var selectedRowKeys = selected[ciType] || [];
   var _RiilHooks$useTableCo = _hooks["default"].useTableColumn({
-      columns: utils.columns(showType, props.showCiNum)
+      columns: [{
+        width: '100%',
+        dataIndex: 'name',
+        title: '数据',
+        cellOption: {
+          nowrap: true
+        }
+      }, {
+        width: '70px',
+        dataIndex: 'type',
+        title: '类型',
+        cellOption: {
+          nowrap: {
+            nowrapCell: utils.typeCell,
+            title: utils.typeCell
+          }
+        }
+      }]
     }),
     columnNodes = _RiilHooks$useTableCo.columnNodes;
   var onTreeSelect = function onTreeSelect(_ref2) {
     var selectedKey = _ref2[0];
-    if (selectedKey) {
+    if (selectedKey && allCiSet[selectedKey] && allCiSet[selectedKey].type !== 'folder') {
       setCiType(selectedKey);
     }
   };
   var onTableSelect = function onTableSelect(selectedKeys) {
     var values = (0, _extends2["default"])({}, selected);
-    _rlog["default"].debug("Setting-allCiSet-onTableSelect", limit, selectedKeys, selected);
+    _rlog["default"].debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
     values[ciType] = selectedKeys;
     setSelected(values);
   };
   var saveSelected = function saveSelected() {
-    saveCb(utils.saveTransform(selected));
+    saveCb(selected);
   };
   var onReset = function onReset() {
-    var values = utils.defaultSelected(allCiSet, defaultSet, showType);
-    setSelected(values);
+    setSelected({});
   };
   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) {
@@ -78,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
@@ -90,18 +113,29 @@ var Setting = function Setting(_ref) {
     type: "notice"
   }, props.label + "\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728" + props.poslabel + "\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 " + limit + " \u9879\u3002")), /*#__PURE__*/_react["default"].createElement(_grid["default"].Row, {
     className: _indexModule["default"].content
-  }, props.showTree && /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
+  }, /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
     span: 8,
-    className: _indexModule["default"]["tree-wrap"]
-  }, /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
-    dataSource: utils.treeDs(allCiSet),
+    className: _indexModule["default"]['tree-wrap']
+  }, dataSource.length && /*#__PURE__*/_react["default"].createElement(_componentActionTree["default"], {
+    dataSource: dataSource,
     onSelect: onTreeSelect,
     draggable: false,
     treeProps: {
-      selectedKeys: [ciType]
+      selectedKeys: [ciType],
+      defaultExpandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      expandedKeys: dataSource.filter(function (item) {
+        return item.type === 'folder';
+      }).map(function (item) {
+        return item.id;
+      }),
+      defaultExpandAll: true
     }
   })), /*#__PURE__*/_react["default"].createElement(_grid["default"].Col, {
-    className: _indexModule["default"]["table-wrap"]
+    className: _indexModule["default"]['table-wrap']
   }, /*#__PURE__*/_react["default"].createElement(_componentTableLayout["default"], {
     filterItems: /*#__PURE__*/_react["default"].createElement("div", {
       className: _indexModule["default"].filter

package/lib/components/BatchAttrMetric/utils.js

@@ -1,13 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.updateCiSetSeleted = exports.treeDs = exports.saveTransform = exports.initSelected = exports.dsTransform = exports.defaultSelected = exports.columns = void 0;
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireDefault(require("react"));
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-var _excluded = ["list"];
+exports.getDefaultSelectedCiType = getDefaultSelectedCiType;
+exports.typeCell = exports.treeDs = void 0;
+var _treeUtil = require("../../utils/treeUtil");
 /**
  * 获取树结构数据源
  * @param {*} allCiSet 数据源
@@ -23,149 +19,7 @@ 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
-  };
-};
-
-/**
- * 数据源转换，追加id
- * @param {*} allCiSet 数据源
- * @returns
- */
-var dsTransform = function dsTransform(allCiSet) {
-  var values = {};
-  Object.keys((0, _extends2["default"])({}, allCiSet)).forEach(function (key) {
-    var _allCiSet$key3 = allCiSet[key],
-      list = _allCiSet$key3.list,
-      value = (0, _objectWithoutPropertiesLoose2["default"])(_allCiSet$key3, _excluded);
-    var data = list.map(function (item) {
-      return (0, _extends2["default"])({}, item, {
-        id: toId(item)
-      });
-    });
-    values[key] = (0, _extends2["default"])({
-      list: data
-    }, value);
-  });
-  return values;
-};
-
-/**
- * 保存时的转换，将id转为对象
- * @param {*} submit 保存的数据
- * @returns
- */
-exports.dsTransform = dsTransform;
-var saveTransform = function saveTransform(submit) {
-  var values = {};
-  Object.keys(submit).forEach(function (key) {
-    values[key] = submit[key].map(function (item) {
-      return reverseToId(item);
-    });
-  });
-  return values;
-};
-
-/**
- * 获取初始选中项
- * @param {*} allCiSet 数据源
- * @param {*} showType 数据类型
- * @returns
- */
-exports.saveTransform = saveTransform;
-var initSelected = function initSelected(allCiSet, showType) {
-  _rlog["default"].debug('initSelected-allCiSet, dataType', allCiSet, showType);
-  var values = {};
-  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.forEach(function (item) {
-      if (item[showType]) {
-        result.push(item.id);
-      }
-    });
-    values[key] = result;
-  });
-  _rlog["default"].debug('initSelected-allCiSet-result, dataType', values);
-  return values;
-};
-
-/**
- * 更新保存选择结果
- * @param {*} selected
- * @param {*} allCiSet
- * @returns
- */
-exports.initSelected = initSelected;
-var updateCiSetSeleted = function updateCiSetSeleted(selected, allCiSet, showType) {
-  var newCiSet = (0, _extends2["default"])({}, allCiSet);
-  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, {
-        tag: selectedArr.indexOf(item.id) >= 0
-      }) : (0, _extends2["default"])({}, item, {
-        tip: selectedArr.indexOf(item.id) >= 0
-      });
-      return obj;
-    });
-    newCiSet[key] = (0, _extends2["default"])({}, allCiSet[key], {
-      list: list
-    });
-  });
-  _rlog["default"].debug('updateCiSetSeleted-selected,newCiSet', selected, newCiSet);
-  return newCiSet;
-};
-
-/**
- * 获取默认选择项，用于重置
- * @param {*} allCiSet 数据源
- * @param {*} defaultSet 默认选择项数据源
- * @param {*} dataType 数据类型
- * @returns
- */
-exports.updateCiSetSeleted = updateCiSetSeleted;
-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 '属性';
@@ -176,63 +30,19 @@ var typeCell = function typeCell(text) {
 };
 
 /**
- * 获取表格列配置
- * @param {*} dataType 数据类型
- * @param {*} showCiNum 是否展示‘匹配资源’列
- * @returns
+ * 获得默认选中第一个模型
+ * @param {*} tree 
+ * @returns 
  */
-var columns = function columns(dataType, showCiNum) {
-  // const dataTypeUp = `${dataType[0].toUpperCase()}${dataType.slice(1)}`;
-  // const ciNumKey = `ci${dataTypeUp}Num`;
-  // const ciArrKey = `ci${dataTypeUp}Arr`;
-  var values = [{
-    width: '100%',
-    dataIndex: 'name',
-    title: '数据',
-    cellOption: {
-      nowrap: true
-    }
-  },
-  // {
-  //   width: '50%',
-  //   dataIndex: ciNumKey,
-  //   title: '匹配资源',
-  //   cell: (text, index, record) => {
-  //     const trigger = (
-  //       <Button text type="primary">
-  //         {text || 0}
-  //       </Button>
-  //     );
-  //     return (
-  //       <Balloon
-  //         needAdjust
-  //         trigger={trigger}
-  //         closable={false}
-  //         triggerType={text ? 'hover' : []}
-  //       >
-  //         <div className={styles['tip-content']}>
-  //           {record[ciArrKey].map((ci, i) => (
-  //             <div key={i}>{ci}</div>
-  //           ))}
-  //         </div>
-  //       </Balloon>
-  //     );
-  //   },
-  // },
-  {
-    width: '70px',
-    dataIndex: 'type',
-    title: '类型',
-    cellOption: {
-      nowrap: {
-        nowrapCell: typeCell,
-        title: typeCell
+exports.typeCell = typeCell;
+function getDefaultSelectedCiType(tree) {
+  var ciType = null;
+  (0, _treeUtil.loopTreeNode)(tree, function (item) {
+    if (item.type !== 'folder') {
+      if (!ciType) {
+        ciType = item.id;
       }
     }
-  }];
-  return values;
-  // return showCiNum
-  //   ? values
-  //   : values.filter((item) => item.dataIndex !== ciNumKey);
-};
-exports.columns = columns;
+  });
+  return ciType;
+}

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

@@ -5,7 +5,7 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _BatchAttrMetric = _interopRequireDefault(require("../../BatchAttrMetric2"));
+var _BatchAttrMetric = _interopRequireDefault(require("../../BatchAttrMetric"));
 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 ModelAttrSelectDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {

package/lib/core/components/DisplaySettingDrawer/ResourceDisplay/BasicConfig.js

@@ -7,19 +7,18 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
 var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
 var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 var _ResourceInfoDisplay = require("../../../../constants/ResourceInfoDisplay");
 var _CommonCheckboxGroup = _interopRequireDefault(require("./CommonCheckboxGroup"));
 var _Setting = _interopRequireDefault(require("../../ResourceViewAttributeSetting/Setting"));
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 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 ConfigType = {
-  DEFAULT: "0",
-  CUSTOM: "1"
+  DEFAULT: '0',
+  CUSTOM: '1'
 };
 function BasicConfig(props, ref) {
   var topo = props.topo,
@@ -51,7 +50,7 @@ function BasicConfig(props, ref) {
   };
   // 默认选择框change
   var handleCommonCheckboxGroupChange = function handleCommonCheckboxGroupChange(selected) {
-    _rlog["default"].debug("handleCommonCheckboxGroupChange", selected);
+    _rlog["default"].debug('handleCommonCheckboxGroupChange', selected);
     onChange({
       isCustom: isCustom,
       data: selected
@@ -64,7 +63,7 @@ function BasicConfig(props, ref) {
   };
   // 自定义选择框change
   var handleCustomChange = function handleCustomChange(parm) {
-    _rlog["default"].debug("handleCustomChange", parm);
+    _rlog["default"].debug('handleCustomChange', parm);
     onChange(parm);
   };
   // 渲染自定义配置抽屉

package/lib/core/components/ResourceViewAttributeSetting/Setting.js

@@ -4,74 +4,46 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-var _BatchAttrMetric = _interopRequireDefault(require("../../../components/BatchAttrMetric"));
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
 var _nodeCiTypeAttrUtil = require("./nodeCiTypeAttrUtil");
+var _ModelAttrSelectDrawer = _interopRequireDefault(require("../../../components/ModelAttrSelectDrawer"));
+var _excluded = ["topo", "elementType", "showType", "value"];
 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 ResourceDiplayInfoSetting = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var value = props.value,
-    topo = props.topo,
+var AttrSettingDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var topo = props.topo,
     elementType = props.elementType,
     showType = props.showType,
-    limit = props.limit,
-    onChange = props.onChange,
-    queryData = props.queryData;
-  var batchAttrMetric = (0, _react.useRef)();
-  var _useState = (0, _react.useState)({}),
-    markData = _useState[0],
-    setMarkarkData = _useState[1];
-  var openMarkSetting = function openMarkSetting(parm) {
-    _rlog["default"].debug("openMarkSetting", parm, elementType, showType);
-    if (queryData) {
-      setMarkarkData(queryData());
+    value = props.value,
+    otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+  var _useState = (0, _react.useState)([]),
+    data = _useState[0],
+    setData = _useState[1];
+  var queryData = function queryData() {
+    _rlog["default"].info('属性配置：加载数据');
+    if (elementType === 'node') {
+      var items = (0, _nodeCiTypeAttrUtil.getNodeModels)(topo);
+      setData(items);
     } else {
-      setMarkarkData(elementType === "node" ? (0, _nodeCiTypeAttrUtil.getNodeCiModSet)({
-        topo: topo
-      }) : undefined);
+      var _items = topo.elementTagTipConfig.getLinkConfigItems();
+      setData(_items);
     }
-    batchAttrMetric.current.show({
-      showType: showType
-    });
   };
-
-  // 保存指标设置
-  var saveMarkSetting = function saveMarkSetting(showType, parm, selectType) {
-    _rlog["default"].debug("saveMarkSetting", showType, parm);
-    onChange({
-      isCustom: true,
-      data: parm
-    });
-  };
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      show: openMarkSetting
-    };
-  });
-  var newValue = (0, _react.useMemo)(function () {
-    var d = (0, _extends2["default"])({}, (value === null || value === void 0 ? void 0 : value.data) || {});
-    Object.keys(d).forEach(function (key) {
-      d[key] = (d[key] || []).map(function (item) {
-        return item.code + "-" + item.type;
-      });
-    });
-    return d;
-  }, [value]);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_BatchAttrMetric["default"], {
-    ref: batchAttrMetric,
-    value: newValue,
-    allCiSet: markData,
-    limit: limit,
-    topo: topo,
-    elementType: elementType,
+  return /*#__PURE__*/_react["default"].createElement(_ModelAttrSelectDrawer["default"], (0, _extends2["default"])({
+    ref: ref
+  }, otherProps, {
+    value: value,
+    data: data,
     showType: showType,
-    saveCb: saveMarkSetting
+    queryData: queryData
   }));
 });
-ResourceDiplayInfoSetting.displayName = 'ResourceDiplayInfoSetting';
-var _default = ResourceDiplayInfoSetting;
+AttrSettingDrawer.displayName = 'AttrSettingDrawer';
+AttrSettingDrawer.propTypes = {};
+var _default = AttrSettingDrawer;
 exports["default"] = _default;

package/lib/core/components/TopoView/topoView.js

@@ -43,7 +43,6 @@ var Topology = function Topology(props) {
   var topo = props.topo,
     defaultEnterEditMode = props.defaultEnterEditMode,
     titleBar = props.titleBar,
-    toolbar = props.toolbar,
     buildLoadOptions = props.buildLoadOptions,
     onReady = props.onReady,
     onLoaded = props.onLoaded,

package/lib/core/components/titlebar/TitleBar.module.scss

@@ -7,10 +7,6 @@
     align-items: center;
   }
 
-  .right {
-
-  }
-
   &.titlebarViewMode {
     padding: 16px;
   }
@@ -31,8 +27,3 @@
   display: flex;
 }
 
-.button {
-}
-
-.moreMenuButton {
-}

package/lib/core/components/titlebar/widgets/TitleWidget.js

@@ -3,19 +3,14 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = TitleWidget;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _TitleBarModule = _interopRequireDefault(require("../TitleBar.module.scss"));
-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; }
 function TitleWidget(props) {
   var topo = props.topo;
   var store = topo.store;
-  var _store$useModel = store.useModel('topoMod'),
-    topoState = _store$useModel[0],
-    topoDispatchers = _store$useModel[1];
+  var topoState = store.useModelState('topoMod');
   var _topoState$currentTop = topoState.currentTopo,
     _topoState$currentTop2 = _topoState$currentTop === void 0 ? {} : _topoState$currentTop,
-    topoId = _topoState$currentTop2.id,
     topoName = _topoState$currentTop2.name;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _TitleBarModule["default"].title

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

@@ -55,10 +55,7 @@ function HelpIcon(props) {
     align: "t",
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       ref: topoViewerRef,
-      className: (0, _classnames["default"])(_HelpIconModule["default"].topoHelpIconBtn, _HelpIconModule["default"]["topoHelpIconBtn-" + helpIconNames]),
-      onClick: function onClick() {
-        open;
-      }
+      className: (0, _classnames["default"])(_HelpIconModule["default"].topoHelpIconBtn, _HelpIconModule["default"]["topoHelpIconBtn-" + helpIconNames])
     }, /*#__PURE__*/_react["default"].createElement("img", {
       src: "/img/topo/editor/bottomTool/help_icon_" + helpIconName + ".svg",
       alt: ""