@riil-frontend/component-topology 3.1.8 → 3.1.11

package/demo/1/345/237/272/346/234/254//345/210/207/346/215/242/345/233/276/346/240/207.md

@@ -0,0 +1,11 @@
+---
+title: 切换图标
+order: 10
+---
+
+<br/>
+
+```jsx
+<DemoCode src="../../demo-src/basic/SwitchNodeIconDemo.jsx" />
+```
+

package/demo/2/347/274/226/350/276/221/346/250/241/345/274/217//345/261/236/346/200/247/351/235/242/346/235/277.md

@@ -0,0 +1,11 @@
+---
+title: 属性面板
+order: 10
+---
+
+<br/>
+
+
+```jsx
+<DemoCode src="../../demo-src/editor/PropertyPanel.jsx" />
+```

package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -49,8 +49,6 @@ export default (function (props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _displaySettingProps$;
-
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -73,7 +71,7 @@ export default (function (props) {
               displayConfigDispatchers.update(displayConfig); // 按配置执行
 
               executeByConfig(displayConfig);
-              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : (_displaySettingProps$ = displaySettingProps.displaySettingProps) === null || _displaySettingProps$ === void 0 ? void 0 : _displaySettingProps$.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
+              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
 
               if (extraOnOk) {
                 extraOnOk();

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

@@ -2,8 +2,8 @@ import _Collapse from "@alifd/next/es/collapse";
 import React, { useEffect } from 'react';
 import GroupNodeList from "./GroupNodeList";
 import GroupAddResourceButton from "./GroupAddResourceButton";
-import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
 import CollapsePanel from "../../../../../../../components/collapse/Panel";
+import CollapseFullheightStyles from "../../../common/GroupNodeList/CollapseFullheight.module.scss";
 export default function GroupRelateData(props) {
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
@@ -12,15 +12,28 @@ export default function GroupRelateData(props) {
       editorProps = props.editorProps;
 
   var createResourcePanel = function createResourcePanel() {
-    return /*#__PURE__*/React.createElement(CollapsePanel, {
-      key: "\u5173\u8054\u8D44\u6E90",
-      title: "\u5173\u8054\u8D44\u6E90",
-      extra: /*#__PURE__*/React.createElement(GroupAddResourceButton, {
+    var _groupDataViewProps$r;
+
+    var groupDataViewProps = editorProps.groupDataViewProps;
+    var headerExtra;
+
+    if ((groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r === void 0 ? void 0 : _groupDataViewProps$r.headerExtra) !== undefined) {
+      var _groupDataViewProps$r2;
+
+      headerExtra = groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r2 = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r2 === void 0 ? void 0 : _groupDataViewProps$r2.headerExtra;
+    } else {
+      headerExtra = /*#__PURE__*/React.createElement(GroupAddResourceButton, {
         topo: topo,
         topoEdit: topoEditApi,
         group: group,
         groupData: values
-      }),
+      });
+    }
+
+    return /*#__PURE__*/React.createElement(CollapsePanel, {
+      key: "\u5173\u8054\u8D44\u6E90",
+      title: "\u5173\u8054\u8D44\u6E90",
+      extra: headerExtra,
       className: CollapseFullheightStyles.panelFullHeight
     }, /*#__PURE__*/React.createElement(GroupNodeList, {
       topo: topo,

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

@@ -1,186 +1,51 @@
 import _Tab from "@alifd/next/es/tab";
-import _Input from "@alifd/next/es/input";
-import _Form from "@alifd/next/es/form";
-import _Field from "@alifd/next/es/field";
 import _extends from "@babel/runtime/helpers/extends";
-import _Collapse from "@alifd/next/es/collapse";
-import _Select from "@alifd/next/es/select";
-import React, { useEffect } from 'react';
-import NodeSizeInput from "../../common/NodeSizeInput/NodeSizeInput";
-import textStyles from "../../../../../common/text.module.scss";
-import NodeIconSelect from "./NodeIconSelect";
-import NodeRelateResourceButton from "./data/NodeRelateResourceButton";
-import styles from "./NodePropertyView.module.scss";
-import TabView from "../../common/tab/TabView";
+import React from 'react';
 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.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
-
-  });
-}
-
-function getBindType(values) {
-  if (values.tag) {
-    return 'resource';
-  }
-
-  if (values.attrObject.bindType) {
-    return values.attrObject.bindType;
-  }
-
-  return 'none';
-}
-
+import TabView from "../../common/tab/TabView";
+import Data from "./data/Data";
+import styles from "./NodePropertyView.module.scss";
+import Setting from "./Setting";
 export default function NodePropertyView(props) {
   var _topo$options$editor;
 
   var topo = props.topo,
       topoEditApi = props.topoEditApi,
       values = props.values,
-      _onChange = props.onChange,
+      onChange = props.onChange,
       editorProps = props.editorProps,
       settingRuntimeState = props.settingRuntimeState;
-  var bindType = getBindType(values);
   var node = useHtElement({
     topo: topo,
     id: values.id
   });
 
-  var field = _Field.useField({
-    autoUnmount: false,
-    values: parseValues(values),
-    onChange: function onChange(name, value) {
-      var newValues = field.getValues();
-
-      _onChange(name, value, newValues);
-    }
-  });
-
-  useEffect(function () {
-    field.setValues(parseValues(values));
-  }, [values]);
-
-  var setBindType = function setBindType(newBindType) {
-    _onChange('attrObject.bindType', newBindType);
-
-    if (newBindType === 'topo') {//
-    }
-  };
-
-  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;
-    return /*#__PURE__*/React.createElement(_Collapse, {
-      defaultExpandedKeys: ['相关资源'],
-      style: {
-        border: 'none'
-      }
-    }, /*#__PURE__*/React.createElement(CollapsePanel, {
-      key: "\u76F8\u5173\u8D44\u6E90",
-      title: "\u76F8\u5173\u8D44\u6E90"
-    }, /*#__PURE__*/React.createElement(_Form, {
-      field: field,
-      labelAlign: "top"
-    }, !values.tag && /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u5173\u8054\u7C7B\u578B"
-    }, /*#__PURE__*/React.createElement(_Select, {
-      name: "bindType",
-      value: bindType,
-      style: {
-        width: '100%',
-        marginRight: 8
-      },
-      onChange: setBindType
-    }, /*#__PURE__*/React.createElement(Option, {
-      value: "none"
-    }, "\u672A\u5173\u8054"), /*#__PURE__*/React.createElement(Option, {
-      value: "resource"
-    }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/React.createElement(Option, {
-      value: "topo"
-    }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u5173\u8054\u8D44\u6E90"
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, /*#__PURE__*/React.createElement("div", {
-      className: textStyles.textEllipsis,
-      style: {
-        flex: 1,
-        paddingRight: 16,
-        color: '#4D6277'
-      },
-      title: values.tag ? values.name : null
-    }, values.tag ? values.name : '—'), /*#__PURE__*/React.createElement(NodeRelateResourceButton, {
-      node: values,
-      topo: topo,
-      topoEditApi: topoEditApi
-    }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u5173\u8054\u62D3\u6251"
-    }, /*#__PURE__*/React.createElement(RelateTopoTree, {
-      name: "attrObject.bindTopo",
-      topo: topo,
-      onChange: handleBindTopoChange
-    })))));
+    return /*#__PURE__*/React.createElement(Data, props);
   };
 
-  var renderViewSetting = function renderViewSetting() {
-    return /*#__PURE__*/React.createElement(_Form, {
-      field: field,
-      labelAlign: "top"
-    }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
-      defaultExpandedKeys: ['显示设置'],
-      style: {
-        border: 'none'
-      }
-    }, /*#__PURE__*/React.createElement(CollapsePanel, {
-      key: "\u663E\u793A\u8BBE\u7F6E",
-      title: "\u663E\u793A\u8BBE\u7F6E"
-    }, /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u56FE\u7247\u540D\u79F0"
-    }, /*#__PURE__*/React.createElement(_Input, {
-      name: "attrObject.customName"
-    })), /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u663E\u793A\u56FE\u7247"
-    }, /*#__PURE__*/React.createElement(NodeIconSelect, {
-      name: "image",
-      topo: topo
-    })), /*#__PURE__*/React.createElement(_Form.Item, {
-      label: "\u56FE\u7247\u5C3A\u5BF8"
-    }, /*#__PURE__*/React.createElement(NodeSizeInput, {
-      node: values.id,
-      value: {
-        width: values.width,
-        height: values.height
-      },
-      onChange: function onChange(size) {
-        _onChange('width', size.width);
-
-        _onChange('height', size.height);
-      },
-      settingRuntimeState: settingRuntimeState
-    }))))));
+  var renderSetting = function renderSetting() {
+    var nodeSettingViewProps = editorProps.nodeSettingViewProps;
+    return /*#__PURE__*/React.createElement(Setting, _extends({}, props, nodeSettingViewProps));
   }; // 未绑定资源的节点，根据参数控制是否可关联资源
 
 
   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;
+
+  if (showRelateResource) {
+    content = /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
+      title: "\u6570\u636E",
+      key: "1"
+    }, renderData()), /*#__PURE__*/React.createElement(_Tab.Item, {
+      title: "\u8BBE\u7F6E",
+      key: "2"
+    }, renderSetting()));
+  } else {
+    content = renderSetting();
+  }
+
   return /*#__PURE__*/React.createElement("div", {
     className: styles.NodePropertyView
-  }, showRelateResource ? /*#__PURE__*/React.createElement(TabView, null, /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u6570\u636E",
-    key: "1"
-  }, renderData()), /*#__PURE__*/React.createElement(_Tab.Item, {
-    title: "\u8BBE\u7F6E",
-    key: "2"
-  }, renderViewSetting())) : renderViewSetting());
+  }, content);
 }

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

@@ -0,0 +1,76 @@
+import _Form from "@alifd/next/es/form";
+import _Input from "@alifd/next/es/input";
+import _Field from "@alifd/next/es/field";
+import _extends from "@babel/runtime/helpers/extends";
+import _Collapse from "@alifd/next/es/collapse";
+import React, { useEffect } from 'react';
+import NodeSizeInput from "../../../common/NodeSizeInput/NodeSizeInput";
+import NodeIconSelect from "../NodeIconSelect";
+var CollapsePanel = _Collapse.Panel;
+
+function parseValues(values) {
+  return _extends({}, values, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+export default function Setting(props) {
+  var topo = props.topo,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps,
+      settingRuntimeState = props.settingRuntimeState,
+      _props$showImageSetti = props.showImageSetting,
+      showImageSetting = _props$showImageSetti === void 0 ? true : _props$showImageSetti;
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+  return /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top"
+  }, /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement(_Collapse, {
+    defaultExpandedKeys: ['显示设置'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/React.createElement(CollapsePanel, {
+    key: "\u663E\u793A\u8BBE\u7F6E",
+    title: "\u663E\u793A\u8BBE\u7F6E"
+  }, /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u56FE\u7247\u540D\u79F01"
+  }, /*#__PURE__*/React.createElement(_Input, {
+    name: "attrObject.customName"
+  })), showImageSetting && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u663E\u793A\u56FE\u7247"
+  }, /*#__PURE__*/React.createElement(NodeIconSelect, {
+    name: "image",
+    topo: topo
+  })), /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u56FE\u7247\u5C3A\u5BF8"
+  }, /*#__PURE__*/React.createElement(NodeSizeInput, {
+    node: values.id,
+    value: {
+      width: values.width,
+      height: values.height
+    },
+    onChange: function onChange(size) {
+      _onChange('width', size.width);
+
+      _onChange('height', size.height);
+    },
+    settingRuntimeState: settingRuntimeState
+  }))))));
+}

package/es/core/editor/components/settings/propertyViews/node/Setting/index.js

@@ -0,0 +1,2 @@
+import Setting from "./Setting";
+export default Setting;

package/es/core/editor/components/settings/propertyViews/node/data/Data.js

@@ -0,0 +1,125 @@
+import _Form from "@alifd/next/es/form";
+import _Field from "@alifd/next/es/field";
+import _extends from "@babel/runtime/helpers/extends";
+import _Collapse from "@alifd/next/es/collapse";
+import _Select from "@alifd/next/es/select";
+import React, { useEffect } from 'react';
+import useHtElement from "../../../../../../common/hooks/useHtElement";
+import textStyles from "../../../../../../common/text.module.scss";
+import NodeRelateResourceButton from "./NodeRelateResourceButton";
+var Option = _Select.Option;
+var CollapsePanel = _Collapse.Panel;
+
+function parseValues(values) {
+  return _extends({}, values, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+function getBindType(values) {
+  if (values.tag) {
+    return 'resource';
+  }
+
+  if (values.attrObject.bindType) {
+    return values.attrObject.bindType;
+  }
+
+  return 'none';
+}
+
+export default function Data(props) {
+  var topo = props.topo,
+      topoEditApi = props.topoEditApi,
+      values = props.values,
+      _onChange = props.onChange,
+      editorProps = props.editorProps;
+  var bindType = getBindType(values);
+  var node = useHtElement({
+    topo: topo,
+    id: values.id
+  });
+
+  var field = _Field.useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  useEffect(function () {
+    field.setValues(parseValues(values));
+  }, [values]);
+
+  var setBindType = function setBindType(newBindType) {
+    _onChange('attrObject.bindType', newBindType);
+
+    if (newBindType === 'topo') {//
+    }
+  };
+
+  var handleBindTopoChange = function handleBindTopoChange(value, data) {
+    // 设置名称为拓扑名称，清空自定义名称
+    node.a('name', data.label);
+    node.a('customName', null);
+  };
+
+  var RelateTopoTree = editorProps === null || editorProps === void 0 ? void 0 : editorProps.relateTopoTree;
+  return /*#__PURE__*/React.createElement(_Collapse, {
+    defaultExpandedKeys: ['相关资源'],
+    style: {
+      border: 'none'
+    }
+  }, /*#__PURE__*/React.createElement(CollapsePanel, {
+    key: "\u76F8\u5173\u8D44\u6E90",
+    title: "\u76F8\u5173\u8D44\u6E90"
+  }, /*#__PURE__*/React.createElement(_Form, {
+    field: field,
+    labelAlign: "top"
+  }, !values.tag && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u5173\u8054\u7C7B\u578B"
+  }, /*#__PURE__*/React.createElement(_Select, {
+    name: "bindType",
+    value: bindType,
+    style: {
+      width: '100%',
+      marginRight: 8
+    },
+    onChange: setBindType
+  }, /*#__PURE__*/React.createElement(Option, {
+    value: "none"
+  }, "\u672A\u5173\u8054"), /*#__PURE__*/React.createElement(Option, {
+    value: "resource"
+  }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/React.createElement(Option, {
+    value: "topo"
+  }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u5173\u8054\u8D44\u6E90"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: textStyles.textEllipsis,
+    style: {
+      flex: 1,
+      paddingRight: 16,
+      color: '#4D6277'
+    },
+    title: values.tag ? values.name : null
+  }, values.tag ? values.name : '—'), /*#__PURE__*/React.createElement(NodeRelateResourceButton, {
+    node: values,
+    topo: topo,
+    topoEditApi: topoEditApi
+  }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/React.createElement(_Form.Item, {
+    label: "\u5173\u8054\u62D3\u6251"
+  }, /*#__PURE__*/React.createElement(RelateTopoTree, {
+    name: "attrObject.bindTopo",
+    topo: topo,
+    onChange: handleBindTopoChange
+  })))));
+}

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 "3.1.8" === 'string' ? "3.1.8" : null;
+var version = typeof "3.1.11" === 'string' ? "3.1.11" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailPlugin.js

@@ -5,6 +5,12 @@ import ResourceDetail from "./ResourceDetail";
 function ResourceDetailPlugin(props) {
   var viewerProps = props.viewerProps;
   var resourceDetailProps = viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps;
+  var hideResourceDetailDrawer = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.hideResourceDetailDrawer) === true;
+
+  if (hideResourceDetailDrawer) {
+    return null;
+  }
+
   return /*#__PURE__*/React.createElement(ResourceDetail, _extends({}, props, resourceDetailProps));
 }
 

package/es/models/customIcon.js

@@ -153,7 +153,7 @@ export default function (engine) {
           var _this3 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-            var data;
+            var data, allIcons, newIcons;
             return _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
                 switch (_context4.prev = _context4.next) {
@@ -161,25 +161,30 @@ export default function (engine) {
                     data = payload.data;
 
                     _this3.update({
-                      visible: false,
-                      icons: {
-                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
-                        container: []
-                      }
-                    });
+                      visible: false
+                    }); // 注册
+
 
                     data.forEach(function (icon) {
                       var iconUrl = topoService.icon.getIconImageUrl(icon.id);
                       window.ht.Default.setImage(getCustomIconHtId(icon.id), iconUrl);
+                    });
+                    _context4.next = 5;
+                    return _this3.loadCustomIcons();
+
+                  case 5:
+                    allIcons = _context4.sent;
+                    newIcons = allIcons.node.filter(function (icon) {
+                      return !!data.find(function (item) {
+                        return item.id === icon.id;
+                      });
                     }); // 通知ht
 
                     engine.view.topoClient.emitEvent('topo_shape_upload_finish', _extends({}, payload, {
-                      data: transformCustomIcons2HtIcons(data)
+                      data: transformCustomIcons2HtIcons(newIcons)
                     }));
-                    _context4.next = 6;
-                    return _this3.loadCustomIcons();
 
-                  case 6:
+                  case 8:
                   case "end":
                     return _context4.stop();
                 }

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -60,8 +60,6 @@ var _default = function _default(props) {
 
   var save = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      var _displaySettingProps$;
-
       var values, prevDisplayConfig, displayConfig, displayConfigDispatchers, extraOnOk;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
@@ -84,7 +82,7 @@ var _default = function _default(props) {
               displayConfigDispatchers.update(displayConfig); // 按配置执行
 
               executeByConfig(displayConfig);
-              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : (_displaySettingProps$ = displaySettingProps.displaySettingProps) === null || _displaySettingProps$ === void 0 ? void 0 : _displaySettingProps$.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
+              extraOnOk = (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onOk) || (displaySettingProps === null || displaySettingProps === void 0 ? void 0 : displaySettingProps.onDisplaySettingDrawerOk);
 
               if (extraOnOk) {
                 extraOnOk();

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

@@ -13,10 +13,10 @@ var _GroupNodeList = _interopRequireDefault(require("./GroupNodeList"));
 
 var _GroupAddResourceButton = _interopRequireDefault(require("./GroupAddResourceButton"));
 
-var _CollapseFullheightModule = _interopRequireDefault(require("../../../common/GroupNodeList/CollapseFullheight.module.scss"));
-
 var _Panel = _interopRequireDefault(require("../../../../../../../components/collapse/Panel"));
 
+var _CollapseFullheightModule = _interopRequireDefault(require("../../../common/GroupNodeList/CollapseFullheight.module.scss"));
+
 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; }
@@ -29,15 +29,28 @@ function GroupRelateData(props) {
       editorProps = props.editorProps;
 
   var createResourcePanel = function createResourcePanel() {
-    return /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
-      key: "\u5173\u8054\u8D44\u6E90",
-      title: "\u5173\u8054\u8D44\u6E90",
-      extra: /*#__PURE__*/_react["default"].createElement(_GroupAddResourceButton["default"], {
+    var _groupDataViewProps$r;
+
+    var groupDataViewProps = editorProps.groupDataViewProps;
+    var headerExtra;
+
+    if ((groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r === void 0 ? void 0 : _groupDataViewProps$r.headerExtra) !== undefined) {
+      var _groupDataViewProps$r2;
+
+      headerExtra = groupDataViewProps === null || groupDataViewProps === void 0 ? void 0 : (_groupDataViewProps$r2 = groupDataViewProps.relateDataProps) === null || _groupDataViewProps$r2 === void 0 ? void 0 : _groupDataViewProps$r2.headerExtra;
+    } else {
+      headerExtra = /*#__PURE__*/_react["default"].createElement(_GroupAddResourceButton["default"], {
         topo: topo,
         topoEdit: topoEditApi,
         group: group,
         groupData: values
-      }),
+      });
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(_Panel["default"], {
+      key: "\u5173\u8054\u8D44\u6E90",
+      title: "\u5173\u8054\u8D44\u6E90",
+      extra: headerExtra,
       className: _CollapseFullheightModule["default"].panelFullHeight
     }, /*#__PURE__*/_react["default"].createElement(_GroupNodeList["default"], {
       topo: topo,