@next-libs/cmdb-instances 7.29.12 → 7.29.13

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, isNil, get, isArray } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, uniqueId, find, startsWith, compact, omit, keyBy, isNil, get, isArray } 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";
@@ -415,7 +415,7 @@ export function LegacyInstanceList(props) {
     };
   };
 
-  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
+  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 fieldIds 进行排序
   var _sortFieldIds = fieldIds => {
     var _props$presetConfigs2;
     var frontFields = [];
@@ -423,14 +423,7 @@ export function LegacyInstanceList(props) {
     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 => {
-      var foundIndex = findIndex(modelData.view.attr_order, orderId => orderId === fieldId);
-      if (foundIndex === -1) {
-        return null;
-      } else {
-        return foundIndex;
-      }
-    });
+    restFields = reject(fieldIds, id => frontFields.includes(id));
     return [...frontFields, ...restFields];
   };
   // istanbul ignore next
@@ -1124,24 +1117,26 @@ export function LegacyInstanceList(props) {
               handleHttpError(e);
             }
           } else {
+            var _sortFields2 = mergeFields(state.sortFields, fields);
             setState({
-              fieldIds: _sortFieldIds(fields)
+              fieldIds: _sortFieldIds(fields),
+              sortFields: _sortFields2
             });
-            jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
+            jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), _sortFieldIds(fields));
           }
           props.onFieldsModalConfirm(fields);
         } else {
           // 点击【默认显示】按钮触发，不影响当前列表显示。
           try {
             // istanbul ignore next
-            var _sortFields2 = mergeFields(state.sortFields, fields);
+            var _sortFields3 = mergeFields(state.sortFields, fields);
             yield updateFieldsProvider.query([props.objectId, {
-              sortFields: _sortFields2,
+              sortFields: _sortFields3,
               isDefault: true
             }]);
             message.success(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SET_DEFAULT_DISPLAY_SUCCESS)));
             setState({
-              backendDefaultFields: _sortFields2
+              backendDefaultFields: _sortFields3
             });
           } catch (e) {
             handleHttpError(e);