@next-libs/cmdb-instances 7.7.1 → 7.9.0

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

@@ -95,6 +95,31 @@ export var isValueEqualFn = (query, attrId, valuesStr) => {
   return query[attrId] ? valuesStr && Object.values(query[attrId]).join(" ") !== valuesStr // 当条件是为空和不为空时，需要判断valuesStr是否存在
   : false;
 };
+export function mergeFields(oldFields, newFieldIds) {
+  return newFieldIds.map(field => {
+    var existField = oldFields.find(f => f.field === field);
+    var order = existField ? existField.order : 0;
+    return {
+      field,
+      order
+    };
+  });
+}
+export function updateSortFields(oldFields, sortInfo, sortType) {
+  var {
+    asc,
+    sort
+  } = sortInfo;
+  var order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
+  return oldFields.map(item => {
+    if (item.field === sort) {
+      item.order = order;
+    } else {
+      item.order = 0;
+    }
+    return item;
+  });
+}
 export function translateConditions(aq, idObjectMap, modelData, t) {
   var conditions = [];
   var relations = [];
@@ -276,6 +301,17 @@ export function LegacyInstanceList(props) {
   var instanceArchiveListProvider = useProvider("providers-of-cmdb.instance-archive-api-list-archive-instance", {
     cache: false
   });
+  var ignorePermissionProvider = useProvider("easyops.api.cmdb.instance@PostSearchV3WithAdmin:1.0.0", {
+    cache: false
+  });
+  // istanbul ignore next
+
+  var fieldsProvider = useProvider("easyops.api.cmdb.instance@GetListDisplayView:1.0.1", {
+    cache: false
+  });
+  var updateFieldsProvider = useProvider("easyops.api.cmdb.instance@UpdateListDisplayView:1.0.0", {
+    cache: false
+  });
   var {
     modelData,
     idObjectMap
@@ -354,10 +390,65 @@ export function LegacyInstanceList(props) {
     });
     return [...frontFields, ...restFields];
   };
+  // istanbul ignore next
+
+  var getFieldsAsync = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(function* () {
+      var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$extraFixedFiel;
+      var sort = props.sort;
+      var fieldIds = (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds;
+      var sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList = modelData.attrList) === null || _modelData$attrList === void 0 ? void 0 : (_modelData$attrList$f2 = _modelData$attrList.find(attr => attr.id === sort)) === null || _modelData$attrList$f2 === void 0 ? void 0 : (_modelData$attrList$f3 = _modelData$attrList$f2.value) === null || _modelData$attrList$f3 === void 0 ? void 0 : _modelData$attrList$f3.default_type;
+      var asc;
+      if (props.asc === true) {
+        asc = ["series-number", "auto-increment-id"].includes(sortType) ? 2 : 1;
+      } else {
+        asc = ["series-number", "auto-increment-id"].includes(sortType) ? -2 : -1;
+      }
+      var sortFields;
+      if (props.saveFieldsBackend) {
+        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;
+            }
+          }
+        } else {
+          fieldIds = jsonLocalStorage.getItem("".concat(modelData.objectId, "-selectAttrIds"));
+        }
+      }
+      if (isEmpty(fieldIds)) {
+        fieldIds = computeDefaultFields().fieldIds;
+      }
+      if (!isEmpty(extraFixedFieldIds)) {
+        fieldIds = uniq([...fieldIds, ...extraFixedFieldIds]);
+      }
+      fieldIds = props.extraDisabledField ? uniq([...fieldIds, props.extraDisabledField]) : fieldIds;
+      fieldIds = _sortFieldIds(fieldIds);
+      var hideModelData = modelData.view.hide_columns || [];
+      fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
+      modelData.isAbstract && fieldIds.push("_object_id");
+      return {
+        fieldIds,
+        sort,
+        asc,
+        sortFields
+      };
+    });
+    return function getFieldsAsync() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var getFields = () => {
-    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 : [];
+    var _props$presetConfigs4, _props$extraFixedFiel2;
+    var fieldIds = (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : _props$presetConfigs4.fieldIds;
+    var extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
     if (isEmpty(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem("".concat(modelData.objectId, "-selectAttrIds"));
     }
@@ -376,17 +467,18 @@ 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$presetConfigs4;
+    var _ref4, _props$dataSource$pag, _props$dataSource, _ref5, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs5;
     return {
       objectId: props.objectId,
       q: props.q,
       aq: initAqToShow(props.aq, modelData, false),
+      sortFields: [],
       aqToShow: props.aqToShow || initAqToShow(props.aq, modelData),
       instanceSourceQuery: props.instanceSourceQuery,
       asc: props.asc,
       sort: props.sort,
-      page: (_ref3 = (_props$dataSource$pag = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.page) !== null && _props$dataSource$pag !== void 0 ? _props$dataSource$pag : props.page) !== null && _ref3 !== void 0 ? _ref3 : 1,
-      pageSize: (_ref4 = (_props$dataSource$pag2 = (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.pageSize) !== null && _props$dataSource$pag2 !== void 0 ? _props$dataSource$pag2 : props.pageSize) !== null && _ref4 !== void 0 ? _ref4 : 10,
+      page: (_ref4 = (_props$dataSource$pag = (_props$dataSource = props.dataSource) === null || _props$dataSource === void 0 ? void 0 : _props$dataSource.page) !== null && _props$dataSource$pag !== void 0 ? _props$dataSource$pag : props.page) !== null && _ref4 !== void 0 ? _ref4 : 1,
+      pageSize: (_ref5 = (_props$dataSource$pag2 = (_props$dataSource2 = props.dataSource) === null || _props$dataSource2 === void 0 ? void 0 : _props$dataSource2.pageSize) !== null && _props$dataSource$pag2 !== void 0 ? _props$dataSource$pag2 : props.pageSize) !== null && _ref5 !== void 0 ? _ref5 : 10,
       aliveHosts: props.aliveHosts,
       relatedToMe: props.relatedToMe,
       objectIdQuery: props.objectIdQuery,
@@ -396,8 +488,8 @@ export function LegacyInstanceList(props) {
       loading: false,
       failed: false,
       isAdvancedSearchVisible: false,
-      fieldIds: getFields(),
-      presetConfigsQuery: (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : _props$presetConfigs4.query,
+      fieldIds: props.saveFieldsBackend ? [] : getFields(),
+      presetConfigsQuery: (_props$presetConfigs5 = props.presetConfigs) === null || _props$presetConfigs5 === void 0 ? void 0 : _props$presetConfigs5.query,
       autoBreakLine: false,
       appSearchInstanceId: "",
       currentChangeSelect: "App",
@@ -415,8 +507,8 @@ export function LegacyInstanceList(props) {
   var cache = useRef(new Map());
   var isFirstRunRef = useRef(true);
   var getInstanceListData = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(function* (sort, asc, page) {
-      var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
+    var _ref6 = _asyncToGenerator(function* (sort, asc, page) {
+      var _modelData$attrList2, _modelData$attrList2$, _modelData$attrList2$2, _props$onSearchExecut;
       var data = {};
       var v3Data = {
         fields: props !== null && props !== void 0 && props.extraFixedFields ? uniq(["instanceId"].concat(props === null || props === void 0 ? void 0 : props.extraFixedFields)) : ["instanceId"]
@@ -428,7 +520,7 @@ export function LegacyInstanceList(props) {
       var query = {};
       v3Data.page = data.page = archiveData.page = page;
       v3Data["page_size"] = data["page_size"] = archiveData["page_size"] = state.pageSize;
-      var sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList = modelData.attrList) === null || _modelData$attrList === void 0 ? void 0 : (_modelData$attrList$f2 = _modelData$attrList.find(attr => attr.id === sort)) === null || _modelData$attrList$f2 === void 0 ? void 0 : (_modelData$attrList$f3 = _modelData$attrList$f2.value) === null || _modelData$attrList$f3 === void 0 ? void 0 : _modelData$attrList$f3.default_type;
+      var sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList2 = modelData.attrList) === null || _modelData$attrList2 === void 0 ? void 0 : (_modelData$attrList2$ = _modelData$attrList2.find(attr => attr.id === sort)) === null || _modelData$attrList2$ === void 0 ? void 0 : (_modelData$attrList2$2 = _modelData$attrList2$.value) === null || _modelData$attrList2$2 === void 0 ? void 0 : _modelData$attrList2$2.default_type;
       var order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
       if (sort) {
         data.sort = {
@@ -497,8 +589,8 @@ export function LegacyInstanceList(props) {
       //按应用筛选
       // istanbul ignore next (state is not updated)
       if (state.searchByApp) {
-        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"];
+        var _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8, _props$presetConfigs9, _props$presetConfigs10;
+        var hostRange = (_props$presetConfigs6 = props.presetConfigs) === null || _props$presetConfigs6 === void 0 ? void 0 : (_props$presetConfigs7 = _props$presetConfigs6.query) === null || _props$presetConfigs7 === void 0 ? void 0 : (_props$presetConfigs8 = _props$presetConfigs7["$and"]) === null || _props$presetConfigs8 === void 0 ? void 0 : (_props$presetConfigs9 = _props$presetConfigs8.find(i => i.instanceId)) === null || _props$presetConfigs9 === void 0 ? void 0 : (_props$presetConfigs10 = _props$presetConfigs9.instanceId) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10["$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 ? {
@@ -514,14 +606,14 @@ export function LegacyInstanceList(props) {
       }
       var promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data);
       // useAutoDiscoveryProvider=true, 使用useProvider的接口
-      return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : InstanceApi_postSearchV3(props.objectId, v3Data);
+      return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : InstanceApi_postSearchV3(props.objectId, v3Data);
     });
     return function getInstanceListData(_x2, _x3, _x4) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var refreshInstanceList = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(function* (sort, asc, page) {
+    var _ref7 = _asyncToGenerator(function* (sort, asc, page) {
       setState({
         loading: true
       });
@@ -559,20 +651,50 @@ export function LegacyInstanceList(props) {
       }
     });
     return function refreshInstanceList(_x5, _x6, _x7) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
+  // const [fieldIds,setFieldIds] = useState([]);
+  // istanbul ignore next
   useEffect(() => {
-    var _props$presetConfigs10;
-    var fieldIds = getFields();
-    if (
-    // 当 props.objectId 改变时，总是更新 state.fieldIds
-    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$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.query
-      });
+    if (props.saveFieldsBackend) {
+      var getFieldIds = /*#__PURE__*/function () {
+        var _ref8 = _asyncToGenerator(function* () {
+          var _props$presetConfigs11, _props$presetConfigs12;
+          var fieldConfig = yield getFieldsAsync();
+          var {
+            fieldIds,
+            sort,
+            asc,
+            sortFields
+          } = fieldConfig;
+          if (
+          // 当 props.objectId 改变时，总是更新 state.fieldIds
+          props.objectId !== state.objectId || !isEqual(fieldIds, state.fieldIds) || !isEqual((_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.query, state.presetConfigsQuery)) setState({
+            fieldIds,
+            presetConfigsQuery: (_props$presetConfigs12 = props.presetConfigs) === null || _props$presetConfigs12 === void 0 ? void 0 : _props$presetConfigs12.query,
+            sort,
+            asc: [1, 2].includes(asc) ? true : false,
+            sortFields
+          });
+        });
+        return function getFieldIds() {
+          return _ref8.apply(this, arguments);
+        };
+      }();
+      getFieldIds();
+    } else {
+      var _props$presetConfigs13;
+      var fieldIds = getFields();
+      if (
+      // 当 props.objectId 改变时，总是更新 state.fieldIds
+      props.objectId !== state.objectId || !isEqual(fieldIds, state.fieldIds) || !isEqual((_props$presetConfigs13 = props.presetConfigs) === null || _props$presetConfigs13 === void 0 ? void 0 : _props$presetConfigs13.query, state.presetConfigsQuery)) {
+        var _props$presetConfigs14;
+        setState({
+          fieldIds,
+          presetConfigsQuery: (_props$presetConfigs14 = props.presetConfigs) === null || _props$presetConfigs14 === void 0 ? void 0 : _props$presetConfigs14.query
+        });
+      }
     }
   }, [props.objectId, props.presetConfigs]);
   useEffect(() => {
@@ -629,7 +751,7 @@ export function LegacyInstanceList(props) {
 
   // istanbul ignore next
   var onSelectionChange = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(function* (selected) {
+    var _ref9 = _asyncToGenerator(function* (selected) {
       var _props$onSelectionCha;
       var {
         selectedItems,
@@ -652,6 +774,8 @@ export function LegacyInstanceList(props) {
           // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
           if (props.useAutoDiscoveryProvider) {
             resp = yield listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
+          } else if (props.ignorePermission) {
+            resp = yield ignorePermissionProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
           } else {
             resp = yield InstanceApi_postSearchV3(props.objectId, params);
           }
@@ -665,7 +789,7 @@ export function LegacyInstanceList(props) {
       });
     });
     return function (_x8) {
-      return _ref7.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }(), []);
   var onSearch = value => {
@@ -685,28 +809,51 @@ export function LegacyInstanceList(props) {
     });
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
   };
-  var onSortingChange = useCallback(info => {
-    var _props$onSortingChang;
-    var asc;
-    var sort;
-    if (info.asc === undefined) {
-      if (!state.sort) {
-        return;
+  var onSortingChange = useCallback( /*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator(function* (info, sortFields) {
+      var _props$onSortingChang;
+      var asc;
+      var sort;
+      if (info.asc === undefined) {
+        if (!state.sort) {
+          return;
+        }
+        setState({
+          asc: undefined,
+          sort: undefined
+        });
+      } else {
+        setState({
+          asc: info.asc,
+          sort: info.sort
+        });
+        asc = info.asc;
+        sort = info.sort;
       }
-      setState({
-        asc: undefined,
-        sort: undefined
-      });
-    } else {
-      setState({
-        asc: info.asc,
-        sort: info.sort
-      });
-      asc = info.asc;
-      sort = info.sort;
-    }
-    (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
-  }, [state.sort]);
+      // istanbul ignore next
+      if (props.saveFieldsBackend) {
+        try {
+          var _modelData$attrList3, _modelData$attrList3$, _modelData$attrList3$2;
+          var oldsortFields = sortFields;
+          var sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList3 = modelData.attrList) === null || _modelData$attrList3 === void 0 ? void 0 : (_modelData$attrList3$ = _modelData$attrList3.find(attr => attr.id === sort)) === null || _modelData$attrList3$ === void 0 ? void 0 : (_modelData$attrList3$2 = _modelData$attrList3$.value) === null || _modelData$attrList3$2 === void 0 ? void 0 : _modelData$attrList3$2.default_type;
+          var newSortFields = updateSortFields(oldsortFields, info, sortType);
+          setState({
+            sortFields: newSortFields
+          });
+          yield updateFieldsProvider.query([props.objectId, {
+            sortFields: newSortFields
+          }]);
+        } catch (e) {
+          handleHttpError;
+        }
+      }
+      // istanbul ignore next
+      (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
+    });
+    return function (_x9, _x10) {
+      return _ref10.apply(this, arguments);
+    };
+  }(), [state.sort]);
   var onPaginationChange = useCallback(pagination => {
     var _props$onPaginationCh2;
     setState({
@@ -789,10 +936,10 @@ export function LegacyInstanceList(props) {
     });
   };
   var defaultFields = useMemo(() => {
-    var _props$presetConfigs12, _props$extraFixedFiel2;
+    var _props$presetConfigs15, _props$extraFixedFiel3;
     var defaultFields;
-    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 : [];
+    var fieldIds = (_props$presetConfigs15 = props.presetConfigs) === null || _props$presetConfigs15 === void 0 ? void 0 : _props$presetConfigs15.fieldIds,
+      extraFixedFieldIds = (_props$extraFixedFiel3 = props.extraFixedFields) !== null && _props$extraFixedFiel3 !== void 0 ? _props$extraFixedFiel3 : [];
     if (!isEmpty(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
@@ -805,27 +952,59 @@ export function LegacyInstanceList(props) {
   }, [props.presetConfigs, modelData]);
 
   // istanbul ignore next
-  var handleConfirm = _ref9 => {
-    var {
-      fields,
-      isReset
-    } = _ref9;
-    if (isReset) {
-      var fieldIds = defaultFields;
-      modelData.isAbstract && fieldIds.push("_object_id");
-      setState({
-        fieldIds
-      });
-      jsonLocalStorage.removeItem("".concat(modelData.objectId, "-selectAttrIds"));
-      props.onFieldsModalConfirm(fieldIds);
-    } else {
-      setState({
-        fieldIds: _sortFieldIds(fields)
-      });
-      jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
-      props.onFieldsModalConfirm(fields);
-    }
-  };
+  var handleConfirm = /*#__PURE__*/function () {
+    var _ref13 = _asyncToGenerator(function* (_ref12) {
+      var {
+        fields,
+        isReset
+      } = _ref12;
+      if (isReset) {
+        var fieldIds = defaultFields;
+        modelData.isAbstract && fieldIds.push("_object_id");
+        if (props.saveFieldsBackend) {
+          var sortFields = mergeFields(state.sortFields, fieldIds);
+          yield updateFieldsProvider.query([props.objectId, {
+            sortFields
+          }]);
+          setState({
+            fieldIds,
+            sortFields
+          });
+          props.onFieldsModalConfirm(fieldIds);
+        } else {
+          jsonLocalStorage.removeItem("".concat(modelData.objectId, "-selectAttrIds"));
+          setState({
+            fieldIds
+          });
+          props.onFieldsModalConfirm(fieldIds);
+        }
+      } else {
+        if (props.saveFieldsBackend) {
+          try {
+            var _sortFields = mergeFields(state.sortFields, fields);
+            yield updateFieldsProvider.query([props.objectId, {
+              sortFields: _sortFields
+            }]);
+            setState({
+              fieldIds: _sortFieldIds(fields),
+              sortFields: _sortFields
+            });
+          } catch (e) {
+            handleHttpError(e);
+          }
+        } else {
+          setState({
+            fieldIds: _sortFieldIds(fields)
+          });
+          jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
+        }
+        props.onFieldsModalConfirm(fields);
+      }
+    });
+    return function handleConfirm(_x11) {
+      return _ref13.apply(this, arguments);
+    };
+  }();
   useEffect(() => {
     var _props$notifyCurrentF;
     (_props$notifyCurrentF = props.notifyCurrentFields) === null || _props$notifyCurrentF === void 0 ? void 0 : _props$notifyCurrentF.call(props, state.fieldIds);
@@ -1122,7 +1301,9 @@ export function LegacyInstanceList(props) {
     onClickItem: props.onClickItem,
     onClickItemV2: props.onClickItemV2,
     onPaginationChange: onPaginationChange,
-    onSortingChange: onSortingChange,
+    onSortingChange: info => {
+      onSortingChange(info, state.sortFields);
+    },
     onSelectionChange: onSelectionChange,
     onInstanceSourceChange: onInstanceSourceChange,
     instanceSourceQuery: state.instanceSourceQuery,