@riil-frontend/component-topology 7.0.0-dev.6 → 7.0.0-dev.8

package/es/core/editor/components/EditorPlugin.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useEffect } from 'react';
 import CustomIconPlugin from "./CustomIconPlugin";
 import SaveLoading from "./plugins/SaveLoading";
-import MultipleResourceSelectPlugin from "./plugins/MultipleResourceSelectPlugin";
 import GroupAddResourceDrawerPlugin from "./GroupAddResourceDrawerPlugin";
 import MetricPollingPlugin from "../../viewer/components/plugins/MetricPollingPlugin";
 import AddElementThemePlugin from "./plugins/AddElementThemePlugin";
@@ -27,7 +26,7 @@ export default function TopoEditorPlugin(props) {
     return null;
   }
 
-  var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MultipleResourceSelectPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+  var plugins = [CorePlugin, SaveLoading, AddElementThemePlugin, CustomIconPlugin, GroupAddResourceDrawerPlugin, MetricPollingPlugin].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,

package/es/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -142,7 +142,8 @@ export default function Data(props) {
     nodeElement: node,
     node: values,
     topo: topo,
-    topoEditApi: topoEditApi
+    topoEditApi: topoEditApi,
+    nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
   }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/React.createElement(RelateTopoTree, {

package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js

@@ -1,7 +1,7 @@
 import _Button from "@alifd/next/es/button";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
-import BindResourceDrawer from "./BindResourceDrawer";
+import DefaultBindResourceDrawer from "./BindResourceDrawer";
 import { isClusterMemberHtElement } from "../../../../../../../utils/clusterUtil";
 /**
  * @return {React.ReactNode | null}
@@ -13,7 +13,8 @@ export default function NodeRelateResourceButton(props) {
   var nodeElement = props.nodeElement,
       topo = props.topo,
       topoEditApi = props.topoEditApi,
-      node = props.node;
+      node = props.node,
+      nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
   var hide = isClusterMemberHtElement(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
   var currentResId = node.tag;
 
@@ -21,6 +22,7 @@ export default function NodeRelateResourceButton(props) {
       visible = _useState[0],
       setVisible = _useState[1];
 
+  var BindResourceDrawer = nodeBindResourceDrawerComponent || DefaultBindResourceDrawer;
   return !hide ? /*#__PURE__*/React.createElement(_Button, {
     type: "primary",
     text: true,

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 "7.0.0-dev.6" === 'string' ? "7.0.0-dev.6" : null;
+var version = typeof "7.0.0-dev.8" === 'string' ? "7.0.0-dev.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/topoData.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService, { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
+import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export function getLayoutId(layout) {
   if (!layout || typeof layout === "string") {
@@ -33,12 +33,12 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+            topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
             rlog.debug("saveTopo", data); // 保存布局
 
             if (!(template && layout)) {

package/es/core/store/models/topoConfig.js

@@ -414,7 +414,9 @@ export default function (topoApp) {
                   case 0:
                     currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
-                    return _saveTopo(_extends({}, data, {
+                    return _saveTopo(_extends({
+                      topoService: topoApp.serverApi
+                    }, data, {
                       viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图

package/es/core/utils/saveSerialize.js

@@ -1,12 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
+
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
  * @param {*} topo 
  */
-
 export default function saveSerialize(_x) {
   return _saveSerialize.apply(this, arguments);
 }
@@ -21,7 +20,7 @@ function _saveSerialize() {
             topoId = topo.getId();
             serialize = topo.getHtTopo().serialize();
             _context.next = 4;
-            return topoService.saveSerializeData(topoId, serialize);
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
           case 4:
           case "end":

package/lib/core/editor/components/EditorPlugin.js

@@ -13,8 +13,6 @@ var _CustomIconPlugin = _interopRequireDefault(require("./CustomIconPlugin"));
 
 var _SaveLoading = _interopRequireDefault(require("./plugins/SaveLoading"));
 
-var _MultipleResourceSelectPlugin = _interopRequireDefault(require("./plugins/MultipleResourceSelectPlugin"));
-
 var _GroupAddResourceDrawerPlugin = _interopRequireDefault(require("./GroupAddResourceDrawerPlugin"));
 
 var _MetricPollingPlugin = _interopRequireDefault(require("../../viewer/components/plugins/MetricPollingPlugin"));
@@ -47,7 +45,7 @@ function TopoEditorPlugin(props) {
     return null;
   }
 
-  var plugins = [_CorePlugin["default"], _SaveLoading["default"], _AddElementThemePlugin["default"], _CustomIconPlugin["default"], _GroupAddResourceDrawerPlugin["default"], _MultipleResourceSelectPlugin["default"], _MetricPollingPlugin["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
+  var plugins = [_CorePlugin["default"], _SaveLoading["default"], _AddElementThemePlugin["default"], _CustomIconPlugin["default"], _GroupAddResourceDrawerPlugin["default"], _MetricPollingPlugin["default"]].concat((editorProps === null || editorProps === void 0 ? void 0 : editorProps.plugins) || []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/_react["default"].createElement(Plugin, (0, _extends2["default"])({
       key: index,

package/lib/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -164,7 +164,8 @@ function Data(props) {
     nodeElement: node,
     node: values,
     topo: topo,
-    topoEditApi: topoEditApi
+    topoEditApi: topoEditApi,
+    nodeBindResourceDrawerComponent: editorProps.nodeBindResourceDrawerComponent
   }))), bindType === "topo" && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5173\u8054\u62D3\u6251"
   }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {

package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js

@@ -28,7 +28,8 @@ function NodeRelateResourceButton(props) {
   var nodeElement = props.nodeElement,
       topo = props.topo,
       topoEditApi = props.topoEditApi,
-      node = props.node;
+      node = props.node,
+      nodeBindResourceDrawerComponent = props.nodeBindResourceDrawerComponent;
   var hide = (0, _clusterUtil.isClusterMemberHtElement)(nodeElement) || ((_node$attrObject$data = node.attrObject.data) === null || _node$attrObject$data === void 0 ? void 0 : _node$attrObject$data.relateResource) === false;
   var currentResId = node.tag;
 
@@ -36,6 +37,7 @@ function NodeRelateResourceButton(props) {
       visible = _useState[0],
       setVisible = _useState[1];
 
+  var BindResourceDrawer = nodeBindResourceDrawerComponent || _BindResourceDrawer["default"];
   return !hide ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "primary",
     text: true,
@@ -43,7 +45,7 @@ function NodeRelateResourceButton(props) {
     onClick: function onClick() {
       setVisible(true);
     }
-  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(_BindResourceDrawer["default"], (0, _extends2["default"])({
+  }, node.tag ? '切换资源' : '选择资源', /*#__PURE__*/_react["default"].createElement(BindResourceDrawer, (0, _extends2["default"])({
     visible: visible,
     currentResId: currentResId
   }, props, {

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 "7.0.0-dev.6" === 'string' ? "7.0.0-dev.6" : null;
+var version = typeof "7.0.0-dev.8" === 'string' ? "7.0.0-dev.8" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/topoData.js

@@ -13,14 +13,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-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 getLayoutId(layout) {
   if (!layout || typeof layout === "string") {
     return layout;
@@ -53,12 +49,12 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+            topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
 
             _rlog["default"].debug("saveTopo", data); // 保存布局
 
@@ -69,7 +65,7 @@ function _saveTopo() {
             }
 
             _context.next = 5;
-            return _topo["default"].changeLayout({
+            return topoService.changeLayout({
               id: topoId,
               template: template,
               layout: getLayoutId(layout),
@@ -83,7 +79,7 @@ function _saveTopo() {
             }
 
             _context.next = 8;
-            return _topo["default"].saveTopoSettings(topoId, globalConfig);
+            return topoService.saveTopoSettings(topoId, globalConfig);
 
           case 8:
             if (!(resources || groups)) {
@@ -112,7 +108,7 @@ function _saveTopo() {
             _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
             _context.next = 15;
-            return _topo["default"].bindResourceToTopo(topoId, {
+            return topoService.bindResourceToTopo(topoId, {
               groups: groupInfo,
               exportLinkIdList: exportLinkIdList,
               relateTopoIdList: relateTopoIdList
@@ -125,7 +121,7 @@ function _saveTopo() {
             }
 
             _context.next = 18;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topoService.saveSerializeData(topoId, serialize);
 
           case 18:
           case "end":

package/lib/core/store/models/topoConfig.js

@@ -438,7 +438,9 @@ function _default(topoApp) {
                   case 0:
                     currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
-                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({}, data, {
+                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({
+                      topoService: topoApp.serverApi
+                    }, data, {
                       viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图

package/lib/core/utils/saveSerialize.js

@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
@@ -30,7 +28,7 @@ function _saveSerialize() {
             topoId = topo.getId();
             serialize = topo.getHtTopo().serialize();
             _context.next = 4;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
           case 4:
           case "end":

package/package.json

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

package/es/core/editor/components/plugins/MultipleResourceSelectPlugin.js

@@ -1,15 +0,0 @@
-import React from 'react';
-import ComboResDrawer from "../../../../components/MultiResourceDrawer";
-export default function MultipleResourceSelectPlugin(props) {
-  var topoEdit = props.topoEdit;
-  return /*#__PURE__*/React.createElement(ComboResDrawer, {
-    visible: topoEdit.showComboResDrawer,
-    loading: topoEdit.topoLoading,
-    initialData: topoEdit.initialComboRes,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    mode: topoEdit.getAddResourceDrawerMode(),
-    onSave: topoEdit.onSaveComboRes,
-    onClose: topoEdit.onCloseComboResDrawer
-  });
-}
-;

package/lib/core/editor/components/plugins/MultipleResourceSelectPlugin.js

@@ -1,25 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = MultipleResourceSelectPlugin;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _MultiResourceDrawer = _interopRequireDefault(require("../../../../components/MultiResourceDrawer"));
-
-function MultipleResourceSelectPlugin(props) {
-  var topoEdit = props.topoEdit;
-  return /*#__PURE__*/_react["default"].createElement(_MultiResourceDrawer["default"], {
-    visible: topoEdit.showComboResDrawer,
-    loading: topoEdit.topoLoading,
-    initialData: topoEdit.initialComboRes,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    mode: topoEdit.getAddResourceDrawerMode(),
-    onSave: topoEdit.onSaveComboRes,
-    onClose: topoEdit.onCloseComboResDrawer
-  });
-}
-
-;