@next-libs/cmdb-instances 7.6.4 → 7.6.5
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.
|
@@ -316,12 +316,13 @@ function LegacyInstanceList(props) {
|
|
|
316
316
|
const fetchInheritanceModelIdNameMap = async modelData => {
|
|
317
317
|
let idNameMap = {};
|
|
318
318
|
if (modelData.isAbstract) {
|
|
319
|
+
var _props$presetConfigs;
|
|
319
320
|
idNameMap = await (0, _cmdbSdk.CmdbObjectApi_getIdMapName)({
|
|
320
321
|
parentObjectId: modelData.objectId
|
|
321
322
|
});
|
|
322
323
|
props.showFilterInstanceSource && jsonLocalStorage.setItem(`instances-sources-objectId-name-map`, {
|
|
323
324
|
parentObjectId: modelData.objectId,
|
|
324
|
-
query: props.presetConfigs.query,
|
|
325
|
+
query: (_props$presetConfigs = props.presetConfigs) === null || _props$presetConfigs === void 0 ? void 0 : _props$presetConfigs.query,
|
|
325
326
|
idNameMap
|
|
326
327
|
});
|
|
327
328
|
}
|
|
@@ -348,10 +349,10 @@ function LegacyInstanceList(props) {
|
|
|
348
349
|
|
|
349
350
|
// 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
|
|
350
351
|
const _sortFieldIds = fieldIds => {
|
|
351
|
-
var _props$
|
|
352
|
+
var _props$presetConfigs2;
|
|
352
353
|
let frontFields = [];
|
|
353
354
|
let restFields = [];
|
|
354
|
-
if ((_props$
|
|
355
|
+
if ((_props$presetConfigs2 = props.presetConfigs) !== null && _props$presetConfigs2 !== void 0 && _props$presetConfigs2.fieldIds) {
|
|
355
356
|
frontFields = (0, _lodash.filter)(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
|
|
356
357
|
}
|
|
357
358
|
restFields = (0, _lodash.sortBy)((0, _lodash.reject)(fieldIds, id => frontFields.includes(id)), fieldId => {
|
|
@@ -365,8 +366,8 @@ function LegacyInstanceList(props) {
|
|
|
365
366
|
return [...frontFields, ...restFields];
|
|
366
367
|
};
|
|
367
368
|
const getFields = () => {
|
|
368
|
-
var _props$
|
|
369
|
-
let fieldIds = (_props$
|
|
369
|
+
var _props$presetConfigs3, _props$extraFixedFiel;
|
|
370
|
+
let fieldIds = (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds;
|
|
370
371
|
const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
|
|
371
372
|
if ((0, _lodash.isEmpty)(fieldIds)) {
|
|
372
373
|
fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
|
|
@@ -386,7 +387,7 @@ function LegacyInstanceList(props) {
|
|
|
386
387
|
};
|
|
387
388
|
const [q, setQ] = (0, _react.useState)(props.q);
|
|
388
389
|
const [state, setState] = (0, _react.useReducer)(reducer, undefined, () => {
|
|
389
|
-
var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2, _props$
|
|
390
|
+
var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs4;
|
|
390
391
|
return {
|
|
391
392
|
objectId: props.objectId,
|
|
392
393
|
q: props.q,
|
|
@@ -407,7 +408,7 @@ function LegacyInstanceList(props) {
|
|
|
407
408
|
failed: false,
|
|
408
409
|
isAdvancedSearchVisible: false,
|
|
409
410
|
fieldIds: getFields(),
|
|
410
|
-
presetConfigsQuery: (_props$
|
|
411
|
+
presetConfigsQuery: (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : _props$presetConfigs4.query,
|
|
411
412
|
autoBreakLine: false,
|
|
412
413
|
appSearchInstanceId: "",
|
|
413
414
|
currentChangeSelect: "App",
|
|
@@ -508,8 +509,8 @@ function LegacyInstanceList(props) {
|
|
|
508
509
|
//按应用筛选
|
|
509
510
|
// istanbul ignore next (state is not updated)
|
|
510
511
|
if (state.searchByApp) {
|
|
511
|
-
var _props$
|
|
512
|
-
const hostRange = (_props$
|
|
512
|
+
var _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8, _props$presetConfigs9;
|
|
513
|
+
const hostRange = (_props$presetConfigs5 = props.presetConfigs) === null || _props$presetConfigs5 === void 0 ? void 0 : (_props$presetConfigs6 = _props$presetConfigs5.query) === null || _props$presetConfigs6 === void 0 ? void 0 : (_props$presetConfigs7 = _props$presetConfigs6["$and"]) === null || _props$presetConfigs7 === void 0 ? void 0 : (_props$presetConfigs8 = _props$presetConfigs7.find(i => i.instanceId)) === null || _props$presetConfigs8 === void 0 ? void 0 : (_props$presetConfigs9 = _props$presetConfigs8.instanceId) === null || _props$presetConfigs9 === void 0 ? void 0 : _props$presetConfigs9["$in"];
|
|
513
514
|
v3Data.query = {
|
|
514
515
|
[state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId,
|
|
515
516
|
...(!(0, _lodash.isEmpty)(hostRange) && props.limitInstanceRange ? {
|
|
@@ -567,15 +568,15 @@ function LegacyInstanceList(props) {
|
|
|
567
568
|
}
|
|
568
569
|
};
|
|
569
570
|
(0, _react.useEffect)(() => {
|
|
570
|
-
var _props$
|
|
571
|
+
var _props$presetConfigs10;
|
|
571
572
|
const fieldIds = getFields();
|
|
572
573
|
if (
|
|
573
574
|
// 当 props.objectId 改变时，总是更新 state.fieldIds
|
|
574
|
-
props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.isEqual)((_props$
|
|
575
|
-
var _props$
|
|
575
|
+
props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.isEqual)((_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query, state.presetConfigsQuery)) {
|
|
576
|
+
var _props$presetConfigs11;
|
|
576
577
|
setState({
|
|
577
578
|
fieldIds,
|
|
578
|
-
presetConfigsQuery: (_props$
|
|
579
|
+
presetConfigsQuery: (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.query
|
|
579
580
|
});
|
|
580
581
|
}
|
|
581
582
|
}, [props.objectId, props.presetConfigs]);
|
|
@@ -788,9 +789,9 @@ function LegacyInstanceList(props) {
|
|
|
788
789
|
});
|
|
789
790
|
};
|
|
790
791
|
const defaultFields = (0, _react.useMemo)(() => {
|
|
791
|
-
var _props$
|
|
792
|
+
var _props$presetConfigs12, _props$extraFixedFiel2;
|
|
792
793
|
let defaultFields;
|
|
793
|
-
const fieldIds = (_props$
|
|
794
|
+
const fieldIds = (_props$presetConfigs12 = props.presetConfigs) === null || _props$presetConfigs12 === void 0 ? void 0 : _props$presetConfigs12.fieldIds,
|
|
794
795
|
extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
|
|
795
796
|
if (!(0, _lodash.isEmpty)(fieldIds)) {
|
|
796
797
|
defaultFields = props.presetConfigs.fieldIds;
|