@next-libs/cmdb-instances 7.29.12 → 7.29.13

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

@@ -429,7 +429,7 @@ function LegacyInstanceList(props) {
     };
   };
 
-  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
+  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 fieldIds 进行排序
   const _sortFieldIds = fieldIds => {
     var _props$presetConfigs2;
     let frontFields = [];
@@ -437,14 +437,7 @@ function LegacyInstanceList(props) {
     if ((_props$presetConfigs2 = props.presetConfigs) !== null && _props$presetConfigs2 !== void 0 && _props$presetConfigs2.fieldIds) {
       frontFields = (0, _lodash.filter)(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
     }
-    restFields = (0, _lodash.sortBy)((0, _lodash.reject)(fieldIds, id => frontFields.includes(id)), fieldId => {
-      const foundIndex = (0, _lodash.findIndex)(modelData.view.attr_order, orderId => orderId === fieldId);
-      if (foundIndex === -1) {
-        return null;
-      } else {
-        return foundIndex;
-      }
-    });
+    restFields = (0, _lodash.reject)(fieldIds, id => frontFields.includes(id));
     return [...frontFields, ...restFields];
   };
   // istanbul ignore next
@@ -1117,10 +1110,12 @@ function LegacyInstanceList(props) {
             (0, _brickKit.handleHttpError)(e);
           }
         } else {
+          const sortFields = mergeFields(state.sortFields, fields);
           setState({
-            fieldIds: _sortFieldIds(fields)
+            fieldIds: _sortFieldIds(fields),
+            sortFields
           });
-          jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, fields);
+          jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, _sortFieldIds(fields));
         }
         props.onFieldsModalConfirm(fields);
       } else {