@riil-frontend/component-topology 3.1.7 → 3.1.10

package/es/core/viewer/components/plugins/{BaseInfo → ResourceDetail}/components/ResourceOverview/index.js

@@ -1,6 +1,6 @@
 import _Message from "@alifd/next/es/message";
-import _extends from "@babel/runtime/helpers/extends";
 import _Table from "@alifd/next/es/table";
+import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
@@ -18,7 +18,8 @@ import SingleResourceStrategyLink from "./SingleResourceStrategyLink";
 import BlockBox from "./BlockBox";
 import useCiAttrAndMetricData from "./useCiAttrAndMetricData";
 import ResourceOverviewMetric from "./ResourceOverviewMetric";
-import BaseInfo from "./BaseInfo"; // url 处理，UICBB 的地址需截取前缀
+import BaseInfo from "./BaseInfo";
+import BaseInfoBlock from "./BaseInfoBlock"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
   var _window, _window$location;
@@ -37,7 +38,7 @@ function formatUrl(url) {
 
 
 export default function ResourceOverview(props) {
-  var _viewerProps$resource;
+  var _viewerProps$resource, _baseInfo$resource;
 
   var topo = props.topo,
       id = props.id,
@@ -45,7 +46,7 @@ export default function ResourceOverview(props) {
       ciType = props.ciType,
       userId = props.userId,
       viewerProps = props.viewerProps;
-  var resourceOverviewProps = viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps;
+  var resourceOverviewProps = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps) || {};
   var ciAttrAndMetricData = useCiAttrAndMetricData({
     topo: topo,
     id: id
@@ -601,22 +602,19 @@ export default function ResourceOverview(props) {
     return _alarmRiskOperation.apply(this, arguments);
   }
 
+  var elementData = {
+    id: id,
+    ciType: ciType,
+    type: type,
+    name: baseInfo === null || baseInfo === void 0 ? void 0 : (_baseInfo$resource = baseInfo.resource) === null || _baseInfo$resource === void 0 ? void 0 : _baseInfo$resource.display_name
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: styles['resource-overview']
-  }, /*#__PURE__*/React.createElement(BlockBox, {
-    headerTitle: "\u57FA\u672C\u4FE1\u606F",
-    headerExtra: ciType === 'network_link' && /*#__PURE__*/React.createElement(SingleResourceStrategyLink, {
-      id: id,
-      ciType: ciType,
-      name: baseInfo.resource.display_name
-    })
-  }, /*#__PURE__*/React.createElement(BaseInfo, {
-    topo: topo,
-    type: type,
-    data: baseInfo,
+  }, /*#__PURE__*/React.createElement(BaseInfoBlock, _extends({
+    data: elementData,
     ciTypeMeta: ciTypeMeta,
-    resourceOverviewProps: resourceOverviewProps
-  })), /*#__PURE__*/React.createElement(BlockBox, {
+    baseInfo: baseInfo
+  }, resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.baseInfoProps)), /*#__PURE__*/React.createElement(BlockBox, {
     headerTitle: "\u5173\u952E\u6307\u6807"
   }, /*#__PURE__*/React.createElement(ResourceOverviewMetric, {
     topo: topo,

package/es/core/viewer/components/plugins/ResourceDetail/index.module.scss

@@ -1,40 +1,49 @@
-.topo-drawer {
-  width: 832px;
+@import '~@alifd/next/variables.scss';
 
-  .drawerHeader {
-    margin-top: 10px;
+.title-popup{
+  width: 240px;
+  .search{
+    width: 100%;
+    padding: 4px 16px 12px;
   }
+  .not-data{
+    color: var(--color-text1-4);
+    font-size: 14px;
+    line-height: 200px;
+    text-align: center;
+  }
+  :global {
+    .#{$css-prefix}menu-content{
+      height: 200px;
+      overflow-y: auto;
+    }
+  }
+}
 
-  .topo-drawer-header-title {
+.baseInfo {
+  box-shadow: 0px 0px 6px 1px #F2F7FD;
+  .drawer-title{
     font-size: 16px;
-    color: #333333;
-    line-height: 22px;
     font-weight: 500;
+    color: #4D6277;
   }
-
-  .topo-drawer-header-link {
-    color: #1071da;
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 22px;
-    padding-left: 12px;
-  }
-
-  .topo-drawer-alarm-banner {
-    padding-bottom: 8px;
-    margin-top: -10px;
-
-    .topo-drawer-alarm-txt {
-      font-size: 12px;
-      color: #333333;
-      line-height: 20px;
+  :global {
+    .#{$css-prefix}drawer-body {
+      height: calc(100% - 49px);
+      padding: 16px 24px;
+      .#{$css-prefix}tabs-content{
+        height: calc(100% - 31px);
+        overflow: auto;
+      }
     }
-
-    .topo-drawer-alarm-refresh {
-      font-size: 12px;
-      color: #096dd9;
-      position: absolute;
-      right: 40px;
+  }
+  .tab{
+    height: 100%;
+    :global {
+      .#{$css-prefix}tabs-content{
+        height: calc(100% - 31px);
+        overflow: auto;
+      }
     }
   }
 }

package/es/core/viewer/components/plugins/ViewerPlugin.js

@@ -2,12 +2,12 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import ResourceWebControllUrlSettingDialog from "./ResourceWebControllUrlSettingDialog";
 import MetricPollingPlugin from "./MetricPollingPlugin";
-import BaseInfo from "./BaseInfo";
+import ResourceDetail from "./ResourceDetail";
 export default function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
-  var plugins = [MetricPollingPlugin, ResourceWebControllUrlSettingDialog, BaseInfo].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
+  var plugins = [MetricPollingPlugin, ResourceWebControllUrlSettingDialog, ResourceDetail].concat((viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.plugins) || []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, plugins.map(function (Plugin, index) {
     return /*#__PURE__*/React.createElement(Plugin, _extends({
       key: index,

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,

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

@@ -7,60 +7,19 @@ exports["default"] = NodePropertyView;
 
 var _tab = _interopRequireDefault(require("@alifd/next/lib/tab"));
 
-var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
-
-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 _select = _interopRequireDefault(require("@alifd/next/lib/select"));
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _NodeSizeInput = _interopRequireDefault(require("../../common/NodeSizeInput/NodeSizeInput"));
-
-var _textModule = _interopRequireDefault(require("../../../../../common/text.module.scss"));
-
-var _NodeIconSelect = _interopRequireDefault(require("./NodeIconSelect"));
-
-var _NodeRelateResourceButton = _interopRequireDefault(require("./data/NodeRelateResourceButton"));
-
-var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
-
-var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
+var _react = _interopRequireDefault(require("react"));
 
 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; }
-
-var Option = _select["default"].Option;
-var CollapsePanel = _collapse["default"].Panel;
-
-function parseValues(values) {
-  return (0, _extends2["default"])({}, values, {
-    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
-    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
-
-  });
-}
+var _TabView = _interopRequireDefault(require("../../common/tab/TabView"));
 
-function getBindType(values) {
-  if (values.tag) {
-    return 'resource';
-  }
+var _Data = _interopRequireDefault(require("./data/Data"));
 
-  if (values.attrObject.bindType) {
-    return values.attrObject.bindType;
-  }
+var _NodePropertyViewModule = _interopRequireDefault(require("./NodePropertyView.module.scss"));
 
-  return 'none';
-}
+var _Setting = _interopRequireDefault(require("./Setting"));
 
 function NodePropertyView(props) {
   var _topo$options$editor;
@@ -68,145 +27,40 @@ function NodePropertyView(props) {
   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 = (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);
-    }
-  });
-
-  (0, _react.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["default"].createElement(_collapse["default"], {
-      defaultExpandedKeys: ['相关资源'],
-      style: {
-        border: 'none'
-      }
-    }, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
-      key: "\u76F8\u5173\u8D44\u6E90",
-      title: "\u76F8\u5173\u8D44\u6E90"
-    }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
-      field: field,
-      labelAlign: "top"
-    }, !values.tag && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u7C7B\u578B"
-    }, /*#__PURE__*/_react["default"].createElement(_select["default"], {
-      name: "bindType",
-      value: bindType,
-      style: {
-        width: '100%',
-        marginRight: 8
-      },
-      onChange: setBindType
-    }, /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "none"
-    }, "\u672A\u5173\u8054"), /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "resource"
-    }, "\u5173\u8054\u8D44\u6E90"), RelateTopoTree && /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "topo"
-    }, "\u5173\u8054\u62D3\u6251"))), bindType === 'resource' && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u8D44\u6E90"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        display: 'flex'
-      }
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: _textModule["default"].textEllipsis,
-      style: {
-        flex: 1,
-        paddingRight: 16,
-        color: '#4D6277'
-      },
-      title: values.tag ? values.name : null
-    }, values.tag ? values.name : '—'), /*#__PURE__*/_react["default"].createElement(_NodeRelateResourceButton["default"], {
-      node: values,
-      topo: topo,
-      topoEditApi: topoEditApi
-    }))), bindType === 'topo' && RelateTopoTree && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u5173\u8054\u62D3\u6251"
-    }, /*#__PURE__*/_react["default"].createElement(RelateTopoTree, {
-      name: "attrObject.bindTopo",
-      topo: topo,
-      onChange: handleBindTopoChange
-    })))));
+    return /*#__PURE__*/_react["default"].createElement(_Data["default"], props);
   };
 
-  var renderViewSetting = function renderViewSetting() {
-    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: "\u663E\u793A\u8BBE\u7F6E",
-      title: "\u663E\u793A\u8BBE\u7F6E"
-    }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u56FE\u7247\u540D\u79F0"
-    }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
-      name: "attrObject.customName"
-    })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u663E\u793A\u56FE\u7247"
-    }, /*#__PURE__*/_react["default"].createElement(_NodeIconSelect["default"], {
-      name: "image",
-      topo: topo
-    })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
-      label: "\u56FE\u7247\u5C3A\u5BF8"
-    }, /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
-      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["default"].createElement(_Setting["default"], (0, _extends2["default"])({}, 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["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();
+  }
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _NodePropertyViewModule["default"].NodePropertyView
-  }, showRelateResource ? /*#__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"
-  }, renderViewSetting())) : renderViewSetting());
+  }, content);
 }

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

@@ -0,0 +1,95 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = Setting;
+
+var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
+
+var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
+
+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 _NodeSizeInput = _interopRequireDefault(require("../../../common/NodeSizeInput/NodeSizeInput"));
+
+var _NodeIconSelect = _interopRequireDefault(require("../NodeIconSelect"));
+
+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, {
+    'attrObject.customName': values['attrObject.customName'] || values['attrObject.name'],
+    'attrObject.bindTopo': values['attrObject.bindTopo'] || '' // 解决切换节点时关联拓扑选项未重置
+
+  });
+}
+
+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["default"].useField({
+    autoUnmount: false,
+    values: parseValues(values),
+    onChange: function onChange(name, value) {
+      var newValues = field.getValues();
+
+      _onChange(name, value, newValues);
+    }
+  });
+
+  (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: "\u663E\u793A\u8BBE\u7F6E",
+    title: "\u663E\u793A\u8BBE\u7F6E"
+  }, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u56FE\u7247\u540D\u79F01"
+  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
+    name: "attrObject.customName"
+  })), showImageSetting && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u663E\u793A\u56FE\u7247"
+  }, /*#__PURE__*/_react["default"].createElement(_NodeIconSelect["default"], {
+    name: "image",
+    topo: topo
+  })), /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u56FE\u7247\u5C3A\u5BF8"
+  }, /*#__PURE__*/_react["default"].createElement(_NodeSizeInput["default"], {
+    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/lib/core/editor/components/settings/propertyViews/node/Setting/index.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _Setting = _interopRequireDefault(require("./Setting"));
+
+var _default = _Setting["default"];
+exports["default"] = _default;