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

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.7" === 'string' ? "7.0.0-dev.7" : 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/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.7" === 'string' ? "7.0.0-dev.7" : 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.7",
   "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.7/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }