@riil-frontend/component-topology 2.4.2 → 2.4.6

package/lib/core/editor/components/settings/view/ViewPropertyView.js

@@ -7,44 +7,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = ViewPropertyView;
 
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
 var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
-
 var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
 
-var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
-
-var _grid = _interopRequireDefault(require("@alifd/next/lib/grid"));
-
-var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
-
 var _react = _interopRequireWildcard(require("react"));
 
-var _ColorPicker = _interopRequireDefault(require("../../LinkDynamicStyleSettingDrawer/rule/ColorPicker"));
-
-var _GroupNodeList = _interopRequireDefault(require("../group/GroupNodeList/GroupNodeList"));
-
-var _ResourceSelectButton = _interopRequireDefault(require("../group/GroupNodeList/ResourceSelectButton"));
-
-var _icon = require("../group/GroupNodeList/icon");
-
 var _LayoutSettings = _interopRequireDefault(require("../common/LayoutSettings"));
 
 var _LineType = _interopRequireDefault(require("../common/LineType"));
 
 var _NodeAlignType = _interopRequireDefault(require("../common/NodeAlignType"));
 
-var _NodeSizeInput = _interopRequireDefault(require("../common/NodeSizeInput/NodeSizeInput"));
+var _BatchSetNodeSize = _interopRequireDefault(require("./BatchSetNodeSize"));
 
-var FormItem = _form["default"].Item;
-var Row = _grid["default"].Row,
-    Col = _grid["default"].Col;
-var Option = _select["default"].Option;
-var CollapsePanel = _collapse["default"].Panel;
-var RadioGroup = _radio["default"].Group; // 字体样式格式 label.font: bold italic 12px 黑体 / 12px 黑体
+var CollapsePanel = _collapse["default"].Panel; // 字体样式格式 label.font: bold italic 12px 黑体 / 12px 黑体
 
 var fontStyleUtil = {
   toMap: function toMap(font, prefix) {
@@ -138,5 +119,5 @@ function ViewPropertyView(props) {
     title: "\u56FE\u7247"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u56FE\u7247\u5C3A\u5BF8"
-  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], null)))))));
+  }, /*#__PURE__*/_react["default"].createElement(_BatchSetNodeSize["default"], null)))))));
 }

package/lib/core/models/TopoApp.js

@@ -625,17 +625,31 @@ var TopoApp = /*#__PURE__*/function () {
     }
 
     return save;
-  }();
+  }()
+  /**
+   * 导出为图片
+   *
+   * @param name {string?} 文件名称，不传使用默认
+   */
+  ;
 
-  _proto.exportImage = /*#__PURE__*/function () {
-    var _exportImage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15() {
+  _proto.exportImage =
+  /*#__PURE__*/
+  function () {
+    var _exportImage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(name) {
+      var fileName;
       return _regenerator["default"].wrap(function _callee15$(_context15) {
         while (1) {
           switch (_context15.prev = _context15.next) {
             case 0:
-              this.view.topoClient.exportImage();
+              fileName = name;
 
-            case 1:
+              if (!name) {// TODO 获取拓扑名称，避免改名重绘拓扑图
+              }
+
+              this.view.topoClient.exportImage(fileName);
+
+            case 3:
             case "end":
               return _context15.stop();
           }
@@ -643,7 +657,7 @@ var TopoApp = /*#__PURE__*/function () {
       }, _callee15, this);
     }));
 
-    function exportImage() {
+    function exportImage(_x9) {
       return _exportImage.apply(this, arguments);
     }
 
@@ -678,7 +692,7 @@ var TopoApp = /*#__PURE__*/function () {
       }, _callee16, this);
     }));
 
-    function loadAttrsAndMetrics(_x9) {
+    function loadAttrsAndMetrics(_x10) {
       return _loadAttrsAndMetrics.apply(this, arguments);
     }
 

package/lib/models/topoMod.d.ts

@@ -49,6 +49,7 @@ export default function _default(topoApp: any): {
             mode: string | null;
             viewState: string | null;
         }, rootState: any): Promise<void>;
+        clearData(): void;
         switchToViewMode(playload: any, rootState: any): void;
         enterEditMode(playload: any, rootState: any): void;
         openDefaultTopoPage(conditions: {}, rootState: any): Promise<void>;

package/lib/models/topoMod.js

@@ -162,10 +162,7 @@ function _default(topoApp) {
                     id = playload.id, data = playload.data, linkTo = playload.linkTo;
                     viewState = playload.mode || playload.viewState || 'view';
                     topoId = id || data.config.id;
-                    _context2.next = 5;
-                    return topoApp.open(topoId);
 
-                  case 5:
                     _this2.update({
                       viewState: viewState,
                       currentTopo: playload,
@@ -173,6 +170,10 @@ function _default(topoApp) {
                       topoPermission: undefined
                     });
 
+                    _context2.next = 6;
+                    return topoApp.open(topoId);
+
+                  case 6:
                     _context2.next = 8;
                     return _this2.initTopoData({
                       topoId: topoId,
@@ -194,6 +195,11 @@ function _default(topoApp) {
             }, _callee2);
           }))();
         },
+        clearData: function clearData() {
+          this.update({
+            topoData: null
+          });
+        },
         switchToViewMode: function switchToViewMode(playload, rootState) {
           this.update({
             viewState: 'view'

package/lib/style.js

@@ -26,6 +26,6 @@ require('@alifd/next/lib/radio/style');
 require('@alifd/next/lib/collapse/style');
 require('@alifd/next/lib/list/style');
 require('@alifd/next/lib/tree-select/style');
-require('@alifd/next/lib/avatar/style');
+
 
 require('./index.scss');

package/lib/topoCenter/store/topoCenter.js

@@ -200,10 +200,23 @@ var _default = {
                     viewState: viewState || 'view'
                   });
 
-                  _context4.next = 5;
+                  if (!id) {
+                    _context4.next = 8;
+                    break;
+                  }
+
+                  _context4.next = 6;
                   return dispatch.topoMod.openTopoPage(playload);
 
-                case 5:
+                case 6:
+                  _context4.next = 10;
+                  break;
+
+                case 8:
+                  _context4.next = 10;
+                  return dispatch.topoMod.clearData();
+
+                case 10:
                 case "end":
                   return _context4.stop();
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.4.2",
+  "version": "2.4.6",
   "description": "拓扑",
   "files": [
     "demo/",
@@ -55,8 +55,9 @@
     "@riil-frontend/component-row-delete-ballon": "^1.0.2",
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.1",
-    "@riil-frontend/component-topology-graph": "^2.1.12",
-    "@riil-frontend/component-topology-utils": "^2.0.13",
+    "@riil-frontend/component-topo-icon-select": "^1.0.0",
+    "@riil-frontend/component-topology-graph": "^2.1.13",
+    "@riil-frontend/component-topology-utils": "^2.0.14",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -99,6 +100,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.2/build/index.html",
-  "gitHead": "4c30a81dfb48bf8ebfd910e644605ce85604fcb7"
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.4.6/build/index.html",
+  "gitHead": "8d9f286eb5da11dfadbef62890d74d2c2dd4d3a9"
 }