@riil-frontend/component-topology 11.0.6 → 11.0.10

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -83,7 +83,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getNodeFiedldMap = function getNodeFiedldMap() {
     var mtCodes = (0, _utils.getNodeMtCodes)(this.topoData);
-    return this.getFiedldMapByMtCodes(mtCodes, 'node');
+    return this.getFiedldMapByType(mtCodes, 'node');
   }
   /**
    * 获得节点字段配置项map
@@ -92,13 +92,8 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getLinkFidldMap = function getLinkFidldMap() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
-    return this.getFiedldMapByMtCodes(mtCodes, 'link');
-  }
-  /**
-   * 获取链路标注悬浮框属性配置数据
-   * @returns 
-   */
-  ;
+    return this.getFiedldMapByType(mtCodes, 'link');
+  };
 
   _proto.getLinkConfigItems = function getLinkConfigItems() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
@@ -128,48 +123,47 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     // ]
   };
 
-  _proto.getFiedldMapByMtCodes = function getFiedldMapByMtCodes(mtCodes, type) {
+  _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
     var _this = this;
 
     var map = {};
     mtCodes.forEach(function (mtCode) {
       var ciType = _this.mtCiTypeMap[mtCode];
-      map[mtCode] = _this.getFiedldMapByType(ciType, type, mtCode);
-    });
-    return map;
-  };
 
-  _proto.getFiedldMapByType = function getFiedldMapByType(ciType, type, mtCode) {
-    var attributes = this.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attr) {
-      return !!attr.userVisible;
+      var attributes = _this.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attr) {
+        return !!attr.userVisible;
+      });
+
+      var metrics = _this.getMtMetricModels(mtCode);
+
+      var extItems = type === 'node' ? [{
+        lavel: '图片名称',
+        value: 'graph:name',
+        typeName: null
+      }, {
+        lavel: '资源类型',
+        value: 'ciType:name',
+        typeName: null
+      }] : [];
+      map[mtCode] = [].concat(extItems, attributes.map(function (item) {
+        return {
+          type: 'attribute',
+          id: "attribute:" + item.code,
+          code: "attribute:" + item.code,
+          name: item.name,
+          typeName: '属性'
+        };
+      }), metrics.map(function (item) {
+        return {
+          type: 'metric',
+          id: "metric:" + item.code,
+          code: "metric:" + item.code,
+          name: item.name,
+          typeName: '指标'
+        };
+      }));
     });
-    var metrics = this.getMtMetricModels(mtCode);
-    var extItems = type === 'node' ? [{
-      lavel: '图片名称',
-      value: 'graph:name',
-      typeName: null
-    }, {
-      lavel: '资源类型',
-      value: 'ciType:name',
-      typeName: null
-    }] : [];
-    return [].concat(extItems, attributes.map(function (item) {
-      return {
-        type: 'attribute',
-        id: "attribute:" + item.code,
-        code: "attribute:" + item.code,
-        name: item.name,
-        typeName: '属性'
-      };
-    }), metrics.map(function (item) {
-      return {
-        type: 'metric',
-        id: "metric:" + item.code,
-        code: "metric:" + item.code,
-        name: item.name,
-        typeName: '指标'
-      };
-    }));
+    return map;
   };
 
   _proto.getMtMetricModels = function getMtMetricModels(mtCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "11.0.6",
+  "version": "11.0.10",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -118,6 +118,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.6/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.10/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/components/ModelAttrSelectDrawer/components/MultipleTypeAttributeSelectDrawer.js

@@ -1,82 +0,0 @@
-import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import ModelAttrSelectDrawer from "./ModelAttrSelectDrawer";
-
-function parseValue(value) {
-  var selected = {};
-  Object.keys(value).forEach(function (ciType) {
-    selected[ciType] = value[ciType].map(function (_ref) {
-      var type = _ref.type,
-          code = _ref.code;
-      return type + ":" + code;
-    });
-  });
-  return selected;
-}
-/**
- * 资源显示属性、指标配置
- */
-
-
-var MultipleTypeAttributeSelectDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
-  var value = props.value,
-      data = props.data,
-      showType = props.showType,
-      limit = props.limit,
-      onChange = props.onChange,
-      queryData = props.queryData;
-  var batchAttrMetric = useRef();
-
-  var _useState = useState(parseValue((value === null || value === void 0 ? void 0 : value.data) || {})),
-      selected = _useState[0],
-      setSelected = _useState[1];
-
-  useEffect(function () {
-    setSelected(parseValue((value === null || value === void 0 ? void 0 : value.data) || {}));
-  }, [value]); // 点击选择数据，显示抽屉
-
-  var show = function show() {
-    queryData();
-    batchAttrMetric.current.show({
-      showType: showType
-    });
-  };
-
-  useImperativeHandle(ref, function () {
-    return {
-      show: show
-    };
-  }); // 保存指标设置
-
-  var save = function save(showType, parm) {
-    rlog.debug('saveMarkSetting', showType, parm);
-    var newSelected = {};
-    Object.keys(parm).forEach(function (ciType) {
-      newSelected[ciType] = parm[ciType].map(function (id) {
-        var _id$split = id.split(':'),
-            type = _id$split[0],
-            code = _id$split[1];
-
-        return {
-          code: code,
-          type: type
-        };
-      });
-    });
-    onChange({
-      isCustom: true,
-      data: newSelected
-    });
-  };
-
-  return /*#__PURE__*/React.createElement(ModelAttrSelectDrawer, {
-    ref: batchAttrMetric,
-    value: selected,
-    dataSource: data,
-    limit: limit,
-    showType: showType,
-    onOk: save
-  });
-});
-MultipleTypeAttributeSelectDrawer.displayName = 'MultipleTypeAttributeSelectDrawer';
-export default MultipleTypeAttributeSelectDrawer;

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

@@ -1,40 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["topo", "showType", "value"];
-import React, { forwardRef, useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
-import ModelAttrSelectDrawer from "../../../../components/ModelAttrSelectDrawer";
-import { getNodeModels } from "../../ResourceViewAttributeSetting/nodeCiTypeAttrUtil";
-/**
- * 节点标注、悬浮框设置
- */
-
-var NodeAttrSettingDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
-  var topo = props.topo,
-      showType = props.showType,
-      value = props.value,
-      otherProps = _objectWithoutPropertiesLoose(props, _excluded);
-
-  var _useState = useState([]),
-      data = _useState[0],
-      setData = _useState[1];
-
-  var queryData = function queryData() {
-    rlog.info('属性配置：加载数据');
-    var items = getNodeModels(topo);
-    setData(items);
-  };
-
-  return /*#__PURE__*/React.createElement(ModelAttrSelectDrawer, _extends({
-    ref: ref
-  }, otherProps, {
-    value: value,
-    data: data,
-    showType: showType,
-    queryData: queryData
-  }));
-});
-NodeAttrSettingDrawer.displayName = 'NodeAttrSettingDrawer';
-NodeAttrSettingDrawer.propTypes = {};
-export default NodeAttrSettingDrawer;

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

@@ -1,97 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
-
-var _ModelAttrSelectDrawer = _interopRequireDefault(require("./ModelAttrSelectDrawer"));
-
-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 parseValue(value) {
-  var selected = {};
-  Object.keys(value).forEach(function (ciType) {
-    selected[ciType] = value[ciType].map(function (_ref) {
-      var type = _ref.type,
-          code = _ref.code;
-      return type + ":" + code;
-    });
-  });
-  return selected;
-}
-/**
- * 资源显示属性、指标配置
- */
-
-
-var MultipleTypeAttributeSelectDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var value = props.value,
-      data = props.data,
-      showType = props.showType,
-      limit = props.limit,
-      onChange = props.onChange,
-      queryData = props.queryData;
-  var batchAttrMetric = (0, _react.useRef)();
-
-  var _useState = (0, _react.useState)(parseValue((value === null || value === void 0 ? void 0 : value.data) || {})),
-      selected = _useState[0],
-      setSelected = _useState[1];
-
-  (0, _react.useEffect)(function () {
-    setSelected(parseValue((value === null || value === void 0 ? void 0 : value.data) || {}));
-  }, [value]); // 点击选择数据，显示抽屉
-
-  var show = function show() {
-    queryData();
-    batchAttrMetric.current.show({
-      showType: showType
-    });
-  };
-
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      show: show
-    };
-  }); // 保存指标设置
-
-  var save = function save(showType, parm) {
-    _rlog["default"].debug('saveMarkSetting', showType, parm);
-
-    var newSelected = {};
-    Object.keys(parm).forEach(function (ciType) {
-      newSelected[ciType] = parm[ciType].map(function (id) {
-        var _id$split = id.split(':'),
-            type = _id$split[0],
-            code = _id$split[1];
-
-        return {
-          code: code,
-          type: type
-        };
-      });
-    });
-    onChange({
-      isCustom: true,
-      data: newSelected
-    });
-  };
-
-  return /*#__PURE__*/_react["default"].createElement(_ModelAttrSelectDrawer["default"], {
-    ref: batchAttrMetric,
-    value: selected,
-    dataSource: data,
-    limit: limit,
-    showType: showType,
-    onOk: save
-  });
-});
-MultipleTypeAttributeSelectDrawer.displayName = 'MultipleTypeAttributeSelectDrawer';
-var _default = MultipleTypeAttributeSelectDrawer;
-exports["default"] = _default;

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

@@ -1,60 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-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 _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
-
-var _ModelAttrSelectDrawer = _interopRequireDefault(require("../../../../components/ModelAttrSelectDrawer"));
-
-var _nodeCiTypeAttrUtil = require("../../ResourceViewAttributeSetting/nodeCiTypeAttrUtil");
-
-var _excluded = ["topo", "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 NodeAttrSettingDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var topo = props.topo,
-      showType = props.showType,
-      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('属性配置：加载数据');
-
-    var items = (0, _nodeCiTypeAttrUtil.getNodeModels)(topo);
-    setData(items);
-  };
-
-  return /*#__PURE__*/_react["default"].createElement(_ModelAttrSelectDrawer["default"], (0, _extends2["default"])({
-    ref: ref
-  }, otherProps, {
-    value: value,
-    data: data,
-    showType: showType,
-    queryData: queryData
-  }));
-});
-NodeAttrSettingDrawer.displayName = 'NodeAttrSettingDrawer';
-NodeAttrSettingDrawer.propTypes = {};
-var _default = NodeAttrSettingDrawer;
-exports["default"] = _default;