@next-libs/cmdb-instances 7.28.10 → 7.29.1

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 } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, 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";
@@ -280,6 +280,18 @@ export var initAqToShow = function (aq, modelData) {
   }
   return;
 };
+// 判断是不是字符串数组
+function isStringArray(arr) {
+  return isArray(arr) && arr.every(item => isString(item));
+}
+// 格式化extraFixedFields
+function getExtraFixedFields(fields) {
+  if (isNil(fields) || isStringArray(fields)) {
+    return fields;
+  } else {
+    return fields.map(v => v.field);
+  }
+}
 export function LegacyInstanceList(props) {
   var _props$selectedRowKey, _state$appList, _props$extraOperateBr, _props$extraFilterBri;
   var {
@@ -351,6 +363,9 @@ export function LegacyInstanceList(props) {
       idObjectMap
     };
   }, [props.objectList, props.objectId]);
+  var processFixedFields = useMemo(() => {
+    return getExtraFixedFields(props === null || props === void 0 ? void 0 : props.extraFixedFields);
+  }, [props.extraFixedFields]);
   var [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = useState({});
   var [fixedHeader, setFixHeader] = useState(false);
   var fetchInheritanceModelIdNameMap = /*#__PURE__*/function () {
@@ -422,7 +437,7 @@ export function LegacyInstanceList(props) {
 
   var getFieldsAsync = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(function* () {
-      var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$extraFixedFiel;
+      var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3;
       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;
@@ -444,7 +459,7 @@ export function LegacyInstanceList(props) {
         sortFields = returnData.sortFields;
         backendDefaultFields = returnData.defaultSortFields;
       }
-      var extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
+      var extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
       if (isEmpty(fieldIds)) {
         fieldIds = sortFields.map(item => item.field);
         if (isEmpty(sort) || isEmpty(asc)) {
@@ -479,9 +494,9 @@ export function LegacyInstanceList(props) {
     };
   }();
   var getFields = () => {
-    var _props$presetConfigs4, _props$extraFixedFiel2;
+    var _props$presetConfigs4;
     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 : [];
+    var extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
     if (isEmpty(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem("".concat(modelData.objectId, "-selectAttrIds"));
     }
@@ -553,7 +568,7 @@ export function LegacyInstanceList(props) {
       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"]
+        fields: processFixedFields ? uniq(["instanceId"].concat(processFixedFields)) : ["instanceId"]
       };
       if (!isEmpty(props.permission)) {
         v3Data.permission = data.permission = props.permission;
@@ -574,7 +589,7 @@ export function LegacyInstanceList(props) {
         }];
       }
       if (state.q) {
-        query = getQuery(modelData, idObjectMap, state.q, state.fieldIds, props.onlySearchByIp, props.extraFixedFields);
+        query = getQuery(modelData, idObjectMap, state.q, state.fieldIds, props.onlySearchByIp, processFixedFields);
       }
       if (state.q && props.useInstanceArchiveProvider) {
         archiveData.key_word = state.q;
@@ -746,7 +761,7 @@ export function LegacyInstanceList(props) {
         });
       }
     }
-  }, [props.objectId, props.presetConfigs]);
+  }, [props.objectId, props.presetConfigs, processFixedFields]);
   useEffect(() => {
     var _props$selectedRowKey2;
     setSelectedRowKeys((_props$selectedRowKey2 = props.selectedRowKeys) !== null && _props$selectedRowKey2 !== void 0 ? _props$selectedRowKey2 : []);
@@ -1011,10 +1026,10 @@ export function LegacyInstanceList(props) {
   // 后台返回的默认配置
 
   var defaultFields = useMemo(() => {
-    var _props$presetConfigs15, _props$extraFixedFiel3;
+    var _props$presetConfigs15;
     var defaultFields;
     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 : [];
+      extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
     if (!isEmpty(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
@@ -1034,7 +1049,7 @@ export function LegacyInstanceList(props) {
       defaultFields = uniq([...defaultFields, ...extraFixedFieldIds]);
     }
     return defaultFields;
-  }, [props.presetConfigs, modelData, state.backendDefaultFields]);
+  }, [props.presetConfigs, modelData, state.backendDefaultFields, processFixedFields]);
 
   // istanbul ignore next
   var handleConfirm = /*#__PURE__*/function () {
@@ -1265,6 +1280,13 @@ export function LegacyInstanceList(props) {
       });
     }
   }, [props.aq, props.aqToShow, props.showFilterInstanceSource]);
+  var fixedFieldIds = useMemo(() => {
+    if (!props.extraFixedFields || isStringArray(props.extraFixedFields)) {
+      return [];
+    } else {
+      return props.extraFixedFields.filter(v => v.fixed).map(v => v.field);
+    }
+  }, [props.extraFixedFields]);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: state.loading
   }, state.inited && !state.failed ? /*#__PURE__*/React.createElement(React.Fragment, null, (!props.searchDisabled || !props.advancedSearchDisabled || !props.relatedToMeDisabled || !props.aliveHostsDisabled || !props.moreButtonsDisabled) && /*#__PURE__*/React.createElement("div", {
@@ -1461,7 +1483,8 @@ export function LegacyInstanceList(props) {
     showCustomizedSerialNumber: props.showCustomizedSerialNumber,
     relationLimit: props.relationLimit,
     onRelationMoreIconClick: props.onRelationMoreIconClick,
-    configProps: props.tableConfigProps
+    configProps: props.tableConfigProps,
+    fixedFieldIds: fixedFieldIds
   })) :
   /*#__PURE__*/
   // 加个空白的div是为了将loading效果撑起来