@next-libs/cmdb-instances 7.28.10 → 7.29.0

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

@@ -297,6 +297,18 @@ const initAqToShow = (aq, modelData, isToShow = true) => {
   return;
 };
 exports.initAqToShow = initAqToShow;
+// 判断是不是字符串数组
+function isStringArray(arr) {
+  return (0, _lodash.isArray)(arr) && arr.every(item => (0, _lodash.isString)(item));
+}
+// 格式化extraFixedFields
+function getExtraFixedFields(fields) {
+  if ((0, _lodash.isNil)(fields) || isStringArray(fields)) {
+    return fields;
+  } else {
+    return fields.map(v => v.field);
+  }
+}
 function LegacyInstanceList(props) {
   var _props$selectedRowKey, _state$appList, _props$extraOperateBr, _props$extraFilterBri;
   const {
@@ -371,6 +383,9 @@ function LegacyInstanceList(props) {
       idObjectMap
     };
   }, [props.objectList, props.objectId]);
+  const processFixedFields = (0, _react.useMemo)(() => {
+    return getExtraFixedFields(props === null || props === void 0 ? void 0 : props.extraFixedFields);
+  }, [props.extraFixedFields]);
   const [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = (0, _react.useState)({});
   const [fixedHeader, setFixHeader] = (0, _react.useState)(false);
   const fetchInheritanceModelIdNameMap = async modelData => {
@@ -435,7 +450,7 @@ function LegacyInstanceList(props) {
   // istanbul ignore next
 
   const getFieldsAsync = async () => {
-    var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$extraFixedFiel;
+    var _props$presetConfigs3, _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3;
     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;
@@ -457,7 +472,7 @@ function LegacyInstanceList(props) {
       sortFields = returnData.sortFields;
       backendDefaultFields = returnData.defaultSortFields;
     }
-    const extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
+    const extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
     if ((0, _lodash.isEmpty)(fieldIds)) {
       fieldIds = sortFields.map(item => item.field);
       if ((0, _lodash.isEmpty)(sort) || (0, _lodash.isEmpty)(asc)) {
@@ -488,9 +503,9 @@ function LegacyInstanceList(props) {
     };
   };
   const getFields = () => {
-    var _props$presetConfigs4, _props$extraFixedFiel2;
+    var _props$presetConfigs4;
     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 : [];
+    const extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
     if ((0, _lodash.isEmpty)(fieldIds)) {
       fieldIds = jsonLocalStorage.getItem(`${modelData.objectId}-selectAttrIds`);
     }
@@ -561,7 +576,7 @@ function LegacyInstanceList(props) {
     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"]
+      fields: processFixedFields ? (0, _lodash.uniq)(["instanceId"].concat(processFixedFields)) : ["instanceId"]
     };
     if (!(0, _lodash.isEmpty)(props.permission)) {
       v3Data.permission = data.permission = props.permission;
@@ -582,7 +597,7 @@ 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;
@@ -1006,10 +1021,10 @@ function LegacyInstanceList(props) {
   // 后台返回的默认配置
 
   const defaultFields = (0, _react.useMemo)(() => {
-    var _props$presetConfigs15, _props$extraFixedFiel3;
+    var _props$presetConfigs15;
     let defaultFields;
     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 : [];
+      extraFixedFieldIds = processFixedFields !== null && processFixedFields !== void 0 ? processFixedFields : [];
     if (!(0, _lodash.isEmpty)(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
@@ -1029,7 +1044,7 @@ function LegacyInstanceList(props) {
       defaultFields = (0, _lodash.uniq)([...defaultFields, ...extraFixedFieldIds]);
     }
     return defaultFields;
-  }, [props.presetConfigs, modelData, state.backendDefaultFields]);
+  }, [props.presetConfigs, modelData, state.backendDefaultFields, processFixedFields]);
 
   // istanbul ignore next
   const handleConfirm = async ({
@@ -1257,6 +1272,13 @@ function LegacyInstanceList(props) {
       });
     }
   }, [props.aq, props.aqToShow, props.showFilterInstanceSource]);
+  const fixedFieldIds = (0, _react.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.default.createElement(_antd.Spin, {
     spinning: state.loading
   }, state.inited && !state.failed ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (!props.searchDisabled || !props.advancedSearchDisabled || !props.relatedToMeDisabled || !props.aliveHostsDisabled || !props.moreButtonsDisabled) && /*#__PURE__*/_react.default.createElement("div", {
@@ -1453,7 +1475,8 @@ function LegacyInstanceList(props) {
     showCustomizedSerialNumber: props.showCustomizedSerialNumber,
     relationLimit: props.relationLimit,
     onRelationMoreIconClick: props.onRelationMoreIconClick,
-    configProps: props.tableConfigProps
+    configProps: props.tableConfigProps,
+    fixedFieldIds: fixedFieldIds
   })) :
   /*#__PURE__*/
   // 加个空白的div是为了将loading效果撑起来