@riil-frontend/component-topology 2.12.7-alpha.21 → 2.12.7-alpha.22

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

@@ -12,12 +12,15 @@ import NodeIconSelect from "./NodeIconSelect";
 import NodeRelateResourceButton from "./data/NodeRelateResourceButton";
 import styles from "./NodePropertyView.module.scss";
 import TabView from "../../common/tab/TabView";
+import useHtElement from "../../../../../common/hooks/useHtElement";
 var Option = _Select.Option;
 var CollapsePanel = _Collapse.Panel;
 
 function parseValues(values) {
   return _extends({}, values, {
-    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name']
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
   });
 }
 
@@ -43,6 +46,10 @@ export default function NodePropertyView(props) {
       editorProps = props.editorProps,
       settingRuntimeState = props.settingRuntimeState;
   var bindType = getBindType(values);
+  var node = useHtElement({
+    topo: topo,
+    id: values.id
+  });
 
   var field = _Field.useField({
     autoUnmount: false,
@@ -56,13 +63,20 @@ export default function NodePropertyView(props) {
     }
   });
 
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+
   var setBindType = function setBindType(value) {
     _onChange('attrObject.bindType', value);
   };
 
-  useEffect(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
+  var handleBindTopoChange = function handleBindTopoChange(value, data) {
+    // 清空自定义名称
+    // 设置名称为拓扑名称
+    node.a('name', data.label);
+    node.a('customName', null);
+  };
 
   var renderData = function renderData() {
     var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
@@ -115,7 +129,8 @@ export default function NodePropertyView(props) {
       label: "\u5173\u8054\u62D3\u6251"
     }, /*#__PURE__*/React.createElement(RelateTopoTree, {
       name: "attrObject.bindTopo",
-      topo: topo
+      topo: topo,
+      onChange: handleBindTopoChange
     })))));
   };
 

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

@@ -33,6 +33,8 @@ var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView
 
 var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
 
+var _useHtElement = _interopRequireDefault(require("../../../../../common/hooks/useHtElement"));
+
 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; }
@@ -42,7 +44,9 @@ var CollapsePanel = _collapse["default"].Panel;
 
 function parseValues(values) {
   return (0, _extends2["default"])({}, values, {
-    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name']
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
   });
 }
 
@@ -68,6 +72,10 @@ function NodePropertyView(props) {
       editorProps = props.editorProps,
       settingRuntimeState = props.settingRuntimeState;
   var bindType = getBindType(values);
+  var node = (0, _useHtElement["default"])({
+    topo: topo,
+    id: values.id
+  });
 
   var field = _field["default"].useField({
     autoUnmount: false,
@@ -81,13 +89,20 @@ function NodePropertyView(props) {
     }
   });
 
+  (0, _react.useEffect)(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+
   var setBindType = function setBindType(value) {
     _onChange('attrObject.bindType', value);
   };
 
-  (0, _react.useEffect)(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
+  var handleBindTopoChange = function handleBindTopoChange(value, data) {
+    // 清空自定义名称
+    // 设置名称为拓扑名称
+    node.a('name', data.label);
+    node.a('customName', null);
+  };
 
   var renderData = function renderData() {
     var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
@@ -140,7 +155,8 @@ function NodePropertyView(props) {
       label: "\u5173\u8054\u62D3\u6251"
     }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
       name: "attrObject.bindTopo",
-      topo: topo
+      topo: topo,
+      onChange: handleBindTopoChange
     })))));
   };
 

package/package.json

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