@riil-frontend/component-topology 6.0.0-alpha.7 → 6.0.0-alpha.9

package/lib/core/editor/components/settings/propertyViews/multipleElements/BatchSetNodeSize/BatchSetNodeSize.js

@@ -94,7 +94,7 @@ function BatchSetNodeSize(props) {
     if (lock) {
       var _setSize;
 
-      setSize((_setSize = {}, _setSize[name] = value, _setSize[name === 'width' ? 'height' : 'width'] = undefined, _setSize));
+      setSize((_setSize = {}, _setSize[name] = value, _setSize[name === "width" ? "height" : "width"] = undefined, _setSize));
     } else {
       var _extends2;
 
@@ -103,11 +103,11 @@ function BatchSetNodeSize(props) {
 
     topo.historyManager.beginTransaction();
     nodes.forEach(function (node) {
-      if (name === 'width') {
+      if (name === "width") {
         if (lock) {
           var height = nodesSizeRatioMap.getNodeHeight(node, value);
 
-          _rlog["default"].debug('多元素锁定设置宽', node, value, height);
+          _rlog["default"].debug("多元素锁定设置宽", node, value, height);
 
           node.setHeight(height);
         }
@@ -133,12 +133,10 @@ function BatchSetNodeSize(props) {
     nodesSizeRatioMap.reset();
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_SizeInput["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_SizeInput["default"], (0, _extends3["default"])({}, props, {
     value: size,
     lock: lock,
     onChange: handleChange,
     onLockChange: onLockChange
-  });
-}
-
-;
+  }));
+}

package/lib/core/editor/components/settings/propertyViews/view/BatchSetNodeSize.js

@@ -15,11 +15,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 BatchSetNodeSize(props) {
-  var size = props.size;
+  var value = props.value,
+      size = props.size,
+      disabled = props.disabled;
   return /*#__PURE__*/_react["default"].createElement(_SizeInput["default"], (0, _extends2["default"])({}, props, {
-    value: {}
+    disabled: disabled,
+    value: value
   }));
-}
-
-;
+}

package/lib/core/hooks/useTopoEdit.js

@@ -469,14 +469,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
               _rlog["default"].debug("bindGroupResources--id, tag", id, tag);
 
-              _context12.next = 4;
+              topo.historyManager.beginTransaction();
+              _context12.next = 5;
               return resourceConfig.updateGroupResources(group, resources);
 
-            case 4:
-              _context12.next = 6;
+            case 5:
+              _context12.next = 7;
               return editDispatchers.fetchDataByConfig();
 
-            case 6:
+            case 7:
               _yield$editDispatcher2 = _context12.sent;
               elements = _yield$editDispatcher2.elements;
               // 区域里的子区域及子区域的节点、新增的链路
@@ -492,7 +493,9 @@ var useTopoEdit = function useTopoEdit(params) {
                 }
               }
 
-            case 12:
+              topo.historyManager.endTransaction();
+
+            case 14:
             case "end":
               return _context12.stop();
           }
@@ -618,7 +621,8 @@ var useTopoEdit = function useTopoEdit(params) {
                 newElements: newElements
               });
 
-              topo.getHtTopo().addElements(newElements); // 临时放这里，仅拓扑中心有
+              topo.getHtTopo().addElements(newElements);
+              topo.fitContent(false, 0); // 临时放这里，仅拓扑中心有
 
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
@@ -630,7 +634,7 @@ var useTopoEdit = function useTopoEdit(params) {
                 resourceTabactiveKey: null
               });
 
-            case 13:
+            case 14:
             case "end":
               return _context15.stop();
           }
@@ -684,6 +688,12 @@ var useTopoEdit = function useTopoEdit(params) {
   function getAddResourceDrawerMode() {
     return getAddResourceType() === "addToFirstLayer" ? "new" : "all";
   }
+  /**
+   * 未选中元素添加资源
+   * 
+   * @param {*} data 
+   */
+
 
   var onSaveComboRes = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(data) {
@@ -712,12 +722,13 @@ var useTopoEdit = function useTopoEdit(params) {
               return bindViewResources(data);
 
             case 9:
+              topo.fitContent(false, 0);
               topo.historyManager.endTransaction();
               topoEditDispatchers.update({
                 resourceTabactiveKey: null
               });
 
-            case 11:
+            case 12:
             case "end":
               return _context7.stop();
           }

package/lib/core/models/TopoApp.js

@@ -52,7 +52,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionManager = _interopRequireDefault(require("./SelectionManager"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "6.0.0-alpha.7" === 'string' ? "6.0.0-alpha.7" : null;
+var version = typeof "6.0.0-alpha.9" === 'string' ? "6.0.0-alpha.9" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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