@next-libs/cmdb-instances 6.48.0 → 6.49.0
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/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js +8 -23
- package/dist/cjs/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
- package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -43
- package/dist/cjs/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
- package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +6 -45
- package/dist/cjs/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
- package/dist/cjs/cmdb-url-link/CmdbUrlLink.js +0 -11
- package/dist/cjs/cmdb-url-link/CmdbUrlLink.js.map +1 -1
- package/dist/cjs/components/index.js +0 -4
- package/dist/cjs/components/index.js.map +1 -1
- package/dist/cjs/components/instance-format/index.js +0 -15
- package/dist/cjs/components/instance-format/index.js.map +1 -1
- package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js +33 -92
- package/dist/cjs/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js +0 -3
- package/dist/cjs/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectDetail.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectList.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectList.js.map +1 -1
- package/dist/cjs/data-providers/fetchCmdbObjectRef.js +0 -2
- package/dist/cjs/data-providers/fetchCmdbObjectRef.js.map +1 -1
- package/dist/cjs/data-providers/index.js +0 -10
- package/dist/cjs/data-providers/index.js.map +1 -1
- package/dist/cjs/float-display-brick/FloatDisplayBrick.js +0 -7
- package/dist/cjs/float-display-brick/FloatDisplayBrick.js.map +1 -1
- package/dist/cjs/i18n/constants.js +0 -1
- package/dist/cjs/i18n/constants.js.map +1 -1
- package/dist/cjs/i18n/index.js +0 -7
- package/dist/cjs/i18n/index.js.map +1 -1
- package/dist/cjs/i18n/locales/en.js +0 -2
- package/dist/cjs/i18n/locales/en.js.map +1 -1
- package/dist/cjs/i18n/locales/zh.js +0 -2
- package/dist/cjs/i18n/locales/zh.js.map +1 -1
- package/dist/cjs/index.js +0 -29
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js +4 -25
- package/dist/cjs/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
- package/dist/cjs/instance-detail/InstanceDetail.js +42 -124
- package/dist/cjs/instance-detail/InstanceDetail.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -19
- package/dist/cjs/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +4 -11
- package/dist/cjs/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/cjs/instance-detail/constants/index.js.map +1 -1
- package/dist/cjs/instance-list/IconButton.js +0 -18
- package/dist/cjs/instance-list/IconButton.js.map +1 -1
- package/dist/cjs/instance-list/InstanceList.js +47 -212
- package/dist/cjs/instance-list/InstanceList.js.map +1 -1
- package/dist/cjs/instance-list/constants.js +0 -7
- package/dist/cjs/instance-list/constants.js.map +1 -1
- package/dist/cjs/instance-list-modal/InstanceListModal.js +8 -32
- package/dist/cjs/instance-list-modal/InstanceListModal.js.map +1 -1
- package/dist/cjs/instance-list-table/AdvancedSearch.js +12 -133
- package/dist/cjs/instance-list-table/AdvancedSearch.js.map +1 -1
- package/dist/cjs/instance-list-table/AdvancedSearchCondition.js +3 -45
- package/dist/cjs/instance-list-table/AdvancedSearchCondition.js.map +1 -1
- package/dist/cjs/instance-list-table/DisplaySettings.js +0 -24
- package/dist/cjs/instance-list-table/DisplaySettings.js.map +1 -1
- package/dist/cjs/instance-list-table/DisplaySettingsModal.js +0 -10
- package/dist/cjs/instance-list-table/DisplaySettingsModal.js.map +1 -1
- package/dist/cjs/instance-list-table/DynamicSearch.js +4 -44
- package/dist/cjs/instance-list-table/DynamicSearch.js.map +1 -1
- package/dist/cjs/instance-list-table/InstanceListTable.js +30 -151
- package/dist/cjs/instance-list-table/InstanceListTable.js.map +1 -1
- package/dist/cjs/instance-list-table/MoreButtonsContainer.js +0 -15
- package/dist/cjs/instance-list-table/MoreButtonsContainer.js.map +1 -1
- package/dist/cjs/instance-list-table/constants.js +0 -2
- package/dist/cjs/instance-list-table/constants.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -2
- package/dist/cjs/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/index.js +0 -16
- package/dist/cjs/instance-list-table/data-providers/index.js.map +1 -1
- package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js +0 -2
- package/dist/cjs/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
- package/dist/cjs/instance-list-table/index.js +0 -12
- package/dist/cjs/instance-list-table/index.js.map +1 -1
- package/dist/cjs/instance-list-table/utils.js +0 -24
- package/dist/cjs/instance-list-table/utils.js.map +1 -1
- package/dist/cjs/model-attribute-form/ModelAttributeForm.js +27 -99
- package/dist/cjs/model-attribute-form/ModelAttributeForm.js.map +1 -1
- package/dist/cjs/model-attribute-form/constants.js.map +1 -1
- package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js +13 -94
- package/dist/cjs/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
- package/dist/cjs/model-relation-form/ModelRelationForm.js +0 -18
- package/dist/cjs/model-relation-form/ModelRelationForm.js.map +1 -1
- package/dist/cjs/processors.js +2 -21
- package/dist/cjs/processors.js.map +1 -1
- package/dist/cjs/struct-components/AddStruct.js +4 -15
- package/dist/cjs/struct-components/AddStruct.js.map +1 -1
- package/dist/cjs/struct-components/AddStructModal.js +0 -48
- package/dist/cjs/struct-components/AddStructModal.js.map +1 -1
- package/dist/cjs/struct-components/StructTable.js +2 -32
- package/dist/cjs/struct-components/StructTable.js.map +1 -1
- package/dist/cjs/struct-components/index.js +0 -8
- package/dist/cjs/struct-components/index.js.map +1 -1
- package/dist/cjs/struct-components/interfaces.js +0 -1
- package/dist/cjs/struct-components/interfaces.js.map +1 -1
- package/dist/cjs/struct-components/mockData.js.map +1 -1
- package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js +8 -18
- package/dist/esm/attribute-form-control-url/AttributeFormControlUrl.js.map +1 -1
- package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js +3 -35
- package/dist/esm/cmdb-instances-input-form/CmdbInstancesInputFormItem.js.map +1 -1
- package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js +4 -32
- package/dist/esm/cmdb-instances-select-panel/CmdbInstancesSelectPanel.js.map +1 -1
- package/dist/esm/cmdb-url-link/CmdbUrlLink.js +0 -3
- package/dist/esm/cmdb-url-link/CmdbUrlLink.js.map +1 -1
- package/dist/esm/components/index.js.map +1 -1
- package/dist/esm/components/instance-format/index.js +0 -5
- package/dist/esm/components/instance-format/index.js.map +1 -1
- package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js +19 -74
- package/dist/esm/components/user-or-user-group-select/UserOrUserGroupSelect.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbInstanceSearch.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectList.js.map +1 -1
- package/dist/esm/data-providers/fetchCmdbObjectRef.js.map +1 -1
- package/dist/esm/data-providers/index.js.map +1 -1
- package/dist/esm/float-display-brick/FloatDisplayBrick.js +0 -1
- package/dist/esm/float-display-brick/FloatDisplayBrick.js.map +1 -1
- package/dist/esm/i18n/constants.js +0 -1
- package/dist/esm/i18n/constants.js.map +1 -1
- package/dist/esm/i18n/index.js +2 -1
- package/dist/esm/i18n/index.js.map +1 -1
- package/dist/esm/i18n/locales/en.js.map +1 -1
- package/dist/esm/i18n/locales/zh.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/instance-attribute-form/InstanceAttributeForm.js +4 -10
- package/dist/esm/instance-attribute-form/InstanceAttributeForm.js.map +1 -1
- package/dist/esm/instance-detail/InstanceDetail.js +36 -111
- package/dist/esm/instance-detail/InstanceDetail.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-field-display/constants.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js +4 -10
- package/dist/esm/instance-detail/components/instance-relation-field-display/instance-relation-field-display.js.map +1 -1
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js +2 -2
- package/dist/esm/instance-detail/components/instance-relation-table-show/instance-relation-table-show.js.map +1 -1
- package/dist/esm/instance-detail/constants/index.js.map +1 -1
- package/dist/esm/instance-list/IconButton.js +0 -8
- package/dist/esm/instance-list/IconButton.js.map +1 -1
- package/dist/esm/instance-list/InstanceList.js +41 -182
- package/dist/esm/instance-list/InstanceList.js.map +1 -1
- package/dist/esm/instance-list/constants.js +0 -2
- package/dist/esm/instance-list/constants.js.map +1 -1
- package/dist/esm/instance-list-modal/InstanceListModal.js +8 -20
- package/dist/esm/instance-list-modal/InstanceListModal.js.map +1 -1
- package/dist/esm/instance-list-table/AdvancedSearch.js +10 -119
- package/dist/esm/instance-list-table/AdvancedSearch.js.map +1 -1
- package/dist/esm/instance-list-table/AdvancedSearchCondition.js +1 -31
- package/dist/esm/instance-list-table/AdvancedSearchCondition.js.map +1 -1
- package/dist/esm/instance-list-table/DisplaySettings.js +0 -16
- package/dist/esm/instance-list-table/DisplaySettings.js.map +1 -1
- package/dist/esm/instance-list-table/DisplaySettingsModal.js +0 -3
- package/dist/esm/instance-list-table/DisplaySettingsModal.js.map +1 -1
- package/dist/esm/instance-list-table/DynamicSearch.js +0 -34
- package/dist/esm/instance-list-table/DynamicSearch.js.map +1 -1
- package/dist/esm/instance-list-table/InstanceListTable.js +23 -138
- package/dist/esm/instance-list-table/InstanceListTable.js.map +1 -1
- package/dist/esm/instance-list-table/MoreButtonsContainer.js +0 -7
- package/dist/esm/instance-list-table/MoreButtonsContainer.js.map +1 -1
- package/dist/esm/instance-list-table/constants.js +0 -2
- package/dist/esm/instance-list-table/constants.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceAggregateCount.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceCount.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbInstanceDetail.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchCmdbObjectDetail.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchPermRoleList.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/fetchPermissionList.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js +1 -1
- package/dist/esm/instance-list-table/data-providers/getDefaultValueTemplate.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/index.js.map +1 -1
- package/dist/esm/instance-list-table/data-providers/searchCmdbInstances.js.map +1 -1
- package/dist/esm/instance-list-table/index.js.map +1 -1
- package/dist/esm/instance-list-table/utils.js +0 -15
- package/dist/esm/instance-list-table/utils.js.map +1 -1
- package/dist/esm/model-attribute-form/ModelAttributeForm.js +19 -92
- package/dist/esm/model-attribute-form/ModelAttributeForm.js.map +1 -1
- package/dist/esm/model-attribute-form/constants.js.map +1 -1
- package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js +27 -102
- package/dist/esm/model-attribute-form-control/ModelAttributeFormControl.js.map +1 -1
- package/dist/esm/model-relation-form/ModelRelationForm.js +0 -10
- package/dist/esm/model-relation-form/ModelRelationForm.js.map +1 -1
- package/dist/esm/processors.js +2 -7
- package/dist/esm/processors.js.map +1 -1
- package/dist/esm/struct-components/AddStruct.js +4 -9
- package/dist/esm/struct-components/AddStruct.js.map +1 -1
- package/dist/esm/struct-components/AddStructModal.js +0 -36
- package/dist/esm/struct-components/AddStructModal.js.map +1 -1
- package/dist/esm/struct-components/StructTable.js +2 -26
- package/dist/esm/struct-components/StructTable.js.map +1 -1
- package/dist/esm/struct-components/index.js.map +1 -1
- package/dist/esm/struct-components/interfaces.js +0 -1
- package/dist/esm/struct-components/interfaces.js.map +1 -1
- package/dist/esm/struct-components/mockData.js.map +1 -1
- package/package.json +9 -9
- package/CHANGELOG.md +0 -3687
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
|
|
4
|
-
|
|
5
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
@@ -13,41 +11,23 @@ exports.getQuery = getQuery;
|
|
|
13
11
|
exports.isValueEqualFn = exports.isSpecialFn = exports.initAqToShow = void 0;
|
|
14
12
|
exports.joinRelationFieldAndShowkey = joinRelationFieldAndShowkey;
|
|
15
13
|
exports.specialQueryHandler = void 0;
|
|
16
|
-
|
|
17
14
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
18
|
-
|
|
19
15
|
var _react = _interopRequireWildcard(require("react"));
|
|
20
|
-
|
|
21
16
|
var _lodash = require("lodash");
|
|
22
|
-
|
|
23
17
|
var _brickKit = require("@next-core/brick-kit");
|
|
24
|
-
|
|
25
18
|
var _i18next = _interopRequireDefault(require("i18next"));
|
|
26
|
-
|
|
27
19
|
var _constants = require("../i18n/constants");
|
|
28
|
-
|
|
29
20
|
var _cmdbSdk = require("@next-sdk/cmdb-sdk");
|
|
30
|
-
|
|
31
21
|
var _compatible = require("@ant-design/compatible");
|
|
32
|
-
|
|
33
22
|
var _antd = require("antd");
|
|
34
|
-
|
|
35
23
|
var _cmdbUtils = require("@next-libs/cmdb-utils");
|
|
36
|
-
|
|
37
24
|
var _storage = require("@next-libs/storage");
|
|
38
|
-
|
|
39
25
|
var _instanceListTable = require("../instance-list-table");
|
|
40
|
-
|
|
41
26
|
var _InstanceListModule = _interopRequireDefault(require("./InstanceList.module.css"));
|
|
42
|
-
|
|
43
27
|
var _constants2 = require("./constants");
|
|
44
|
-
|
|
45
28
|
var _ModelAttributeFormControl = require("../model-attribute-form-control/ModelAttributeFormControl");
|
|
46
|
-
|
|
47
29
|
var _IconButton = require("./IconButton");
|
|
48
|
-
|
|
49
30
|
var _processors = require("../processors");
|
|
50
|
-
|
|
51
31
|
function joinRelationFieldAndShowkey(fields, modelData, objectList) {
|
|
52
32
|
const attrIdMap = (0, _lodash.keyBy)(modelData.attrList, "id");
|
|
53
33
|
return fields.map(field => {
|
|
@@ -55,10 +35,8 @@ function joinRelationFieldAndShowkey(fields, modelData, objectList) {
|
|
|
55
35
|
return field;
|
|
56
36
|
} else {
|
|
57
37
|
const relation = modelData.relation_list.find(relation => relation.left_id === field || relation.right_id === field);
|
|
58
|
-
|
|
59
38
|
if (relation) {
|
|
60
39
|
var _otherSideObject$view, _otherSideObject$view2, _otherSideObject$view3;
|
|
61
|
-
|
|
62
40
|
const isLeft = relation.left_object_id === modelData.objectId;
|
|
63
41
|
const otherSideObjectId = isLeft ? relation.right_object_id : relation.left_object_id;
|
|
64
42
|
const otherSideObject = objectList.find(object => object.objectId === otherSideObjectId);
|
|
@@ -70,16 +48,13 @@ function joinRelationFieldAndShowkey(fields, modelData, objectList) {
|
|
|
70
48
|
}
|
|
71
49
|
});
|
|
72
50
|
}
|
|
73
|
-
|
|
74
51
|
function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
|
|
75
52
|
const query = {
|
|
76
53
|
$or: []
|
|
77
54
|
};
|
|
78
55
|
const queryValues = q.trim().split(/\s+/);
|
|
79
|
-
|
|
80
56
|
if (onlySearchByIp) {
|
|
81
57
|
var _getRuntime$getCurren;
|
|
82
|
-
|
|
83
58
|
const searchIpFields = ((_getRuntime$getCurren = (0, _brickKit.getRuntime)().getCurrentApp().config) === null || _getRuntime$getCurren === void 0 ? void 0 : _getRuntime$getCurren.searchIpFields) || [];
|
|
84
59
|
const queryOrs = [...new Set(["ip", ...searchIpFields])];
|
|
85
60
|
const searchValue = {
|
|
@@ -92,7 +67,6 @@ function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
|
|
|
92
67
|
});
|
|
93
68
|
return query;
|
|
94
69
|
}
|
|
95
|
-
|
|
96
70
|
(0, _cmdbUtils.forEachAvailableFields)(modelData, attr => {
|
|
97
71
|
queryValues.forEach(queryValue => query.$or.push({
|
|
98
72
|
[attr.id]: {
|
|
@@ -114,41 +88,31 @@ function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
|
|
|
114
88
|
}, fields);
|
|
115
89
|
return query;
|
|
116
90
|
}
|
|
117
|
-
|
|
118
91
|
const isSpecialFn = (query, attrId) => {
|
|
119
92
|
return Object.keys(query[attrId]).some(v => v === "$exists" || v === "$gte" || v === "$lte");
|
|
120
93
|
};
|
|
121
|
-
|
|
122
94
|
exports.isSpecialFn = isSpecialFn;
|
|
123
|
-
|
|
124
95
|
const specialQueryHandler = (query, key, queries) => {
|
|
125
96
|
// $exists $gte $lte 针对为空,不为空,时间范围特殊处理
|
|
126
97
|
const isSpecial = isSpecialFn(query, key);
|
|
127
|
-
|
|
128
98
|
if (isSpecial) {
|
|
129
99
|
return;
|
|
130
100
|
}
|
|
131
|
-
|
|
132
101
|
queries.push(query);
|
|
133
102
|
};
|
|
134
|
-
|
|
135
103
|
exports.specialQueryHandler = specialQueryHandler;
|
|
136
|
-
|
|
137
104
|
const isValueEqualFn = (query, attrId, valuesStr) => {
|
|
138
105
|
const isSpecial = isSpecialFn(query, attrId);
|
|
139
106
|
if (isSpecial) return false;
|
|
140
107
|
return query[attrId] ? valuesStr && Object.values(query[attrId]).join(" ") !== valuesStr // 当条件是为空和不为空时,需要判断valuesStr是否存在
|
|
141
108
|
: false;
|
|
142
109
|
};
|
|
143
|
-
|
|
144
110
|
exports.isValueEqualFn = isValueEqualFn;
|
|
145
|
-
|
|
146
111
|
function translateConditions(aq, idObjectMap, modelData, t) {
|
|
147
112
|
const conditions = [];
|
|
148
113
|
const relations = [];
|
|
149
114
|
modelData.relation_list.forEach(relation => {
|
|
150
115
|
let sidesArr = [];
|
|
151
|
-
|
|
152
116
|
if ((0, _cmdbUtils.isSelfRelation)(relation)) {
|
|
153
117
|
sidesArr = [{
|
|
154
118
|
this: "left",
|
|
@@ -160,14 +124,12 @@ function translateConditions(aq, idObjectMap, modelData, t) {
|
|
|
160
124
|
} else {
|
|
161
125
|
sidesArr = [(0, _cmdbUtils.getRelationObjectSides)(relation, modelData)];
|
|
162
126
|
}
|
|
163
|
-
|
|
164
127
|
sidesArr.forEach(sides => {
|
|
165
128
|
const objectId = relation[`${sides.this}_id`];
|
|
166
129
|
const relationObject = idObjectMap[relation[`${sides.that}_object_id`]];
|
|
167
130
|
const nameKeys = (0, _cmdbUtils.getInstanceNameKeys)(relationObject);
|
|
168
131
|
nameKeys.forEach(nameKey => {
|
|
169
132
|
var _find$name, _find;
|
|
170
|
-
|
|
171
133
|
const nameOfNameKey = (_find$name = (_find = (0, _lodash.find)(relationObject === null || relationObject === void 0 ? void 0 : relationObject.attrList, ["id", nameKey])) === null || _find === void 0 ? void 0 : _find.name) !== null && _find$name !== void 0 ? _find$name : nameKey;
|
|
172
134
|
const id = `${objectId}.${nameKey}`;
|
|
173
135
|
const name = `${relation[`${sides.this}_name`]}(${nameOfNameKey})`;
|
|
@@ -191,45 +153,35 @@ function translateConditions(aq, idObjectMap, modelData, t) {
|
|
|
191
153
|
});
|
|
192
154
|
});
|
|
193
155
|
const attrAndRelationList = [...modelData.attrList, ...relations];
|
|
194
|
-
|
|
195
156
|
if (!(0, _lodash.isEmpty)(aq)) {
|
|
196
157
|
for (const query of aq) {
|
|
197
158
|
let queries = [query];
|
|
198
|
-
|
|
199
159
|
if (Object.keys(query)[0] === "$or" || Object.keys(query)[0] === "$and") {
|
|
200
160
|
queries = query[Object.keys(query)[0]];
|
|
201
161
|
}
|
|
202
|
-
|
|
203
162
|
queries.forEach(query => {
|
|
204
163
|
const key = Object.keys(query)[0];
|
|
205
164
|
const value = Object.values(query)[0];
|
|
206
165
|
let attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
|
|
207
|
-
|
|
208
166
|
if (Object.keys(value)[0] === _cmdbUtils.ElementOperators.Exists && attr.relationSideId) {
|
|
209
167
|
const relationSideId = attr.relationSideId;
|
|
210
168
|
attr = attrAndRelationList.find(attr => attr.id === `${relationSideId}.`) || attr;
|
|
211
169
|
}
|
|
212
|
-
|
|
213
170
|
if (attr) {
|
|
214
171
|
query = (0, _processors.changeQueryWithCustomRules)(modelData.objectId, attr.id, query);
|
|
215
172
|
const info = (0, _instanceListTable.getFieldConditionsAndValues)(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
|
|
216
|
-
|
|
217
173
|
if (![_instanceListTable.ConditionType.Between, _instanceListTable.ConditionType.Empty, _instanceListTable.ConditionType.NotEmpty, _instanceListTable.ConditionType.False, _instanceListTable.ConditionType.True].includes(info.currentCondition.type)) {
|
|
218
174
|
info.values = info.values.map(v => (0, _lodash.isString)(v) && v.includes(" ") ? v.replace(/^"+|"+$/g, "") : v);
|
|
219
175
|
}
|
|
220
|
-
|
|
221
176
|
let condition = `${attr.name}: ${info.currentCondition.label}`;
|
|
222
|
-
|
|
223
177
|
if (![_instanceListTable.ConditionType.Empty, _instanceListTable.ConditionType.NotEmpty].includes(info.currentCondition.type)) {
|
|
224
178
|
condition += `"${info.values.join(" ~ ")}"`;
|
|
225
179
|
}
|
|
226
|
-
|
|
227
180
|
const curCondition = {
|
|
228
181
|
attrId: key,
|
|
229
182
|
condition,
|
|
230
183
|
valuesStr: info.queryValuesStr
|
|
231
184
|
};
|
|
232
|
-
|
|
233
185
|
if (conditions.every(v => !(0, _lodash.isEqual)((0, _lodash.omit)(v, "attrId"), (0, _lodash.omit)(curCondition, "attrId")))) {
|
|
234
186
|
conditions.push(curCondition);
|
|
235
187
|
}
|
|
@@ -237,27 +189,20 @@ function translateConditions(aq, idObjectMap, modelData, t) {
|
|
|
237
189
|
});
|
|
238
190
|
}
|
|
239
191
|
}
|
|
240
|
-
|
|
241
192
|
return conditions;
|
|
242
193
|
}
|
|
243
|
-
|
|
244
194
|
function newKey(fieldIds, aq) {
|
|
245
195
|
let key = "";
|
|
246
|
-
|
|
247
196
|
if (!(0, _lodash.isEmpty)(fieldIds)) {
|
|
248
197
|
key += fieldIds.join("-");
|
|
249
198
|
}
|
|
250
|
-
|
|
251
199
|
if (!(0, _lodash.isEmpty)(aq)) {
|
|
252
200
|
key += `-${aq.length}`;
|
|
253
201
|
}
|
|
254
|
-
|
|
255
202
|
return key;
|
|
256
203
|
}
|
|
257
|
-
|
|
258
204
|
const isOfStruct = (modelData, fieldId) => {
|
|
259
205
|
var _modelData$attrList$f;
|
|
260
|
-
|
|
261
206
|
const structFields = (_modelData$attrList$f = modelData.attrList.filter(attr => attr.value.type === "struct" || attr.value.type === "structs")) === null || _modelData$attrList$f === void 0 ? void 0 : _modelData$attrList$f.map(attr => {
|
|
262
207
|
const structs = [];
|
|
263
208
|
attr.value.struct_define.forEach(struct => {
|
|
@@ -267,29 +212,23 @@ const isOfStruct = (modelData, fieldId) => {
|
|
|
267
212
|
}).flat();
|
|
268
213
|
return structFields.includes(fieldId);
|
|
269
214
|
};
|
|
270
|
-
|
|
271
215
|
const isOfBoolean = (attrList, fieldId) => {
|
|
272
216
|
var _keyAttrMap$fieldId;
|
|
273
|
-
|
|
274
217
|
const keyAttrMap = (0, _lodash.keyBy)(attrList, "id");
|
|
275
218
|
return ((_keyAttrMap$fieldId = keyAttrMap[fieldId]) === null || _keyAttrMap$fieldId === void 0 ? void 0 : _keyAttrMap$fieldId.value.type) === _ModelAttributeFormControl.ModelAttributeValueType.BOOLEAN;
|
|
276
219
|
};
|
|
277
|
-
|
|
278
220
|
const initAqToShow = (aq, modelData, isToShow = true) => {
|
|
279
221
|
let newAqToShow = [];
|
|
280
|
-
|
|
281
222
|
if (aq) {
|
|
282
223
|
aq.forEach(query => {
|
|
283
224
|
const aqToShow = Object.entries(query).map(([key, expressions]) => {
|
|
284
225
|
let newExpressions = [];
|
|
285
|
-
|
|
286
226
|
if (key === _cmdbUtils.LogicalOperators.Or || key === _cmdbUtils.LogicalOperators.And) {
|
|
287
227
|
const firstSubQuery = expressions[0];
|
|
288
228
|
const fieldId = Object.keys(firstSubQuery)[0];
|
|
289
229
|
const isStruct = isOfStruct(modelData, fieldId);
|
|
290
230
|
const isBool = isOfBoolean(modelData.attrList, fieldId);
|
|
291
231
|
const structQueries = expressions.filter(expression => Object.keys(expression)[0] === fieldId);
|
|
292
|
-
|
|
293
232
|
if (isStruct && isToShow) {
|
|
294
233
|
const structExpressions = structQueries.map(item => ({
|
|
295
234
|
[fieldId.split(".")[0]]: item[fieldId]
|
|
@@ -298,7 +237,6 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
|
|
|
298
237
|
} else if (isBool && !isToShow) {
|
|
299
238
|
const boolExpressions = expressions.map(expression => {
|
|
300
239
|
const targetValue = expression[fieldId];
|
|
301
|
-
|
|
302
240
|
if (typeof Object.values(targetValue)[0] === "string") {
|
|
303
241
|
return {
|
|
304
242
|
[fieldId]: {
|
|
@@ -313,7 +251,6 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
|
|
|
313
251
|
} else {
|
|
314
252
|
newExpressions = [...newExpressions, ...expressions];
|
|
315
253
|
}
|
|
316
|
-
|
|
317
254
|
return {
|
|
318
255
|
[key]: newExpressions
|
|
319
256
|
};
|
|
@@ -325,15 +262,11 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
|
|
|
325
262
|
});
|
|
326
263
|
return newAqToShow;
|
|
327
264
|
}
|
|
328
|
-
|
|
329
265
|
return;
|
|
330
266
|
};
|
|
331
|
-
|
|
332
267
|
exports.initAqToShow = initAqToShow;
|
|
333
|
-
|
|
334
268
|
function LegacyInstanceList(props) {
|
|
335
269
|
var _props$selectedRowKey, _state$appList, _props$extraFilterBri;
|
|
336
|
-
|
|
337
270
|
const {
|
|
338
271
|
showTooltip = true
|
|
339
272
|
} = props;
|
|
@@ -342,17 +275,19 @@ function LegacyInstanceList(props) {
|
|
|
342
275
|
name: _i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.ALL_CLUSTER}`)
|
|
343
276
|
}];
|
|
344
277
|
const jsonLocalStorage = new _storage.JsonStorage(localStorage);
|
|
345
|
-
|
|
346
278
|
const reducer = (prevState, updatedProperty) => {
|
|
347
|
-
return {
|
|
279
|
+
return {
|
|
280
|
+
...prevState,
|
|
348
281
|
...updatedProperty
|
|
349
282
|
};
|
|
350
|
-
};
|
|
283
|
+
};
|
|
284
|
+
// 资源自动发现页面24小时发现主机抽屉的实例列表处,通用的postSearchV3接口无法查到正确结果,需要用下面的接口替换,参数里也要加上jobId:***
|
|
351
285
|
// 为了不影响其他地方的实例列表,在该处加一个useAutoDiscoveryProvider参数,该参数为undefined或false的,仍调用原接口
|
|
352
286
|
|
|
353
|
-
|
|
354
287
|
const listProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.job@SearchResource:1.0.1");
|
|
355
|
-
const instanceArchiveListProvider = (0, _brickKit.useProvider)("providers-of-cmdb.instance-archive-api-list-archive-instance"
|
|
288
|
+
const instanceArchiveListProvider = (0, _brickKit.useProvider)("providers-of-cmdb.instance-archive-api-list-archive-instance", {
|
|
289
|
+
cache: false
|
|
290
|
+
});
|
|
356
291
|
const {
|
|
357
292
|
modelData,
|
|
358
293
|
idObjectMap
|
|
@@ -361,7 +296,6 @@ function LegacyInstanceList(props) {
|
|
|
361
296
|
const idObjectMap = {};
|
|
362
297
|
props.objectList.forEach(object => {
|
|
363
298
|
idObjectMap[object.objectId] = object;
|
|
364
|
-
|
|
365
299
|
if (object.objectId === props.objectId) {
|
|
366
300
|
modelData = object;
|
|
367
301
|
modelData.attrList = !props.disabledDefaultFields ? (0, _lodash.union)(object.attrList, _constants2.extraFieldAttrs) : object.attrList;
|
|
@@ -374,23 +308,18 @@ function LegacyInstanceList(props) {
|
|
|
374
308
|
}, [props.objectList, props.objectId]);
|
|
375
309
|
const [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = (0, _react.useState)({});
|
|
376
310
|
const [fixedHeader, setFixHeader] = (0, _react.useState)(false);
|
|
377
|
-
|
|
378
311
|
const fetchInheritanceModelIdNameMap = async modelData => {
|
|
379
312
|
let idNameMap = {};
|
|
380
|
-
|
|
381
313
|
if (modelData.isAbstract) {
|
|
382
314
|
idNameMap = await (0, _cmdbSdk.CmdbObjectApi_getIdMapName)({
|
|
383
315
|
parentObjectId: modelData.objectId
|
|
384
316
|
});
|
|
385
317
|
}
|
|
386
|
-
|
|
387
318
|
setInheritanceModelIdNameMap(idNameMap);
|
|
388
319
|
};
|
|
389
|
-
|
|
390
320
|
(0, _react.useEffect)(() => {
|
|
391
321
|
fetchInheritanceModelIdNameMap(modelData);
|
|
392
322
|
}, [modelData]);
|
|
393
|
-
|
|
394
323
|
const computeDefaultFields = ({
|
|
395
324
|
inModal
|
|
396
325
|
} = {
|
|
@@ -405,22 +334,18 @@ function LegacyInstanceList(props) {
|
|
|
405
334
|
return {
|
|
406
335
|
fieldIds
|
|
407
336
|
};
|
|
408
|
-
};
|
|
409
|
-
|
|
337
|
+
};
|
|
410
338
|
|
|
339
|
+
// 根据用户预定义的 presetConfigs.fieldIds 进行排序,如果不在预定义的字段,则根据 modelData.view.attr_order 进行排序
|
|
411
340
|
const _sortFieldIds = fieldIds => {
|
|
412
341
|
var _props$presetConfigs;
|
|
413
|
-
|
|
414
342
|
let frontFields = [];
|
|
415
343
|
let restFields = [];
|
|
416
|
-
|
|
417
344
|
if ((_props$presetConfigs = props.presetConfigs) !== null && _props$presetConfigs !== void 0 && _props$presetConfigs.fieldIds) {
|
|
418
345
|
frontFields = (0, _lodash.filter)(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
|
|
419
346
|
}
|
|
420
|
-
|
|
421
347
|
restFields = (0, _lodash.sortBy)((0, _lodash.reject)(fieldIds, id => frontFields.includes(id)), fieldId => {
|
|
422
348
|
const foundIndex = (0, _lodash.findIndex)(modelData.view.attr_order, orderId => orderId === fieldId);
|
|
423
|
-
|
|
424
349
|
if (foundIndex === -1) {
|
|
425
350
|
return null;
|
|
426
351
|
} else {
|
|
@@ -429,25 +354,19 @@ function LegacyInstanceList(props) {
|
|
|
429
354
|
});
|
|
430
355
|
return [...frontFields, ...restFields];
|
|
431
356
|
};
|
|
432
|
-
|
|
433
357
|
const getFields = () => {
|
|
434
358
|
var _props$presetConfigs2, _props$extraFixedFiel;
|
|
435
|
-
|
|
436
359
|
let fieldIds = (_props$presetConfigs2 = props.presetConfigs) === null || _props$presetConfigs2 === void 0 ? void 0 : _props$presetConfigs2.fieldIds;
|
|
437
360
|
const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
|
|
438
|
-
|
|
439
361
|
if ((0, _lodash.isEmpty)(fieldIds)) {
|
|
440
362
|
fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
|
|
441
363
|
}
|
|
442
|
-
|
|
443
364
|
if ((0, _lodash.isEmpty)(fieldIds)) {
|
|
444
365
|
fieldIds = computeDefaultFields().fieldIds;
|
|
445
366
|
}
|
|
446
|
-
|
|
447
367
|
if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
|
|
448
368
|
fieldIds = (0, _lodash.uniq)([...fieldIds, ...extraFixedFieldIds]);
|
|
449
369
|
}
|
|
450
|
-
|
|
451
370
|
fieldIds = props.extraDisabledField ? (0, _lodash.uniq)([...fieldIds, props.extraDisabledField]) : fieldIds;
|
|
452
371
|
fieldIds = _sortFieldIds(fieldIds);
|
|
453
372
|
const hideModelData = modelData.view.hide_columns || [];
|
|
@@ -455,11 +374,9 @@ function LegacyInstanceList(props) {
|
|
|
455
374
|
modelData.isAbstract && fieldIds.push("_object_id");
|
|
456
375
|
return fieldIds;
|
|
457
376
|
};
|
|
458
|
-
|
|
459
377
|
const [q, setQ] = (0, _react.useState)(props.q);
|
|
460
378
|
const [state, setState] = (0, _react.useReducer)(reducer, undefined, () => {
|
|
461
379
|
var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs3;
|
|
462
|
-
|
|
463
380
|
return {
|
|
464
381
|
objectId: props.objectId,
|
|
465
382
|
q: props.q,
|
|
@@ -494,26 +411,21 @@ function LegacyInstanceList(props) {
|
|
|
494
411
|
const [selectedRowKeys, setSelectedRowKeys] = (0, _react.useState)((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
|
|
495
412
|
const cache = (0, _react.useRef)(new Map());
|
|
496
413
|
const isFirstRunRef = (0, _react.useRef)(true);
|
|
497
|
-
|
|
498
414
|
const getInstanceListData = async (sort, asc, page) => {
|
|
499
415
|
var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
|
|
500
|
-
|
|
501
416
|
const data = {};
|
|
502
417
|
const v3Data = {
|
|
503
418
|
fields: props !== null && props !== void 0 && props.extraFixedFields ? (0, _lodash.uniq)(["instanceId"].concat(props === null || props === void 0 ? void 0 : props.extraFixedFields)) : ["instanceId"]
|
|
504
419
|
};
|
|
505
|
-
|
|
506
420
|
if (!(0, _lodash.isEmpty)(props.permission)) {
|
|
507
421
|
v3Data.permission = data.permission = props.permission;
|
|
508
422
|
}
|
|
509
|
-
|
|
510
423
|
const archiveData = {};
|
|
511
424
|
let query = {};
|
|
512
425
|
v3Data.page = data.page = archiveData.page = page;
|
|
513
426
|
v3Data["page_size"] = data["page_size"] = archiveData["page_size"] = state.pageSize;
|
|
514
427
|
const sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList = modelData.attrList) === null || _modelData$attrList === void 0 ? void 0 : (_modelData$attrList$f2 = _modelData$attrList.find(attr => attr.id === sort)) === null || _modelData$attrList$f2 === void 0 ? void 0 : (_modelData$attrList$f3 = _modelData$attrList$f2.value) === null || _modelData$attrList$f3 === void 0 ? void 0 : _modelData$attrList$f3.default_type;
|
|
515
428
|
const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
|
|
516
|
-
|
|
517
429
|
if (sort) {
|
|
518
430
|
data.sort = {
|
|
519
431
|
[sort]: order
|
|
@@ -523,23 +435,18 @@ function LegacyInstanceList(props) {
|
|
|
523
435
|
order
|
|
524
436
|
}];
|
|
525
437
|
}
|
|
526
|
-
|
|
527
438
|
if (state.q) {
|
|
528
439
|
query = getQuery(modelData, idObjectMap, state.q, state.fieldIds, props.onlySearchByIp);
|
|
529
440
|
}
|
|
530
|
-
|
|
531
441
|
if (state.q && props.useInstanceArchiveProvider) {
|
|
532
442
|
archiveData.key_word = state.q;
|
|
533
443
|
}
|
|
534
|
-
|
|
535
444
|
if (!(0, _lodash.isEmpty)(state.aq)) {
|
|
536
445
|
query[_cmdbUtils.LogicalOperators.And] = state.aq;
|
|
537
446
|
}
|
|
538
|
-
|
|
539
447
|
if (!(0, _lodash.isEmpty)(props.defaultQuery)) {
|
|
540
448
|
query[_cmdbUtils.LogicalOperators.And] = [...(query[_cmdbUtils.LogicalOperators.And] || []), ...props.defaultQuery];
|
|
541
449
|
}
|
|
542
|
-
|
|
543
450
|
if (props.presetConfigs) {
|
|
544
451
|
if (!(0, _lodash.isEmpty)(props.presetConfigs.query)) {
|
|
545
452
|
if (Object.keys(query).length) {
|
|
@@ -551,51 +458,44 @@ function LegacyInstanceList(props) {
|
|
|
551
458
|
}
|
|
552
459
|
}
|
|
553
460
|
}
|
|
554
|
-
|
|
555
461
|
if (state.fieldIds) {
|
|
556
462
|
data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
|
|
557
463
|
v3Data.fields = [...state.fieldIds, ...v3Data.fields];
|
|
558
464
|
v3Data.ignore_missing_field_error = true;
|
|
559
465
|
}
|
|
560
|
-
|
|
561
466
|
if (props.useAutoDiscoveryProvider) {
|
|
562
467
|
v3Data.fields = joinRelationFieldAndShowkey(v3Data.fields, modelData, props.objectList);
|
|
563
468
|
}
|
|
564
|
-
|
|
565
469
|
if (props.useInstanceArchiveProvider) {
|
|
566
470
|
archiveData.fields = v3Data.fields.join(",");
|
|
567
471
|
}
|
|
568
|
-
|
|
569
472
|
if (state.aliveHosts && props.objectId === "HOST") {
|
|
570
|
-
query = {
|
|
473
|
+
query = {
|
|
474
|
+
...query,
|
|
571
475
|
_agentStatus: "正常"
|
|
572
476
|
};
|
|
573
477
|
}
|
|
574
|
-
|
|
575
478
|
if (state.instanceSourceQuery) {
|
|
576
|
-
query = {
|
|
479
|
+
query = {
|
|
480
|
+
...query,
|
|
577
481
|
_object_id: state.instanceSourceQuery
|
|
578
482
|
};
|
|
579
483
|
}
|
|
580
|
-
|
|
581
484
|
if (!(0, _lodash.isEmpty)(query)) {
|
|
582
485
|
v3Data.query = data.query = query;
|
|
583
|
-
}
|
|
584
|
-
|
|
486
|
+
}
|
|
487
|
+
// useAutoDiscoveryProvider=true, 使用useProvider的接口,请求参数里加上extraParams
|
|
585
488
|
|
|
586
489
|
if (props.useAutoDiscoveryProvider && !(0, _lodash.isEmpty)(props.extraParams)) {
|
|
587
490
|
Object.assign(v3Data, props.extraParams);
|
|
588
491
|
}
|
|
589
|
-
|
|
590
492
|
if (state.relatedToMe) {
|
|
591
493
|
v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
|
|
592
|
-
}
|
|
494
|
+
}
|
|
495
|
+
//按应用筛选
|
|
593
496
|
// istanbul ignore next (state is not updated)
|
|
594
|
-
|
|
595
|
-
|
|
596
497
|
if (state.searchByApp) {
|
|
597
498
|
var _props$presetConfigs4, _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8;
|
|
598
|
-
|
|
599
499
|
const hostRange = (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : (_props$presetConfigs5 = _props$presetConfigs4.query) === null || _props$presetConfigs5 === void 0 ? void 0 : (_props$presetConfigs6 = _props$presetConfigs5["$and"]) === null || _props$presetConfigs6 === void 0 ? void 0 : (_props$presetConfigs7 = _props$presetConfigs6.find(i => i.instanceId)) === null || _props$presetConfigs7 === void 0 ? void 0 : (_props$presetConfigs8 = _props$presetConfigs7.instanceId) === null || _props$presetConfigs8 === void 0 ? void 0 : _props$presetConfigs8["$in"];
|
|
600
500
|
v3Data.query = {
|
|
601
501
|
[state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId,
|
|
@@ -609,21 +509,17 @@ function LegacyInstanceList(props) {
|
|
|
609
509
|
} : {})
|
|
610
510
|
};
|
|
611
511
|
}
|
|
612
|
-
|
|
613
512
|
if (props.useInstanceArchiveProvider) {
|
|
614
513
|
return instanceArchiveListProvider.query([props.objectId, archiveData]);
|
|
615
514
|
}
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
515
|
+
const promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data);
|
|
516
|
+
// useAutoDiscoveryProvider=true, 使用useProvider的接口
|
|
619
517
|
return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
|
|
620
518
|
};
|
|
621
|
-
|
|
622
519
|
const refreshInstanceList = async (sort, asc, page) => {
|
|
623
520
|
setState({
|
|
624
521
|
loading: true
|
|
625
522
|
});
|
|
626
|
-
|
|
627
523
|
try {
|
|
628
524
|
if (props.dataSource) {
|
|
629
525
|
setState({
|
|
@@ -657,16 +553,13 @@ function LegacyInstanceList(props) {
|
|
|
657
553
|
});
|
|
658
554
|
}
|
|
659
555
|
};
|
|
660
|
-
|
|
661
556
|
(0, _react.useEffect)(() => {
|
|
662
557
|
var _props$presetConfigs9;
|
|
663
|
-
|
|
664
558
|
const fieldIds = getFields();
|
|
665
|
-
|
|
666
|
-
|
|
559
|
+
if (
|
|
560
|
+
// 当 props.objectId 改变时,总是更新 state.fieldIds
|
|
667
561
|
props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.isEqual)((_props$presetConfigs9 = props.presetConfigs) === null || _props$presetConfigs9 === void 0 ? void 0 : _props$presetConfigs9.query, state.presetConfigsQuery)) {
|
|
668
562
|
var _props$presetConfigs10;
|
|
669
|
-
|
|
670
563
|
setState({
|
|
671
564
|
fieldIds,
|
|
672
565
|
presetConfigsQuery: (_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query
|
|
@@ -675,21 +568,18 @@ function LegacyInstanceList(props) {
|
|
|
675
568
|
}, [props.objectId, props.presetConfigs]);
|
|
676
569
|
(0, _react.useEffect)(() => {
|
|
677
570
|
var _props$selectedRowKey2;
|
|
678
|
-
|
|
679
571
|
setSelectedRowKeys((_props$selectedRowKey2 = props.selectedRowKeys) !== null && _props$selectedRowKey2 !== void 0 ? _props$selectedRowKey2 : []);
|
|
680
|
-
}, [props.objectId, props.selectedRowKeys]);
|
|
572
|
+
}, [props.objectId, props.selectedRowKeys]);
|
|
681
573
|
|
|
574
|
+
// on filter condition change
|
|
682
575
|
(0, _react.useEffect)(() => {
|
|
683
576
|
if (isFirstRunRef.current) {
|
|
684
577
|
isFirstRunRef.current = false;
|
|
685
578
|
return;
|
|
686
579
|
}
|
|
687
|
-
|
|
688
580
|
let skip = false;
|
|
689
|
-
|
|
690
581
|
if (state.page !== 1) {
|
|
691
582
|
var _props$onPaginationCh;
|
|
692
|
-
|
|
693
583
|
setState({
|
|
694
584
|
page: 1
|
|
695
585
|
});
|
|
@@ -698,45 +588,40 @@ function LegacyInstanceList(props) {
|
|
|
698
588
|
pageSize: state.pageSize
|
|
699
589
|
});
|
|
700
590
|
skip = true;
|
|
701
|
-
}
|
|
702
|
-
|
|
591
|
+
}
|
|
703
592
|
|
|
593
|
+
// 当 prop.objectId 改变时先跳过,等 state.fieldIds 更新后再获取数据
|
|
704
594
|
if (props.objectId !== state.objectId) {
|
|
705
595
|
setState({
|
|
706
596
|
objectId: props.objectId
|
|
707
597
|
});
|
|
708
598
|
skip = true;
|
|
709
599
|
}
|
|
710
|
-
|
|
711
600
|
if (skip) {
|
|
712
601
|
return;
|
|
713
602
|
}
|
|
714
|
-
|
|
715
603
|
refreshInstanceList(state.sort, state.asc, 1);
|
|
716
|
-
}, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
|
|
604
|
+
}, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
|
|
717
605
|
|
|
606
|
+
// on other condition change
|
|
718
607
|
(0, _react.useEffect)(() => {
|
|
719
608
|
if ((0, _lodash.isEmpty)(state.fieldIds)) return;
|
|
720
609
|
refreshInstanceList(state.sort, state.asc, state.page);
|
|
721
610
|
}, [state.page, state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
|
|
722
|
-
|
|
723
611
|
const onChange = e => {
|
|
724
612
|
setQ(e.target.value);
|
|
725
|
-
};
|
|
726
|
-
|
|
613
|
+
};
|
|
727
614
|
|
|
615
|
+
// istanbul ignore next
|
|
728
616
|
const onSelectionChange = (0, _react.useCallback)(async selected => {
|
|
729
617
|
var _props$onSelectionCha;
|
|
730
|
-
|
|
731
618
|
let {
|
|
732
619
|
selectedItems,
|
|
733
620
|
selectedKeys
|
|
734
621
|
} = selected;
|
|
735
622
|
setSelectedRowKeys(selectedKeys);
|
|
736
|
-
|
|
737
623
|
if (selectedKeys.length > (0, _lodash.compact)(selectedItems).length) {
|
|
738
624
|
const ids = selectedKeys.filter(id => !cache.current.has(id));
|
|
739
|
-
|
|
740
625
|
if (ids.length) {
|
|
741
626
|
let resp;
|
|
742
627
|
const params = {
|
|
@@ -747,39 +632,32 @@ function LegacyInstanceList(props) {
|
|
|
747
632
|
}
|
|
748
633
|
},
|
|
749
634
|
page_size: ids.length
|
|
750
|
-
};
|
|
751
|
-
|
|
635
|
+
};
|
|
636
|
+
// useAutoDiscoveryProvider=true, 使用useProvider的接口,虽然这里列表用不到选择功能,但还是加上保持统一
|
|
752
637
|
if (props.useAutoDiscoveryProvider) {
|
|
753
638
|
resp = await listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
|
|
754
639
|
} else {
|
|
755
640
|
resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, params);
|
|
756
641
|
}
|
|
757
|
-
|
|
758
642
|
resp.list.forEach(i => cache.current.set(i.instanceId, i));
|
|
759
643
|
}
|
|
760
|
-
|
|
761
644
|
selectedItems = selectedKeys.map(id => cache.current.get(id));
|
|
762
645
|
}
|
|
763
|
-
|
|
764
646
|
(_props$onSelectionCha = props.onSelectionChange) === null || _props$onSelectionCha === void 0 ? void 0 : _props$onSelectionCha.call(props, {
|
|
765
647
|
selectedItems,
|
|
766
648
|
selectedKeys
|
|
767
649
|
});
|
|
768
650
|
}, []);
|
|
769
|
-
|
|
770
651
|
const onSearch = value => {
|
|
771
652
|
var _props$onSearch;
|
|
772
|
-
|
|
773
653
|
const q = value.trim();
|
|
774
654
|
setState({
|
|
775
655
|
q
|
|
776
656
|
});
|
|
777
657
|
(_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, q);
|
|
778
658
|
};
|
|
779
|
-
|
|
780
659
|
const onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
|
|
781
660
|
var _props$onAdvancedSear;
|
|
782
|
-
|
|
783
661
|
setState({
|
|
784
662
|
aq: queries,
|
|
785
663
|
fieldToShow,
|
|
@@ -787,18 +665,14 @@ function LegacyInstanceList(props) {
|
|
|
787
665
|
});
|
|
788
666
|
(_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
|
|
789
667
|
};
|
|
790
|
-
|
|
791
668
|
const onSortingChange = (0, _react.useCallback)(info => {
|
|
792
669
|
var _props$onSortingChang;
|
|
793
|
-
|
|
794
670
|
let asc;
|
|
795
671
|
let sort;
|
|
796
|
-
|
|
797
672
|
if (info.asc === undefined) {
|
|
798
673
|
if (!state.sort) {
|
|
799
674
|
return;
|
|
800
675
|
}
|
|
801
|
-
|
|
802
676
|
setState({
|
|
803
677
|
asc: undefined,
|
|
804
678
|
sort: undefined
|
|
@@ -811,12 +685,10 @@ function LegacyInstanceList(props) {
|
|
|
811
685
|
asc = info.asc;
|
|
812
686
|
sort = info.sort;
|
|
813
687
|
}
|
|
814
|
-
|
|
815
688
|
(_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
|
|
816
689
|
}, [state.sort]);
|
|
817
690
|
const onPaginationChange = (0, _react.useCallback)(pagination => {
|
|
818
691
|
var _props$onPaginationCh2;
|
|
819
|
-
|
|
820
692
|
setState({
|
|
821
693
|
page: pagination.page,
|
|
822
694
|
pageSize: pagination.pageSize
|
|
@@ -825,42 +697,34 @@ function LegacyInstanceList(props) {
|
|
|
825
697
|
}, []);
|
|
826
698
|
const onInstanceSourceChange = (0, _react.useCallback)(instanceSourceQuery => {
|
|
827
699
|
var _props$onInstanceSour;
|
|
828
|
-
|
|
829
700
|
setState({
|
|
830
701
|
instanceSourceQuery
|
|
831
702
|
});
|
|
832
703
|
(_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
|
|
833
704
|
}, []);
|
|
834
|
-
|
|
835
705
|
const onRelatedToMeChange = checked => {
|
|
836
706
|
var _props$onRelatedToMeC;
|
|
837
|
-
|
|
838
707
|
setState({
|
|
839
708
|
relatedToMe: checked
|
|
840
709
|
});
|
|
841
710
|
(_props$onRelatedToMeC = props.onRelatedToMeChange) === null || _props$onRelatedToMeC === void 0 ? void 0 : _props$onRelatedToMeC.call(props, checked);
|
|
842
711
|
};
|
|
843
|
-
|
|
844
712
|
const onAliveHostsChange = checked => {
|
|
845
713
|
var _props$onAliveHostsCh;
|
|
846
|
-
|
|
847
714
|
setState({
|
|
848
715
|
aliveHosts: checked
|
|
849
716
|
});
|
|
850
717
|
(_props$onAliveHostsCh = props.onAliveHostsChange) === null || _props$onAliveHostsCh === void 0 ? void 0 : _props$onAliveHostsCh.call(props, checked);
|
|
851
718
|
};
|
|
852
|
-
|
|
853
719
|
const toggleAutoBreakLine = autoBreakLine => {
|
|
854
720
|
setState({
|
|
855
721
|
autoBreakLine
|
|
856
722
|
});
|
|
857
|
-
};
|
|
858
|
-
|
|
859
|
-
|
|
723
|
+
};
|
|
724
|
+
// istanbul ignore next (state is not updated)
|
|
860
725
|
const toggleSearchMode = _react.default.useCallback(async () => {
|
|
861
726
|
if (!state.searchByApp) {
|
|
862
727
|
var _appListResp$list, _appListResp$list2, _appListResp$list3;
|
|
863
|
-
|
|
864
728
|
const appListResp = await (0, _cmdbSdk.InstanceApi_postSearchV3)("APP", {
|
|
865
729
|
fields: ["clusters", "instanceId", "name"],
|
|
866
730
|
sort: [{
|
|
@@ -885,9 +749,8 @@ function LegacyInstanceList(props) {
|
|
|
885
749
|
page: 1
|
|
886
750
|
});
|
|
887
751
|
}
|
|
888
|
-
}, [state.searchByApp]);
|
|
889
|
-
|
|
890
|
-
|
|
752
|
+
}, [state.searchByApp]);
|
|
753
|
+
// istanbul ignore next (state is not updated)
|
|
891
754
|
const appSelectChange = v => {
|
|
892
755
|
setState({
|
|
893
756
|
appSearchInstanceId: v,
|
|
@@ -896,9 +759,8 @@ function LegacyInstanceList(props) {
|
|
|
896
759
|
clusterValue: "all",
|
|
897
760
|
clusterList: [...baseList, ...state.appList.find(r => r.instanceId === v).clusters]
|
|
898
761
|
});
|
|
899
|
-
};
|
|
900
|
-
|
|
901
|
-
|
|
762
|
+
};
|
|
763
|
+
// istanbul ignore next (state is not updated)
|
|
902
764
|
const clusterSelectChange = v => {
|
|
903
765
|
setState({
|
|
904
766
|
appSearchInstanceId: v === "all" ? state.appSelectValue : v,
|
|
@@ -906,27 +768,23 @@ function LegacyInstanceList(props) {
|
|
|
906
768
|
clusterValue: v
|
|
907
769
|
});
|
|
908
770
|
};
|
|
909
|
-
|
|
910
771
|
const defaultFields = (0, _react.useMemo)(() => {
|
|
911
772
|
var _props$presetConfigs11, _props$extraFixedFiel2;
|
|
912
|
-
|
|
913
773
|
let defaultFields;
|
|
914
774
|
const fieldIds = (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.fieldIds,
|
|
915
|
-
|
|
916
|
-
|
|
775
|
+
extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
|
|
917
776
|
if (!(0, _lodash.isEmpty)(fieldIds)) {
|
|
918
777
|
defaultFields = props.presetConfigs.fieldIds;
|
|
919
778
|
} else {
|
|
920
779
|
defaultFields = computeDefaultFields().fieldIds;
|
|
921
780
|
}
|
|
922
|
-
|
|
923
781
|
if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
|
|
924
782
|
defaultFields = (0, _lodash.uniq)([...defaultFields, ...extraFixedFieldIds]);
|
|
925
783
|
}
|
|
926
|
-
|
|
927
784
|
return defaultFields;
|
|
928
|
-
}, [props.presetConfigs, modelData]);
|
|
785
|
+
}, [props.presetConfigs, modelData]);
|
|
929
786
|
|
|
787
|
+
// istanbul ignore next
|
|
930
788
|
const handleConfirm = ({
|
|
931
789
|
fields,
|
|
932
790
|
isReset
|
|
@@ -947,78 +805,61 @@ function LegacyInstanceList(props) {
|
|
|
947
805
|
props.onFieldsModalConfirm(fields);
|
|
948
806
|
}
|
|
949
807
|
};
|
|
950
|
-
|
|
951
808
|
(0, _react.useEffect)(() => {
|
|
952
809
|
var _props$notifyCurrentF;
|
|
953
|
-
|
|
954
810
|
(_props$notifyCurrentF = props.notifyCurrentFields) === null || _props$notifyCurrentF === void 0 ? void 0 : _props$notifyCurrentF.call(props, state.fieldIds);
|
|
955
|
-
}, [props.notifyCurrentFields]);
|
|
811
|
+
}, [props.notifyCurrentFields]);
|
|
956
812
|
|
|
813
|
+
// istanbul ignore next
|
|
957
814
|
(0, _react.useEffect)(() => {
|
|
958
815
|
var _props$selectedRowKey3;
|
|
959
|
-
|
|
960
816
|
((_props$selectedRowKey3 = props.selectedRowKeys) === null || _props$selectedRowKey3 === void 0 ? void 0 : _props$selectedRowKey3.length) && (async () => {
|
|
961
817
|
const data = {};
|
|
962
818
|
const v3Data = {
|
|
963
819
|
fields: ["instanceId"]
|
|
964
820
|
};
|
|
965
|
-
|
|
966
821
|
if (!(0, _lodash.isEmpty)(props.permission)) {
|
|
967
822
|
v3Data.permission = data.permission = props.permission;
|
|
968
823
|
}
|
|
969
|
-
|
|
970
824
|
if (state.fieldIds) {
|
|
971
825
|
data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
|
|
972
826
|
v3Data.fields = [...state.fieldIds, ...v3Data.fields];
|
|
973
827
|
v3Data.ignore_missing_field_error = true;
|
|
974
828
|
}
|
|
975
|
-
|
|
976
829
|
v3Data.query = {
|
|
977
830
|
instanceId: {
|
|
978
831
|
$in: props.selectedRowKeys
|
|
979
832
|
}
|
|
980
833
|
};
|
|
981
834
|
v3Data.page_size = props.selectedRowKeys.length;
|
|
982
|
-
|
|
983
835
|
if (state.relatedToMe) {
|
|
984
836
|
v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
|
|
985
837
|
}
|
|
986
|
-
|
|
987
838
|
if (props.extraParams) {
|
|
988
839
|
Object.assign(v3Data, props.extraParams);
|
|
989
840
|
}
|
|
990
|
-
|
|
991
841
|
let resp;
|
|
992
|
-
|
|
993
842
|
if (props.useAutoDiscoveryProvider) {
|
|
994
843
|
resp = await listProvider.query([props.objectId, v3Data]);
|
|
995
844
|
} else {
|
|
996
845
|
resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
|
|
997
846
|
}
|
|
998
|
-
|
|
999
847
|
resp.list.forEach(i => cache.current.set(i.instanceId, i));
|
|
1000
848
|
})();
|
|
1001
849
|
}, [props.selectedRowKeys]);
|
|
1002
|
-
|
|
1003
850
|
const handleToggleFixHeader = () => {
|
|
1004
851
|
setFixHeader(!fixedHeader);
|
|
1005
852
|
};
|
|
1006
|
-
|
|
1007
853
|
const onAdvancedSearchCloseGen = (attrId, valuesStr) => {
|
|
1008
854
|
return () => {
|
|
1009
855
|
var _props$onAdvancedSear2;
|
|
1010
|
-
|
|
1011
856
|
const queries = [];
|
|
1012
857
|
const queriesToShow = [];
|
|
1013
|
-
|
|
1014
858
|
const filterAq = queries => queries.filter(v => isValueEqualFn(v, attrId, valuesStr));
|
|
1015
|
-
|
|
1016
859
|
state.aq.forEach(query => {
|
|
1017
860
|
const key = Object.keys(query)[0];
|
|
1018
|
-
|
|
1019
861
|
if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
|
|
1020
862
|
const filteredSubQueries = filterAq(query[key]);
|
|
1021
|
-
|
|
1022
863
|
if (filteredSubQueries.length > 0) {
|
|
1023
864
|
queries.push({
|
|
1024
865
|
[key]: filteredSubQueries
|
|
@@ -1029,10 +870,10 @@ function LegacyInstanceList(props) {
|
|
|
1029
870
|
if (!Array.isArray(query[key]) && isSpecialFn(query, key)) {
|
|
1030
871
|
queries.push(query);
|
|
1031
872
|
} else {
|
|
1032
|
-
const fieldId = Object.keys(query[key][0])[0];
|
|
1033
|
-
|
|
1034
|
-
const isStruct = isOfStruct(modelData, fieldId);
|
|
1035
|
-
|
|
873
|
+
const fieldId = Object.keys(query[key][0])[0];
|
|
874
|
+
// 判断是否为结构体
|
|
875
|
+
const isStruct = isOfStruct(modelData, fieldId);
|
|
876
|
+
// 结构体情况处理
|
|
1036
877
|
if (!((key === "$or" || key === "$and") && (0, _lodash.startsWith)(fieldId, `${attrId}.`) && isStruct)) {
|
|
1037
878
|
queries.push(query);
|
|
1038
879
|
}
|
|
@@ -1043,10 +884,8 @@ function LegacyInstanceList(props) {
|
|
|
1043
884
|
});
|
|
1044
885
|
state.aqToShow.forEach(query => {
|
|
1045
886
|
const key = Object.keys(query)[0];
|
|
1046
|
-
|
|
1047
887
|
if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
|
|
1048
888
|
const filteredSubQueries = filterAq(query[key]);
|
|
1049
|
-
|
|
1050
889
|
if (filteredSubQueries.length > 0) {
|
|
1051
890
|
queriesToShow.push({
|
|
1052
891
|
[key]: filteredSubQueries
|
|
@@ -1065,7 +904,6 @@ function LegacyInstanceList(props) {
|
|
|
1065
904
|
(_props$onAdvancedSear2 = props.onAdvancedSearch) === null || _props$onAdvancedSear2 === void 0 ? void 0 : _props$onAdvancedSear2.call(props, queries);
|
|
1066
905
|
};
|
|
1067
906
|
};
|
|
1068
|
-
|
|
1069
907
|
const conditions = translateConditions(state.aqToShow, idObjectMap, modelData);
|
|
1070
908
|
return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
|
|
1071
909
|
spinning: state.loading
|
|
@@ -1241,13 +1079,12 @@ function LegacyInstanceList(props) {
|
|
|
1241
1079
|
rowSelectionType: props.rowSelectionType
|
|
1242
1080
|
})) : null);
|
|
1243
1081
|
}
|
|
1082
|
+
|
|
1244
1083
|
/**
|
|
1245
1084
|
* 把 objectList 封装到构件中请求,废弃掉通过老模板使用的方式,可直接使用构件。
|
|
1246
1085
|
* 同时也兼容之前的使用方式,对于外部传进来的会优先使用外部的数据,构件内部不会额外请求,
|
|
1247
1086
|
* 不传的话构件内部做请求,并作缓存
|
|
1248
1087
|
*/
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
1088
|
function InstanceList(props) {
|
|
1252
1089
|
const [objectList, setObjectList] = (0, _react.useState)(props.objectList);
|
|
1253
1090
|
(0, _react.useEffect)(() => {
|
|
@@ -1257,7 +1094,6 @@ function InstanceList(props) {
|
|
|
1257
1094
|
(async () => {
|
|
1258
1095
|
if (!props.objectList) {
|
|
1259
1096
|
const cacheData = _constants2.objectListCache.get(props.objectId);
|
|
1260
|
-
|
|
1261
1097
|
if (cacheData) {
|
|
1262
1098
|
setObjectList(cacheData);
|
|
1263
1099
|
} else {
|
|
@@ -1266,7 +1102,6 @@ function InstanceList(props) {
|
|
|
1266
1102
|
ref_object: props.objectId
|
|
1267
1103
|
})).data;
|
|
1268
1104
|
setObjectList(list);
|
|
1269
|
-
|
|
1270
1105
|
_constants2.objectListCache.set(props.objectId, list);
|
|
1271
1106
|
} catch (e) {
|
|
1272
1107
|
// istanbul ignore next
|