@riil-frontend/component-topology 6.0.0-alpha.42 → 6.0.0-alpha.43

package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyView.js

@@ -58,19 +58,14 @@ function BoxPropertyView(props) {
   }, [values]);
   return /*#__PURE__*/_react["default"].createElement(_form["default"], {
     field: field,
-    labelAlign: "top"
-  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-    defaultExpandedKeys: ['标题区'],
+    labelAlign: "top",
     style: {
-      border: 'none'
+      margin: '12px 0 0 32px'
     }
-  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
-    key: "\u6807\u9898\u533A",
-    title: "\u6807\u9898\u533A"
   }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u6807\u9898\u540D\u79F0"
   }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
     name: "attrObject.topLeftText",
     topo: topo
-  }))))));
+  })));
 }

package/lib/core/editor/components/settings/propertyViews/box/BoxPropertyViewV1.js

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = BoxPropertyView;
+
+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 _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
+
+var _NameInput = _interopRequireDefault(require("./NameInput"));
+
+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 CollapsePanel = _collapse["default"].Panel;
+
+function parseValues(values) {
+  return (0, _extends2["default"])({}, values);
+}
+
+function BoxPropertyView(props) {
+  var topo = props.topo,
+      values = props.values,
+      _onChange = props.onChange;
+  var boxNode = (0, _useHtElement["default"])({
+    topo: topo,
+    id: values.id
+  });
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+
+      if (name === 'attrObject.topLeftText') {
+        // 修改框名称改变名称背景块大小
+        topo.getHtTopo().setRectangleText(boxNode);
+      }
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
+    defaultExpandedKeys: ['标题区'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
+    key: "\u6807\u9898\u533A",
+    title: "\u6807\u9898\u533A"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u6807\u9898\u540D\u79F0"
+  }, /*#__PURE__*/_react["default"].createElement(_NameInput["default"], {
+    name: "attrObject.topLeftText",
+    topo: topo
+  }))))));
+}

package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = CommonEdgePropertyView;
+exports["default"] = void 0;
 
 var _numberPicker = _interopRequireDefault(require("@alifd/next/lib/number-picker"));
 
@@ -23,6 +23,8 @@ var _ColorPicker = _interopRequireDefault(require("../../../../../../common/comp
 
 var _LineType = _interopRequireDefault(require("../../common/LineType"));
 
+var _addEdgeProps = _interopRequireDefault(require("./addEdgeProps"));
+
 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; }
@@ -148,4 +150,8 @@ function CommonEdgePropertyView(props) {
       }
     }
   })))), extraDisplaySetting))));
-}
+}
+
+var _default = (0, _addEdgeProps["default"])(CommonEdgePropertyView);
+
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/edge/EdgeGroupPropertyView.js

@@ -3,21 +3,18 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = EdgeGroupPropertyView;
+exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
-var _EdgeGroupSetting = _interopRequireDefault(require("./edgeGroup/EdgeGroupSetting"));
-
-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); }
+var _addEdgeProps = _interopRequireDefault(require("./addEdgeProps"));
 
-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 _EdgeGroupSetting = _interopRequireDefault(require("./edgeGroup/EdgeGroupSetting"));
 
 function EdgeGroupPropertyView(props) {
-  var topo = props.topo,
-      edge = props.edge,
-      values = props.values,
-      onChange = props.onChange,
-      editorProps = props.editorProps;
   return /*#__PURE__*/_react["default"].createElement(_EdgeGroupSetting["default"], props);
-}
+}
+
+var _default = (0, _addEdgeProps["default"])(EdgeGroupPropertyView);
+
+exports["default"] = _default;

package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
 
-var _CommonEdgePropertyView = _interopRequireDefault(require("./CommonEdgePropertyView"));
-
 var _EdgeGroupPropertyView = _interopRequireDefault(require("./EdgeGroupPropertyView"));
 
 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); }
@@ -20,7 +18,6 @@ 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; }
 
 var commonViews = {
-  edge: _CommonEdgePropertyView["default"],
   edgeGroup: _EdgeGroupPropertyView["default"]
 };
 /**
@@ -30,31 +27,18 @@ var commonViews = {
 function EdgePropertyViewRoute(props) {
   var topo = props.topo,
       values = props.values,
+      selectionElement = props.selectionElement,
       editorProps = props.editorProps;
-  var edge = (0, _useHtElement["default"])({
-    topo: topo,
-    id: values.id
-  });
+  var edge = selectionElement;
   var type;
 
-  if (edge.isEdgeGroupAgent()) {
-    if (editorProps.getEdgeGroupPropertyViewType) {
-      type = editorProps.getEdgeGroupPropertyViewType((0, _extends2["default"])({}, props, {
-        edge: edge
-      }));
-    }
-
-    type = type || "edgeGroup";
-  } else {
-    if (editorProps.getEdgePropertyViewType) {
-      type = editorProps.getEdgePropertyViewType((0, _extends2["default"])({}, props, {
-        edge: edge
-      }));
-    }
-
-    type = type || "edge";
+  if (editorProps.getEdgePropertyViewType) {
+    type = editorProps.getEdgePropertyViewType((0, _extends2["default"])({}, props, {
+      edge: edge
+    }));
   }
 
+  type = type || 'edge';
   var views = (0, _extends2["default"])({}, commonViews, editorProps.edgePropertyViews || {});
   var View = views[type];
 

package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -0,0 +1,19 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = addEdgeProps;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function addEdgeProps(Component) {
+  return function AdapterEdgeProps(props) {
+    var selectionElement = props.selectionElement;
+    return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({}, props, {
+      edge: selectionElement
+    }));
+  };
+}

package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js

@@ -30,13 +30,12 @@ function parseValues(values) {
 function EdgeGroupSetting(props) {
   var topo = props.topo,
       edge = props.edge,
-      values = props.values,
       _onChange = props.onChange,
       editorProps = props.editorProps;
 
   var field = _field["default"].useField({
     autoUnmount: false,
-    values: parseValues(values),
+    values: {},
     onChange: function onChange(name, value) {
       var newValues = field.getValues();
 
@@ -44,10 +43,6 @@ function EdgeGroupSetting(props) {
     }
   });
 
-  (0, _react.useEffect)(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
-
   var setLineColor = function setLineColor(color) {
     var style = edge.a('styles') || {};
     edge.s('edge.color', color);

package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.js

@@ -5,46 +5,35 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = GroupPropertyView;
 
-var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
-
-var _GroupPropertyViewModule = _interopRequireDefault(require("./GroupPropertyView.module.scss"));
-
-var _useGroup = _interopRequireDefault(require("./hooks/useGroup"));
-
-var _Setting = _interopRequireDefault(require("./SettingTab/Setting"));
+var _ClusterGroupRelateData = _interopRequireDefault(require("./cluster/ClusterGroupRelateData"));
 
 var _RelateData = _interopRequireDefault(require("./DataTab/RelateData"));
 
-var _ClusterGroupRelateData = _interopRequireDefault(require("./cluster/ClusterGroupRelateData"));
+var _GroupBasicSetting = _interopRequireDefault(require("./SettingTab/GroupBasicSetting"));
+
+var _GroupPropertyViewModule = _interopRequireDefault(require("./GroupPropertyView.module.scss"));
 
 function GroupPropertyView(props) {
   var topo = props.topo,
       topoEdit = props.topoEdit,
       values = props.values,
-      onChange = props.onChange,
-      settingRuntimeState = props.settingRuntimeState,
-      editorProps = props.editorProps;
-  var group = (0, _useGroup["default"])({
-    topo: topo,
-    id: values.id
-  });
+      selectionElement = props.selectionElement;
+  var group = selectionElement;
   var isCluster = group.a('cluster');
   var DataTabContent = isCluster ? _ClusterGroupRelateData["default"] : _RelateData["default"];
-  return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, /*#__PURE__*/_react["default"].createElement(DataTabContent, (0, _extends2["default"])({
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _GroupPropertyViewModule["default"].GroupPropertyView
+  }, /*#__PURE__*/_react["default"].createElement(_GroupBasicSetting["default"], (0, _extends2["default"])({
     group: group
-  }, props))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({
+  }, props, {
+    isCluster: isCluster
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: _GroupPropertyViewModule["default"].data
+  }, /*#__PURE__*/_react["default"].createElement(DataTabContent, (0, _extends2["default"])({
     group: group
   }, props))));
 }

package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyView.module.scss

@@ -1,3 +1,10 @@
 .GroupPropertyView {
-  
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .data {
+    flex: 1;
+    overflow: auto;
+  }
 }

package/lib/core/editor/components/settings/propertyViews/group/GroupPropertyViewV1.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = GroupPropertyView;
+
+var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
+
+var _GroupPropertyViewModule = _interopRequireDefault(require("./GroupPropertyView.module.scss"));
+
+var _Setting = _interopRequireDefault(require("./SettingTab/Setting"));
+
+var _RelateData = _interopRequireDefault(require("./DataTab/RelateData"));
+
+var _ClusterGroupRelateData = _interopRequireDefault(require("./cluster/ClusterGroupRelateData"));
+
+function GroupPropertyView(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit,
+      values = props.values,
+      selectionElement = props.selectionElement;
+  var group = selectionElement;
+  var isCluster = group.a('cluster');
+  var DataTabContent = isCluster ? _ClusterGroupRelateData["default"] : _RelateData["default"];
+  return /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+    title: "\u6570\u636E",
+    key: "1"
+  }, /*#__PURE__*/_react["default"].createElement(DataTabContent, (0, _extends2["default"])({
+    group: group
+  }, props))), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
+    title: "\u8BBE\u7F6E",
+    key: "2"
+  }, /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({
+    group: group
+  }, props))));
+}

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

@@ -0,0 +1,97 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = GroupBasicSetting;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
+
+var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _NodeSizeInput = _interopRequireDefault(require("../../../common/NodeSizeInput/NodeSizeInput"));
+
+var _GroupIconSelect = _interopRequireDefault(require("./GroupIconSelect"));
+
+var _GroupExpandStatus = _interopRequireDefault(require("./GroupExpandStatus"));
+
+var _GroupExpandSetting = _interopRequireDefault(require("./GroupExpandSetting"));
+
+var _SpecialCharacterValidateUtil = require("../../../../../../../utils/SpecialCharacterValidateUtil");
+
+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 CollapsePanel = _collapse["default"].Panel;
+
+function GroupBasicSetting(props) {
+  var topo = props.topo,
+      topoEdit = props.topoEdit,
+      values = props.values,
+      _onChange = props.onChange,
+      settingRuntimeState = props.settingRuntimeState,
+      editorProps = props.editorProps,
+      group = props.group,
+      isCluster = props.isCluster;
+  var expanded = values.expanded;
+  var id = values.id;
+
+  var field = _field["default"].useField({
+    autoUnmount: false,
+    values: values,
+    onChange: function onChange(name, value) {
+      if (name === 'attrObject.name' && !(0, _SpecialCharacterValidateUtil.validateSpecialCharacter)(value)) {
+        return;
+      }
+
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  (0, _react.useEffect)(function () {
+    field.setValues(values);
+  }, [values]);
+  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    field: field,
+    labelAlign: "top",
+    style: {
+      paddingLeft: 32,
+      paddingRight: 16,
+      marginTop: 12
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, (0, _extends2["default"])({
+    label: isCluster ? '集群名称' : '区域名称'
+  }, _SpecialCharacterValidateUtil.SPECIAL_CHARACTER_FORM_ITEM_VALIDATE_PROPS, {
+    patternTrigger: "onChange"
+  }), /*#__PURE__*/_react["default"].createElement(_input["default"], {
+    name: "attrObject.name",
+    maxLength: 30,
+    placeholder: "\u8BF7\u8F93\u5165",
+    onFocus: function onFocus() {
+      topo.historyManager.beginTransaction();
+    },
+    onBlur: function onBlur() {
+      topo.historyManager.endTransaction();
+    }
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u9ED8\u8BA4\u663E\u793A\u65B9\u5F0F"
+  }, /*#__PURE__*/_react["default"].createElement(_GroupExpandStatus["default"], {
+    topo: topo,
+    group: group,
+    expanded: expanded,
+    setExpanded: function setExpanded(val) {
+      return group.setExpanded(val);
+    }
+  }))));
+}

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

@@ -41,15 +41,17 @@ function GroupExpandSetting(props) {
     topo.historyManager.beginTransaction(); // console.log("setAlignmentBySelectionNodes", v);
     // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 
-    onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
 
     topo.historyManager.endTransaction();
   };
 
-  var layoutOnChange = function layoutOnChange(v) {
+  var layoutOnChange = function layoutOnChange(value) {
     topo.historyManager.beginTransaction();
-    setLayout(v);
-    onChange("layout", v);
+    setLayout(value); // onChange("layout", v);
+
+    var layouType = value.id === 'toward' ? "" + value.id + value.options.subId : value.id;
+    topo.getHtTopo().layoutInContainer(layouType);
     topo.historyManager.endTransaction();
   };
 
@@ -58,9 +60,9 @@ function GroupExpandSetting(props) {
     setLayout({}); // onChange("layout", {});
   }, [id]);
   return /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
-    defaultExpandedKeys: ["布局", "显示设置", "对齐方式"],
+    defaultExpandedKeys: ['布局', '显示设置', '对齐方式'],
     style: {
-      border: "none"
+      border: 'none'
     }
   }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
     key: "\u5E03\u5C40",

package/lib/core/editor/components/settings/propertyViews/index.js

@@ -21,14 +21,17 @@ var _EdgePropertyView = _interopRequireDefault(require("./edge/EdgePropertyView"
 
 var _BoxPropertyView = _interopRequireDefault(require("./box/BoxPropertyView"));
 
+var _EdgeGroupPropertyView = _interopRequireDefault(require("./edge/EdgeGroupPropertyView"));
+
 var propertyPanelMap = {
-  view: _ViewPropertyView["default"],
+  // view: ViewPropertyView,
   group: _GroupPropertyView["default"],
   node: _NodePropertyView["default"],
   edge: _EdgePropertyView["default"],
+  // edgeGroup: EdgeGroupPropertyView,
   layer: _LayerPropertyView["default"],
   text: _TextPropertyView["default"],
-  multiple: _MultipleElementPropertyView["default"],
+  // multiple: MultipleElementPropertyView,
   box: _BoxPropertyView["default"]
 };
 

package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js

@@ -5,21 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = NodePropertyView;
 
-var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
-
-var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
-
 var _Data = _interopRequireDefault(require("./data/Data"));
 
 var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
 
-var _Setting = _interopRequireDefault(require("./Setting"));
+var _BasicSetting = _interopRequireDefault(require("./Setting/BasicSetting"));
 
 function NodePropertyView(props) {
   var _topo$options$editor;
@@ -29,40 +23,19 @@ function NodePropertyView(props) {
       values = props.values,
       onChange = props.onChange,
       editorProps = props.editorProps,
-      settingRuntimeState = props.settingRuntimeState;
-  var node = (0, _useHtElement["default"])({
-    topo: topo,
-    id: values.id
-  });
-
-  var renderData = function renderData() {
-    return /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
-      node: node
-    }));
-  };
-
-  var renderSetting = function renderSetting() {
-    var nodeSettingViewProps = editorProps.nodeSettingViewProps;
-    return /*#__PURE__*/_react["default"].createElement(_Setting["default"], (0, _extends2["default"])({}, props, nodeSettingViewProps));
-  }; // 未绑定资源的节点，根据参数控制是否可关联资源
-
+      selectionElement = props.selectionElement;
+  var node = selectionElement; // 未绑定资源的节点，根据参数控制是否可关联资源
 
   var showRelateResource = !!values.tag || !values.tag && ((_topo$options$editor = topo.options.editor) === null || _topo$options$editor === void 0 ? void 0 : _topo$options$editor.enableRelateResource) !== false;
-  var content;
+  var dataContent = null;
 
   if (showRelateResource) {
-    content = /*#__PURE__*/_react["default"].createElement(_TabView["default"], null, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-      title: "\u6570\u636E",
-      key: "1"
-    }, renderData()), /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
-      title: "\u8BBE\u7F6E",
-      key: "2"
-    }, renderSetting()));
-  } else {
-    content = renderSetting();
+    dataContent = /*#__PURE__*/_react["default"].createElement(_Data["default"], (0, _extends2["default"])({}, props, {
+      node: node
+    }));
   }
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _NodePropertyViewModule["default"].NodePropertyView
-  }, content);
+  }, /*#__PURE__*/_react["default"].createElement(_BasicSetting["default"], props), dataContent);
 }