@next-libs/cmdb-instances 7.8.0 → 7.9.1

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

@@ -10,8 +10,10 @@ exports.LegacyInstanceList = LegacyInstanceList;
 exports.getQuery = getQuery;
 exports.isValueEqualFn = exports.isSpecialFn = exports.initAqToShow = void 0;
 exports.joinRelationFieldAndShowkey = joinRelationFieldAndShowkey;
+exports.mergeFields = mergeFields;
 exports.specialQueryHandler = void 0;
 exports.translateConditions = translateConditions;
+exports.updateSortFields = updateSortFields;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
@@ -110,6 +112,31 @@ const isValueEqualFn = (query, attrId, valuesStr) => {
   : false;
 };
 exports.isValueEqualFn = isValueEqualFn;
+function mergeFields(oldFields, newFieldIds) {
+  return newFieldIds.map(field => {
+    const existField = oldFields.find(f => f.field === field);
+    const order = existField ? existField.order : 0;
+    return {
+      field,
+      order
+    };
+  });
+}
+function updateSortFields(oldFields, sortInfo, sortType) {
+  const {
+    asc,
+    sort
+  } = sortInfo;
+  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;
+    } else {
+      item.order = 0;
+    }
+    return item;
+  });
+}
 function translateConditions(aq, idObjectMap, modelData, t) {
   const conditions = [];
   const relations = [];
@@ -296,6 +323,14 @@ function LegacyInstanceList(props) {
   const ignorePermissionProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@PostSearchV3WithAdmin:1.0.0", {
     cache: false
   });
+  // istanbul ignore next
+
+  const fieldsProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@GetListDisplayView:1.0.1", {
+    cache: false
+  });
+  const updateFieldsProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@UpdateListDisplayView:1.0.0", {
+    cache: false
+  });
   const {
     modelData,
     idObjectMap
@@ -368,10 +403,53 @@ function LegacyInstanceList(props) {
     });
     return [...frontFields, ...restFields];
   };
-  const getFields = () => {
-    var _props$presetConfigs3, _props$extraFixedFiel;
+  // istanbul ignore next
+
+  const getFieldsAsync = async () => {
+    var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$extraFixedFiel;
+    let sort = props.sort;
     let fieldIds = (_props$presetConfigs3 = props.presetConfigs) === null || _props$presetConfigs3 === void 0 ? void 0 : _props$presetConfigs3.fieldIds;
+    const 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;
+    let 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;
+    }
+    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)) {
+      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;
+        }
+      }
+    }
+    if ((0, _lodash.isEmpty)(fieldIds)) {
+      fieldIds = computeDefaultFields().fieldIds;
+    }
+    if (!(0, _lodash.isEmpty)(extraFixedFieldIds)) {
+      fieldIds = (0, _lodash.uniq)([...fieldIds, ...extraFixedFieldIds]);
+    }
+    fieldIds = props.extraDisabledField ? (0, _lodash.uniq)([...fieldIds, props.extraDisabledField]) : fieldIds;
+    fieldIds = _sortFieldIds(fieldIds);
+    const hideModelData = modelData.view.hide_columns || [];
+    fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
+    modelData.isAbstract && fieldIds.push("_object_id");
+    return {
+      fieldIds,
+      sort,
+      asc,
+      sortFields
+    };
+  };
+  const getFields = () => {
+    var _props$presetConfigs4, _props$extraFixedFiel2;
+    let fieldIds = (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : _props$presetConfigs4.fieldIds;
+    const extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
     if ((0, _lodash.isEmpty)(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
     }
@@ -390,11 +468,12 @@ function LegacyInstanceList(props) {
   };
   const [q, setQ] = (0, _react.useState)(props.q);
   const [state, setState] = (0, _react.useReducer)(reducer, undefined, () => {
-    var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _props$dataSource$pag2, _props$dataSource2, _props$presetConfigs4;
+    var _ref, _props$dataSource$pag, _props$dataSource, _ref2, _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,
@@ -410,8 +489,8 @@ 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",
@@ -429,7 +508,7 @@ function LegacyInstanceList(props) {
   const cache = (0, _react.useRef)(new Map());
   const isFirstRunRef = (0, _react.useRef)(true);
   const getInstanceListData = async (sort, asc, page) => {
-    var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
+    var _modelData$attrList2, _modelData$attrList2$, _modelData$attrList2$2, _props$onSearchExecut;
     const data = {};
     const v3Data = {
       fields: props !== null && props !== void 0 && props.extraFixedFields ? (0, _lodash.uniq)(["instanceId"].concat(props === null || props === void 0 ? void 0 : props.extraFixedFields)) : ["instanceId"]
@@ -441,7 +520,7 @@ function LegacyInstanceList(props) {
     let query = {};
     v3Data.page = data.page = archiveData.page = page;
     v3Data["page_size"] = data["page_size"] = archiveData["page_size"] = state.pageSize;
-    const 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;
+    const 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;
     const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
     if (sort) {
       data.sort = {
@@ -512,8 +591,8 @@ function LegacyInstanceList(props) {
     //按应用筛选
     // istanbul ignore next (state is not updated)
     if (state.searchByApp) {
-      var _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8, _props$presetConfigs9;
-      const 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;
+      const 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 = {
         [state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId,
         ...(!(0, _lodash.isEmpty)(hostRange) && props.limitInstanceRange ? {
@@ -570,17 +649,42 @@ function LegacyInstanceList(props) {
       });
     }
   };
+  // const [fieldIds,setFieldIds] = useState([]);
+  // istanbul ignore next
   (0, _react.useEffect)(() => {
-    var _props$presetConfigs10;
-    const fieldIds = getFields();
-    if (
-    // 当 props.objectId 改变时，总是更新 state.fieldIds
-    props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.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) {
+      const getFieldIds = async () => {
+        var _props$presetConfigs11, _props$presetConfigs12;
+        const fieldConfig = await getFieldsAsync();
+        const {
+          fieldIds,
+          sort,
+          asc,
+          sortFields
+        } = fieldConfig;
+        if (
+        // 当 props.objectId 改变时，总是更新 state.fieldIds
+        props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.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
+        });
+      };
+      getFieldIds();
+    } else {
+      var _props$presetConfigs13;
+      const fieldIds = getFields();
+      if (
+      // 当 props.objectId 改变时，总是更新 state.fieldIds
+      props.objectId !== state.objectId || !(0, _lodash.isEqual)(fieldIds, state.fieldIds) || !(0, _lodash.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]);
   (0, _react.useEffect)(() => {
@@ -690,7 +794,7 @@ function LegacyInstanceList(props) {
     });
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
   };
-  const onSortingChange = (0, _react.useCallback)(info => {
+  const onSortingChange = (0, _react.useCallback)(async (info, sortFields) => {
     var _props$onSortingChang;
     let asc;
     let sort;
@@ -710,6 +814,24 @@ function LegacyInstanceList(props) {
       asc = info.asc;
       sort = info.sort;
     }
+    // istanbul ignore next
+    if (props.saveFieldsBackend && sortFields.find(item => item.field === info.sort)) {
+      try {
+        var _modelData$attrList3, _modelData$attrList3$, _modelData$attrList3$2;
+        const oldsortFields = sortFields;
+        const 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;
+        const newSortFields = updateSortFields(oldsortFields, info, sortType);
+        setState({
+          sortFields: newSortFields
+        });
+        await updateFieldsProvider.query([props.objectId, {
+          sortFields: newSortFields
+        }]);
+      } catch (e) {
+        _brickKit.handleHttpError;
+      }
+    }
+    // istanbul ignore next
     (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
   }, [state.sort]);
   const onPaginationChange = (0, _react.useCallback)(pagination => {
@@ -794,10 +916,10 @@ function LegacyInstanceList(props) {
     });
   };
   const defaultFields = (0, _react.useMemo)(() => {
-    var _props$presetConfigs12, _props$extraFixedFiel2;
+    var _props$presetConfigs15, _props$extraFixedFiel3;
     let defaultFields;
-    const 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 : [];
+    const 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 (!(0, _lodash.isEmpty)(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
@@ -810,23 +932,50 @@ function LegacyInstanceList(props) {
   }, [props.presetConfigs, modelData]);
 
   // istanbul ignore next
-  const handleConfirm = ({
+  const handleConfirm = async ({
     fields,
     isReset
   }) => {
     if (isReset) {
       const fieldIds = defaultFields;
       modelData.isAbstract && fieldIds.push("_object_id");
-      setState({
-        fieldIds
-      });
-      jsonLocalStorage.removeItem(`${modelData.objectId}-selectAttrIds`);
-      props.onFieldsModalConfirm(fieldIds);
+      if (props.saveFieldsBackend) {
+        const sortFields = mergeFields(state.sortFields, fieldIds);
+        await updateFieldsProvider.query([props.objectId, {
+          sortFields
+        }]);
+        setState({
+          fieldIds,
+          sortFields
+        });
+        props.onFieldsModalConfirm(fieldIds);
+      } else {
+        jsonLocalStorage.removeItem(`${modelData.objectId}-selectAttrIds`);
+        setState({
+          fieldIds
+        });
+        props.onFieldsModalConfirm(fieldIds);
+      }
     } else {
-      setState({
-        fieldIds: _sortFieldIds(fields)
-      });
-      jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, fields);
+      if (props.saveFieldsBackend) {
+        try {
+          const sortFields = mergeFields(state.sortFields, fields);
+          await updateFieldsProvider.query([props.objectId, {
+            sortFields
+          }]);
+          setState({
+            fieldIds: _sortFieldIds(fields),
+            sortFields
+          });
+        } catch (e) {
+          (0, _brickKit.handleHttpError)(e);
+        }
+      } else {
+        setState({
+          fieldIds: _sortFieldIds(fields)
+        });
+        jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, fields);
+      }
       props.onFieldsModalConfirm(fields);
     }
   };
@@ -1126,7 +1275,9 @@ 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,