@next-libs/cmdb-instances 7.6.4 → 7.6.5

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

@@ -300,12 +300,13 @@ export function LegacyInstanceList(props) {
     var _ref2 = _asyncToGenerator(function* (modelData) {
       var idNameMap = {};
       if (modelData.isAbstract) {
+        var _props$presetConfigs;
         idNameMap = yield CmdbObjectApi_getIdMapName({
           parentObjectId: modelData.objectId
         });
         props.showFilterInstanceSource && jsonLocalStorage.setItem("instances-sources-objectId-name-map", {
           parentObjectId: modelData.objectId,
-          query: props.presetConfigs.query,
+          query: (_props$presetConfigs = props.presetConfigs) === null || _props$presetConfigs === void 0 ? void 0 : _props$presetConfigs.query,
           idNameMap
         });
       }
@@ -337,10 +338,10 @@ export function LegacyInstanceList(props) {
 
   // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
   var _sortFieldIds = fieldIds => {
-    var _props$presetConfigs;
+    var _props$presetConfigs2;
     var frontFields = [];
     var restFields = [];
-    if ((_props$presetConfigs = props.presetConfigs) !== null && _props$presetConfigs !== void 0 && _props$presetConfigs.fieldIds) {
+    if ((_props$presetConfigs2 = props.presetConfigs) !== null && _props$presetConfigs2 !== void 0 && _props$presetConfigs2.fieldIds) {
       frontFields = filter(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
     }
     restFields = sortBy(reject(fieldIds, id => frontFields.includes(id)), fieldId => {
@@ -354,8 +355,8 @@ export function LegacyInstanceList(props) {
     return [...frontFields, ...restFields];
   };
   var getFields = () => {
-    var _props$presetConfigs2, _props$extraFixedFiel;
-    var fieldIds = (_props$presetConfigs2 = props.presetConfigs) === null || _props$presetConfigs2 === void 0 ? void 0 : _props$presetConfigs2.fieldIds;
+    var _props$presetConfigs3, _props$extraFixedFiel;
+    var fieldIds = (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds;
     var extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
     if (isEmpty(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem("".concat(modelData.objectId, "-selectAttrIds"));
@@ -375,7 +376,7 @@ export function LegacyInstanceList(props) {
   };
   var [q, setQ] = useState(props.q);
   var [state, setState] = useReducer(reducer, undefined, () => {
-    var _ref3, _props$dataSource$pag, _props$dataSource, _ref4, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs3;
+    var _ref3, _props$dataSource$pag, _props$dataSource, _ref4, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs4;
     return {
       objectId: props.objectId,
       q: props.q,
@@ -396,7 +397,7 @@ export function LegacyInstanceList(props) {
       failed: false,
       isAdvancedSearchVisible: false,
       fieldIds: getFields(),
-      presetConfigsQuery: (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.query,
+      presetConfigsQuery: (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : _props$presetConfigs4.query,
       autoBreakLine: false,
       appSearchInstanceId: "",
       currentChangeSelect: "App",
@@ -496,8 +497,8 @@ export function LegacyInstanceList(props) {
       //按应用筛选
       // istanbul ignore next (state is not updated)
       if (state.searchByApp) {
-        var _props$presetConfigs4, _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8;
-        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"];
+        var _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8, _props$presetConfigs9;
+        var 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"];
         v3Data.query = _objectSpread(_objectSpread({
           [state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId
         }, !isEmpty(hostRange) && props.limitInstanceRange ? {
@@ -562,15 +563,15 @@ export function LegacyInstanceList(props) {
     };
   }();
   useEffect(() => {
-    var _props$presetConfigs9;
+    var _props$presetConfigs10;
     var fieldIds = getFields();
     if (
     // 当 props.objectId 改变时，总是更新 state.fieldIds
-    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)) {
-      var _props$presetConfigs10;
+    props.objectId !== state.objectId || !isEqual(fieldIds, state.fieldIds) || !isEqual((_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query, state.presetConfigsQuery)) {
+      var _props$presetConfigs11;
       setState({
         fieldIds,
-        presetConfigsQuery: (_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query
+        presetConfigsQuery: (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.query
       });
     }
   }, [props.objectId, props.presetConfigs]);
@@ -788,9 +789,9 @@ export function LegacyInstanceList(props) {
     });
   };
   var defaultFields = useMemo(() => {
-    var _props$presetConfigs11, _props$extraFixedFiel2;
+    var _props$presetConfigs12, _props$extraFixedFiel2;
     var defaultFields;
-    var fieldIds = (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.fieldIds,
+    var fieldIds = (_props$presetConfigs12 = props.presetConfigs) === null || _props$presetConfigs12 === void 0 ? void 0 : _props$presetConfigs12.fieldIds,
       extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
     if (!isEmpty(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;