@next-libs/cmdb-instances 6.7.1 → 6.7.5

package/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.7.5](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.7.4...@next-libs/cmdb-instances@6.7.5) (2021-10-22)
+
+
+### Bug Fixes
+
+* **cmdb-instances:** instance-list icon tooltip translation issue ([10e6c0f](https://github.com/easyops-cn/next-libs/commit/10e6c0f07e8cce58414049716e8eb96ebded7ba0))
+
+
+
+
+
+## [6.7.4](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.7.3...@next-libs/cmdb-instances@6.7.4) (2021-10-22)
+
+
+### Bug Fixes
+
+* **cmdb-instance:** 修复显示设置_object_id字段 ([da3c688](https://github.com/easyops-cn/next-libs/commit/da3c688bf2eba62ed96c386a4901649ecbca8eb3))
+
+
+
+
+
+## [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

package/dist/cjs/i18n/constants.js

@@ -33,8 +33,8 @@ exports.K = K;
   K["TITLE_PLACEHOLDER"] = "TITLE_PLACEHOLDER";
   K["CLICK_TO_FILTER"] = "CLICK_TO_FILTER";
   K["CLICK_TO_CANCEL_FILTER"] = "CLICK_TO_CANCEL_FILTER";
-  K["CLICK_TO_HIDDEN"] = " CLICK_TO_HIDDEN";
-  K["CLICK_TO_SHOW"] = " CLICK_TO_SHOW";
+  K["CLICK_TO_HIDDEN"] = "CLICK_TO_HIDDEN";
+  K["CLICK_TO_SHOW"] = "CLICK_TO_SHOW";
   K["RELATED_TO_ME"] = "RELATED_TO_ME";
   K["DISPLAY_OMITTED_INFORMATION"] = "DISPLAY_OMITTED_INFORMATION";
   K["CLEAR"] = "CLEAR";

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

@@ -681,7 +681,8 @@ function InstanceList(props) {
       aliveHosts: checked
     });
     (_props$onAliveHostsCh = props.onAliveHostsChange) === null || _props$onAliveHostsCh === void 0 ? void 0 : _props$onAliveHostsCh.call(props, checked);
-  };
+  }; // istanbul ignore next
+
 
   const handleConfirm = selectAttrIds => {
     setState({
@@ -757,10 +758,12 @@ function InstanceList(props) {
     }
 
     return defaultFields;
-  };
+  }; // istanbul ignore next
+
 
   const handleReset = () => {
     const fieldIds = handleDefaultFields();
+    modelData.isAbstract && fieldIds.push("_object_id");
     setState({
       fieldIds
     });
@@ -980,7 +983,7 @@ function InstanceList(props) {
   })), state.instanceSourceQuery && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
     closable: true,
     onClose: () => {
-      onInstanceSourceChange(undefined);
+      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
@@ -1009,7 +1012,7 @@ function InstanceList(props) {
     onInstanceSourceChange: onInstanceSourceChange,
     instanceSourceQuery: state.instanceSourceQuery,
     inheritanceModelIdNameMap: inheritanceModelIdNameMap,
-    showFilterInstanceSource: props.showFilterInstanceSource,
+    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

@@ -244,7 +244,7 @@ class LegacyInstanceListTable extends _react.default.Component {
       mergedColumns = [{
         title: this.instanceSourceTitle,
         dataIndex: "_object_id",
-        ...(this.props.showFilterInstanceSource ? {
+        ...(!this.props.filterInstanceSourceDisabled ? {
           filters: (0, _lodash.map)(this.inheritanceModelIdNameMap, (value, key) => ({
             text: value,
             value: key

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

@@ -137,11 +137,13 @@ class Settings extends _react.default.Component {
   }
 
   render() {
+    var _this$state$nextField;
+
     const {
       title
     } = this.props;
     const filterList = this.state.filterList;
-    const count = this.state.nextFields.length;
+    const count = (_this$state$nextField = this.state.nextFields) === null || _this$state$nextField === void 0 ? void 0 : _this$state$nextField.filter(v => v !== "_object_id").length;
 
     const extraAttrIds = _constants.extraFieldAttrs.map(extraFieldAttr => extraFieldAttr.id);
 

package/dist/esm/i18n/constants.js

@@ -25,8 +25,8 @@ export var K;
   K["TITLE_PLACEHOLDER"] = "TITLE_PLACEHOLDER";
   K["CLICK_TO_FILTER"] = "CLICK_TO_FILTER";
   K["CLICK_TO_CANCEL_FILTER"] = "CLICK_TO_CANCEL_FILTER";
-  K["CLICK_TO_HIDDEN"] = " CLICK_TO_HIDDEN";
-  K["CLICK_TO_SHOW"] = " CLICK_TO_SHOW";
+  K["CLICK_TO_HIDDEN"] = "CLICK_TO_HIDDEN";
+  K["CLICK_TO_SHOW"] = "CLICK_TO_SHOW";
   K["RELATED_TO_ME"] = "RELATED_TO_ME";
   K["DISPLAY_OMITTED_INFORMATION"] = "DISPLAY_OMITTED_INFORMATION";
   K["CLEAR"] = "CLEAR";

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

@@ -673,7 +673,8 @@ export function InstanceList(props) {
       aliveHosts: checked
     });
     (_props$onAliveHostsCh = props.onAliveHostsChange) === null || _props$onAliveHostsCh === void 0 ? void 0 : _props$onAliveHostsCh.call(props, checked);
-  };
+  }; // istanbul ignore next
+
 
   var handleConfirm = selectAttrIds => {
     setState({
@@ -748,10 +749,12 @@ export function InstanceList(props) {
     }
 
     return defaultFields;
-  };
+  }; // istanbul ignore next
+
 
   var handleReset = () => {
     var fieldIds = handleDefaultFields();
+    modelData.isAbstract && fieldIds.push("_object_id");
     setState({
       fieldIds
     });
@@ -971,7 +974,7 @@ export function InstanceList(props) {
   })), state.instanceSourceQuery && /*#__PURE__*/React.createElement(Tag, {
     closable: true,
     onClose: () => {
-      onInstanceSourceChange(undefined);
+      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
@@ -1000,7 +1003,7 @@ export function InstanceList(props) {
     onInstanceSourceChange: onInstanceSourceChange,
     instanceSourceQuery: state.instanceSourceQuery,
     inheritanceModelIdNameMap: inheritanceModelIdNameMap,
-    showFilterInstanceSource: props.showFilterInstanceSource,
+    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

@@ -226,7 +226,7 @@ export class LegacyInstanceListTable extends React.Component {
       mergedColumns = [_objectSpread(_objectSpread({
         title: this.instanceSourceTitle,
         dataIndex: "_object_id"
-      }, this.props.showFilterInstanceSource ? {
+      }, !this.props.filterInstanceSourceDisabled ? {
         filters: map(this.inheritanceModelIdNameMap, (value, key) => ({
           text: value,
           value: key

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

@@ -128,11 +128,13 @@ export class Settings extends React.Component {
   }
 
   render() {
+    var _this$state$nextField;
+
     var {
       title
     } = this.props;
     var filterList = this.state.filterList;
-    var count = this.state.nextFields.length;
+    var count = (_this$state$nextField = this.state.nextFields) === null || _this$state$nextField === void 0 ? void 0 : _this$state$nextField.filter(v => v !== "_object_id").length;
     var extraAttrIds = extraFieldAttrs.map(extraFieldAttr => extraFieldAttr.id);
     var attrs = filterList.filter(attr => !extraAttrIds.includes(attr.id));
     var extraAttrs = filterList.filter(attr => extraAttrIds.includes(attr.id));

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

@@ -23,8 +23,8 @@ export declare enum K {
     TITLE_PLACEHOLDER = "TITLE_PLACEHOLDER",
     CLICK_TO_FILTER = "CLICK_TO_FILTER",
     CLICK_TO_CANCEL_FILTER = "CLICK_TO_CANCEL_FILTER",
-    CLICK_TO_HIDDEN = " CLICK_TO_HIDDEN",
-    CLICK_TO_SHOW = " CLICK_TO_SHOW",
+    CLICK_TO_HIDDEN = "CLICK_TO_HIDDEN",
+    CLICK_TO_SHOW = "CLICK_TO_SHOW",
     RELATED_TO_ME = "RELATED_TO_ME",
     DISPLAY_OMITTED_INFORMATION = "DISPLAY_OMITTED_INFORMATION",
     CLEAR = "CLEAR",

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

@@ -35,7 +35,7 @@ interface InstanceListProps {
     selectDisabled?: boolean;
     pageSizeOptions?: string[];
     showSizeChanger?: boolean;
-    showFilterInstanceSource?: boolean;
+    filterInstanceSourceDisabled?: boolean;
     instanceSourceQuery?: string;
     onSearchExecute?(data: InstanceApi_PostSearchRequestBody, v3Data: InstanceApi_PostSearchV3RequestBody): Promise<InstanceApi_PostSearchV3ResponseBody> | void;
     onSearch?(value: string): void;

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

@@ -27,7 +27,7 @@ export interface InstanceListTableProps extends WithTranslation {
     sortDisabled?: boolean;
     instanceSourceQuery?: string;
     inheritanceModelIdNameMap?: Record<string, string>;
-    showFilterInstanceSource?: boolean;
+    filterInstanceSourceDisabled?: boolean;
     onClickItem?(evt: React.MouseEvent<HTMLAnchorElement, MouseEvent>, id: string): void;
     onPaginationChange?(pagination: ReadPaginationChangeDetail): void;
     onSortingChange?(sorting: ReadSortingChangeDetail): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-libs/cmdb-instances",
-  "version": "6.7.1",
+  "version": "6.7.5",
   "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": "5dc29fc3114ddda2713689a7bb1803af84a9d02e"
+  "gitHead": "480d248e637b35ab4fcfd1d4d87e40dbaf61e9a3"
 }