@next-libs/cmdb-instances 6.6.6 → 6.7.3

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.7.3](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.7.2...@next-libs/cmdb-instances@6.7.3) (2021-10-22)
+
+
+### Bug Fixes
+
+* **cmdb-instance:** 修复实例来源筛选后删除筛选条件未清空控件选择的值 ([8e34847](https://github.com/easyops-cn/next-libs/commit/8e34847489b181ad8499cdc3ecbaae9340dc51ff))
+
+
+
+
+
+## [6.7.2](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.7.1...@next-libs/cmdb-instances@6.7.2) (2021-10-20)
+
+
+### Bug Fixes
+
+* **cmdb-instance:** 父模型实例列表显示实例来源字段修改 ([3db0d91](https://github.com/easyops-cn/next-libs/commit/3db0d91b1541e368912caf48f7fa5b74e07c29f5))
+
+
+
+
+
+## [6.7.1](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.7.0...@next-libs/cmdb-instances@6.7.1) (2021-10-20)
+
+**Note:** Version bump only for package @next-libs/cmdb-instances
+
+
+
+
+
+# [6.7.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.6...@next-libs/cmdb-instances@6.7.0) (2021-10-20)
+
+
+### Features
+
+* **cmdb-instance:** 父模型实例列表显示实例来源 ([873dcf1](https://github.com/easyops-cn/next-libs/commit/873dcf11f45e2a112bcc3810aa97102a70edc742))
+
+
+
+
+
 ## [6.6.6](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.6.5...@next-libs/cmdb-instances@6.6.6) (2021-10-20)
 
 **Note:** Version bump only for package @next-libs/cmdb-instances

package/dist/cjs/i18n/constants.js

@@ -104,4 +104,7 @@ exports.K = K;
   K["FREE_SELECTION"] = "FREE_SELECTION";
   K["APP_SELECTION"] = "APP_SELECTION";
   K["ATTRIBUTE_NAME_REQUIRED"] = "ATTRIBUTE_NAME_REQUIRED";
+  K["INSTANCE_SOURCE"] = "INSTANCE_SOURCE";
+  K["INSTANCE_SOURCE_TOOLTIP"] = "INSTANCE_SOURCE_TOOLTIP";
+  K["INSTANCE_SOURCE_TAG_TEXT"] = "INSTANCE_SOURCE_TAG_TEXT";
 })(K || (exports.K = K = {}));

package/dist/cjs/i18n/locales/en.js

@@ -101,7 +101,10 @@ const locale = {
   [_constants.K.ALL_CLUSTER]: "All cluster",
   [_constants.K.FREE_SELECTION]: "Free selection",
   [_constants.K.APP_SELECTION]: "App selection",
-  [_constants.K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} is required"
+  [_constants.K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} is required",
+  [_constants.K.INSTANCE_SOURCE]: "Instance source",
+  [_constants.K.INSTANCE_SOURCE_TOOLTIP]: "The instance comes from a common model that inherits the current parent model",
+  [_constants.K.INSTANCE_SOURCE_TAG_TEXT]: 'Instance source: equal to "{{query}}"'
 };
 var _default = locale;
 exports.default = _default;

package/dist/cjs/i18n/locales/zh.js

@@ -101,7 +101,10 @@ const locale = {
   [_constants.K.ALL_CLUSTER]: "所有集群",
   [_constants.K.FREE_SELECTION]: "自由筛选",
   [_constants.K.APP_SELECTION]: "按应用筛选",
-  [_constants.K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} 为必填项"
+  [_constants.K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} 为必填项",
+  [_constants.K.INSTANCE_SOURCE]: "实例来源",
+  [_constants.K.INSTANCE_SOURCE_TOOLTIP]: "实例来源于继承当前父模型的普通模型",
+  [_constants.K.INSTANCE_SOURCE_TAG_TEXT]: '实例来源：等于"{{query}}"'
 };
 var _default = locale;
 exports.default = _default;

package/dist/cjs/instance-list/InstanceList.js

@@ -262,6 +262,23 @@ function InstanceList(props) {
       idObjectMap
     };
   }, [props.objectList, props.objectId]);
+  const [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = (0, _react.useState)({});
+
+  const fetchInheritanceModelIdNameMap = async modelData => {
+    let idNameMap = {};
+
+    if (modelData.isAbstract) {
+      idNameMap = await (0, _cmdbSdk.CmdbObjectApi_getIdMapName)({
+        parentObjectId: modelData.objectId
+      });
+    }
+
+    setInheritanceModelIdNameMap(idNameMap);
+  };
+
+  (0, _react.useEffect)(() => {
+    fetchInheritanceModelIdNameMap(modelData);
+  }, [modelData]);
 
   const computeDefaultFields = ({
     inModal
@@ -318,6 +335,7 @@ function InstanceList(props) {
     fieldIds = _sortFieldIds(fieldIds);
     const hideModelData = modelData.view.hide_columns || [];
     fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
+    modelData.isAbstract && fieldIds.push("_object_id");
     return fieldIds;
   };
 
@@ -330,6 +348,7 @@ function InstanceList(props) {
       q: props.q,
       aq: props.aq,
       aqToShow: props.aqToShow || initAqToShow(props.aq, modelData),
+      instanceSourceQuery: props.instanceSourceQuery,
       asc: props.asc,
       sort: props.sort,
       page: (_ref = (_props$dataSource$pag = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.page) !== null && _props$dataSource$pag !== void 0 ? _props$dataSource$pag : props.page) !== null && _ref !== void 0 ? _ref : 1,
@@ -422,6 +441,12 @@ function InstanceList(props) {
       };
     }
 
+    if (state.instanceSourceQuery) {
+      query = { ...query,
+        _object_id: state.instanceSourceQuery
+      };
+    }
+
     if (!(0, _lodash.isEmpty)(query)) {
       v3Data.query = data.query = query;
     }
@@ -527,7 +552,7 @@ function InstanceList(props) {
     }
 
     refreshInstanceList(state.sort, state.asc, 1);
-  }, [state.q, state.aq, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
+  }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
 
   (0, _react.useEffect)(() => {
     if ((0, _lodash.isEmpty)(state.fieldIds)) return;
@@ -631,6 +656,15 @@ function InstanceList(props) {
     (_props$onPaginationCh2 = props.onPaginationChange) === null || _props$onPaginationCh2 === void 0 ? void 0 : _props$onPaginationCh2.call(props, pagination);
   };
 
+  const onInstanceSourceChange = instanceSourceQuery => {
+    var _props$onInstanceSour;
+
+    setState({
+      instanceSourceQuery
+    });
+    (_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
+  };
+
   const onRelatedToMeChange = checked => {
     var _props$onRelatedToMeC;
 
@@ -933,7 +967,7 @@ function InstanceList(props) {
     q: state.aqToShow,
     fieldToShow: state.fieldToShow,
     onSearch: onAdvancedSearch
-  })), !props.hideSearchConditions && !state.searchByApp && (state.q || !(0, _lodash.isEmpty)(conditions)) && /*#__PURE__*/_react.default.createElement("div", {
+  })), !props.hideSearchConditions && !state.searchByApp && (state.instanceSourceQuery || state.q || !(0, _lodash.isEmpty)(conditions)) && /*#__PURE__*/_react.default.createElement("div", {
     className: _InstanceListModule.default.searchConditions
   }, /*#__PURE__*/_react.default.createElement("span", null, _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.CURRENT_FILTER_REQUIREMENTS}`)), state.q && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
     closable: true,
@@ -943,6 +977,13 @@ function InstanceList(props) {
     }
   }, _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.FUZZY_SEARCH}`, {
     query: state.q
+  })), state.instanceSourceQuery && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
+    closable: true,
+    onClose: () => {
+      onInstanceSourceChange(null);
+    }
+  }, _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.INSTANCE_SOURCE_TAG_TEXT}`, {
+    query: (inheritanceModelIdNameMap === null || inheritanceModelIdNameMap === void 0 ? void 0 : inheritanceModelIdNameMap[state.instanceSourceQuery]) || state.instanceSourceQuery
   })), conditions.map(condition => /*#__PURE__*/_react.default.createElement(_antd.Tag, {
     key: `${condition.attrId}${condition.valuesStr}-${(0, _lodash.uniqueId)()}`,
     closable: true,
@@ -965,6 +1006,10 @@ function InstanceList(props) {
     onPaginationChange: onPaginationChange,
     onSortingChange: onSortingChange,
     onSelectionChange: onSelectionChange,
+    onInstanceSourceChange: onInstanceSourceChange,
+    instanceSourceQuery: state.instanceSourceQuery,
+    inheritanceModelIdNameMap: inheritanceModelIdNameMap,
+    filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
     autoBreakLine: state.autoBreakLine,
     relationLinkDisabled: props.relationLinkDisabled,
     pageSizeOptions: props.pageSizeOptions,

package/dist/cjs/instance-list-modal/InstanceListModal.js

@@ -131,7 +131,9 @@ function InstanceListModal(props) {
     permission: props.permission,
     aliveHosts: fixAliveHosts,
     fixAliveHosts: fixAliveHosts,
+    instanceSourceQuery: props.instanceSourceQuery,
     searchDisabled: props.searchDisabled,
+    filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
     advancedSearchDisabled: props.advancedSearchDisabled,
     aliveHostsDisabled: props.aliveHostsDisabled,
     relatedToMeDisabled: props.relatedToMeDisabled,

package/dist/cjs/instance-list-table/InstanceListTable.js

@@ -25,6 +25,8 @@ var _icons = require("@ant-design/icons");
 
 var _brickTypes = require("@next-core/brick-types");
 
+var _cmdbSdk = require("@next-sdk/cmdb-sdk");
+
 var _basicComponents = require("@next-libs/basic-components");
 
 var _cmdbUtils = require("@next-libs/cmdb-utils");
@@ -74,7 +76,27 @@ class LegacyInstanceListTable extends _react.default.Component {
     super(props);
     (0, _defineProperty2.default)(this, "keyDisplayConfigMap", {});
     (0, _defineProperty2.default)(this, "recordUseBrickDataMap", void 0);
+    (0, _defineProperty2.default)(this, "inheritanceModelIdNameMap", void 0);
+    (0, _defineProperty2.default)(this, "instanceSourceTitle", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", null, _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.INSTANCE_SOURCE}`)), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.INSTANCE_SOURCE_TOOLTIP}`)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: _InstanceListTableModule.default.titleTooltipIcon
+    }, /*#__PURE__*/_react.default.createElement(_basicComponents.GeneralIcon, {
+      icon: {
+        lib: "antd",
+        icon: "question-circle",
+        theme: "filled"
+      }
+    })))));
     (0, _defineProperty2.default)(this, "onChange", (pagination, filters, sorter, extra) => {
+      var _filters$_object_id;
+
+      const newInstanceSourceQuery = filters === null || filters === void 0 ? void 0 : (_filters$_object_id = filters._object_id) === null || _filters$_object_id === void 0 ? void 0 : _filters$_object_id[0];
+
+      if (newInstanceSourceQuery !== this.state.instanceSourceQuery) {
+        this.props.onInstanceSourceChange(newInstanceSourceQuery);
+      }
+
       if ( // pagination.current will pass in 0 when total is 0 and sorter has changed
       pagination.current > 0 && pagination.current !== this.state.pagination.current || pagination.pageSize !== this.state.pagination.pageSize) {
         var _this$props$onPaginat, _this$props;
@@ -114,6 +136,7 @@ class LegacyInstanceListTable extends _react.default.Component {
     (_this$props$propertyD = this.props.propertyDisplayConfigs) === null || _this$props$propertyD === void 0 ? void 0 : _this$props$propertyD.forEach(config => this.keyDisplayConfigMap[config.key] = config);
     const fieldIds = this.props.fieldIds;
     const sortedColumns = this.getChangeColumns(fieldIds);
+    this.inheritanceModelIdNameMap = this.props.inheritanceModelIdNameMap;
     const defaultPagination = {
       disabled: this.props.paginationDisabled,
       pageSizeOptions: this.props.pageSizeOptions,
@@ -126,6 +149,7 @@ class LegacyInstanceListTable extends _react.default.Component {
     };
     this.state = {
       list: this.props.instanceListData.list,
+      instanceSourceQuery: this.props.instanceSourceQuery,
       columns: this.getMergedColumns(sortedColumns, this.props.extraColumns),
       pagination: { ...defaultPagination,
         total: this.props.instanceListData.total,
@@ -214,7 +238,29 @@ class LegacyInstanceListTable extends _react.default.Component {
   }
 
   getMergedColumns(columns, extraColumns) {
-    return extraColumns ? [...columns, ...this.processExtraColumns(extraColumns)] : columns;
+    let mergedColumns = extraColumns ? [...columns, ...this.processExtraColumns(extraColumns)] : columns;
+
+    if (this.props.modelData.isAbstract) {
+      mergedColumns = [{
+        title: this.instanceSourceTitle,
+        dataIndex: "_object_id",
+        ...(!this.props.filterInstanceSourceDisabled ? {
+          filters: (0, _lodash.map)(this.inheritanceModelIdNameMap, (value, key) => ({
+            text: value,
+            value: key
+          })),
+          filterMultiple: false,
+          filteredValue: this.props.instanceSourceQuery && [this.props.instanceSourceQuery]
+        } : {}),
+        render: (value, record, index) => {
+          var _this$inheritanceMode;
+
+          return /*#__PURE__*/_react.default.createElement(_antd.Tag, null, ((_this$inheritanceMode = this.inheritanceModelIdNameMap) === null || _this$inheritanceMode === void 0 ? void 0 : _this$inheritanceMode[value]) || value);
+        }
+      }, ...mergedColumns.filter(c => c.dataIndex !== "_object_id")];
+    }
+
+    return mergedColumns;
   }
 
   processExtraColumns(extraColumns) {
@@ -249,7 +295,23 @@ class LegacyInstanceListTable extends _react.default.Component {
     });
   }
 
+  async componentDidMount() {
+    if (this.props.modelData.isAbstract && (0, _lodash.isNil)(this.inheritanceModelIdNameMap)) {
+      this.inheritanceModelIdNameMap = await (0, _cmdbSdk.CmdbObjectApi_getIdMapName)({
+        parentObjectId: this.props.modelData.objectId
+      });
+    }
+
+    const columns = this.getChangeColumns(this.props.fieldIds);
+    this.setState({
+      columns: this.getMergedColumns(columns, this.props.extraColumns)
+    });
+  }
+
   UNSAFE_componentWillReceiveProps(nextProps) {
+    this.inheritanceModelIdNameMap = { ...this.inheritanceModelIdNameMap,
+      ...nextProps.inheritanceModelIdNameMap
+    };
     const columns = this.getChangeColumns(nextProps.fieldIds);
     this.setState({
       columns: this.getMergedColumns(columns, nextProps.extraColumns)
@@ -474,8 +536,10 @@ class LegacyInstanceListTable extends _react.default.Component {
         const detailUrlTemplate = (0, _cmdbUtils.getTemplateFromMap)(this.props.detailUrlTemplates, object.objectId);
 
         if (detailUrlTemplate) {
+          var _this$inheritanceMode2;
+
           const data = { ...record,
-            objectId: object.objectId
+            objectId: object.isAbstract ? record._object_id : object.objectId
           };
           const url = (0, _cmdbUtils.parseTemplate)(detailUrlTemplate, data);
 
@@ -491,13 +555,13 @@ class LegacyInstanceListTable extends _react.default.Component {
             to: url,
             onClick: e => this.handleClickItem(e, record.instanceId),
             "data-testid": "instance-detail-link"
-          }, !firstColumns ? {
+          }, !firstColumns || object.isAbstract ? {
             target: "_blank"
           } : this.props.target ? {
             target: this.props.target
           } : {}), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
             placement: "top",
-            title: `${_i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.JUMP_TO}`)}${object.name}${_i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.INSTANCE_DETAIL}`)}`
+            title: `${_i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.JUMP_TO}`)}${object.isAbstract ? ((_this$inheritanceMode2 = this.inheritanceModelIdNameMap) === null || _this$inheritanceMode2 === void 0 ? void 0 : _this$inheritanceMode2[record._object_id]) || record._object_id : object.name}${_i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.INSTANCE_DETAIL}`)}`
           }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("span", {
             className: _InstanceListTableModule.default.iconWrap
           }, /*#__PURE__*/_react.default.createElement(_basicComponents.GeneralIcon, {
@@ -632,6 +696,12 @@ class LegacyInstanceListTable extends _react.default.Component {
         columns
       });
     }
+
+    if (this.props.instanceSourceQuery !== prevProps.instanceSourceQuery) {
+      this.setState({
+        instanceSourceQuery: this.props.instanceSourceQuery
+      });
+    }
   }
 
   render() {

package/dist/esm/i18n/constants.js

@@ -96,4 +96,7 @@ export var K;
   K["FREE_SELECTION"] = "FREE_SELECTION";
   K["APP_SELECTION"] = "APP_SELECTION";
   K["ATTRIBUTE_NAME_REQUIRED"] = "ATTRIBUTE_NAME_REQUIRED";
+  K["INSTANCE_SOURCE"] = "INSTANCE_SOURCE";
+  K["INSTANCE_SOURCE_TOOLTIP"] = "INSTANCE_SOURCE_TOOLTIP";
+  K["INSTANCE_SOURCE_TAG_TEXT"] = "INSTANCE_SOURCE_TAG_TEXT";
 })(K || (K = {}));

package/dist/esm/i18n/locales/en.js

@@ -93,6 +93,9 @@ var locale = {
   [K.ALL_CLUSTER]: "All cluster",
   [K.FREE_SELECTION]: "Free selection",
   [K.APP_SELECTION]: "App selection",
-  [K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} is required"
+  [K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} is required",
+  [K.INSTANCE_SOURCE]: "Instance source",
+  [K.INSTANCE_SOURCE_TOOLTIP]: "The instance comes from a common model that inherits the current parent model",
+  [K.INSTANCE_SOURCE_TAG_TEXT]: 'Instance source: equal to "{{query}}"'
 };
 export default locale;

package/dist/esm/i18n/locales/zh.js

@@ -93,6 +93,9 @@ var locale = {
   [K.ALL_CLUSTER]: "所有集群",
   [K.FREE_SELECTION]: "自由筛选",
   [K.APP_SELECTION]: "按应用筛选",
-  [K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} 为必填项"
+  [K.ATTRIBUTE_NAME_REQUIRED]: "{{attribute_name}} 为必填项",
+  [K.INSTANCE_SOURCE]: "实例来源",
+  [K.INSTANCE_SOURCE_TOOLTIP]: "实例来源于继承当前父模型的普通模型",
+  [K.INSTANCE_SOURCE_TAG_TEXT]: '实例来源：等于"{{query}}"'
 };
 export default locale;

package/dist/esm/instance-list/InstanceList.js

@@ -5,7 +5,7 @@ import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, rejec
 import { BrickAsComponent, handleHttpError } from "@next-core/brick-kit";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
-import { InstanceApi_postSearchV3 } from "@next-sdk/cmdb-sdk";
+import { InstanceApi_postSearchV3, CmdbObjectApi_getIdMapName } from "@next-sdk/cmdb-sdk";
 import { Icon as LegacyIcon } from "@ant-design/compatible";
 import { Button, Spin, Input, Tag, Select } from "antd";
 import { getRelationObjectSides, forEachAvailableFields, getInstanceNameKeys } from "@next-libs/cmdb-utils";
@@ -231,6 +231,29 @@ export function InstanceList(props) {
       idObjectMap
     };
   }, [props.objectList, props.objectId]);
+  var [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = useState({});
+
+  var fetchInheritanceModelIdNameMap = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (modelData) {
+      var idNameMap = {};
+
+      if (modelData.isAbstract) {
+        idNameMap = yield CmdbObjectApi_getIdMapName({
+          parentObjectId: modelData.objectId
+        });
+      }
+
+      setInheritanceModelIdNameMap(idNameMap);
+    });
+
+    return function fetchInheritanceModelIdNameMap(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  useEffect(() => {
+    fetchInheritanceModelIdNameMap(modelData);
+  }, [modelData]);
 
   var computeDefaultFields = ({
     inModal
@@ -287,22 +310,24 @@ export function InstanceList(props) {
     fieldIds = _sortFieldIds(fieldIds);
     var hideModelData = modelData.view.hide_columns || [];
     fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
+    modelData.isAbstract && fieldIds.push("_object_id");
     return fieldIds;
   };
 
   var [q, setQ] = useState(props.q);
   var [state, setState] = useReducer(reducer, undefined, () => {
-    var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2;
+    var _ref2, _props$dataSource$pag, _props$dataSource, _ref3, _props$dataSource$pag2, _props$dataSource2;
 
     return {
       objectId: props.objectId,
       q: props.q,
       aq: props.aq,
       aqToShow: props.aqToShow || initAqToShow(props.aq, modelData),
+      instanceSourceQuery: props.instanceSourceQuery,
       asc: props.asc,
       sort: props.sort,
-      page: (_ref = (_props$dataSource$pag = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.page) !== null && _props$dataSource$pag !== void 0 ? _props$dataSource$pag : props.page) !== null && _ref !== void 0 ? _ref : 1,
-      pageSize: (_ref2 = (_props$dataSource$pag2 = (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.pageSize) !== null && _props$dataSource$pag2 !== void 0 ? _props$dataSource$pag2 : props.pageSize) !== null && _ref2 !== void 0 ? _ref2 : 10,
+      page: (_ref2 = (_props$dataSource$pag = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.page) !== null && _props$dataSource$pag !== void 0 ? _props$dataSource$pag : props.page) !== null && _ref2 !== void 0 ? _ref2 : 1,
+      pageSize: (_ref3 = (_props$dataSource$pag2 = (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.pageSize) !== null && _props$dataSource$pag2 !== void 0 ? _props$dataSource$pag2 : props.pageSize) !== null && _ref3 !== void 0 ? _ref3 : 10,
       aliveHosts: props.aliveHosts,
       relatedToMe: props.relatedToMe,
       inited: false,
@@ -328,7 +353,7 @@ export function InstanceList(props) {
   var isFirstRunRef = useRef(true);
 
   var getInstanceListData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(function* (sort, asc, page) {
+    var _ref4 = _asyncToGenerator(function* (sort, asc, page) {
       var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
 
       var data = {};
@@ -392,6 +417,12 @@ export function InstanceList(props) {
         });
       }
 
+      if (state.instanceSourceQuery) {
+        query = _objectSpread(_objectSpread({}, query), {}, {
+          _object_id: state.instanceSourceQuery
+        });
+      }
+
       if (!isEmpty(query)) {
         v3Data.query = data.query = query;
       }
@@ -414,13 +445,13 @@ export function InstanceList(props) {
       return promise ? promise : InstanceApi_postSearchV3(props.objectId, v3Data);
     });
 
-    return function getInstanceListData(_x, _x2, _x3) {
-      return _ref3.apply(this, arguments);
+    return function getInstanceListData(_x2, _x3, _x4) {
+      return _ref4.apply(this, arguments);
     };
   }();
 
   var refreshInstanceList = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(function* (sort, asc, page) {
+    var _ref5 = _asyncToGenerator(function* (sort, asc, page) {
       setState({
         loading: true
       });
@@ -452,8 +483,8 @@ export function InstanceList(props) {
       }
     });
 
-    return function refreshInstanceList(_x4, _x5, _x6) {
-      return _ref4.apply(this, arguments);
+    return function refreshInstanceList(_x5, _x6, _x7) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -507,7 +538,7 @@ export function InstanceList(props) {
     }
 
     refreshInstanceList(state.sort, state.asc, 1);
-  }, [state.q, state.aq, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
+  }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
 
   useEffect(() => {
     if (isEmpty(state.fieldIds)) return;
@@ -520,7 +551,7 @@ export function InstanceList(props) {
 
 
   var onSelectionChange = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(function* (selected) {
+    var _ref6 = _asyncToGenerator(function* (selected) {
       var _props$onSelectionCha;
 
       var {
@@ -554,8 +585,8 @@ export function InstanceList(props) {
       });
     });
 
-    return function onSelectionChange(_x7) {
-      return _ref5.apply(this, arguments);
+    return function onSelectionChange(_x8) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -617,6 +648,15 @@ export function InstanceList(props) {
     (_props$onPaginationCh2 = props.onPaginationChange) === null || _props$onPaginationCh2 === void 0 ? void 0 : _props$onPaginationCh2.call(props, pagination);
   };
 
+  var onInstanceSourceChange = instanceSourceQuery => {
+    var _props$onInstanceSour;
+
+    setState({
+      instanceSourceQuery
+    });
+    (_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
+  };
+
   var onRelatedToMeChange = checked => {
     var _props$onRelatedToMeC;
 
@@ -918,7 +958,7 @@ export function InstanceList(props) {
     q: state.aqToShow,
     fieldToShow: state.fieldToShow,
     onSearch: onAdvancedSearch
-  })), !props.hideSearchConditions && !state.searchByApp && (state.q || !isEmpty(conditions)) && /*#__PURE__*/React.createElement("div", {
+  })), !props.hideSearchConditions && !state.searchByApp && (state.instanceSourceQuery || state.q || !isEmpty(conditions)) && /*#__PURE__*/React.createElement("div", {
     className: styles.searchConditions
   }, /*#__PURE__*/React.createElement("span", null, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.CURRENT_FILTER_REQUIREMENTS))), state.q && /*#__PURE__*/React.createElement(Tag, {
     closable: true,
@@ -928,6 +968,13 @@ export function InstanceList(props) {
     }
   }, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.FUZZY_SEARCH), {
     query: state.q
+  })), state.instanceSourceQuery && /*#__PURE__*/React.createElement(Tag, {
+    closable: true,
+    onClose: () => {
+      onInstanceSourceChange(null);
+    }
+  }, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_SOURCE_TAG_TEXT), {
+    query: (inheritanceModelIdNameMap === null || inheritanceModelIdNameMap === void 0 ? void 0 : inheritanceModelIdNameMap[state.instanceSourceQuery]) || state.instanceSourceQuery
   })), conditions.map(condition => /*#__PURE__*/React.createElement(Tag, {
     key: "".concat(condition.attrId).concat(condition.valuesStr, "-").concat(uniqueId()),
     closable: true,
@@ -950,6 +997,10 @@ export function InstanceList(props) {
     onPaginationChange: onPaginationChange,
     onSortingChange: onSortingChange,
     onSelectionChange: onSelectionChange,
+    onInstanceSourceChange: onInstanceSourceChange,
+    instanceSourceQuery: state.instanceSourceQuery,
+    inheritanceModelIdNameMap: inheritanceModelIdNameMap,
+    filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
     autoBreakLine: state.autoBreakLine,
     relationLinkDisabled: props.relationLinkDisabled,
     pageSizeOptions: props.pageSizeOptions,

package/dist/esm/instance-list-modal/InstanceListModal.js

@@ -117,7 +117,9 @@ export function InstanceListModal(props) {
     permission: props.permission,
     aliveHosts: fixAliveHosts,
     fixAliveHosts: fixAliveHosts,
+    instanceSourceQuery: props.instanceSourceQuery,
     searchDisabled: props.searchDisabled,
+    filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
     advancedSearchDisabled: props.advancedSearchDisabled,
     aliveHostsDisabled: props.aliveHostsDisabled,
     relatedToMeDisabled: props.relatedToMeDisabled,

package/dist/esm/instance-list-table/InstanceListTable.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
@@ -7,9 +8,10 @@ import React from "react";
 import { withTranslation } from "react-i18next";
 import classnames from "classnames";
 import { Button, Popover, Table, Tag, Tooltip, Modal } from "antd";
-import { isNil, isBoolean, compact } from "lodash";
+import { isNil, isBoolean, compact, map } from "lodash";
 import { DeleteOutlined } from "@ant-design/icons";
 import { PropertyDisplayType } from "@next-core/brick-types";
+import { CmdbObjectApi_getIdMapName } from "@next-sdk/cmdb-sdk";
 import { Link, GeneralIcon } from "@next-libs/basic-components";
 import { forEachAvailableFields, getInstanceNameKeys, getTemplateFromMap, parseTemplate, modifyModelData } from "@next-libs/cmdb-utils";
 import { ModelAttributeValueType } from "../model-attribute-form-control/ModelAttributeFormControl";
@@ -52,7 +54,29 @@ export class LegacyInstanceListTable extends React.Component {
 
     _defineProperty(this, "recordUseBrickDataMap", void 0);
 
+    _defineProperty(this, "inheritanceModelIdNameMap", void 0);
+
+    _defineProperty(this, "instanceSourceTitle", /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_SOURCE))), /*#__PURE__*/React.createElement(Tooltip, {
+      title: i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_SOURCE_TOOLTIP))
+    }, /*#__PURE__*/React.createElement("span", {
+      className: styles.titleTooltipIcon
+    }, /*#__PURE__*/React.createElement(GeneralIcon, {
+      icon: {
+        lib: "antd",
+        icon: "question-circle",
+        theme: "filled"
+      }
+    })))));
+
     _defineProperty(this, "onChange", (pagination, filters, sorter, extra) => {
+      var _filters$_object_id;
+
+      var newInstanceSourceQuery = filters === null || filters === void 0 ? void 0 : (_filters$_object_id = filters._object_id) === null || _filters$_object_id === void 0 ? void 0 : _filters$_object_id[0];
+
+      if (newInstanceSourceQuery !== this.state.instanceSourceQuery) {
+        this.props.onInstanceSourceChange(newInstanceSourceQuery);
+      }
+
       if ( // pagination.current will pass in 0 when total is 0 and sorter has changed
       pagination.current > 0 && pagination.current !== this.state.pagination.current || pagination.pageSize !== this.state.pagination.pageSize) {
         var _this$props$onPaginat, _this$props;
@@ -94,6 +118,7 @@ export class LegacyInstanceListTable extends React.Component {
     (_this$props$propertyD = this.props.propertyDisplayConfigs) === null || _this$props$propertyD === void 0 ? void 0 : _this$props$propertyD.forEach(config => this.keyDisplayConfigMap[config.key] = config);
     var fieldIds = this.props.fieldIds;
     var sortedColumns = this.getChangeColumns(fieldIds);
+    this.inheritanceModelIdNameMap = this.props.inheritanceModelIdNameMap;
     var defaultPagination = {
       disabled: this.props.paginationDisabled,
       pageSizeOptions: this.props.pageSizeOptions,
@@ -106,6 +131,7 @@ export class LegacyInstanceListTable extends React.Component {
     };
     this.state = {
       list: this.props.instanceListData.list,
+      instanceSourceQuery: this.props.instanceSourceQuery,
       columns: this.getMergedColumns(sortedColumns, this.props.extraColumns),
       pagination: _objectSpread(_objectSpread({}, defaultPagination), {}, {
         total: this.props.instanceListData.total,
@@ -194,7 +220,29 @@ export class LegacyInstanceListTable extends React.Component {
   }
 
   getMergedColumns(columns, extraColumns) {
-    return extraColumns ? [...columns, ...this.processExtraColumns(extraColumns)] : columns;
+    var mergedColumns = extraColumns ? [...columns, ...this.processExtraColumns(extraColumns)] : columns;
+
+    if (this.props.modelData.isAbstract) {
+      mergedColumns = [_objectSpread(_objectSpread({
+        title: this.instanceSourceTitle,
+        dataIndex: "_object_id"
+      }, !this.props.filterInstanceSourceDisabled ? {
+        filters: map(this.inheritanceModelIdNameMap, (value, key) => ({
+          text: value,
+          value: key
+        })),
+        filterMultiple: false,
+        filteredValue: this.props.instanceSourceQuery && [this.props.instanceSourceQuery]
+      } : {}), {}, {
+        render: (value, record, index) => {
+          var _this$inheritanceMode;
+
+          return /*#__PURE__*/React.createElement(Tag, null, ((_this$inheritanceMode = this.inheritanceModelIdNameMap) === null || _this$inheritanceMode === void 0 ? void 0 : _this$inheritanceMode[value]) || value);
+        }
+      }), ...mergedColumns.filter(c => c.dataIndex !== "_object_id")];
+    }
+
+    return mergedColumns;
   }
 
   processExtraColumns(extraColumns) {
@@ -229,7 +277,26 @@ export class LegacyInstanceListTable extends React.Component {
     });
   }
 
+  componentDidMount() {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      if (_this.props.modelData.isAbstract && isNil(_this.inheritanceModelIdNameMap)) {
+        _this.inheritanceModelIdNameMap = yield CmdbObjectApi_getIdMapName({
+          parentObjectId: _this.props.modelData.objectId
+        });
+      }
+
+      var columns = _this.getChangeColumns(_this.props.fieldIds);
+
+      _this.setState({
+        columns: _this.getMergedColumns(columns, _this.props.extraColumns)
+      });
+    })();
+  }
+
   UNSAFE_componentWillReceiveProps(nextProps) {
+    this.inheritanceModelIdNameMap = _objectSpread(_objectSpread({}, this.inheritanceModelIdNameMap), nextProps.inheritanceModelIdNameMap);
     var columns = this.getChangeColumns(nextProps.fieldIds);
     this.setState({
       columns: this.getMergedColumns(columns, nextProps.extraColumns)
@@ -454,8 +521,10 @@ export class LegacyInstanceListTable extends React.Component {
         var detailUrlTemplate = getTemplateFromMap(this.props.detailUrlTemplates, object.objectId);
 
         if (detailUrlTemplate) {
+          var _this$inheritanceMode2;
+
           var data = _objectSpread(_objectSpread({}, record), {}, {
-            objectId: object.objectId
+            objectId: object.isAbstract ? record._object_id : object.objectId
           });
 
           var url = parseTemplate(detailUrlTemplate, data);
@@ -472,13 +541,13 @@ export class LegacyInstanceListTable extends React.Component {
             to: url,
             onClick: e => this.handleClickItem(e, record.instanceId),
             "data-testid": "instance-detail-link"
-          }, !firstColumns ? {
+          }, !firstColumns || object.isAbstract ? {
             target: "_blank"
           } : this.props.target ? {
             target: this.props.target
           } : {}), /*#__PURE__*/React.createElement(Tooltip, {
             placement: "top",
-            title: "".concat(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.JUMP_TO))).concat(object.name).concat(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_DETAIL)))
+            title: "".concat(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.JUMP_TO))).concat(object.isAbstract ? ((_this$inheritanceMode2 = this.inheritanceModelIdNameMap) === null || _this$inheritanceMode2 === void 0 ? void 0 : _this$inheritanceMode2[record._object_id]) || record._object_id : object.name).concat(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_DETAIL)))
           }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
             className: styles.iconWrap
           }, /*#__PURE__*/React.createElement(GeneralIcon, {
@@ -614,6 +683,12 @@ export class LegacyInstanceListTable extends React.Component {
         columns
       });
     }
+
+    if (this.props.instanceSourceQuery !== prevProps.instanceSourceQuery) {
+      this.setState({
+        instanceSourceQuery: this.props.instanceSourceQuery
+      });
+    }
   }
 
   render() {

package/dist/esm/instance-list-table/InstanceListTable.module.css

@@ -22,19 +22,33 @@
   font-weight: normal;
   color: #595959;
 }
+
 .moreButtonsContainer {
   background: #f5f5f5;
   border: none;
 }
+
 .moreButtonsContainer:hover {
   background: #f5f5f5;
 }
+
 .linkKey {
   padding-left: 5px;
 }
+
 .iconWrap {
   transform: translateY(0px);
 }
+
 .iconWrapOfStruct {
   transform: translateY(5px);
 }
+
+.titleTooltipIcon {
+  margin: 0 3px;
+  color: #8c8c8c;
+
+  &:hover {
+    color: #595959;
+  }
+}

package/dist/types/i18n/constants.d.ts

@@ -93,7 +93,10 @@ export declare enum K {
     ALL_CLUSTER = "ALL_CLUSTER",
     FREE_SELECTION = "FREE_SELECTION",
     APP_SELECTION = "APP_SELECTION",
-    ATTRIBUTE_NAME_REQUIRED = "ATTRIBUTE_NAME_REQUIRED"
+    ATTRIBUTE_NAME_REQUIRED = "ATTRIBUTE_NAME_REQUIRED",
+    INSTANCE_SOURCE = "INSTANCE_SOURCE",
+    INSTANCE_SOURCE_TOOLTIP = "INSTANCE_SOURCE_TOOLTIP",
+    INSTANCE_SOURCE_TAG_TEXT = "INSTANCE_SOURCE_TAG_TEXT"
 }
 export declare type Locale = {
     [key in K]: string;

package/dist/types/instance-list/InstanceList.d.ts

@@ -35,6 +35,8 @@ interface InstanceListProps {
     selectDisabled?: boolean;
     pageSizeOptions?: string[];
     showSizeChanger?: boolean;
+    filterInstanceSourceDisabled?: boolean;
+    instanceSourceQuery?: string;
     onSearchExecute?(data: InstanceApi_PostSearchRequestBody, v3Data: InstanceApi_PostSearchV3RequestBody): Promise<InstanceApi_PostSearchV3ResponseBody> | void;
     onSearch?(value: string): void;
     onAdvancedSearch?(queries: Query[]): void;
@@ -44,6 +46,7 @@ interface InstanceListProps {
     onSelectionChange?(selection: ReadSelectionChangeDetail): void;
     onRelatedToMeChange?(value: boolean): void;
     onAliveHostsChange?(value: boolean): void;
+    onInstanceSourceChange?(instanceResource: string): void;
     relationLinkDisabled?: boolean;
     notifyCurrentFields?: (fiels: string[]) => void;
     defaultQuery?: {

package/dist/types/instance-list-modal/InstanceListModal.d.ts

@@ -13,11 +13,13 @@ export interface InstanceListModalProps {
     presetConfigs?: InstanceListPresetConfigs;
     permission?: string[];
     aq?: Query[];
+    instanceSourceQuery?: string;
     searchDisabled?: boolean;
     advancedSearchDisabled?: boolean;
     aliveHostsDisabled?: boolean;
     relatedToMeDisabled?: boolean;
     moreButtonsDisabled?: boolean;
+    filterInstanceSourceDisabled?: boolean;
     sortDisabled?: boolean;
     selectDisabled?: boolean;
     singleSelect?: boolean;

package/dist/types/instance-list-table/InstanceListTable.d.ts

@@ -25,10 +25,14 @@ export interface InstanceListTableProps extends WithTranslation {
     selectDisabled?: boolean;
     autoBreakLine?: boolean;
     sortDisabled?: boolean;
+    instanceSourceQuery?: string;
+    inheritanceModelIdNameMap?: Record<string, string>;
+    filterInstanceSourceDisabled?: boolean;
     onClickItem?(evt: React.MouseEvent<HTMLAnchorElement, MouseEvent>, id: string): void;
     onPaginationChange?(pagination: ReadPaginationChangeDetail): void;
     onSortingChange?(sorting: ReadSortingChangeDetail): void;
     onSelectionChange?(selection: ReadSelectionChangeDetail): void;
+    onInstanceSourceChange?(instanceSourceQuery: string): void;
     relationLinkDisabled?: boolean;
     paginationDisabled?: boolean;
     pageSizeOptions?: string[];
@@ -42,6 +46,7 @@ export interface InstanceListTableProps extends WithTranslation {
 }
 interface InstanceListTableState {
     list: Record<string, any>[];
+    instanceSourceQuery?: string;
     columns?: ColumnType<Record<string, any>>[];
     pagination: TablePaginationConfig;
     defaultPagination: TablePaginationConfig;
@@ -49,12 +54,15 @@ interface InstanceListTableState {
 export declare class LegacyInstanceListTable extends React.Component<InstanceListTableProps, InstanceListTableState> {
     keyDisplayConfigMap: Record<string, PropertyDisplayConfig>;
     recordUseBrickDataMap: Map<unknown, InstanceListUseBrickData>;
+    inheritanceModelIdNameMap: Record<string, string>;
+    instanceSourceTitle: React.ReactElement;
     constructor(props: InstanceListTableProps);
     openConfirmModal(index: number): void;
     remove(index: number): void;
     getChangeColumns(ids: string[]): ColumnType<Record<string, any>>[];
     getMergedColumns(columns: ColumnType<Record<string, any>>[], extraColumns: CustomColumn[]): ColumnType<Record<string, any>>[];
     processExtraColumns(extraColumns: CustomColumn[]): ColumnType<Record<string, any>>[];
+    componentDidMount(): Promise<void>;
     UNSAFE_componentWillReceiveProps(nextProps: InstanceListTableProps): void;
     handleClickItem(e: React.MouseEvent<HTMLAnchorElement, MouseEvent>, id: string): void;
     getCustomPropertyRender(config: PropertyDisplayConfig, isPrimary?: boolean): (value: any, record: Record<string, any>, index: number) => JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-libs/cmdb-instances",
-  "version": "6.6.6",
+  "version": "6.7.3",
   "description": "> TODO: description",
   "homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
   "license": "GPL-3.0",
@@ -50,5 +50,5 @@
     "immutability-helper": "^3.1.1",
     "marked": "^2.1.3"
   },
-  "gitHead": "bb7e58e42bd056499085305a7bb3e2eff306b9cb"
+  "gitHead": "d692fdc49831a52922c09ec7899383d1fb6c25b7"
 }