@next-libs/cmdb-instances 7.13.9 → 7.14.1

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

@@ -8,7 +8,7 @@ import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
 import { InstanceApi_postSearchV3, CmdbObjectApi_getIdMapName, CmdbObjectApi_getObjectRef } from "@next-sdk/cmdb-sdk";
 import { Icon as LegacyIcon } from "@ant-design/compatible";
-import { Button, Spin, Input, Tag, Select } from "antd";
+import { Button, Spin, Input, Tag, Select, message } from "antd";
 import { getRelationObjectSides, forEachAvailableFields, getInstanceNameKeys, isSelfRelation, ElementOperators, LogicalOperators } from "@next-libs/cmdb-utils";
 import { JsonStorage } from "@next-libs/storage";
 import { ConditionType, AdvancedSearch, getFieldConditionsAndValues, MoreButtonsContainer, InstanceListTable } from "../instance-list-table";
@@ -309,8 +309,14 @@ export function LegacyInstanceList(props) {
   var fieldsProvider = useProvider("easyops.api.cmdb.instance@GetListDisplayView:1.0.1", {
     cache: false
   });
+
+  // istanbul ignore next
   var updateFieldsProvider = useProvider("easyops.api.cmdb.instance@UpdateListDisplayView:1.0.0", {
-    cache: false
+    cache: false,
+    onError: error => {
+      // istanbul ignore next
+      throw error;
+    }
   });
 
   // 用于外部调用的接口, 当useExternalCmdbApi为true，才调用这些接口
@@ -420,6 +426,7 @@ export function LegacyInstanceList(props) {
       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, sortFields;
+      var backendDefaultFields;
       if (props.asc === true) {
         asc = ["series-number", "auto-increment-id"].includes(sortType) ? 2 : 1;
       } else {
@@ -431,7 +438,10 @@ export function LegacyInstanceList(props) {
           sourceId: props.externalSourceId
         }])).sortFields;
       } else {
-        sortFields = (yield fieldsProvider.query([props.objectId])).sortFields;
+        // 获取用户配置的显示列
+        var returnData = yield fieldsProvider.query([props.objectId]);
+        sortFields = returnData.sortFields;
+        backendDefaultFields = returnData.defaultSortFields;
       }
       var extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
       if (isEmpty(fieldIds)) {
@@ -459,7 +469,8 @@ export function LegacyInstanceList(props) {
         fieldIds,
         sort,
         asc,
-        sortFields
+        sortFields,
+        backendDefaultFields
       };
     });
     return function getFieldsAsync() {
@@ -521,7 +532,8 @@ export function LegacyInstanceList(props) {
         instanceId: "all",
         name: i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.ALL_CLUSTER))
       }],
-      searchByApp: false
+      searchByApp: false,
+      backendDefaultFields: []
     };
   });
   var [selectedRowKeys, setSelectedRowKeys] = useState((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
@@ -698,7 +710,8 @@ export function LegacyInstanceList(props) {
             fieldIds,
             sort,
             asc,
-            sortFields
+            sortFields,
+            backendDefaultFields
           } = fieldConfig;
           if (
           // 当 props.objectId 改变时，总是更新 state.fieldIds
@@ -707,7 +720,8 @@ export function LegacyInstanceList(props) {
             presetConfigsQuery: (_props$presetConfigs12 = props.presetConfigs) === null || _props$presetConfigs12 === void 0 ? void 0 : _props$presetConfigs12.query,
             sort,
             asc: [1, 2].includes(asc) ? true : false,
-            sortFields
+            sortFields,
+            backendDefaultFields
           });
         });
         return function getFieldIds() {
@@ -986,6 +1000,9 @@ export function LegacyInstanceList(props) {
       clusterValue: v
     });
   };
+
+  // 后台返回的默认配置
+
   var defaultFields = useMemo(() => {
     var _props$presetConfigs15, _props$extraFixedFiel3;
     var defaultFields;
@@ -994,22 +1011,34 @@ export function LegacyInstanceList(props) {
     if (!isEmpty(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
-      defaultFields = computeDefaultFields().fieldIds;
+      var _state$backendDefault;
+      // istanbul ignore next
+      // 所有用户（包括管理员）点击恢复默认按钮是恢复到 1.管理员设置的默认显示 2.管理员未设置时取前N个
+      if (props.saveFieldsBackend && !props.useExternalCmdbApi && state.backendDefaultFields && ((_state$backendDefault = state.backendDefaultFields) === null || _state$backendDefault === void 0 ? void 0 : _state$backendDefault.length) > 0) {
+        var _state$backendDefault2;
+        // istanbul ignore next
+        // 后台接口返回的默认字段（1. admin用户设置的，2. 前N个）
+        defaultFields = compact((_state$backendDefault2 = state.backendDefaultFields) === null || _state$backendDefault2 === void 0 ? void 0 : _state$backendDefault2.map(s => s.field));
+      } else {
+        defaultFields = computeDefaultFields().fieldIds;
+      }
     }
     if (!isEmpty(extraFixedFieldIds)) {
       defaultFields = uniq([...defaultFields, ...extraFixedFieldIds]);
     }
     return defaultFields;
-  }, [props.presetConfigs, modelData]);
+  }, [props.presetConfigs, modelData, state.backendDefaultFields]);
 
   // istanbul ignore next
   var handleConfirm = /*#__PURE__*/function () {
     var _ref13 = _asyncToGenerator(function* (_ref12) {
       var {
         fields,
-        isReset
+        isReset,
+        isAdminSetDisplay
       } = _ref12;
       if (isReset) {
+        // 恢复默认操作
         var fieldIds = defaultFields;
         modelData.isAbstract && fieldIds.push("_object_id");
         if (props.saveFieldsBackend) {
@@ -1038,34 +1067,53 @@ export function LegacyInstanceList(props) {
           props.onFieldsModalConfirm(fieldIds);
         }
       } else {
-        if (props.saveFieldsBackend) {
-          try {
-            var _sortFields = mergeFields(state.sortFields, fields);
-            if (props.useExternalCmdbApi) {
-              yield externalUpdateFieldsProvider.query([{
-                object_id: props.objectId,
-                sourceId: props.externalSourceId,
-                sortFields: _sortFields
-              }]);
-            } else {
-              yield updateFieldsProvider.query([props.objectId, {
+        if (!isAdminSetDisplay) {
+          // 点击确定按钮触发
+          if (props.saveFieldsBackend) {
+            try {
+              var _sortFields = mergeFields(state.sortFields, fields);
+              if (props.useExternalCmdbApi) {
+                yield externalUpdateFieldsProvider.query([{
+                  object_id: props.objectId,
+                  sourceId: props.externalSourceId,
+                  sortFields: _sortFields
+                }]);
+              } else {
+                yield updateFieldsProvider.query([props.objectId, {
+                  sortFields: _sortFields
+                }]);
+              }
+              setState({
+                fieldIds: _sortFieldIds(fields),
                 sortFields: _sortFields
-              }]);
+              });
+            } catch (e) {
+              handleHttpError(e);
             }
+          } else {
             setState({
-              fieldIds: _sortFieldIds(fields),
-              sortFields: _sortFields
+              fieldIds: _sortFieldIds(fields)
+            });
+            jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
+          }
+          props.onFieldsModalConfirm(fields);
+        } else {
+          // 点击【默认显示】按钮触发，不影响当前列表显示。
+          try {
+            // istanbul ignore next
+            var _sortFields2 = mergeFields(state.sortFields, fields);
+            yield updateFieldsProvider.query([props.objectId, {
+              sortFields: _sortFields2,
+              isDefault: true
+            }]);
+            message.success(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SET_DEFAULT_DISPLAY_SUCCESS)));
+            setState({
+              backendDefaultFields: _sortFields2
             });
           } catch (e) {
             handleHttpError(e);
           }
-        } else {
-          setState({
-            fieldIds: _sortFieldIds(fields)
-          });
-          jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
         }
-        props.onFieldsModalConfirm(fields);
       }
     });
     return function handleConfirm(_x11) {
@@ -1313,6 +1361,8 @@ export function LegacyInstanceList(props) {
   }), !props.moreButtonsDisabled && /*#__PURE__*/React.createElement(MoreButtonsContainer, {
     modelData: modelData,
     onConfirm: handleConfirm,
+    useExternalCmdbApi: props.useExternalCmdbApi,
+    saveFieldsBackend: props.saveFieldsBackend,
     fieldIds: state.fieldIds,
     defaultFields: defaultFields,
     extraDisabledField: props.extraDisabledField,