@next-libs/cmdb-instances 7.9.0 → 7.9.1

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import React, { useEffect, useReducer, useState, useRef, useMemo, useCallback } from "react";
-import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact, omit, keyBy } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact, omit, keyBy, isNil } from "lodash";
 import { BrickAsComponent, getRuntime, handleHttpError, useProvider } from "@next-core/brick-kit";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
@@ -110,7 +110,7 @@ export function updateSortFields(oldFields, sortInfo, sortType) {
     asc,
     sort
   } = sortInfo;
-  var order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
+  var order = isNil(asc) ? 0 : ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
   return oldFields.map(item => {
     if (item.field === sort) {
       item.order = order;
@@ -404,23 +404,16 @@ export function LegacyInstanceList(props) {
       } else {
         asc = ["series-number", "auto-increment-id"].includes(sortType) ? -2 : -1;
       }
-      var sortFields;
-      if (props.saveFieldsBackend) {
-        sortFields = (yield fieldsProvider.query([props.objectId])).sortFields;
-      }
+      var sortFields = (yield fieldsProvider.query([props.objectId])).sortFields;
       var extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
       if (isEmpty(fieldIds)) {
-        if (props.saveFieldsBackend) {
-          fieldIds = sortFields.map(item => item.field);
-          if (isEmpty(sort) || isEmpty(asc)) {
-            var orderField = sortFields.find(item => item.order !== 0);
-            if (orderField) {
-              sort = orderField.field;
-              asc = orderField.order;
-            }
+        fieldIds = sortFields.map(item => item.field);
+        if (isEmpty(sort) || isEmpty(asc)) {
+          var orderField = sortFields.find(item => item.order !== 0);
+          if (orderField) {
+            sort = orderField.field;
+            asc = orderField.order;
           }
-        } else {
-          fieldIds = jsonLocalStorage.getItem("".concat(modelData.objectId, "-selectAttrIds"));
         }
       }
       if (isEmpty(fieldIds)) {
@@ -831,7 +824,7 @@ export function LegacyInstanceList(props) {
         sort = info.sort;
       }
       // istanbul ignore next
-      if (props.saveFieldsBackend) {
+      if (props.saveFieldsBackend && sortFields.find(item => item.field === info.sort)) {
         try {
           var _modelData$attrList3, _modelData$attrList3$, _modelData$attrList3$2;
           var oldsortFields = sortFields;