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