@riil-frontend/component-topology 11.0.6 → 11.0.10

package/es/components/ModelAttrSelectDrawer/index.js

@@ -1,2 +1,2 @@
-import MultipleTypeAttributeSelectDrawer from "./components/MultipleTypeAttributeSelectDrawer";
-export default MultipleTypeAttributeSelectDrawer;
+import ModelAttrSelectDrawer from "./components/ModelAttrSelectDrawer";
+export default ModelAttrSelectDrawer;

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

@@ -3,7 +3,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG } from "../../../constants/ResourceInfoDisplay";
 import BasicConfig from "./ResourceDisplay/BasicConfig";
-import NodeAttrSettingDrawer from "./components/NodeAttrSettingDrawer";
 var defaultCommonOptions = [{
   value: 'graph:name',
   label: '图片名称'
@@ -20,17 +19,15 @@ var defaultCommonOptions = [{
 var NodeTag = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var commonOptions = props.commonOptions;
   return /*#__PURE__*/React.createElement(BasicConfig, _extends({
-    ref: ref,
+    ref: ref
+  }, props, {
     limit: 3,
     elementType: "node",
     showType: "tag",
     commonOptions: commonOptions || defaultCommonOptions,
     defaultCommonConfig: DEFAULT_NODE_TAG_COMMON_CONFIG,
-    customSettingDrawer: function customSettingDrawer(params) {
-      return /*#__PURE__*/React.createElement(NodeAttrSettingDrawer, params);
-    },
     type: "node"
-  }, props));
+  }));
 });
 NodeTag.displayName = 'NodeTag';
 NodeTag.propTypes = {

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

@@ -3,7 +3,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { DEFAULT_TIP_COMMON_CONFIG } from "../../../constants/ResourceInfoDisplay";
 import BasicConfig from "./ResourceDisplay/BasicConfig";
-import NodeAttrSettingDrawer from "./components/NodeAttrSettingDrawer";
 var defaultCommonOptions = [{
   value: 'attribute:display_name',
   label: '显示名称'
@@ -20,16 +19,14 @@ var defaultCommonOptions = [{
 var NodeTip = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var commonOptions = props.commonOptions;
   return /*#__PURE__*/React.createElement(BasicConfig, _extends({
-    ref: ref,
+    ref: ref
+  }, props, {
     limit: 4,
     elementType: "node",
     showType: "tip",
     commonOptions: commonOptions || defaultCommonOptions,
-    defaultCommonConfig: DEFAULT_TIP_COMMON_CONFIG,
-    customSettingDrawer: function customSettingDrawer(params) {
-      return /*#__PURE__*/React.createElement(NodeAttrSettingDrawer, params);
-    }
-  }, props));
+    defaultCommonConfig: DEFAULT_TIP_COMMON_CONFIG
+  }));
 });
 NodeTip.propTypes = {
   commonOptions: PropTypes.array

package/es/core/components/ResourceViewAttributeSetting/nodeCiTypeAttrUtil.js

@@ -1,88 +1,4 @@
-import { getCiTypesFromCiElements } from "../../../utils/topoData";
-/**
- * 获取节点标注、悬浮框配置
- * @param {*} topo 
- * @returns 
- */
-
-export function getNodeModels(topo) {
-  var data = topo.store.getModelState('topoMod').data;
-  var ciTypeMap = topo.ciTyeCache.ciTypes;
-  return getNodeModSet();
-
-  function getNodeModSet() {
-    var ciTypes = getCiTypesFromCiElements(data.nodes);
-    return getMods(ciTypes);
-  }
-  /**
-   *
-   * @param {array} ciTypeCodes
-   * @returns
-   */
-
-
-  function getMods(ciTypeCodes) {
-    return Object.keys(ciTypeMap).filter(function (item) {
-      return ciTypeCodes.includes(item);
-    }).map(function (key) {
-      var ciTypeObj = ciTypeMap[key];
-      return {
-        id: ciTypeObj.code,
-        label: ciTypeObj.displayName,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, 'node')
-      };
-    });
-  }
-  /**
-   * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
-   * @param {} ciTypeObj
-   * @returns
-   */
-
-
-  function ciModfilter(ciTypeObj, type) {
-    var custom = [];
-
-    if (type === 'node') {
-      custom.push.apply(custom, [{
-        id: 'graph:name',
-        code: 'name',
-        name: '图片名称',
-        type: 'custom'
-      }, {
-        id: 'ciType:display_name',
-        code: 'ciType',
-        name: '资源类型',
-        type: 'custom'
-      }]);
-    }
-
-    var attributes = ciTypeObj.attributes.filter(function (attr) {
-      return !!attr.userVisible;
-    }).map(function (item) {
-      return {
-        type: 'attribute',
-        id: "attribute:" + item.code,
-        code: "attribute:" + item.code,
-        name: item.name,
-        typeName: '属性'
-      };
-    });
-    var metrics = ciTypeObj.metrics.map(function (item) {
-      return {
-        type: 'metric',
-        id: "metric:" + item.code,
-        code: "metric:" + item.code,
-        name: item.name,
-        typeName: '指标'
-      };
-    });
-    return [].concat(custom, attributes, metrics);
-  }
-
-  ;
-} // 资源类型含有属性和指标集合
+import { getCiTypesFromCiElements } from "../../../utils/topoData"; // 资源类型含有属性和指标集合
 
 export function getNodeCiModSet(params) {
   var topo = params.topo;
@@ -113,7 +29,8 @@ export function getNodeCiModSet(params) {
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, 'node', ciTypeObj.code)
       };
-    });
+    }); // console.log("modSet--------------------", modSet);
+
     return modSet;
   }
   /**
@@ -143,7 +60,13 @@ export function getNodeCiModSet(params) {
       (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
         tagArr.push(item.code + "-" + item.type);
       });
-    }
+    } // rlog.debug(
+    //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
+    //   globalSetting,
+    //   tipArr,
+    //   tagArr
+    // );
+
 
     var custom = [];
 

package/es/core/hooks/useTopoEdit.js

@@ -234,8 +234,7 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域",
-        type: "normal"
+        children: "仅删除区域"
       },
       cancelProps: {
         children: "全部删除"
@@ -290,30 +289,27 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
-
+      // console.log("仅删除区域", topo.view.topoClient, data);
       var children = getGroupChildren(group);
       children.map(function (child) {
-        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
-        // var nodeRect = child.getRect();
-        // child.setPosition(
-        //   viewRect.x + nodeRect.width + 2,
-        //   viewRect.y + nodeRect.height + 4
-        // ); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null);
+        var viewRect = topo.getGraphView().getViewRect();
+        var nodeRect = child.getRect();
+        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction();
     }
   };
 

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "11.0.6" === 'string' ? "11.0.6" : null;
+var version = typeof "11.0.10" === 'string' ? "11.0.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -70,7 +70,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getNodeFiedldMap = function getNodeFiedldMap() {
     var mtCodes = getNodeMtCodes(this.topoData);
-    return this.getFiedldMapByMtCodes(mtCodes, 'node');
+    return this.getFiedldMapByType(mtCodes, 'node');
   }
   /**
    * 获得节点字段配置项map
@@ -79,13 +79,8 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getLinkFidldMap = function getLinkFidldMap() {
     var mtCodes = getLinkMtCodes(this.topoData);
-    return this.getFiedldMapByMtCodes(mtCodes, 'link');
-  }
-  /**
-   * 获取链路标注悬浮框属性配置数据
-   * @returns 
-   */
-  ;
+    return this.getFiedldMapByType(mtCodes, 'link');
+  };
 
   _proto.getLinkConfigItems = function getLinkConfigItems() {
     var mtCodes = getLinkMtCodes(this.topoData);
@@ -115,48 +110,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/lib/components/ModelAttrSelectDrawer/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _MultipleTypeAttributeSelectDrawer = _interopRequireDefault(require("./components/MultipleTypeAttributeSelectDrawer"));
+var _ModelAttrSelectDrawer = _interopRequireDefault(require("./components/ModelAttrSelectDrawer"));
 
-var _default = _MultipleTypeAttributeSelectDrawer["default"];
+var _default = _ModelAttrSelectDrawer["default"];
 exports["default"] = _default;

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

@@ -15,8 +15,6 @@ var _ResourceInfoDisplay = require("../../../constants/ResourceInfoDisplay");
 
 var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig"));
 
-var _NodeAttrSettingDrawer = _interopRequireDefault(require("./components/NodeAttrSettingDrawer"));
-
 var defaultCommonOptions = [{
   value: 'graph:name',
   label: '图片名称'
@@ -33,17 +31,15 @@ var defaultCommonOptions = [{
 var NodeTag = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var commonOptions = props.commonOptions;
   return /*#__PURE__*/_react["default"].createElement(_BasicConfig["default"], (0, _extends2["default"])({
-    ref: ref,
+    ref: ref
+  }, props, {
     limit: 3,
     elementType: "node",
     showType: "tag",
     commonOptions: commonOptions || defaultCommonOptions,
     defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_NODE_TAG_COMMON_CONFIG,
-    customSettingDrawer: function customSettingDrawer(params) {
-      return /*#__PURE__*/_react["default"].createElement(_NodeAttrSettingDrawer["default"], params);
-    },
     type: "node"
-  }, props));
+  }));
 });
 
 NodeTag.displayName = 'NodeTag';

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

@@ -15,8 +15,6 @@ var _ResourceInfoDisplay = require("../../../constants/ResourceInfoDisplay");
 
 var _BasicConfig = _interopRequireDefault(require("./ResourceDisplay/BasicConfig"));
 
-var _NodeAttrSettingDrawer = _interopRequireDefault(require("./components/NodeAttrSettingDrawer"));
-
 var defaultCommonOptions = [{
   value: 'attribute:display_name',
   label: '显示名称'
@@ -33,16 +31,14 @@ var defaultCommonOptions = [{
 var NodeTip = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var commonOptions = props.commonOptions;
   return /*#__PURE__*/_react["default"].createElement(_BasicConfig["default"], (0, _extends2["default"])({
-    ref: ref,
+    ref: ref
+  }, props, {
     limit: 4,
     elementType: "node",
     showType: "tip",
     commonOptions: commonOptions || defaultCommonOptions,
-    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG,
-    customSettingDrawer: function customSettingDrawer(params) {
-      return /*#__PURE__*/_react["default"].createElement(_NodeAttrSettingDrawer["default"], params);
-    }
-  }, props));
+    defaultCommonConfig: _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG
+  }));
 });
 
 NodeTip.propTypes = {

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

@@ -2,95 +2,10 @@
 
 exports.__esModule = true;
 exports.getNodeCiModSet = getNodeCiModSet;
-exports.getNodeModels = getNodeModels;
 
 var _topoData = require("../../../utils/topoData");
 
-/**
- * 获取节点标注、悬浮框配置
- * @param {*} topo 
- * @returns 
- */
-function getNodeModels(topo) {
-  var data = topo.store.getModelState('topoMod').data;
-  var ciTypeMap = topo.ciTyeCache.ciTypes;
-  return getNodeModSet();
-
-  function getNodeModSet() {
-    var ciTypes = (0, _topoData.getCiTypesFromCiElements)(data.nodes);
-    return getMods(ciTypes);
-  }
-  /**
-   *
-   * @param {array} ciTypeCodes
-   * @returns
-   */
-
-
-  function getMods(ciTypeCodes) {
-    return Object.keys(ciTypeMap).filter(function (item) {
-      return ciTypeCodes.includes(item);
-    }).map(function (key) {
-      var ciTypeObj = ciTypeMap[key];
-      return {
-        id: ciTypeObj.code,
-        label: ciTypeObj.displayName,
-        icon: ciTypeObj.icon,
-        list: ciModfilter(ciTypeObj, 'node')
-      };
-    });
-  }
-  /**
-   * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
-   * @param {} ciTypeObj
-   * @returns
-   */
-
-
-  function ciModfilter(ciTypeObj, type) {
-    var custom = [];
-
-    if (type === 'node') {
-      custom.push.apply(custom, [{
-        id: 'graph:name',
-        code: 'name',
-        name: '图片名称',
-        type: 'custom'
-      }, {
-        id: 'ciType:display_name',
-        code: 'ciType',
-        name: '资源类型',
-        type: 'custom'
-      }]);
-    }
-
-    var attributes = ciTypeObj.attributes.filter(function (attr) {
-      return !!attr.userVisible;
-    }).map(function (item) {
-      return {
-        type: 'attribute',
-        id: "attribute:" + item.code,
-        code: "attribute:" + item.code,
-        name: item.name,
-        typeName: '属性'
-      };
-    });
-    var metrics = ciTypeObj.metrics.map(function (item) {
-      return {
-        type: 'metric',
-        id: "metric:" + item.code,
-        code: "metric:" + item.code,
-        name: item.name,
-        typeName: '指标'
-      };
-    });
-    return [].concat(custom, attributes, metrics);
-  }
-
-  ;
-} // 资源类型含有属性和指标集合
-
-
+// 资源类型含有属性和指标集合
 function getNodeCiModSet(params) {
   var topo = params.topo;
   var data = topo.store.getModelState('topoMod').data;
@@ -120,7 +35,8 @@ function getNodeCiModSet(params) {
         icon: ciTypeObj.icon,
         list: ciModfilter(ciTypeObj, globalConfig, 'node', ciTypeObj.code)
       };
-    });
+    }); // console.log("modSet--------------------", modSet);
+
     return modSet;
   }
   /**
@@ -150,7 +66,13 @@ function getNodeCiModSet(params) {
       (_tags$data$code = tags.data[code]) === null || _tags$data$code === void 0 ? void 0 : _tags$data$code.map(function (item) {
         tagArr.push(item.code + "-" + item.type);
       });
-    }
+    } // rlog.debug(
+    //   "过滤ci元数据中的属性和指标，用于属性和指标显示设置",
+    //   globalSetting,
+    //   tipArr,
+    //   tagArr
+    // );
+
 
     var custom = [];
 

package/lib/core/hooks/useTopoEdit.js

@@ -263,8 +263,7 @@ var useTopoEdit = function useTopoEdit(params) {
       content: "是否仅删除区域或将区域包含的内容一同删除？",
       //footer:()=>{return <><Button type="primary" onClick={doDeleteOnlyGroup}>仅删除区域</Button><Button type="primary" onClick={doDeleteOnlyGroup}>确定</Button></>},
       okProps: {
-        children: "仅删除区域",
-        type: "normal"
+        children: "仅删除区域"
       },
       cancelProps: {
         children: "全部删除"
@@ -319,30 +318,27 @@ var useTopoEdit = function useTopoEdit(params) {
     });
 
     function doDeleteOnlyGroup() {
-      topo.historyManager.beginTransaction(); // console.log("仅删除区域", topo.view.topoClient, data);
-
+      // console.log("仅删除区域", topo.view.topoClient, data);
       var children = (0, _htElementUtils.getGroupChildren)(group);
       children.map(function (child) {
-        child.setParent(null); // var viewRect = topo.getGraphView().getViewRect();
-        // var nodeRect = child.getRect();
-        // child.setPosition(
-        //   viewRect.x + nodeRect.width + 2,
-        //   viewRect.y + nodeRect.height + 4
-        // ); // 解决集群从区域内移出时，连线位置未更新的问题
+        child.setParent(null);
+        var viewRect = topo.getGraphView().getViewRect();
+        var nodeRect = child.getRect();
+        child.setPosition(viewRect.x + nodeRect.width + 2, viewRect.y + nodeRect.height + 4); // 解决集群从区域内移出时，连线位置未更新的问题
 
         setTimeout(function () {
           child.iv();
           topo.historyManager.endTransaction();
         }, 50);
       });
-      topo.view.topoClient.deleteGroup(data);
-      topo.historyManager.endTransaction(); // console.log("仅删除区域", children, group);
+      topo.view.topoClient.deleteGroup(data); // console.log("仅删除区域", children, group);
     }
 
     function doDelete() {
       topo.historyManager.beginTransaction(); // FIXME 。如果命中其他的动态条件，则立即显示
 
       topo.view.topoClient.deleteGroup(data);
+      topo.historyManager.endTransaction();
     }
   };
 

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "11.0.6" === 'string' ? "11.0.6" : null;
+var version = typeof "11.0.10" === 'string' ? "11.0.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑