@next-libs/cmdb-instances 6.48.0 → 6.49.1

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

@@ -24,10 +24,8 @@ export function joinRelationFieldAndShowkey(fields, modelData, objectList) {
       return field;
     } else {
       var relation = modelData.relation_list.find(relation => relation.left_id === field || relation.right_id === field);
-
       if (relation) {
         var _otherSideObject$view, _otherSideObject$view2, _otherSideObject$view3;
-
         var isLeft = relation.left_object_id === modelData.objectId;
         var otherSideObjectId = isLeft ? relation.right_object_id : relation.left_object_id;
         var otherSideObject = objectList.find(object => object.objectId === otherSideObjectId);
@@ -44,10 +42,8 @@ export function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
     $or: []
   };
   var queryValues = q.trim().split(/\s+/);
-
   if (onlySearchByIp) {
     var _getRuntime$getCurren;
-
     var searchIpFields = ((_getRuntime$getCurren = getRuntime().getCurrentApp().config) === null || _getRuntime$getCurren === void 0 ? void 0 : _getRuntime$getCurren.searchIpFields) || [];
     var queryOrs = [...new Set(["ip", ...searchIpFields])];
     var searchValue = {
@@ -60,7 +56,6 @@ export function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp) {
     });
     return query;
   }
-
   forEachAvailableFields(modelData, attr => {
     queryValues.forEach(queryValue => query.$or.push({
       [attr.id]: {
@@ -88,11 +83,9 @@ export var isSpecialFn = (query, attrId) => {
 export var specialQueryHandler = (query, key, queries) => {
   // $exists $gte $lte 针对为空，不为空，时间范围特殊处理
   var isSpecial = isSpecialFn(query, key);
-
   if (isSpecial) {
     return;
   }
-
   queries.push(query);
 };
 export var isValueEqualFn = (query, attrId, valuesStr) => {
@@ -101,13 +94,11 @@ export var isValueEqualFn = (query, attrId, valuesStr) => {
   return query[attrId] ? valuesStr && Object.values(query[attrId]).join(" ") !== valuesStr // 当条件是为空和不为空时，需要判断valuesStr是否存在
   : false;
 };
-
 function translateConditions(aq, idObjectMap, modelData, t) {
   var conditions = [];
   var relations = [];
   modelData.relation_list.forEach(relation => {
     var sidesArr = [];
-
     if (isSelfRelation(relation)) {
       sidesArr = [{
         this: "left",
@@ -119,14 +110,12 @@ function translateConditions(aq, idObjectMap, modelData, t) {
     } else {
       sidesArr = [getRelationObjectSides(relation, modelData)];
     }
-
     sidesArr.forEach(sides => {
       var objectId = relation["".concat(sides.this, "_id")];
       var relationObject = idObjectMap[relation["".concat(sides.that, "_object_id")]];
       var nameKeys = getInstanceNameKeys(relationObject);
       nameKeys.forEach(nameKey => {
         var _find$name, _find;
-
         var nameOfNameKey = (_find$name = (_find = find(relationObject === null || relationObject === void 0 ? void 0 : relationObject.attrList, ["id", nameKey])) === null || _find === void 0 ? void 0 : _find.name) !== null && _find$name !== void 0 ? _find$name : nameKey;
         var id = "".concat(objectId, ".").concat(nameKey);
         var name = "".concat(relation["".concat(sides.this, "_name")], "(").concat(nameOfNameKey, ")");
@@ -150,45 +139,35 @@ function translateConditions(aq, idObjectMap, modelData, t) {
     });
   });
   var attrAndRelationList = [...modelData.attrList, ...relations];
-
   if (!isEmpty(aq)) {
     for (var query of aq) {
       var _queries = [query];
-
       if (Object.keys(query)[0] === "$or" || Object.keys(query)[0] === "$and") {
         _queries = query[Object.keys(query)[0]];
       }
-
       _queries.forEach(query => {
         var key = Object.keys(query)[0];
         var value = Object.values(query)[0];
         var attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
-
         if (Object.keys(value)[0] === ElementOperators.Exists && attr.relationSideId) {
           var relationSideId = attr.relationSideId;
           attr = attrAndRelationList.find(attr => attr.id === "".concat(relationSideId, ".")) || attr;
         }
-
         if (attr) {
           query = changeQueryWithCustomRules(modelData.objectId, attr.id, query);
           var info = getFieldConditionsAndValues(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
-
           if (![ConditionType.Between, ConditionType.Empty, ConditionType.NotEmpty, ConditionType.False, ConditionType.True].includes(info.currentCondition.type)) {
             info.values = info.values.map(v => isString(v) && v.includes(" ") ? v.replace(/^"+|"+$/g, "") : v);
           }
-
           var condition = "".concat(attr.name, ": ").concat(info.currentCondition.label);
-
           if (![ConditionType.Empty, ConditionType.NotEmpty].includes(info.currentCondition.type)) {
             condition += "\"".concat(info.values.join(" ~ "), "\"");
           }
-
           var curCondition = {
             attrId: key,
             condition,
             valuesStr: info.queryValuesStr
           };
-
           if (conditions.every(v => !isEqual(omit(v, "attrId"), omit(curCondition, "attrId")))) {
             conditions.push(curCondition);
           }
@@ -196,27 +175,20 @@ function translateConditions(aq, idObjectMap, modelData, t) {
       });
     }
   }
-
   return conditions;
 }
-
 function newKey(fieldIds, aq) {
   var key = "";
-
   if (!isEmpty(fieldIds)) {
     key += fieldIds.join("-");
   }
-
   if (!isEmpty(aq)) {
     key += "-".concat(aq.length);
   }
-
   return key;
 }
-
 var isOfStruct = (modelData, fieldId) => {
   var _modelData$attrList$f;
-
   var structFields = (_modelData$attrList$f = modelData.attrList.filter(attr => attr.value.type === "struct" || attr.value.type === "structs")) === null || _modelData$attrList$f === void 0 ? void 0 : _modelData$attrList$f.map(attr => {
     var structs = [];
     attr.value.struct_define.forEach(struct => {
@@ -226,31 +198,25 @@ var isOfStruct = (modelData, fieldId) => {
   }).flat();
   return structFields.includes(fieldId);
 };
-
 var isOfBoolean = (attrList, fieldId) => {
   var _keyAttrMap$fieldId;
-
   var keyAttrMap = keyBy(attrList, "id");
   return ((_keyAttrMap$fieldId = keyAttrMap[fieldId]) === null || _keyAttrMap$fieldId === void 0 ? void 0 : _keyAttrMap$fieldId.value.type) === ModelAttributeValueType.BOOLEAN;
 };
-
 export var initAqToShow = function (aq, modelData) {
   var isToShow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var newAqToShow = [];
-
   if (aq) {
     aq.forEach(query => {
       var aqToShow = Object.entries(query).map(_ref => {
         var [key, expressions] = _ref;
         var newExpressions = [];
-
         if (key === LogicalOperators.Or || key === LogicalOperators.And) {
           var firstSubQuery = expressions[0];
           var _fieldId = Object.keys(firstSubQuery)[0];
           var isStruct = isOfStruct(modelData, _fieldId);
           var isBool = isOfBoolean(modelData.attrList, _fieldId);
           var structQueries = expressions.filter(expression => Object.keys(expression)[0] === _fieldId);
-
           if (isStruct && isToShow) {
             var structExpressions = structQueries.map(item => ({
               [_fieldId.split(".")[0]]: item[_fieldId]
@@ -259,7 +225,6 @@ export var initAqToShow = function (aq, modelData) {
           } else if (isBool && !isToShow) {
             var boolExpressions = expressions.map(expression => {
               var targetValue = expression[_fieldId];
-
               if (typeof Object.values(targetValue)[0] === "string") {
                 return {
                   [_fieldId]: {
@@ -274,7 +239,6 @@ export var initAqToShow = function (aq, modelData) {
           } else {
             newExpressions = [...newExpressions, ...expressions];
           }
-
           return {
             [key]: newExpressions
           };
@@ -286,12 +250,10 @@ export var initAqToShow = function (aq, modelData) {
     });
     return newAqToShow;
   }
-
   return;
 };
 export function LegacyInstanceList(props) {
   var _props$selectedRowKey, _state$appList, _props$extraFilterBri;
-
   var {
     showTooltip = true
   } = props;
@@ -300,15 +262,16 @@ export function LegacyInstanceList(props) {
     name: i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.ALL_CLUSTER))
   }];
   var jsonLocalStorage = new JsonStorage(localStorage);
-
   var reducer = (prevState, updatedProperty) => {
     return _objectSpread(_objectSpread({}, prevState), updatedProperty);
-  }; // 资源自动发现页面24小时发现主机抽屉的实例列表处，通用的postSearchV3接口无法查到正确结果，需要用下面的接口替换，参数里也要加上jobId:***
+  };
+  // 资源自动发现页面24小时发现主机抽屉的实例列表处，通用的postSearchV3接口无法查到正确结果，需要用下面的接口替换，参数里也要加上jobId:***
   // 为了不影响其他地方的实例列表，在该处加一个useAutoDiscoveryProvider参数，该参数为undefined或false的，仍调用原接口
 
-
   var listProvider = useProvider("easyops.api.cmdb.job@SearchResource:1.0.1");
-  var instanceArchiveListProvider = useProvider("providers-of-cmdb.instance-archive-api-list-archive-instance");
+  var instanceArchiveListProvider = useProvider("providers-of-cmdb.instance-archive-api-list-archive-instance", {
+    cache: false
+  });
   var {
     modelData,
     idObjectMap
@@ -317,7 +280,6 @@ export function LegacyInstanceList(props) {
     var idObjectMap = {};
     props.objectList.forEach(object => {
       idObjectMap[object.objectId] = object;
-
       if (object.objectId === props.objectId) {
         modelData = object;
         modelData.attrList = !props.disabledDefaultFields ? union(object.attrList, extraFieldAttrs) : object.attrList;
@@ -330,29 +292,23 @@ export function LegacyInstanceList(props) {
   }, [props.objectList, props.objectId]);
   var [inheritanceModelIdNameMap, setInheritanceModelIdNameMap] = useState({});
   var [fixedHeader, setFixHeader] = useState(false);
-
   var fetchInheritanceModelIdNameMap = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(function* (modelData) {
       var idNameMap = {};
-
       if (modelData.isAbstract) {
         idNameMap = yield CmdbObjectApi_getIdMapName({
           parentObjectId: modelData.objectId
         });
       }
-
       setInheritanceModelIdNameMap(idNameMap);
     });
-
     return function fetchInheritanceModelIdNameMap(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
-
   useEffect(() => {
     fetchInheritanceModelIdNameMap(modelData);
   }, [modelData]);
-
   var computeDefaultFields = function () {
     var {
       inModal
@@ -368,22 +324,18 @@ export function LegacyInstanceList(props) {
     return {
       fieldIds
     };
-  }; // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
-
+  };
 
+  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
   var _sortFieldIds = fieldIds => {
     var _props$presetConfigs;
-
     var frontFields = [];
     var restFields = [];
-
     if ((_props$presetConfigs = props.presetConfigs) !== null && _props$presetConfigs !== void 0 && _props$presetConfigs.fieldIds) {
       frontFields = filter(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
     }
-
     restFields = sortBy(reject(fieldIds, id => frontFields.includes(id)), fieldId => {
       var foundIndex = findIndex(modelData.view.attr_order, orderId => orderId === fieldId);
-
       if (foundIndex === -1) {
         return null;
       } else {
@@ -392,25 +344,19 @@ export function LegacyInstanceList(props) {
     });
     return [...frontFields, ...restFields];
   };
-
   var getFields = () => {
     var _props$presetConfigs2, _props$extraFixedFiel;
-
     var fieldIds = (_props$presetConfigs2 = props.presetConfigs) === null || _props$presetConfigs2 === void 0 ? void 0 : _props$presetConfigs2.fieldIds;
     var extraFixedFieldIds = (_props$extraFixedFiel = props.extraFixedFields) !== null && _props$extraFixedFiel !== void 0 ? _props$extraFixedFiel : [];
-
     if (isEmpty(fieldIds)) {
       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 || [];
@@ -418,11 +364,9 @@ export function LegacyInstanceList(props) {
     modelData.isAbstract && fieldIds.push("_object_id");
     return fieldIds;
   };
-
   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$presetConfigs3;
-
     return {
       objectId: props.objectId,
       q: props.q,
@@ -457,27 +401,22 @@ export function LegacyInstanceList(props) {
   var [selectedRowKeys, setSelectedRowKeys] = useState((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
   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 data = {};
       var v3Data = {
         fields: props !== null && props !== void 0 && props.extraFixedFields ? uniq(["instanceId"].concat(props === null || props === void 0 ? void 0 : props.extraFixedFields)) : ["instanceId"]
       };
-
       if (!isEmpty(props.permission)) {
         v3Data.permission = data.permission = props.permission;
       }
-
       var archiveData = {};
       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 order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
-
       if (sort) {
         data.sort = {
           [sort]: order
@@ -487,23 +426,18 @@ export function LegacyInstanceList(props) {
           order
         }];
       }
-
       if (state.q) {
         query = getQuery(modelData, idObjectMap, state.q, state.fieldIds, props.onlySearchByIp);
       }
-
       if (state.q && props.useInstanceArchiveProvider) {
         archiveData.key_word = state.q;
       }
-
       if (!isEmpty(state.aq)) {
         query[LogicalOperators.And] = state.aq;
       }
-
       if (!isEmpty(props.defaultQuery)) {
         query[LogicalOperators.And] = [...(query[LogicalOperators.And] || []), ...props.defaultQuery];
       }
-
       if (props.presetConfigs) {
         if (!isEmpty(props.presetConfigs.query)) {
           if (Object.keys(query).length) {
@@ -515,51 +449,42 @@ export function LegacyInstanceList(props) {
           }
         }
       }
-
       if (state.fieldIds) {
         data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
         v3Data.fields = [...state.fieldIds, ...v3Data.fields];
         v3Data.ignore_missing_field_error = true;
       }
-
       if (props.useAutoDiscoveryProvider) {
         v3Data.fields = joinRelationFieldAndShowkey(v3Data.fields, modelData, props.objectList);
       }
-
       if (props.useInstanceArchiveProvider) {
         archiveData.fields = v3Data.fields.join(",");
       }
-
       if (state.aliveHosts && props.objectId === "HOST") {
         query = _objectSpread(_objectSpread({}, query), {}, {
           _agentStatus: "正常"
         });
       }
-
       if (state.instanceSourceQuery) {
         query = _objectSpread(_objectSpread({}, query), {}, {
           _object_id: state.instanceSourceQuery
         });
       }
-
       if (!isEmpty(query)) {
         v3Data.query = data.query = query;
-      } // useAutoDiscoveryProvider=true, 使用useProvider的接口，请求参数里加上extraParams
-
+      }
+      // useAutoDiscoveryProvider=true, 使用useProvider的接口，请求参数里加上extraParams
 
       if (props.useAutoDiscoveryProvider && !isEmpty(props.extraParams)) {
         Object.assign(v3Data, props.extraParams);
       }
-
       if (state.relatedToMe) {
         v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
-      } //按应用筛选
+      }
+      //按应用筛选
       // istanbul ignore next (state is not updated)
-
-
       if (state.searchByApp) {
         var _props$presetConfigs4, _props$presetConfigs5, _props$presetConfigs6, _props$presetConfigs7, _props$presetConfigs8;
-
         var hostRange = (_props$presetConfigs4 = props.presetConfigs) === null || _props$presetConfigs4 === void 0 ? void 0 : (_props$presetConfigs5 = _props$presetConfigs4.query) === null || _props$presetConfigs5 === void 0 ? void 0 : (_props$presetConfigs6 = _props$presetConfigs5["$and"]) === null || _props$presetConfigs6 === void 0 ? void 0 : (_props$presetConfigs7 = _props$presetConfigs6.find(i => i.instanceId)) === null || _props$presetConfigs7 === void 0 ? void 0 : (_props$presetConfigs8 = _props$presetConfigs7.instanceId) === null || _props$presetConfigs8 === void 0 ? void 0 : _props$presetConfigs8["$in"];
         v3Data.query = _objectSpread(_objectSpread({
           [state.currentChangeSelect === "App" || state.currentChangeSelect === "Cluster" && state.clusterValue === "all" ? "_deviceList_CLUSTER.appId.instanceId" : "_deviceList_CLUSTER.instanceId"]: state.appSearchInstanceId
@@ -571,27 +496,22 @@ export function LegacyInstanceList(props) {
           _agentStatus: "正常"
         } : {});
       }
-
       if (props.useInstanceArchiveProvider) {
         return instanceArchiveListProvider.query([props.objectId, archiveData]);
       }
-
-      var promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data); // useAutoDiscoveryProvider=true, 使用useProvider的接口
-
+      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 function getInstanceListData(_x2, _x3, _x4) {
       return _ref5.apply(this, arguments);
     };
   }();
-
   var refreshInstanceList = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(function* (sort, asc, page) {
       setState({
         loading: true
       });
-
       try {
         if (props.dataSource) {
           setState({
@@ -625,21 +545,17 @@ export function LegacyInstanceList(props) {
         });
       }
     });
-
     return function refreshInstanceList(_x5, _x6, _x7) {
       return _ref6.apply(this, arguments);
     };
   }();
-
   useEffect(() => {
     var _props$presetConfigs9;
-
     var fieldIds = getFields();
-
-    if ( // 当 props.objectId 改变时，总是更新 state.fieldIds
+    if (
+    // 当 props.objectId 改变时，总是更新 state.fieldIds
     props.objectId !== state.objectId || !isEqual(fieldIds, state.fieldIds) || !isEqual((_props$presetConfigs9 = props.presetConfigs) === null || _props$presetConfigs9 === void 0 ? void 0 : _props$presetConfigs9.query, state.presetConfigsQuery)) {
       var _props$presetConfigs10;
-
       setState({
         fieldIds,
         presetConfigsQuery: (_props$presetConfigs10 = props.presetConfigs) === null || _props$presetConfigs10 === void 0 ? void 0 : _props$presetConfigs10.query
@@ -648,21 +564,18 @@ export function LegacyInstanceList(props) {
   }, [props.objectId, props.presetConfigs]);
   useEffect(() => {
     var _props$selectedRowKey2;
-
     setSelectedRowKeys((_props$selectedRowKey2 = props.selectedRowKeys) !== null && _props$selectedRowKey2 !== void 0 ? _props$selectedRowKey2 : []);
-  }, [props.objectId, props.selectedRowKeys]); // on filter condition change
+  }, [props.objectId, props.selectedRowKeys]);
 
+  // on filter condition change
   useEffect(() => {
     if (isFirstRunRef.current) {
       isFirstRunRef.current = false;
       return;
     }
-
     var skip = false;
-
     if (state.page !== 1) {
       var _props$onPaginationCh;
-
       setState({
         page: 1
       });
@@ -671,46 +584,41 @@ export function LegacyInstanceList(props) {
         pageSize: state.pageSize
       });
       skip = true;
-    } // 当 prop.objectId 改变时先跳过，等 state.fieldIds 更新后再获取数据
-
+    }
 
+    // 当 prop.objectId 改变时先跳过，等 state.fieldIds 更新后再获取数据
     if (props.objectId !== state.objectId) {
       setState({
         objectId: props.objectId
       });
       skip = true;
     }
-
     if (skip) {
       return;
     }
-
     refreshInstanceList(state.sort, state.asc, 1);
-  }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]); // on other condition change
+  }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
 
+  // on other condition change
   useEffect(() => {
     if (isEmpty(state.fieldIds)) return;
     refreshInstanceList(state.sort, state.asc, state.page);
   }, [state.page, state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
-
   var onChange = e => {
     setQ(e.target.value);
-  }; // istanbul ignore next
-
+  };
 
+  // istanbul ignore next
   var onSelectionChange = useCallback( /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(function* (selected) {
       var _props$onSelectionCha;
-
       var {
         selectedItems,
         selectedKeys
       } = selected;
       setSelectedRowKeys(selectedKeys);
-
       if (selectedKeys.length > compact(selectedItems).length) {
         var ids = selectedKeys.filter(id => !cache.current.has(id));
-
         if (ids.length) {
           var resp;
           var params = {
@@ -721,44 +629,36 @@ export function LegacyInstanceList(props) {
               }
             },
             page_size: ids.length
-          }; // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
-
+          };
+          // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
           if (props.useAutoDiscoveryProvider) {
             resp = yield listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
           } else {
             resp = yield InstanceApi_postSearchV3(props.objectId, params);
           }
-
           resp.list.forEach(i => cache.current.set(i.instanceId, i));
         }
-
         selectedItems = selectedKeys.map(id => cache.current.get(id));
       }
-
       (_props$onSelectionCha = props.onSelectionChange) === null || _props$onSelectionCha === void 0 ? void 0 : _props$onSelectionCha.call(props, {
         selectedItems,
         selectedKeys
       });
     });
-
     return function (_x8) {
       return _ref7.apply(this, arguments);
     };
   }(), []);
-
   var onSearch = value => {
     var _props$onSearch;
-
     var q = value.trim();
     setState({
       q
     });
     (_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, q);
   };
-
   var onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
     var _props$onAdvancedSear;
-
     setState({
       aq: queries,
       fieldToShow,
@@ -766,18 +666,14 @@ 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;
       }
-
       setState({
         asc: undefined,
         sort: undefined
@@ -790,12 +686,10 @@ export function LegacyInstanceList(props) {
       asc = info.asc;
       sort = info.sort;
     }
-
     (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
   }, [state.sort]);
   var onPaginationChange = useCallback(pagination => {
     var _props$onPaginationCh2;
-
     setState({
       page: pagination.page,
       pageSize: pagination.pageSize
@@ -804,42 +698,34 @@ export function LegacyInstanceList(props) {
   }, []);
   var onInstanceSourceChange = useCallback(instanceSourceQuery => {
     var _props$onInstanceSour;
-
     setState({
       instanceSourceQuery
     });
     (_props$onInstanceSour = props.onInstanceSourceChange) === null || _props$onInstanceSour === void 0 ? void 0 : _props$onInstanceSour.call(props, instanceSourceQuery);
   }, []);
-
   var onRelatedToMeChange = checked => {
     var _props$onRelatedToMeC;
-
     setState({
       relatedToMe: checked
     });
     (_props$onRelatedToMeC = props.onRelatedToMeChange) === null || _props$onRelatedToMeC === void 0 ? void 0 : _props$onRelatedToMeC.call(props, checked);
   };
-
   var onAliveHostsChange = checked => {
     var _props$onAliveHostsCh;
-
     setState({
       aliveHosts: checked
     });
     (_props$onAliveHostsCh = props.onAliveHostsChange) === null || _props$onAliveHostsCh === void 0 ? void 0 : _props$onAliveHostsCh.call(props, checked);
   };
-
   var toggleAutoBreakLine = autoBreakLine => {
     setState({
       autoBreakLine
     });
-  }; // istanbul ignore next (state is not updated)
-
-
+  };
+  // istanbul ignore next (state is not updated)
   var toggleSearchMode = React.useCallback( /*#__PURE__*/_asyncToGenerator(function* () {
     if (!state.searchByApp) {
       var _appListResp$list, _appListResp$list2, _appListResp$list3;
-
       var appListResp = yield InstanceApi_postSearchV3("APP", {
         fields: ["clusters", "instanceId", "name"],
         sort: [{
@@ -864,8 +750,8 @@ export function LegacyInstanceList(props) {
         page: 1
       });
     }
-  }), [state.searchByApp]); // istanbul ignore next (state is not updated)
-
+  }), [state.searchByApp]);
+  // istanbul ignore next (state is not updated)
   var appSelectChange = v => {
     setState({
       appSearchInstanceId: v,
@@ -874,9 +760,8 @@ export function LegacyInstanceList(props) {
       clusterValue: "all",
       clusterList: [...baseList, ...state.appList.find(r => r.instanceId === v).clusters]
     });
-  }; // istanbul ignore next (state is not updated)
-
-
+  };
+  // istanbul ignore next (state is not updated)
   var clusterSelectChange = v => {
     setState({
       appSearchInstanceId: v === "all" ? state.appSelectValue : v,
@@ -884,33 +769,28 @@ export function LegacyInstanceList(props) {
       clusterValue: v
     });
   };
-
   var defaultFields = useMemo(() => {
     var _props$presetConfigs11, _props$extraFixedFiel2;
-
     var defaultFields;
     var fieldIds = (_props$presetConfigs11 = props.presetConfigs) === null || _props$presetConfigs11 === void 0 ? void 0 : _props$presetConfigs11.fieldIds,
-        extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
-
+      extraFixedFieldIds = (_props$extraFixedFiel2 = props.extraFixedFields) !== null && _props$extraFixedFiel2 !== void 0 ? _props$extraFixedFiel2 : [];
     if (!isEmpty(fieldIds)) {
       defaultFields = props.presetConfigs.fieldIds;
     } else {
       defaultFields = computeDefaultFields().fieldIds;
     }
-
     if (!isEmpty(extraFixedFieldIds)) {
       defaultFields = uniq([...defaultFields, ...extraFixedFieldIds]);
     }
-
     return defaultFields;
-  }, [props.presetConfigs, modelData]); // istanbul ignore next
+  }, [props.presetConfigs, modelData]);
 
+  // istanbul ignore next
   var handleConfirm = _ref9 => {
     var {
       fields,
       isReset
     } = _ref9;
-
     if (isReset) {
       var fieldIds = defaultFields;
       modelData.isAbstract && fieldIds.push("_object_id");
@@ -927,78 +807,61 @@ export function LegacyInstanceList(props) {
       props.onFieldsModalConfirm(fields);
     }
   };
-
   useEffect(() => {
     var _props$notifyCurrentF;
-
     (_props$notifyCurrentF = props.notifyCurrentFields) === null || _props$notifyCurrentF === void 0 ? void 0 : _props$notifyCurrentF.call(props, state.fieldIds);
-  }, [props.notifyCurrentFields]); // istanbul ignore next
+  }, [props.notifyCurrentFields]);
 
+  // istanbul ignore next
   useEffect(() => {
     var _props$selectedRowKey3;
-
     ((_props$selectedRowKey3 = props.selectedRowKeys) === null || _props$selectedRowKey3 === void 0 ? void 0 : _props$selectedRowKey3.length) && _asyncToGenerator(function* () {
       var data = {};
       var v3Data = {
         fields: ["instanceId"]
       };
-
       if (!isEmpty(props.permission)) {
         v3Data.permission = data.permission = props.permission;
       }
-
       if (state.fieldIds) {
         data.fields = Object.fromEntries(state.fieldIds.map(fieldId => [fieldId, true]));
         v3Data.fields = [...state.fieldIds, ...v3Data.fields];
         v3Data.ignore_missing_field_error = true;
       }
-
       v3Data.query = {
         instanceId: {
           $in: props.selectedRowKeys
         }
       };
       v3Data.page_size = props.selectedRowKeys.length;
-
       if (state.relatedToMe) {
         v3Data.only_my_instance = data.only_my_instance = state.relatedToMe;
       }
-
       if (props.extraParams) {
         Object.assign(v3Data, props.extraParams);
       }
-
       var resp;
-
       if (props.useAutoDiscoveryProvider) {
         resp = yield listProvider.query([props.objectId, v3Data]);
       } else {
         resp = yield InstanceApi_postSearchV3(props.objectId, v3Data);
       }
-
       resp.list.forEach(i => cache.current.set(i.instanceId, i));
     })();
   }, [props.selectedRowKeys]);
-
   var handleToggleFixHeader = () => {
     setFixHeader(!fixedHeader);
   };
-
   var onAdvancedSearchCloseGen = (attrId, valuesStr) => {
     return () => {
       var _props$onAdvancedSear2;
-
       var queries = [];
       var queriesToShow = [];
-
       var filterAq = queries => queries.filter(v => isValueEqualFn(v, attrId, valuesStr));
-
       state.aq.forEach(query => {
         var key = Object.keys(query)[0];
-
         if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
           var filteredSubQueries = filterAq(query[key]);
-
           if (filteredSubQueries.length > 0) {
             queries.push({
               [key]: filteredSubQueries
@@ -1009,10 +872,10 @@ export function LegacyInstanceList(props) {
           if (!Array.isArray(query[key]) && isSpecialFn(query, key)) {
             queries.push(query);
           } else {
-            var _fieldId2 = Object.keys(query[key][0])[0]; // 判断是否为结构体
-
-            var isStruct = isOfStruct(modelData, _fieldId2); // 结构体情况处理
-
+            var _fieldId2 = Object.keys(query[key][0])[0];
+            // 判断是否为结构体
+            var isStruct = isOfStruct(modelData, _fieldId2);
+            // 结构体情况处理
             if (!((key === "$or" || key === "$and") && startsWith(_fieldId2, "".concat(attrId, ".")) && isStruct)) {
               queries.push(query);
             }
@@ -1023,10 +886,8 @@ export function LegacyInstanceList(props) {
       });
       state.aqToShow.forEach(query => {
         var key = Object.keys(query)[0];
-
         if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
           var filteredSubQueries = filterAq(query[key]);
-
           if (filteredSubQueries.length > 0) {
             queriesToShow.push({
               [key]: filteredSubQueries
@@ -1045,7 +906,6 @@ export function LegacyInstanceList(props) {
       (_props$onAdvancedSear2 = props.onAdvancedSearch) === null || _props$onAdvancedSear2 === void 0 ? void 0 : _props$onAdvancedSear2.call(props, queries);
     };
   };
-
   var conditions = translateConditions(state.aqToShow, idObjectMap, modelData);
   return /*#__PURE__*/React.createElement(Spin, {
     spinning: state.loading
@@ -1221,12 +1081,12 @@ export function LegacyInstanceList(props) {
     rowSelectionType: props.rowSelectionType
   })) : null);
 }
+
 /**
  *  把 objectList 封装到构件中请求，废弃掉通过老模板使用的方式，可直接使用构件。
  *  同时也兼容之前的使用方式，对于外部传进来的会优先使用外部的数据，构件内部不会额外请求，
  *  不传的话构件内部做请求，并作缓存
  */
-
 export function InstanceList(props) {
   var [objectList, setObjectList] = useState(props.objectList);
   useEffect(() => {
@@ -1236,7 +1096,6 @@ export function InstanceList(props) {
       _asyncToGenerator(function* () {
         if (!props.objectList) {
           var cacheData = objectListCache.get(props.objectId);
-
           if (cacheData) {
             setObjectList(cacheData);
           } else {