@riil-frontend/component-topology 6.0.10 → 6.0.12

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

@@ -13,8 +13,12 @@ export default function useHtElements(props) {
     }
   }, [ids, idList]);
   var elements = useMemo(function () {
+    // 
     return idList.map(function (id) {
       return topo.getDataModel().getDataById(id);
+    }) // 多选删除时，被删除的元素是undefined
+    .filter(function (element) {
+      return !!element;
     });
   }, [topo, idList]);
   return elements;

package/es/core/editor/components/Toolbar/widgets/AddResourceButton.js

@@ -1,5 +1,6 @@
-import React, { useEffect, useState } from 'react';
-import { isGroup, isLayer } from "../../../../../utils/htElementDataUtil";
+import React, { useEffect, useMemo, useState } from 'react';
+import { isClusterHtElement } from "../../../../../utils/clusterUtil";
+import { isGroup, isLayer } from "../../../../../utils/htElementUtils";
 import useLayerAddResource from "../../../hooks/useLayerAddResource";
 import LayerAddResourceDrawer from "../../settings/propertyViews/layer/DataTab/LayerAddResourceDrawer";
 import ButtonBox from "./components/ButtonBox";
@@ -10,8 +11,8 @@ function getAddType(selection) {
     var data = selection[0];
 
     if (isLayer(data)) {
-      return 'layer';
-    } else if (isGroup(data)) {
+      return 'layer'; // 集群视为添加到视图
+    } else if (isGroup(data) && !isClusterHtElement(data)) {
       return 'group';
     }
   }
@@ -24,13 +25,9 @@ function AddResourceButton(props) {
       editorProps = props.editorProps; // 选中的元素
 
   var selection = topo.selectionModel.useSelection();
-
-  var _useState = useState(getAddType(selection)),
-      addType = _useState[0],
-      setAddType = _useState[1];
-
-  useEffect(function () {
-    setAddType(getAddType(selection));
+  var addType = useMemo(function () {
+    var elements = selection.length ? topo.selectionModel.getSelection() : [];
+    return getAddType(elements);
   }, [selection]); // 选中分层添加
 
   var layerAddResource = useLayerAddResource({

package/es/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -25,7 +25,7 @@ function FontColorDropdown(props) {
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
     onChange({
-      opacity: Math.round(value / 100)
+      opacity: (value / 100).toFixed(2)
     });
     topo.historyManager.endTransaction();
   };

package/es/core/models/TopoApp.js

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

package/es/networkTopo/services/funcAuth.js

@@ -0,0 +1,39 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import authServices from '@riil-frontend/component-topology-common/es/services/authorization';
+export default {
+  getFuncAuth: function getFuncAuth() {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var funcResult, permissions;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return authServices.checkFuncAuthentication([{
+                func: 'topo_createTopo'
+              }, {
+                func: 'topo_manageNavTree'
+              }, {
+                func: 'topo_setTopoPermission'
+              }, {
+                func: 'addResource'
+              }]);
+
+            case 2:
+              funcResult = _context.sent;
+              permissions = {};
+              funcResult.forEach(function (func) {
+                permissions[func.func.replace('topo_', '')] = func.passed === 'PASS';
+              });
+              return _context.abrupt("return", permissions);
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};

package/es/networkTopo/services/index.js

@@ -3,7 +3,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { request } from '@riil-frontend/component-topology-utils';
-export default _extends({}, topoService, {
+import funcAuth from "./funcAuth";
+export default _extends({}, topoService, funcAuth, {
   // 获取有权限的拓扑树
   getTopoTreeByLoginUser: function getTopoTreeByLoginUser(params) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {

package/es/networkTopo/store/functionAuth.js

@@ -6,111 +6,99 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * 功能权限 Model
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import authServices from '@riil-frontend/component-topology-common/es/services/authorization';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    permissions: {
-      createTopo: false,
-      manageNavTree: false,
-      setTopoPermission: false
-    }
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      init: function init(payload, rootState) {
-        var _this = this;
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: {
+      permissions: {
+        createTopo: false,
+        manageNavTree: false,
+        setTopoPermission: false
+      }
+    },
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      }
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        init: function init(payload, rootState) {
+          var _this = this;
 
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var permissions;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _context.next = 2;
-                  return _this.getPermissions();
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var permissions;
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return _this.getPermissions();
 
-                case 2:
-                  permissions = _context.sent;
+                  case 2:
+                    permissions = _context.sent;
 
-                  if (permissions) {
-                    _this.update({
-                      permissions: permissions
-                    });
-                  }
+                    if (permissions) {
+                      _this.update({
+                        permissions: permissions
+                      });
+                    }
 
-                case 4:
-                case "end":
-                  return _context.stop();
+                  case 4:
+                  case "end":
+                    return _context.stop();
+                }
               }
-            }
-          }, _callee);
-        }))();
-      },
-      getPermissions: function getPermissions() {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          var funcResult, permissions;
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  _context2.next = 2;
-                  return authServices.checkFuncAuthentication([{
-                    func: 'topo_createTopo'
-                  }, {
-                    func: 'topo_manageNavTree'
-                  }, {
-                    func: 'topo_setTopoPermission'
-                  }, {
-                    func: 'addResource'
-                  }]);
+            }, _callee);
+          }))();
+        },
+        getPermissions: function getPermissions() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+            var permissions;
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return topo.serverApi.getFuncAuth();
 
-                case 2:
-                  funcResult = _context2.sent;
-                  permissions = {};
-                  funcResult.forEach(function (func) {
-                    permissions[func.func.replace('topo_', '')] = func.passed === 'PASS';
-                  });
-                  return _context2.abrupt("return", permissions);
+                  case 2:
+                    permissions = _context2.sent;
+                    return _context2.abrupt("return", permissions);
 
-                case 6:
-                case "end":
-                  return _context2.stop();
+                  case 4:
+                  case "end":
+                    return _context2.stop();
+                }
               }
-            }
-          }, _callee2);
-        }))();
-      },
-      checkAuth: function checkAuth(name, rootState) {
-        return rootState.functionAuth.permissions[name];
-      },
-      refresh: function refresh() {
-        var _this2 = this;
+            }, _callee2);
+          }))();
+        },
+        checkAuth: function checkAuth(name, rootState) {
+          return rootState.functionAuth.permissions[name];
+        },
+        refresh: function refresh() {
+          var _this2 = this;
 
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  _context3.next = 2;
-                  return _this2.init();
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) {
+                switch (_context3.prev = _context3.next) {
+                  case 0:
+                    _context3.next = 2;
+                    return _this2.init();
 
-                case 2:
-                case "end":
-                  return _context3.stop();
+                  case 2:
+                  case "end":
+                    return _context3.stop();
+                }
               }
-            }
-          }, _callee3);
-        }))();
-      }
-    };
-  }
-};
+            }, _callee3);
+          }))();
+        }
+      };
+    }
+  };
+}

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

@@ -19,8 +19,12 @@ function useHtElements(props) {
     }
   }, [ids, idList]);
   var elements = (0, _react.useMemo)(function () {
+    // 
     return idList.map(function (id) {
       return topo.getDataModel().getDataById(id);
+    }) // 多选删除时，被删除的元素是undefined
+    .filter(function (element) {
+      return !!element;
     });
   }, [topo, idList]);
   return elements;

package/lib/core/editor/components/Toolbar/widgets/AddResourceButton.js

@@ -7,7 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _htElementDataUtil = require("../../../../../utils/htElementDataUtil");
+var _clusterUtil = require("../../../../../utils/clusterUtil");
+
+var _htElementUtils = require("../../../../../utils/htElementUtils");
 
 var _useLayerAddResource = _interopRequireDefault(require("../../../hooks/useLayerAddResource"));
 
@@ -25,9 +27,9 @@ function getAddType(selection) {
   if (selection.length === 1) {
     var data = selection[0];
 
-    if ((0, _htElementDataUtil.isLayer)(data)) {
-      return 'layer';
-    } else if ((0, _htElementDataUtil.isGroup)(data)) {
+    if ((0, _htElementUtils.isLayer)(data)) {
+      return 'layer'; // 集群视为添加到视图
+    } else if ((0, _htElementUtils.isGroup)(data) && !(0, _clusterUtil.isClusterHtElement)(data)) {
       return 'group';
     }
   }
@@ -40,13 +42,9 @@ function AddResourceButton(props) {
       editorProps = props.editorProps; // 选中的元素
 
   var selection = topo.selectionModel.useSelection();
-
-  var _useState = (0, _react.useState)(getAddType(selection)),
-      addType = _useState[0],
-      setAddType = _useState[1];
-
-  (0, _react.useEffect)(function () {
-    setAddType(getAddType(selection));
+  var addType = (0, _react.useMemo)(function () {
+    var elements = selection.length ? topo.selectionModel.getSelection() : [];
+    return getAddType(elements);
   }, [selection]); // 选中分层添加
 
   var layerAddResource = (0, _useLayerAddResource["default"])({

package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js

@@ -43,7 +43,7 @@ function FontColorDropdown(props) {
   var backOpacityChange = function backOpacityChange(value) {
     topo.historyManager.beginTransaction();
     onChange({
-      opacity: Math.round(value / 100)
+      opacity: (value / 100).toFixed(2)
     });
     topo.historyManager.endTransaction();
   };

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.10" === 'string' ? "6.0.10" : null;
+var version = typeof "6.0.12" === 'string' ? "6.0.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/services/funcAuth.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _authorization = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/authorization"));
+
+var _default = {
+  getFuncAuth: function getFuncAuth() {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var funcResult, permissions;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return _authorization["default"].checkFuncAuthentication([{
+                func: 'topo_createTopo'
+              }, {
+                func: 'topo_manageNavTree'
+              }, {
+                func: 'topo_setTopoPermission'
+              }, {
+                func: 'addResource'
+              }]);
+
+            case 2:
+              funcResult = _context.sent;
+              permissions = {};
+              funcResult.forEach(function (func) {
+                permissions[func.func.replace('topo_', '')] = func.passed === 'PASS';
+              });
+              return _context.abrupt("return", permissions);
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};
+exports["default"] = _default;

package/lib/networkTopo/services/index.js

@@ -15,7 +15,9 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 
 var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
 
-var _default = (0, _extends2["default"])({}, _topo["default"], {
+var _funcAuth = _interopRequireDefault(require("./funcAuth"));
+
+var _default = (0, _extends2["default"])({}, _topo["default"], _funcAuth["default"], {
   // 获取有权限的拓扑树
   getTopoTreeByLoginUser: function getTopoTreeByLoginUser(params) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {