@riil-frontend/component-topology 2.15.6 → 2.15.9

package/lib/core/viewer/components/titlebar/widgets/EditButton.js

@@ -20,12 +20,13 @@ function EditButton(props) {
   var topo = props.topo,
       onEnterEdit = props.onEnterEdit,
       style = props.style;
-  var store = topo.store; // const [topoState] = store.useModel('topoMod');
-  // const { topoPermission, } = topoState;
+  var store = topo.store;
 
-  var functionAuthState = store.useModelState('functionAuth'); // let show = topo.options.usePermission ? topoPermissonUtil.isEditable(topoPermission) : true;
+  var _store$useModel = store.useModel('topoMod'),
+      topoState = _store$useModel[0];
 
-  var show = topo.options.usePermission ? functionAuthState.permissions.createTopo : true;
+  var topoPermission = topoState.topoPermission;
+  var show = topo.options.usePermission ? _topoPermissionUtil["default"].isEditable(topoPermission) : true;
 
   if (!show) {
     return null;

package/lib/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -28,7 +28,8 @@ function buildNodeContextmenu(topoApp) {
         label: '访问',
         id: 'Resource.WebConsole.open',
         disable: function disable(data) {
-          return !topoApp.view.resourceWebControllUrl.getResourceUrl(data.id);
+          var resourceWebControllUrl = topoApp.pluginManager.pluginMap.resourceWebControllUrl;
+          return !resourceWebControllUrl.getResourceUrl(data.id);
         }
       }, {
         label: '设置',

package/lib/models/iconManage.js

@@ -19,6 +19,8 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
 
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
+
 var _icon = require("../core/common/icons/icon");
 
 /**
@@ -230,33 +232,46 @@ function _default(engine) {
                       case 3:
                         success = _context5.sent;
 
-                        if (success) {
-                          _message["default"].success('删除成功');
-
-                          engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
-                        } else {
-                          _message["default"].error('删除失败');
+                        if (!success) {
+                          _context5.next = 12;
+                          break;
                         }
 
-                        _context5.next = 10;
-                        break;
+                        _context5.next = 7;
+                        return _this4.loadCustomIcons();
 
                       case 7:
-                        _context5.prev = 7;
+                        _message["default"].success('删除成功');
+
+                        _componentTopologyGraph.iconFactory.remove((0, _icon.getCustomIconHtId)(id));
+
+                        engine.view.topoClient.emitEvent('topo_shape_delete_finish', htIconId);
+                        _context5.next = 13;
+                        break;
+
+                      case 12:
+                        _message["default"].error('删除失败');
+
+                      case 13:
+                        _context5.next = 18;
+                        break;
+
+                      case 15:
+                        _context5.prev = 15;
                         _context5.t0 = _context5["catch"](0);
 
                         _rlog["default"].warn('删除图标失败', _context5.t0);
 
-                      case 10:
-                        _context5.next = 12;
+                      case 18:
+                        _context5.next = 20;
                         return _this4.loadCustomIcons();
 
-                      case 12:
+                      case 20:
                       case "end":
                         return _context5.stop();
                     }
                   }
-                }, _callee5, null, [[0, 7]]);
+                }, _callee5, null, [[0, 15]]);
               }));
 
               function onOk() {

package/lib/models/topoMod.js

@@ -43,14 +43,13 @@ function _default(topoApp) {
       data: null,
       // 后端返回的分组、连线、节点数据
       topoData: null,
+      // ht 拓扑数据，用于首次load
       currentTopo: undefined,
       topoPermission: undefined,
       currentNode: {
         id: "",
         name: "无数据"
       },
-      drawVisible: false,
-      selectNodeId: "",
       topoAlarmIsOpen: false,
       // 拓扑通道是否打开
       alarmPanelIsOpen: false,
@@ -375,8 +374,7 @@ function _default(topoApp) {
                     _this5.update({
                       topoData: null,
                       data: null,
-                      loading: false,
-                      drawVisible: false
+                      loading: false
                     });
 
                     topoApp.options.onLoad();
@@ -478,7 +476,7 @@ function _default(topoApp) {
                       topoApp.alarm.open();
                     }
 
-                    topoApp.view.afterTopoDataLoaded(topoData);
+                    topoApp.onTopoDataLoaded(topoData);
                     endTime = (0, _moment["default"])();
 
                     _rlog["default"].info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
@@ -662,6 +660,25 @@ function _default(topoApp) {
 
 
                   case 11:
+                    _context12.next = 13;
+                    return dispatch.functionAuth.checkAuth('createTopo');
+
+                  case 13:
+                    if (!_context12.sent) {
+                      _context12.next = 17;
+                      break;
+                    }
+
+                    _context12.t1 = 'delete';
+                    _context12.next = 18;
+                    break;
+
+                  case 17:
+                    _context12.t1 = 'read';
+
+                  case 18:
+                    topoPermission = _context12.t1;
+
                     if (update !== false) {
                       _this9.update({
                         topoPermission: topoPermission
@@ -670,7 +687,7 @@ function _default(topoApp) {
 
                     return _context12.abrupt("return", topoPermission);
 
-                  case 13:
+                  case 21:
                   case "end":
                     return _context12.stop();
                 }

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -375,7 +375,7 @@ function AddLinkDrawer(props) {
         } // 切换到连线组状态
 
 
-        htTopo.toggleEdgeGroup(source, target, true);
+        htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
         if (edgesInNodes.length === 1 && !htTopo.getEdgeData(edgesInNodes[0])) {
@@ -384,7 +384,7 @@ function AddLinkDrawer(props) {
           htTopo.createEdge(source, target, linkData);
         }
 
-        htTopo.toggleEdgeGroup(source, target, false);
+        htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 

package/lib/utils/tree.js

@@ -53,7 +53,9 @@ function formatTree(json, funcPermissions) {
         type: type,
         name: name,
         showDefault: showDefault,
-        permission: node.operation,
+        // permission: node.operation,
+        // FIXME 拓扑数据权限临时方案，待移除
+        permission: funcPermissions.createTopo ? 'delete' : 'read',
         children: node !== null && node !== void 0 && node.children ? loop(node.children) : []
       };
     });
@@ -155,7 +157,7 @@ var loopTreeFun = function loopTreeFun(data, callback) {
       loopTreeFun(item.children, callback);
     }
 
-    return callback(item, index, arr);
+    callback(item, index, arr);
   });
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.6",
+  "version": "2.15.9",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -69,7 +69,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.1",
+    "@riil-frontend/component-topology-graph": "^2.5.2",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -111,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.6/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.9/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }