@riil-frontend/component-topology 2.15.45 → 2.15.46

package/es/components/TagImageSelect/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent"];
+var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent", "value"];
 import React from "react";
 import TemplateButton from "../TemplateButton";
 import TagSelect from "../TagSelect";
@@ -14,12 +14,14 @@ var TagImageSelect = function TagImageSelect(props) {
       tagProps = props.tagProps,
       itemProps = props.itemProps,
       ItemComponent = props.ItemComponent,
+      value = props.value,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var Item = ItemComponent || TemplateButton;
   return /*#__PURE__*/React.createElement(TagSelect, _extends({}, otherProps, {
     onChange: onChange,
     className: styles.tagSelect,
+    value: value,
     dataSource: dataSource.map(function (item) {
       return {
         key: item.id,

package/es/components/TagSelect/index.js

@@ -20,9 +20,9 @@ var TagSelect = function TagSelect(props) {
       setCurrent = _useState[1];
 
   useEffect(function () {
-    if (value) {
-      setCurrent(value);
-    }
+    // if (value) {
+    // }
+    setCurrent(value);
   }, [value]);
   return /*#__PURE__*/React.createElement("div", {
     className: "tag-select-wrap"

package/es/core/editor/components/settings/common/LayoutSettings.js

@@ -1,6 +1,6 @@
 import _Form from "@alifd/next/es/form";
 import _Radio from "@alifd/next/es/radio";
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import TemplateGroup from "../../../../../components/TagImageSelect";
 import styles from "./LayoutSettings.module.scss";
 var LAYOUTS = {
@@ -21,33 +21,25 @@ var LayoutSettings = function LayoutSettings(props) {
   var _props$layout = props.layout,
       layout = _props$layout === void 0 ? {} : _props$layout,
       onChange = props.onChange,
+      regionId = props.regionId,
       size = props.size;
   var layoutId = layout.id,
-      layoutOptions = layout.options;
-
-  var _useState = useState(layout || {}),
-      value = _useState[0],
-      setValue = _useState[1];
+      layoutOptions = layout.options; // const [value, setValue] = useState();
 
   var handleChange = function handleChange(data) {
-    console.log("handleChange", data);
-    onChange && onChange(data); // setValue({
-    //   id: data,
-    //   options: {
-    //     value: "east",
-    //     label: "横向",
-    //   },
-    // });
+    onChange && onChange(data);
   };
 
   var onLayoutSelect = function onLayoutSelect(id) {
+    // console.log("onLayoutSelect", id, layout, value);
     var options;
 
     if (id === "toward") {
       options = {
         subId: TREE_LAYOUT_OPTIONS[0].value
       };
-    }
+    } // setValue(id);
+
 
     handleChange({
       id: id,
@@ -60,14 +52,14 @@ var LayoutSettings = function LayoutSettings(props) {
       id: id,
       name: LAYOUTS[id],
       icon: "layout_" + id,
-      selected: layoutId === id,
-      onSelect: onLayoutSelect
+      selected: layoutId === id
     };
   });
   return /*#__PURE__*/React.createElement("div", {
     className: styles["layout-setting-template-group"]
   }, /*#__PURE__*/React.createElement(TemplateGroup, {
     dataSource: layoutGroup,
+    value: layoutId,
     size: size,
     onChange: onLayoutSelect,
     boxProps: {
@@ -86,7 +78,7 @@ var LayoutSettings = function LayoutSettings(props) {
       iconClassName: styles.icon,
       textClassName: styles.text
     }
-  }), layoutId === "toward" && /*#__PURE__*/React.createElement(_Form.Item, {
+  }), layoutId === "toward" ? /*#__PURE__*/React.createElement(_Form.Item, {
     label: "\u5E03\u5C40\u65B9\u5411"
   }, /*#__PURE__*/React.createElement(_Radio.Group, {
     dataSource: TREE_LAYOUT_OPTIONS,
@@ -99,7 +91,7 @@ var LayoutSettings = function LayoutSettings(props) {
         }
       });
     }
-  })));
+  })) : null);
 };
 
 export default LayoutSettings;

package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -2,11 +2,11 @@ import _extends from "@babel/runtime/helpers/extends";
 import { useState } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { iconFactory } from "@riil-frontend/component-topology-graph";
-import sortBy from 'lodash/sortBy';
+import sortBy from "lodash/sortBy";
 import { getGroupChildrenNodes, getNodeData } from "../../../../../../../../utils/htElementUtils";
 
 function sortResourcesByName(resources) {
-  return sortBy(resources, 'name');
+  return sortBy(resources, "name");
 }
 
 export default function useGroupRelateResource(props) {
@@ -33,7 +33,7 @@ export default function useGroupRelateResource(props) {
       data: item,
       node: item.node
     };
-  });
-  rlog.info('useGroupRelateResource', data);
+  }); // rlog.info('useGroupRelateResource', data);
+
   return data;
 }

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

@@ -1,6 +1,6 @@
 import _Form from "@alifd/next/es/form";
 import _Collapse from "@alifd/next/es/collapse";
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from "react";
 import GroupExpandStatus from "./GroupExpandStatus";
 import AlignSetting from "../../../common/AlignSetting";
 import LayoutSettings from "../../../common/LayoutSettings"; // import NodeIconSelect from '../../node/NodeIconSelect';
@@ -12,6 +12,7 @@ export default function GroupExpandSetting(props) {
       group = props.group,
       expanded = props.expanded,
       onChange = props.onChange,
+      id = props.id,
       settingRuntimeState = props.settingRuntimeState;
 
   var _useState = useState(),
@@ -19,22 +20,26 @@ export default function GroupExpandSetting(props) {
       setLayout = _useState[1];
 
   var alignOnChange = function alignOnChange(v) {
-    console.log('setAlignmentBySelectionNodes', v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
-
-    onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    // console.log("setAlignmentBySelectionNodes", v);
+    // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
+    onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
   var layoutOnChange = function layoutOnChange(v) {
-    console.log('layoutOnChange', v);
+    // console.log("layoutOnChange", v);
     setLayout(v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 
-    onChange('layout', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    onChange("layout", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
+  useEffect(function () {
+    // console.log("GroupExpandSetting-id-layout", id, layout);
+    setLayout({}); // onChange("layout", {});
+  }, [id]);
   return /*#__PURE__*/React.createElement(_Collapse, {
-    defaultExpandedKeys: ['布局', '显示设置', '对齐方式'],
+    defaultExpandedKeys: ["布局", "显示设置", "对齐方式"],
     style: {
-      border: 'none'
+      border: "none"
     }
   }, /*#__PURE__*/React.createElement(CollapsePanel, {
     key: "\u5E03\u5C40",

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.45" === 'string' ? "2.15.45" : null;
+var version = typeof "2.15.46" === 'string' ? "2.15.46" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/components/TagImageSelect/index.js

@@ -17,7 +17,7 @@ var _TagSelect = _interopRequireDefault(require("../TagSelect"));
 
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
-var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent"];
+var _excluded = ["dataSource", "onChange", "size", "boxProps", "tagProps", "itemProps", "ItemComponent", "value"];
 
 var TagImageSelect = function TagImageSelect(props) {
   var dataSource = props.dataSource,
@@ -27,11 +27,13 @@ var TagImageSelect = function TagImageSelect(props) {
       tagProps = props.tagProps,
       itemProps = props.itemProps,
       ItemComponent = props.ItemComponent,
+      value = props.value,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
   var Item = ItemComponent || _TemplateButton["default"];
   return /*#__PURE__*/_react["default"].createElement(_TagSelect["default"], (0, _extends2["default"])({}, otherProps, {
     onChange: onChange,
     className: _indexModule["default"].tagSelect,
+    value: value,
     dataSource: dataSource.map(function (item) {
       return {
         key: item.id,

package/lib/components/TagSelect/index.js

@@ -37,9 +37,9 @@ var TagSelect = function TagSelect(props) {
       setCurrent = _useState[1];
 
   (0, _react.useEffect)(function () {
-    if (value) {
-      setCurrent(value);
-    }
+    // if (value) {
+    // }
+    setCurrent(value);
   }, [value]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "tag-select-wrap"

package/lib/core/editor/components/settings/common/LayoutSettings.js

@@ -37,33 +37,25 @@ var LayoutSettings = function LayoutSettings(props) {
   var _props$layout = props.layout,
       layout = _props$layout === void 0 ? {} : _props$layout,
       onChange = props.onChange,
+      regionId = props.regionId,
       size = props.size;
   var layoutId = layout.id,
-      layoutOptions = layout.options;
-
-  var _useState = (0, _react.useState)(layout || {}),
-      value = _useState[0],
-      setValue = _useState[1];
+      layoutOptions = layout.options; // const [value, setValue] = useState();
 
   var handleChange = function handleChange(data) {
-    console.log("handleChange", data);
-    onChange && onChange(data); // setValue({
-    //   id: data,
-    //   options: {
-    //     value: "east",
-    //     label: "横向",
-    //   },
-    // });
+    onChange && onChange(data);
   };
 
   var onLayoutSelect = function onLayoutSelect(id) {
+    // console.log("onLayoutSelect", id, layout, value);
     var options;
 
     if (id === "toward") {
       options = {
         subId: TREE_LAYOUT_OPTIONS[0].value
       };
-    }
+    } // setValue(id);
+
 
     handleChange({
       id: id,
@@ -76,14 +68,14 @@ var LayoutSettings = function LayoutSettings(props) {
       id: id,
       name: LAYOUTS[id],
       icon: "layout_" + id,
-      selected: layoutId === id,
-      onSelect: onLayoutSelect
+      selected: layoutId === id
     };
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _LayoutSettingsModule["default"]["layout-setting-template-group"]
   }, /*#__PURE__*/_react["default"].createElement(_TagImageSelect["default"], {
     dataSource: layoutGroup,
+    value: layoutId,
     size: size,
     onChange: onLayoutSelect,
     boxProps: {
@@ -102,7 +94,7 @@ var LayoutSettings = function LayoutSettings(props) {
       iconClassName: _LayoutSettingsModule["default"].icon,
       textClassName: _LayoutSettingsModule["default"].text
     }
-  }), layoutId === "toward" && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+  }), layoutId === "toward" ? /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
     label: "\u5E03\u5C40\u65B9\u5411"
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
     dataSource: TREE_LAYOUT_OPTIONS,
@@ -115,7 +107,7 @@ var LayoutSettings = function LayoutSettings(props) {
         }
       });
     }
-  })));
+  })) : null);
 };
 
 var _default = LayoutSettings;

package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -18,7 +18,7 @@ var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
 
 function sortResourcesByName(resources) {
-  return (0, _sortBy["default"])(resources, 'name');
+  return (0, _sortBy["default"])(resources, "name");
 }
 
 function useGroupRelateResource(props) {
@@ -45,9 +45,7 @@ function useGroupRelateResource(props) {
       data: item,
       node: item.node
     };
-  });
-
-  _rlog["default"].info('useGroupRelateResource', data);
+  }); // rlog.info('useGroupRelateResource', data);
 
   return data;
 }

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

@@ -30,6 +30,7 @@ function GroupExpandSetting(props) {
       group = props.group,
       expanded = props.expanded,
       onChange = props.onChange,
+      id = props.id,
       settingRuntimeState = props.settingRuntimeState;
 
   var _useState = (0, _react.useState)(),
@@ -37,22 +38,26 @@ function GroupExpandSetting(props) {
       setLayout = _useState[1];
 
   var alignOnChange = function alignOnChange(v) {
-    console.log('setAlignmentBySelectionNodes', v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
-
-    onChange('groupAlign', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    // console.log("setAlignmentBySelectionNodes", v);
+    // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
+    onChange("groupAlign", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
   var layoutOnChange = function layoutOnChange(v) {
-    console.log('layoutOnChange', v);
+    // console.log("layoutOnChange", v);
     setLayout(v); // topo.view.topoClient.htTopoClient.setAlignmentBySelectionNodes(v);
 
-    onChange('layout', v); // topoEditApi.setAlignmentBySelectionNodes(v);
+    onChange("layout", v); // topoEditApi.setAlignmentBySelectionNodes(v);
   };
 
+  (0, _react.useEffect)(function () {
+    // console.log("GroupExpandSetting-id-layout", id, layout);
+    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/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.45" === 'string' ? "2.15.45" : null;
+var version = typeof "2.15.46" === 'string' ? "2.15.46" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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