@next-libs/cmdb-instances 7.9.0 → 7.9.1

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

@@ -127,7 +127,7 @@ function updateSortFields(oldFields, sortInfo, sortType) {
     asc,
     sort
   } = sortInfo;
-  const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
+  const order = (0, _lodash.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;
@@ -416,23 +416,16 @@ function LegacyInstanceList(props) {
     } else {
       asc = ["series-number", "auto-increment-id"].includes(sortType) ? -2 : -1;
     }
-    let sortFields;
-    if (props.saveFieldsBackend) {
-      sortFields = (await fieldsProvider.query([props.objectId])).sortFields;
-    }
+    const sortFields = (await fieldsProvider.query([props.objectId])).sortFields;
     const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
     if ((0, _lodash.isEmpty)(fieldIds)) {
-      if (props.saveFieldsBackend) {
-        fieldIds = sortFields.map(item => item.field);
-        if ((0, _lodash.isEmpty)(sort) || (0, _lodash.isEmpty)(asc)) {
-          const orderField = sortFields.find(item => item.order !== 0);
-          if (orderField) {
-            sort = orderField.field;
-            asc = orderField.order;
-          }
+      fieldIds = sortFields.map(item => item.field);
+      if ((0, _lodash.isEmpty)(sort) || (0, _lodash.isEmpty)(asc)) {
+        const orderField = sortFields.find(item => item.order !== 0);
+        if (orderField) {
+          sort = orderField.field;
+          asc = orderField.order;
         }
-      } else {
-        fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
       }
     }
     if ((0, _lodash.isEmpty)(fieldIds)) {
@@ -822,7 +815,7 @@ 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;
         const oldsortFields = sortFields;