@riil-frontend/component-topology 11.0.1 → 11.0.3

package/es/components/BatchAttrMetric2/SelectTable.js

@@ -0,0 +1,21 @@
+import React from 'react';
+export default function SelectTable(props) {
+  return /*#__PURE__*/React.createElement(Table, {
+    fixedHeader: true,
+    hasBorder: false,
+    dataSource: tableData,
+    emptyContent: /*#__PURE__*/React.createElement(NoDataPage, {
+      type: "table"
+    }),
+    rowSelection: {
+      selectedRowKeys: selectedRowKeys,
+      onChange: onTableSelect,
+      getProps: function getProps(_ref) {
+        var id = _ref.id;
+        return {
+          disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= limit
+        };
+      }
+    }
+  }, columnNodes);
+}

package/es/components/BatchAttrMetric2/constant.js

@@ -0,0 +1,30 @@
+// 选择类型
+export var SELECT_TYPE = {
+  single: {
+    showTree: false,
+    showCiNum: false,
+    drawerWidth: "calc(" + 5 + "/24 * 100%)"
+  },
+  batch: {
+    showTree: true,
+    showCiNum: true,
+    drawerWidth: "calc(" + 10 + "/24 * 100%)"
+  }
+}; // 数据类型
+
+export var DATA_TYPE = {
+  tag: {
+    drawerTitle: '选择图数据',
+    maxSelect: 4,
+    label: '图',
+    poslabel: '拓扑图上',
+    message: "\u56FE\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728\u62D3\u6251\u56FE\u4E0A\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 4 \u9879\u3002"
+  },
+  tip: {
+    drawerTitle: '选择Tooltips显示数据',
+    maxSelect: 10,
+    label: 'Tootip',
+    poslabel: 'Tooltip中',
+    message: "Tootip\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728Tooltip\u4E2D\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 10 \u9879\u3002"
+  }
+};

package/es/components/BatchAttrMetric2/index.js

@@ -0,0 +1,75 @@
+import _Drawer from "@alifd/next/es/drawer";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["saveCb", "showType"],
+    _excluded2 = ["drawerTitle", "drawerWidth"];
+import React, { forwardRef, useImperativeHandle, useState } from 'react';
+import { useBoolean } from 'ahooks';
+import PropTypes from 'prop-types';
+import styles from "./index.module.scss";
+import SettingPage from "./setting";
+import { SELECT_TYPE, DATA_TYPE } from "./constant";
+/**
+ * 属性指标配置抽屉
+ */
+
+var BatchAttrMetricDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _saveCb = props.saveCb,
+      showType = props.showType,
+      settingProps = _objectWithoutPropertiesLoose(props, _excluded);
+
+  var _useBoolean = useBoolean(false),
+      visible = _useBoolean[0],
+      _useBoolean$ = _useBoolean[1],
+      setTrue = _useBoolean$.setTrue,
+      setFalse = _useBoolean$.setFalse;
+
+  var selectType = 'batch';
+  useImperativeHandle(ref, function () {
+    return {
+      /**
+       * 展开抽屉
+       */
+      show: function show(entryConfig) {
+        if (entryConfig === void 0) {
+          entryConfig = {};
+        }
+
+        setTrue();
+      }
+    };
+  });
+
+  var config = _extends({}, SELECT_TYPE[selectType], DATA_TYPE[showType]);
+
+  var drawerTitle = config.drawerTitle,
+      drawerWidth = config.drawerWidth,
+      pageConfig = _objectWithoutPropertiesLoose(config, _excluded2);
+
+  return /*#__PURE__*/React.createElement(_Drawer, {
+    closeMode: ['close', 'esc'],
+    visible: visible,
+    onClose: setFalse,
+    title: drawerTitle,
+    className: styles.drawer,
+    width: drawerWidth
+  }, visible && /*#__PURE__*/React.createElement(SettingPage, _extends({}, pageConfig, settingProps, {
+    cancelCb: setFalse,
+    saveCb: function saveCb(values) {
+      setFalse();
+
+      _saveCb(showType, values);
+    }
+  })));
+});
+BatchAttrMetricDrawer.displayName = 'BatchAttrMetricDrawer';
+BatchAttrMetricDrawer.propTypes = {
+  // 数据项
+  dataSource: PropTypes.array.isRequired,
+  // 保存回调
+  saveCb: PropTypes.func
+};
+BatchAttrMetricDrawer.defaultProps = {
+  saveCb: function saveCb() {}
+};
+export default BatchAttrMetricDrawer;

package/es/components/BatchAttrMetric2/index.module.scss

@@ -0,0 +1,76 @@
+@import "@alifd/next/variables";
+
+.drawer {
+  & > div {
+    overflow: hidden !important;
+  }
+  :global {
+    .#{$css-prefix}drawer-body {
+      padding: 0;
+      height: calc(100% - 45px);
+    }
+  }
+}
+.layout {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  & > div:last-child > button:first-child {
+    float: left;
+    line-height: 24px;
+  }
+  :global {
+    .riil-footer {
+      position: unset;
+    }
+  }
+}
+.message {
+  padding: 16px 24px 0;
+}
+.content {
+  padding: 16px 24px 0;
+  flex: auto;
+  overflow: hidden;
+  & > div:first-child:not(:last-child) {
+    box-shadow: 1px 0px 0px 0px #E4E9EE;
+    padding-right: $s-4;
+  }
+  & > div:last-child:not(:first-child) {
+    padding-left: $s-4;
+  }
+  :global {
+    .#{$css-prefix}table-header-node.#{$css-prefix}table-selection {
+      .#{$css-prefix}checkbox-wrapper {
+        display: none;
+      }
+    }
+    .#{$css-prefix}table-cell-wrapper {
+      white-space: unset !important;
+    }
+  }
+}
+.tree-wrap {
+  :global {
+    .#{$css-prefix}tree-node-label-wrapper {
+      width: 1px;
+      .tree-node-label > span {
+        display: inline-block;
+        width: calc(100% - 24px);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+}
+.table-wrap {
+  height: calc(100% + 1.5px);
+}
+.tip-content {
+  max-height: 250px;
+  overflow: auto;
+  & > div {
+    line-height: 20px;
+  }
+}

package/es/components/BatchAttrMetric2/setting.js

@@ -0,0 +1,188 @@
+import _Button from "@alifd/next/es/button";
+import _Table from "@alifd/next/es/table";
+import _Search from "@alifd/next/es/search";
+import _Grid from "@alifd/next/es/grid";
+import _Message from "@alifd/next/es/message";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["value", "defaultSet", "dataSource"];
+import React, { useState, useMemo } from 'react';
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import ActionTree from '@riil-frontend/component-action-tree';
+import NoDataPage from '@riil-frontend/component-topology-common/es/components/NoDataPage';
+import TableLayout from '@riil-frontend/component-table-layout';
+import RiilHooks from '@riil-frontend/hooks';
+import * as utils from "./utils";
+import styles from "./index.module.scss";
+import { loopTreeNode } from "../../utils/treeUtil";
+
+var Setting = function Setting(_ref) {
+  var _ref$value = _ref.value,
+      value = _ref$value === void 0 ? {} : _ref$value,
+      defaultSet = _ref.defaultSet,
+      dataSource = _ref.dataSource,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+  var limit = props.limit,
+      saveCb = props.saveCb;
+  var allCiSet = useMemo(function () {
+    var map = {};
+    loopTreeNode(dataSource, function (item) {
+      map[item.id] = item;
+    });
+    return map;
+  }, [dataSource]);
+
+  var _useState = useState(Object.keys(allCiSet)[0]),
+      ciType = _useState[0],
+      setCiType = _useState[1];
+
+  var _useState2 = useState(''),
+      search = _useState2[0],
+      setSearch = _useState2[1];
+
+  var _useState3 = useState(value),
+      selected = _useState3[0],
+      setSelected = _useState3[1];
+
+  var selectedRowKeys = selected[ciType] || [];
+
+  var _RiilHooks$useTableCo = RiilHooks.useTableColumn({
+    columns: [{
+      width: '100%',
+      dataIndex: 'name',
+      title: '数据',
+      cellOption: {
+        nowrap: true
+      }
+    }, {
+      width: '70px',
+      dataIndex: 'type',
+      title: '类型',
+      cellOption: {
+        nowrap: {
+          nowrapCell: utils.typeCell,
+          title: utils.typeCell
+        }
+      }
+    }]
+  }),
+      columnNodes = _RiilHooks$useTableCo.columnNodes;
+
+  var onTreeSelect = function onTreeSelect(_ref2) {
+    var selectedKey = _ref2[0];
+
+    if (selectedKey && allCiSet[selectedKey].type !== 'folder') {
+      setCiType(selectedKey);
+    }
+  };
+
+  var onTableSelect = function onTableSelect(selectedKeys) {
+    var values = _extends({}, selected);
+
+    rlog.debug('Setting-allCiSet-onTableSelect', limit, selectedKeys, selected);
+    values[ciType] = selectedKeys;
+    setSelected(values);
+  };
+
+  var saveSelected = function saveSelected() {
+    saveCb(selected);
+  };
+
+  var onReset = function onReset() {
+    setSelected({});
+  };
+
+  var tableData = useMemo(function () {
+    var _allCiSet$ciType;
+
+    // console.log('allCiSet,ciType,search', allCiSet, ciType, search);
+    var list = ((_allCiSet$ciType = allCiSet[ciType]) === null || _allCiSet$ciType === void 0 ? void 0 : _allCiSet$ciType.list) || [];
+
+    if (search) {
+      list = list.filter(function (item) {
+        var _item$name;
+
+        return ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toUpperCase().indexOf(search.toUpperCase())) !== -1;
+      });
+    }
+
+    return list;
+  }, [allCiSet, ciType, search]);
+
+  function onSearch(value) {
+    // console.log('search', search);
+    setSearch(value);
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: styles.layout
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.message
+  }, /*#__PURE__*/React.createElement(_Message, {
+    type: "notice"
+  }, props.label + "\u6570\u636E\uFF1A\u9009\u62E9\u7684\u6307\u6807\u548C\u5C5E\u6027\u5C06\u4F1A\u663E\u793A\u5728" + props.poslabel + "\uFF0C\u6700\u591A\u652F\u6301\u52FE\u9009 " + limit + " \u9879\u3002")), /*#__PURE__*/React.createElement(_Grid.Row, {
+    className: styles.content
+  }, /*#__PURE__*/React.createElement(_Grid.Col, {
+    span: 8,
+    className: styles['tree-wrap']
+  }, /*#__PURE__*/React.createElement(ActionTree, {
+    dataSource: dataSource,
+    onSelect: onTreeSelect,
+    draggable: false,
+    treeProps: {
+      selectedKeys: [ciType]
+    }
+  })), /*#__PURE__*/React.createElement(_Grid.Col, {
+    className: styles['table-wrap']
+  }, /*#__PURE__*/React.createElement(TableLayout, {
+    filterItems: /*#__PURE__*/React.createElement("div", {
+      className: styles.filter
+    }, /*#__PURE__*/React.createElement(_Search, {
+      // className={styles.search}
+      style: {
+        width: 200
+      },
+      shape: "simple",
+      placeholder: "\u8BF7\u8F93\u5165\u5173\u952E\u5B57",
+      onSearch: onSearch,
+      onChange: function onChange(val) {
+        return !val && onSearch('');
+      },
+      hasClear: true
+    })),
+    table: /*#__PURE__*/React.createElement(_Table, {
+      fixedHeader: true,
+      hasBorder: false,
+      dataSource: tableData,
+      emptyContent: /*#__PURE__*/React.createElement(NoDataPage, {
+        type: "table"
+      }),
+      rowSelection: {
+        selectedRowKeys: selectedRowKeys,
+        onChange: onTableSelect,
+        getProps: function getProps(_ref3) {
+          var id = _ref3.id;
+          return {
+            disabled: !selectedRowKeys.includes(id) && selectedRowKeys.length >= limit
+          };
+        }
+      }
+    }, columnNodes)
+  }))), /*#__PURE__*/React.createElement("div", {
+    className: "riil-footer right"
+  }, /*#__PURE__*/React.createElement(_Button, {
+    text: true,
+    type: "primary",
+    onClick: onReset
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(_Button, {
+    type: "primary",
+    onClick: function onClick() {
+      saveSelected();
+    }
+  }, "\u786E\u5B9A"), /*#__PURE__*/React.createElement(_Button, {
+    onClick: props.cancelCb
+  }, "\u53D6\u6D88")));
+};
+
+export default Setting;

package/es/components/BatchAttrMetric2/utils.js

@@ -0,0 +1,80 @@
+import React from "react";
+import styles from "./index.module.scss";
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+/**
+ * 获取树结构数据源
+ * @param {*} allCiSet 数据源
+ * @returns
+ */
+
+export var treeDs = function treeDs(allCiSet) {
+  return Object.keys(allCiSet).map(function (key) {
+    var _allCiSet$key, _allCiSet$key2;
+
+    return {
+      id: key,
+      label: (_allCiSet$key = allCiSet[key]) === null || _allCiSet$key === void 0 ? void 0 : _allCiSet$key.name,
+      icon: "/img/model/" + ((_allCiSet$key2 = allCiSet[key]) === null || _allCiSet$key2 === void 0 ? void 0 : _allCiSet$key2.icon) + ".svg"
+    };
+  });
+}; // 由于属性和指标code存在重复，拼接code与类型作为id
+
+var toId = function toId(_ref) {
+  var code = _ref.code,
+      type = _ref.type;
+  return type ? code + "-" + type : code;
+}; // id反解析回对象
+
+
+var reverseToId = function reverseToId(id) {
+  var _id$split = id.split("-"),
+      code = _id$split[0],
+      type = _id$split[1];
+
+  return {
+    code: code,
+    type: type
+  };
+};
+/**
+ * 获取默认选择项，用于重置
+ * @param {*} allCiSet 数据源
+ * @param {*} defaultSet 默认选择项数据源
+ * @param {*} dataType 数据类型
+ * @returns
+ */
+
+
+export var defaultSelected = function defaultSelected(allCiSet, defaultSet, dataType) {
+  if (defaultSet === void 0) {
+    defaultSet = {};
+  }
+
+  var values = {};
+  Object.keys(allCiSet).forEach(function (key) {
+    var ciTypeSelected = defaultSet[key] || defaultSet[allCiSet[key].code]; // 没有ci类型对应的默认配置 ->  使用通用的配置项
+    // const selected = (ciTypeSelected || defaultSet['common'])[dataType] || [];
+
+    var selected = [];
+    var selectedIds = selected.map(function (item) {
+      return toId(item);
+    });
+    var data = allCiSet[key].list;
+    var selectedData = data === null || data === void 0 ? void 0 : data.filter(function (item) {
+      return selectedIds.includes(item.id);
+    });
+    values[key] = selectedData.map(function (item) {
+      return item.id;
+    }) || [];
+  });
+  return values;
+};
+export var typeCell = function typeCell(text) {
+  if (text === "attribute") {
+    return "属性";
+  } else if (text === "metric") {
+    return "指标";
+  }
+
+  return "-";
+};

package/es/components/ModelAttrSelectDrawer/components/ModelAttrSelect.js

@@ -0,0 +1,7 @@
+import React from 'react';
+
+function ModelAttrSelect(props) {
+  return /*#__PURE__*/React.createElement("div", null, "ModelAttrSelect");
+}
+
+export default ModelAttrSelect;

package/es/components/ModelAttrSelectDrawer/components/ModelAttrSelectDrawer.js

@@ -0,0 +1,36 @@
+import React, { forwardRef } from 'react';
+import PropTypes from 'prop-types';
+import BatchAttrMetricDrawer from "../../BatchAttrMetric2";
+var ModelAttrSelectDrawer = /*#__PURE__*/forwardRef(function (props, ref) {
+  var value = props.value,
+      dataSource = props.dataSource,
+      limit = props.limit,
+      showType = props.showType,
+      onOk = props.onOk;
+  return /*#__PURE__*/React.createElement(BatchAttrMetricDrawer, {
+    ref: ref,
+    value: value,
+    dataSource: dataSource,
+    limit: limit,
+    showType: showType,
+    saveCb: onOk
+  });
+});
+ModelAttrSelectDrawer.displayName = 'ModelAttrSelectDrawer';
+ModelAttrSelectDrawer.propTypes = {
+  // 数据项
+  dataSource: PropTypes.array,
+  value: PropTypes.object,
+  limit: PropTypes.number,
+  showType: PropTypes.oneOf(['tag', 'tip', null]),
+  // 保存回调
+  onOk: PropTypes.func
+};
+ModelAttrSelectDrawer.defaultProps = {
+  dataSource: [],
+  value: {},
+  limit: 999,
+  showType: null,
+  onOk: function onOk(val) {}
+};
+export default ModelAttrSelectDrawer;

package/es/components/ModelAttrSelectDrawer/index.js

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

package/es/core/components/DisplaySettingDrawer/NodeTag.js

@@ -29,6 +29,7 @@ var NodeTag = /*#__PURE__*/React.forwardRef(function (props, ref) {
     type: "node"
   }));
 });
+NodeTag.displayName = 'NodeTag';
 NodeTag.propTypes = {
   commonOptions: PropTypes.array
 };

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "11.0.1" === 'string' ? "11.0.1" : null;
+var version = typeof "11.0.3" === 'string' ? "11.0.3" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -85,7 +85,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
   _proto.getLinkConfigItems = function getLinkConfigItems() {
     var mtCodes = getLinkMtCodes(this.topoData);
     var linkFidldMap = this.getLinkFidldMap();
-    return [{
+    var list = [{
       id: 'm.critical_link',
       label: '关键链路'
     }, {
@@ -100,6 +100,14 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
         list: linkFidldMap[t.id] || []
       });
     });
+    return list; // return [
+    //   { id: 'ax1', label: '本级平台', children: list, type: 'folder', disabled: true },
+    //   {
+    //     id: 'bb22', label: '下级平台', type: 'folder', children: [
+    //       { id: 'xvdafa', label: '关键链路', icon: '/img/model/networkLink.svg' },
+    //     ]
+    //   },
+    // ]
   };
 
   _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
@@ -127,16 +135,18 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
       map[mtCode] = [].concat(extItems, attributes.map(function (item) {
         return {
           type: 'attribute',
-          typeName: '属性',
+          id: "attribute:" + item.code,
+          code: "attribute:" + item.code,
           name: item.name,
-          code: "attribute:" + item.code
+          typeName: '属性'
         };
       }), metrics.map(function (item) {
         return {
           type: 'metric',
-          typeName: '指标',
+          id: "metric:" + item.code,
+          code: "metric:" + item.code,
           name: item.name,
-          code: "metric:" + item.code
+          typeName: '指标'
         };
       }));
     });

package/es/core/utils/showGraphManageStatusUtil.js

@@ -20,15 +20,16 @@ export function showManageStatus(options) {
           manageStatus = resource.manageStatus,
           permission = resource.permission;
       var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable);
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 没有告警且有查看权限，才显示未监控状态
+
       var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
       var element = topo.getDataModel().getDataByTag(id);
-      if (!element) return;
+      if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
+
+      element.a('ci.isMonitoring', !showUnMoniteStatus);
 
       if (type === 'node') {
         try {
-          element.a('isMonitoring', showUnMoniteStatus); // 用于缩小色块时显示未监控颜色
-
           if (showUnMoniteStatus) {
             topo.getHtTopo().setNodeStyleIcon(element, {
               styleIcon: 'unMoniter',

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

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["canShow", "getCustomDetailContent"];
 import React from 'react';
 import Tab from "../../../../../components/FullheightTab";
 import ClusterMemberTable from "./components/ClusterMemberTable";
@@ -11,11 +13,18 @@ export default function ResourceDetail(props) {
   var topo = props.topo,
       userId = props.userId,
       activeData = props.activeData,
-      resourceData = props.resourceData;
+      resourceData = props.resourceData,
+      viewerProps = props.viewerProps;
+
+  var canShow = props.canShow,
+      getCustomDetailContent = props.getCustomDetailContent,
+      widgetProps = _objectWithoutPropertiesLoose(props, _excluded);
+
   var tabBodys = [{
     title: '资源概览',
-    content: /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, props, activeData, {
-      userId: userId
+    content: /*#__PURE__*/React.createElement(ResourceOverview, _extends({}, widgetProps, activeData, {
+      userId: userId,
+      resourceDetailProps: viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps
     }))
   }, {
     title: '集群成员',

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

@@ -17,7 +17,6 @@ import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog'; // impo
 
 import Link from "../../../../../../../components/Link";
 import { queryCisByIds, commonQueryCiData } from "../../../../../../services";
-import alarmService from "../../../../../../services/alarm";
 import service from "../../../../../../services/overview";
 import BaseInfoBlock from "./BaseInfoBlock";
 import BlockBox from "./BlockBox";
@@ -44,21 +43,23 @@ function formatUrl(url) {
   }
 }
 /**
- * 资源概览
+ * 资源概览。
+ * 业务拓扑集成了，修改时请注意
  */
 
 
 export default function ResourceOverview(props) {
-  var _viewerProps$resource, _data$attributes;
+  var _data$attributes;
 
   var topo = props.topo,
       id = props.id,
       type = props.type,
       ciType = props.ciType,
+      resourceData = props.resourceData,
       userId = props.userId,
-      viewerProps = props.viewerProps,
+      resourceDetailProps = props.resourceDetailProps,
       style = props.style;
-  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 = (resourceDetailProps === null || resourceDetailProps === void 0 ? void 0 : resourceDetailProps.resourceOverviewProps) || {}; // 是否是业务拓扑
 
   var isAppTopo = !!resourceOverviewProps.getData;
 
@@ -432,8 +433,7 @@ export default function ResourceOverview(props) {
     id: id,
     ciType: ciType,
     type: type,
-    // name: '123'
-    name: props.name ? props.name : props.resourceData.attributes.name
+    name: resourceData.name ? resourceData.name : resourceData.attributes.name
   }; // 基本信息设置改变
 
   function baseInfoColChange(_x6) {