@next-libs/cmdb-instances 6.7.1 → 6.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [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)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **cmdb-instance:** 父模型实例列表显示实例来源字段修改 ([3db0d91](https://github.com/easyops-cn/next-libs/commit/3db0d91b1541e368912caf48f7fa5b74e07c29f5))
12
+
13
+
14
+
15
+
16
+
6
17
  ## [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)
7
18
 
8
19
  **Note:** Version bump only for package @next-libs/cmdb-instances
@@ -1009,7 +1009,7 @@ function InstanceList(props) {
1009
1009
  onInstanceSourceChange: onInstanceSourceChange,
1010
1010
  instanceSourceQuery: state.instanceSourceQuery,
1011
1011
  inheritanceModelIdNameMap: inheritanceModelIdNameMap,
1012
- showFilterInstanceSource: props.showFilterInstanceSource,
1012
+ filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
1013
1013
  autoBreakLine: state.autoBreakLine,
1014
1014
  relationLinkDisabled: props.relationLinkDisabled,
1015
1015
  pageSizeOptions: props.pageSizeOptions,
@@ -131,7 +131,9 @@ function InstanceListModal(props) {
131
131
  permission: props.permission,
132
132
  aliveHosts: fixAliveHosts,
133
133
  fixAliveHosts: fixAliveHosts,
134
+ instanceSourceQuery: props.instanceSourceQuery,
134
135
  searchDisabled: props.searchDisabled,
136
+ filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
135
137
  advancedSearchDisabled: props.advancedSearchDisabled,
136
138
  aliveHostsDisabled: props.aliveHostsDisabled,
137
139
  relatedToMeDisabled: props.relatedToMeDisabled,
@@ -244,7 +244,7 @@ class LegacyInstanceListTable extends _react.default.Component {
244
244
  mergedColumns = [{
245
245
  title: this.instanceSourceTitle,
246
246
  dataIndex: "_object_id",
247
- ...(this.props.showFilterInstanceSource ? {
247
+ ...(!this.props.filterInstanceSourceDisabled ? {
248
248
  filters: (0, _lodash.map)(this.inheritanceModelIdNameMap, (value, key) => ({
249
249
  text: value,
250
250
  value: key
@@ -1000,7 +1000,7 @@ export function InstanceList(props) {
1000
1000
  onInstanceSourceChange: onInstanceSourceChange,
1001
1001
  instanceSourceQuery: state.instanceSourceQuery,
1002
1002
  inheritanceModelIdNameMap: inheritanceModelIdNameMap,
1003
- showFilterInstanceSource: props.showFilterInstanceSource,
1003
+ filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
1004
1004
  autoBreakLine: state.autoBreakLine,
1005
1005
  relationLinkDisabled: props.relationLinkDisabled,
1006
1006
  pageSizeOptions: props.pageSizeOptions,
@@ -117,7 +117,9 @@ export function InstanceListModal(props) {
117
117
  permission: props.permission,
118
118
  aliveHosts: fixAliveHosts,
119
119
  fixAliveHosts: fixAliveHosts,
120
+ instanceSourceQuery: props.instanceSourceQuery,
120
121
  searchDisabled: props.searchDisabled,
122
+ filterInstanceSourceDisabled: props.filterInstanceSourceDisabled,
121
123
  advancedSearchDisabled: props.advancedSearchDisabled,
122
124
  aliveHostsDisabled: props.aliveHostsDisabled,
123
125
  relatedToMeDisabled: props.relatedToMeDisabled,
@@ -226,7 +226,7 @@ export class LegacyInstanceListTable extends React.Component {
226
226
  mergedColumns = [_objectSpread(_objectSpread({
227
227
  title: this.instanceSourceTitle,
228
228
  dataIndex: "_object_id"
229
- }, this.props.showFilterInstanceSource ? {
229
+ }, !this.props.filterInstanceSourceDisabled ? {
230
230
  filters: map(this.inheritanceModelIdNameMap, (value, key) => ({
231
231
  text: value,
232
232
  value: key
@@ -35,7 +35,7 @@ interface InstanceListProps {
35
35
  selectDisabled?: boolean;
36
36
  pageSizeOptions?: string[];
37
37
  showSizeChanger?: boolean;
38
- showFilterInstanceSource?: boolean;
38
+ filterInstanceSourceDisabled?: boolean;
39
39
  instanceSourceQuery?: string;
40
40
  onSearchExecute?(data: InstanceApi_PostSearchRequestBody, v3Data: InstanceApi_PostSearchV3RequestBody): Promise<InstanceApi_PostSearchV3ResponseBody> | void;
41
41
  onSearch?(value: string): void;
@@ -13,11 +13,13 @@ export interface InstanceListModalProps {
13
13
  presetConfigs?: InstanceListPresetConfigs;
14
14
  permission?: string[];
15
15
  aq?: Query[];
16
+ instanceSourceQuery?: string;
16
17
  searchDisabled?: boolean;
17
18
  advancedSearchDisabled?: boolean;
18
19
  aliveHostsDisabled?: boolean;
19
20
  relatedToMeDisabled?: boolean;
20
21
  moreButtonsDisabled?: boolean;
22
+ filterInstanceSourceDisabled?: boolean;
21
23
  sortDisabled?: boolean;
22
24
  selectDisabled?: boolean;
23
25
  singleSelect?: boolean;
@@ -27,7 +27,7 @@ export interface InstanceListTableProps extends WithTranslation {
27
27
  sortDisabled?: boolean;
28
28
  instanceSourceQuery?: string;
29
29
  inheritanceModelIdNameMap?: Record<string, string>;
30
- showFilterInstanceSource?: boolean;
30
+ filterInstanceSourceDisabled?: boolean;
31
31
  onClickItem?(evt: React.MouseEvent<HTMLAnchorElement, MouseEvent>, id: string): void;
32
32
  onPaginationChange?(pagination: ReadPaginationChangeDetail): void;
33
33
  onSortingChange?(sorting: ReadSortingChangeDetail): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@next-libs/cmdb-instances",
3
- "version": "6.7.1",
3
+ "version": "6.7.2",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
6
6
  "license": "GPL-3.0",
@@ -50,5 +50,5 @@
50
50
  "immutability-helper": "^3.1.1",
51
51
  "marked": "^2.1.3"
52
52
  },
53
- "gitHead": "5dc29fc3114ddda2713689a7bb1803af84a9d02e"
53
+ "gitHead": "c84803cd210037c08df1698a04dc604f2bffe500"
54
54
  }