@riil-frontend/component-topology 6.0.0-alpha.2 → 6.0.0-alpha.21

package/lib/core/editor/components/settings/common/SizeInput/NodeSizeInput.js

@@ -9,27 +9,23 @@ var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _grid = _interopRequireDefault(require("@alifd/next/lib/grid"));
-
 var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _NodeSizeNumberPicker = _interopRequireDefault(require("./NodeSizeNumberPicker"));
 
 var _NodeSizeInputModule = _interopRequireDefault(require("./NodeSizeInput.module.scss"));
 
-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; }
 
 var FormItem = _form["default"].Item;
-var Row = _grid["default"].Row,
-    Col = _grid["default"].Col;
 /**
  * 节点大小组件
  *
@@ -42,11 +38,13 @@ function SizeInput(props) {
       max = props.max,
       step = props.step,
       onChange = props.onChange,
-      lock = props.lock,
-      onLockChange = props.onLockChange,
       _props$showLabel = props.showLabel,
       showLabel = _props$showLabel === void 0 ? true : _props$showLabel,
-      size = props.size;
+      numberPickerProps = props.numberPickerProps,
+      size = props.size,
+      lock = props.lock,
+      disabled = props.disabled,
+      onLockChange = props.onLockChange;
 
   var handleChange = function handleChange(name, attrValue) {
     var _extends2;
@@ -64,6 +62,18 @@ function SizeInput(props) {
     return val ? Math.round(val) : val;
   }
 
+  var renderLock = function renderLock() {
+    var imgSrc = "/img/topo/editor/toolbar/" + (lock ? 'lock' : 'unlock') + "/" + (disabled ? 'Disable' : 'Normal') + ".svg";
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: _NodeSizeInputModule["default"].lockBtn,
+      onClick: switchLock
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: imgSrc,
+      alt: "",
+      width: 8
+    }));
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_form["default"], {
     labelAlign: "top",
     component: "div",
@@ -84,27 +94,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeNumberPicker["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeNumberPicker["default"], (0, _extends3["default"])({
     value: parseValue(value.width),
     label: showLabel ? '宽:' : '',
+    innerAfter: showLabel ? undefined : 'W',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('width', val);
     }
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: _NodeSizeInputModule["default"].lockBtn,
-    onClick: switchLock
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require(lock ? './img/icon_锁.svg' : './img/icon_解锁.svg'),
-    alt: ""
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  })))), renderLock(), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       flex: 1
     }
@@ -114,22 +121,24 @@ function SizeInput(props) {
     style: {
       marginBottom: 0
     }
-  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeNumberPicker["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeNumberPicker["default"], (0, _extends3["default"])({
     value: parseValue(value.height),
-    label: showLabel ? '高:' : '' // addonTextAfter="H"
-    ,
+    label: showLabel ? '高:' : '',
+    innerAfter: showLabel ? undefined : 'H',
     min: 1,
     max: max,
     step: step,
+    disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165",
-    size: size,
+    size: size
+  }, numberPickerProps, {
     style: {
       width: '100%'
     },
     onChange: function onChange(val) {
       return handleChange('height', val);
     }
-  }))))));
+  })))))));
 }
 
 SizeInput.propTypes = {

package/lib/core/editor/components/settings/common/SizeInput/NodeSizeNumberPicker.js

@@ -13,7 +13,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown"];
+var _excluded = ["value", "onChange", "min", "onBlur", "onKeyDown", "disabled"];
 
 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); }
 
@@ -31,6 +31,7 @@ function NodeSizeNumberPicker(props) {
       min = props.min,
       onBlur = props.onBlur,
       onKeyDown = props.onKeyDown,
+      disabled = props.disabled,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
 
   var _useState = (0, _react.useState)(value),
@@ -63,13 +64,13 @@ function NodeSizeNumberPicker(props) {
 
   var handleChange = function handleChange(value, e) {
     // 失去焦点最大最小值
-    if (e.type === 'blur') {
+    if (e.type === "blur") {
       onChange(!value ? min : value);
       return;
     } // 加减号立即变更
 
 
-    if (e.triggerType === 'up' || e.triggerType === 'down') {
+    if (e.triggerType === "up" || e.triggerType === "down") {
       onChange(value);
       return;
     }
@@ -80,10 +81,9 @@ function NodeSizeNumberPicker(props) {
   return /*#__PURE__*/_react["default"].createElement(_numberPicker["default"], (0, _extends2["default"])({}, otherProps, {
     value: inputValue,
     min: min,
+    disabled: disabled,
     onChange: handleChange,
     onBlur: handleBlur,
     onKeyDown: handleKeyDown
   }));
-}
-
-;
+}

package/lib/core/editor/components/settings/propertyViews/group/SettingTab/GroupExpandSetting.js

@@ -89,13 +89,5 @@ function GroupExpandSetting(props) {
     setExpanded: function setExpanded(val) {
       return group.setExpanded(val);
     }
-  }))), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
-    key: "\u5BF9\u9F50\u65B9\u5F0F",
-    title: "\u5BF9\u9F50\u65B9\u5F0F"
-  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-    label: ""
-  }, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
-    onChange: alignOnChange,
-    selected: "left"
   }))));
 }

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
+
+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; }
+
+var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
+  var visible = props.visible,
+      layer = props.layer,
+      topo = props.topo,
+      topoEdit = props.topoEdit,
+      onClose = props.onClose;
+
+  var onOk = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
+      var layerData;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              layerData = {
+                id: layer.tag,
+                tag: layer.attrObject.tag
+              };
+              _context.next = 3;
+              return topoEdit.addLayerResources(layerData, selected);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function onOk(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
+    visible: visible,
+    getExcludeIds: topoEdit.getAllNodeResourceIds,
+    onOk: onOk,
+    onClose: onClose
+  });
+};
+
+var _default = LayerAddResourceDrawer;
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceButton.js

@@ -5,45 +5,36 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LayerAddResourceButton;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
+
+var _useLayerAddResource = _interopRequireDefault(require("../../../../../hooks/useLayerAddResource"));
 
 var _AddResourceButton = _interopRequireDefault(require("../../../common/AddResourceButton"));
 
 var _LayerAddResourceDrawer = _interopRequireDefault(require("./LayerAddResourceDrawer"));
 
-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 LayerAddResourceButton(props) {
   var topo = props.topo,
-      layer = props.layer,
+      editorProps = props.editorProps,
       layerData = props.layerData,
-      CustomAddResourceDrawer = props.addResourceDrawer,
       onAdd = props.onAdd,
       topoEdit = props.topoEdit;
-
-  var _useState = (0, _react.useState)(false),
-      drawerVisible = _useState[0],
-      setDrawerVisible = _useState[1];
-
-  var AddResourceDrawer = CustomAddResourceDrawer || _LayerAddResourceDrawer["default"];
+  var layerAddResource = (0, _useLayerAddResource["default"])({
+    topo: topo,
+    topoEdit: topoEdit,
+    layerData: layerData
+  });
 
   var handleClick = function handleClick() {
-    setDrawerVisible(true);
+    layerAddResource.open();
   };
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_AddResourceButton["default"], {
     onClick: handleClick
-  }), /*#__PURE__*/_react["default"].createElement(AddResourceDrawer, {
-    visible: drawerVisible,
+  }), /*#__PURE__*/_react["default"].createElement(_LayerAddResourceDrawer["default"], {
     layer: layerData,
-    topo: topo,
-    topoEdit: topoEdit,
-    onClose: function onClose() {
-      setDrawerVisible(false);
-    },
-    setVisible: setDrawerVisible
+    editorProps: editorProps,
+    layerAddResource: layerAddResource
   }));
 }
 

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js

@@ -5,59 +5,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _react = _interopRequireDefault(require("react"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _DefaultLayerAddResourceDrawer = _interopRequireDefault(require("./DefaultLayerAddResourceDrawer"));
 
-var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
-
-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; }
-
-var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
-  var visible = props.visible,
-      layer = props.layer,
-      topo = props.topo,
-      topoEdit = props.topoEdit,
-      onClose = props.onClose;
-
-  var onOk = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(selected) {
-      var layerData;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              layerData = {
-                id: layer.tag,
-                tag: layer.attrObject.tag
-              };
-              _context.next = 3;
-              return topoEdit.addLayerResources(layerData, selected);
-
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function onOk(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-
-  return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
-    visible: visible,
-    getExcludeIds: topoEdit.getAllNodeResourceIds,
-    onOk: onOk,
-    onClose: onClose
-  });
-};
+function LayerAddResourceDrawer(props) {
+  var layer = props.layer,
+      editorProps = props.editorProps,
+      layerAddResource = props.layerAddResource;
+  var AddResourceDrawer = (editorProps === null || editorProps === void 0 ? void 0 : editorProps.layerResourceSelectComponent) || _DefaultLayerAddResourceDrawer["default"];
+  return /*#__PURE__*/_react["default"].createElement(AddResourceDrawer, (0, _extends2["default"])({
+    layer: layer
+  }, layerAddResource.drawerProps));
+}
 
 var _default = LayerAddResourceDrawer;
 exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/RelateData.js

@@ -31,9 +31,10 @@ function LayerRelateData(props) {
       title: "\u5173\u8054\u8D44\u6E90",
       extra: /*#__PURE__*/_react["default"].createElement(_LayerAddResourceButton["default"], {
         topo: topo,
+        topoEdit: topoEditApi,
+        editorProps: editorProps,
         layer: layer,
         layerData: values,
-        topoEdit: topoEditApi,
         onAdd: function onAdd() {
           /* TODO 刷新列表 refreshList */
         },

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/multipleElements/MultipleElementLineType.js

@@ -7,56 +7,19 @@ exports["default"] = MultipleElementLineType;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _htElementUtils = require("../../../../../../utils/htElementUtils");
+var _edgeTypeStyleUtil = require("../../../../utils/edgeTypeStyleUtil");
 
-var _LineType = _interopRequireDefault(require("../../common/LineType"));
+var _LineType = _interopRequireDefault(require("../../../Toolbar/widgets/EdgeTypeButton/LineType"));
 
 function MultipleElementLineType(props) {
   var topo = props.topo;
 
-  var setLineType = function setLineType(type) {};
-
-  var getChildrenNodeIds = function getChildrenNodeIds(nodes) {
-    var nodeIds = nodes.map(function (node) {
-      return node.getId();
-    });
-    nodes.forEach(function (node) {
-      if (node instanceof ht.Group) {
-        var children = node.getChildren().toArray();
-        nodeIds.push.apply(nodeIds, getChildrenNodeIds(children));
-      }
-    });
-    return nodeIds;
-  };
-
-  var getSelectedEdges = function getSelectedEdges() {
-    var gv = topo.getGraphView();
-    var selection = gv.getSelectionModel().getSelection().toArray();
-    var edges = selection.filter(function (element) {
-      return element instanceof ht.Edge;
-    }); // 查询选中节点间的连线
-
-    var nodes = selection.filter(function (element) {
-      return element instanceof ht.Node;
-    });
-    var nodeIds = getChildrenNodeIds(nodes);
-    var dm = gv.getDataModel();
-    (0, _htElementUtils.getEdges)(dm).forEach(function (edge) {
-      if (nodeIds.find(function (nodeId) {
-        return nodeId === edge.getSource().getId();
-      }) && nodeIds.find(function (nodeId) {
-        return nodeId === edge.getTarget().getId();
-      }) && !edges.find(function (item) {
-        return item === edge;
-      })) {
-        edges.push(edge);
-      }
-    });
-    return edges;
+  var setLineType = function setLineType(type) {
+    var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
+    (0, _edgeTypeStyleUtil.setEdgesType)(edges, type, topo);
   };
 
   return /*#__PURE__*/_react["default"].createElement(_LineType["default"], {
-    getEdges: getSelectedEdges,
     onChange: setLineType,
     topo: topo
   });

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

@@ -55,19 +55,7 @@ function MultipleElementPropertyView(props) {
 
   (0, _react.useEffect)(function () {
     field.setValues(values);
-  }, [values]);
-
-  var alignOnChange = function alignOnChange(v) {
-    // console.log('setAlignmentBySelectionNodes', v);
-    topo.historyManager.beginTransaction();
-    topo.getHtTopo().setAlignmentBySelectionNodes(v);
-
-    _onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
-
-
-    topo.historyManager.endTransaction();
-  }; // TODO 临时方案，满足应用部署拓扑多选元素属性面板不显示对齐
-
+  }, [values]); // TODO 临时方案，满足应用部署拓扑多选元素属性面板不显示对齐
 
   if (!(editorProps !== null && editorProps !== void 0 && (_editorProps$multiple = editorProps.multipleElementPropertyViewProps) !== null && _editorProps$multiple !== void 0 && _editorProps$multiple.showElementAlign) && topoShowType === _template.TPL_TREE) {
     return /*#__PURE__*/_react["default"].createElement(_ViewPropertyView["default"], props);
@@ -99,8 +87,7 @@ function MultipleElementPropertyView(props) {
     key: "\u5BF9\u9F50\u65B9\u5F0F",
     title: "\u5BF9\u9F50\u65B9\u5F0F"
   }, /*#__PURE__*/_react["default"].createElement(_AlignSetting["default"], {
-    onChange: alignOnChange,
-    selected: "left"
+    topo: topo
   })), /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u7EBF\u5F62",
     title: "\u7EBF\u5F62"

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/editor/components/titlebar/TopoEditorTitleBar.js

@@ -9,6 +9,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
@@ -25,6 +27,8 @@ var _TitleBarModule = _interopRequireDefault(require("../../../components/titleb
 
 var _DebugTools = _interopRequireDefault(require("./widgets/DebugTools"));
 
+var _SettingButtonWidget = _interopRequireDefault(require("../../../viewer/components/titlebar/widgets/SettingButtonWidget"));
+
 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; }
@@ -151,5 +155,9 @@ function TopoEditorTitleBar(props) {
         }
       });
     }
-  }, "\u9000\u51FA"))));
+  }, "\u9000\u51FA"), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], (0, _extends2["default"])({
+    isEditor: true
+  }, props, {
+    viewerProps: topo.viewProps.viewerProps
+  })))));
 }

package/lib/core/editor/hooks/useLayerAddResource.js

@@ -0,0 +1,34 @@
+"use strict";
+
+exports.__esModule = true;
+exports["default"] = useLayerAddResource;
+
+var _react = require("react");
+
+function useLayerAddResource(props) {
+  var topo = props.topo,
+      layer = props.layer,
+      topoEdit = props.topoEdit;
+
+  var _useState = (0, _react.useState)(false),
+      drawerVisible = _useState[0],
+      setDrawerVisible = _useState[1];
+
+  return {
+    open: function open() {
+      return setDrawerVisible(true);
+    },
+    close: function close() {
+      return setDrawerVisible(false);
+    },
+    drawerProps: {
+      visible: drawerVisible,
+      setVisible: setDrawerVisible,
+      onClose: function onClose() {
+        setDrawerVisible(false);
+      },
+      topo: topo,
+      topoEdit: topoEdit
+    }
+  };
+}

package/lib/core/{store/models → editor/store}/topoEdit.js

@@ -21,7 +21,14 @@ var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-co
 var _default = {
   // 定义 model 的初始 state
   state: {
-    saving: false
+    // 是否就绪
+    ready: false,
+    // 保存状态
+    saving: false,
+    // 选择/拖动模式模式。默认选择模式 select|move
+    viewMouseMode: 'select',
+    // 资源面板展开项
+    resourceTabactiveKey: null
   },
   // 定义改变该模型状态的纯函数
   reducers: {