@riil-frontend/component-topology 2.12.2 → 2.12.5-alpha.2

package/es/core/editor/components/settings/link/LinkPropertyView.js

@@ -9,9 +9,9 @@ import _Grid from "@alifd/next/lib/grid";
 import _Form from "@alifd/next/lib/form";
 import React, { useState, useEffect } from 'react';
 import ColorPicker from "../../LinkDynamicStyleSettingDrawer/rule/ColorPicker";
-import GroupNodeList from "../group/GroupNodeList/GroupNodeList";
-import ResourceSelectButton from "../group/GroupNodeList/ResourceSelectButton";
-import { getIconMap } from "../group/GroupNodeList/icon";
+import GroupNodeList from "../group/DataTab/GroupNodeList";
+import ResourceSelectButton from "../common/GroupNodeList/ResourceSelectButton";
+import { getIconMap } from "../common/GroupNodeList/icon";
 import LineType from "../common/LineType";
 var FormItem = _Form.Item;
 var Row = _Grid.Row,

package/es/core/editor/components/settings/node/NodeIconSelect.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { getIconGroups } from "../group/GroupNodeList/icon";
+import { getIconGroups } from "../common/GroupNodeList/icon";
 import IconSelect from '@riil-frontend/component-topo-icon-select';
 export default function NodeIconSelect(props) {
   var value = props.value,

package/es/core/editor/components/settings/propertyViews.js

@@ -0,0 +1,23 @@
+import SettingsForm from "./SettingsForm";
+import NodePropertyView from "./node/NodePropertyView";
+import LayerSettingsForm from "./layer/LayerSettingsForm";
+import TextPropertyView from "./text/TextPropertyView";
+import LinkPropertyView from "./link/LinkPropertyView";
+import ViewPropertyView from "./view/ViewPropertyView";
+import GroupPropertyView from "./group/GroupPropertyView";
+var propertyPanelMap = {
+  // view: SettingsForm,
+  node: NodePropertyView,
+  layer: LayerSettingsForm,
+  text: TextPropertyView,
+  group: GroupPropertyView
+};
+
+if (localStorage.getItem('topo.debug') === 'true') {
+  Object.assign(propertyPanelMap, {
+    line: LinkPropertyView,
+    view: ViewPropertyView
+  });
+}
+
+export default propertyPanelMap;

package/es/core/models/TopoApp.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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 { setRequest } from '@riil-frontend/component-topology-common';
+import { setRequest } from '@riil-frontend/component-topology-common/es/index';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import CiTyeCache from "./cache/CiTyeCache";
 import Alarm from "./common/Alarm";
@@ -478,42 +478,54 @@ var TopoApp = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _enterEditMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
-      var topoDispatchers, editDispatchers, ciSetDoc, linkDynamicStyleDispatcher, iconManageDispatchers, topoTreeData;
+      var topoDispatchers, editDispatchers, iconManageDispatchers, ciSetDoc, linkDynamicStyleDispatcher;
       return _regeneratorRuntime.wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
-              return this.view.switchToEditMode();
-
-            case 2:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
               topoDispatchers.update({
                 viewState: 'edit'
               });
+
+              if (!this.options.beforeSwitchToEditMode) {
+                _context11.next = 5;
+                break;
+              }
+
+              _context11.next = 5;
+              return this.options.beforeSwitchToEditMode();
+
+            case 5:
+              _context11.next = 7;
+              return this.view.switchToEditMode();
+
+            case 7:
               editDispatchers = this.store.getModelDispatchers('topoCreateMod');
               editDispatchers.switchToEditMode();
 
               if (this.options.onSwitchToEditMode) {
                 this.options.onSwitchToEditMode();
-              } // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+              } // 加载自定义图标
 
 
+              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
+              iconManageDispatchers.loadIcons(); // 每个节点的属性指标显示配置 TODO 每个节点都传了属性指标列表，待优化
+
               ciSetDoc = this.store.getModelState('topoBizMod').ciSetDoc;
               this.view.topoClient.saveMarkSetting({
                 tagAndTipSet: ciSetDoc
               }); // 刷新链路动态样式
 
               linkDynamicStyleDispatcher = this.store.getModelDispatchers('linkDynamicStyle');
-              linkDynamicStyleDispatcher.execute(); // 加载自定义图标
-
-              iconManageDispatchers = this.store.getModelDispatchers('iconManage');
-              iconManageDispatchers.loadIcons(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
-
-              topoTreeData = formatTreeDataSelect(this.store.getModelState('topoTreeMod').treeData, this.id);
-              this.view.topoClient.setTopoTreeData(topoTreeData);
-
-            case 15:
+              linkDynamicStyleDispatcher.execute(); // 加载关联拓扑图数据 FIXME 关联拓扑图时动态获取
+              // const topoTreeData = formatTreeDataSelect(
+              //   this.store.getModelState('topoTreeMod').treeData,
+              //   this.id
+              // );
+              // this.view.topoClient.setTopoTreeData(topoTreeData);
+
+            case 16:
             case "end":
               return _context11.stop();
           }

package/es/hooks/useContainerLinkTopo.js

@@ -1,4 +1,4 @@
-import { TopoEvent } from '@riil-frontend/component-topology-graph';
+import TopoEvent from '@riil-frontend/component-topology-graph/es/event';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { loopTreeFun } from "../utils/tree";
 /**

package/es/hooks/usePolling.js

@@ -4,7 +4,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { TopoEvent } from '@riil-frontend/component-topology-graph';
+import TopoEvent from '@riil-frontend/component-topology-graph/es/event';
 import { metricValueFormat } from '@riil-frontend/utils';
 import { findItem } from "../utils/topoData";
 import DictCache from "../core/models/cache/DictCache";