@next-libs/cmdb-instances 7.30.1 → 7.30.3

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

@@ -91,7 +91,22 @@ function getQuery(modelData, idObjectMap, q, fields, onlySearchByIp, extraFixedF
         });
       });
     });
-  }, fields);
+  }, fields,
+  //istanbul ignore next
+  relation => {
+    var _relation$display_key;
+    const relationObject = idObjectMap[relation.relation_object];
+    const showKeys = (_relation$display_key = relation.display_keys) !== null && _relation$display_key !== void 0 && _relation$display_key.length ? relation.display_keys : (0, _cmdbUtils.getInstanceNameKeys)(relationObject);
+    queryValues.forEach(queryValue => {
+      showKeys.forEach(nameKey => {
+        query.$or.push({
+          [`${relation.relation_id}.${nameKey}`]: {
+            $like: `%${queryValue}%`
+          }
+        });
+      });
+    });
+  });
   return query;
 }
 const isSpecialFn = (query, attrId) => {
@@ -145,8 +160,8 @@ function translateConditions(aq, idObjectMap, modelData, t) {
   const relations = [];
   const transHierRelations = [];
   (_modelData$view = modelData.view) === null || _modelData$view === void 0 ? void 0 : (_modelData$view$trans = _modelData$view.trans_hier_relation_list) === null || _modelData$view$trans === void 0 ? void 0 : _modelData$view$trans.forEach(relation => {
-    var _relation$display_key;
-    const nameKeys = (_relation$display_key = relation.display_keys) !== null && _relation$display_key !== void 0 && _relation$display_key.length ? relation.display_keys : (0, _cmdbUtils.getInstanceNameKeys)(idObjectMap[relation.relation_object]);
+    var _relation$display_key2;
+    const nameKeys = (_relation$display_key2 = relation.display_keys) !== null && _relation$display_key2 !== void 0 && _relation$display_key2.length ? relation.display_keys : (0, _cmdbUtils.getInstanceNameKeys)(idObjectMap[relation.relation_object]);
     nameKeys.forEach(nameKey => {
       transHierRelations.push({
         id: `${relation.relation_id}.${nameKey}`,
@@ -353,6 +368,9 @@ function LegacyInstanceList(props) {
   const ignorePermissionProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@PostSearchV3WithAdmin:1.0.0", {
     cache: false
   });
+  const searchRelationInstanceProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@SearchRelationInstance:1.1.0", {
+    cache: false
+  });
   // istanbul ignore next
 
   const fieldsProvider = (0, _brickKit.useProvider)("easyops.api.cmdb.instance@GetListDisplayView:1.0.1", {
@@ -582,7 +600,7 @@ function LegacyInstanceList(props) {
     };
   }, [props.objectId, props.externalSourceId]);
   const getInstanceListData = async (sort, asc, page) => {
-    var _modelData$attrList2, _modelData$attrList2$, _modelData$attrList2$2, _props$onSearchExecut;
+    var _modelData$attrList2, _modelData$attrList2$, _modelData$attrList2$2, _props$onSearchExecut, _props$transHierRelat;
     const data = {};
     const v3Data = {
       fields: processFixedFields ? (0, _lodash.uniq)(["instanceId"].concat(processFixedFields)) : ["instanceId"]
@@ -702,7 +720,10 @@ function LegacyInstanceList(props) {
     return promise ? promise : props.useExternalCmdbApi ? externalPostSearchV3.query([{
       ...v3Data,
       ...externalRequestParams
-    }]) : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data); //涉及到v3data的请求
+    }]) : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : props.searchTransHierRelationInstance && (_props$transHierRelat = props.transHierRelation) !== null && _props$transHierRelat !== void 0 && _props$transHierRelat.relation_id && props.searchTransHierRelationSource ? searchRelationInstanceProvider.query([props.searchTransHierRelationSource.objectId, props.transHierRelation.relation_id, props.searchTransHierRelationSource.instanceId, {
+      query_relation: v3Data.query,
+      ...v3Data
+    }]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data); //涉及到v3data的请求
   };
   const refreshInstanceList = async (sort, asc, page) => {
     setState({
@@ -1562,15 +1583,17 @@ function LegacyInstanceListWrapper(props) {
       if (transHierRelationSideObjectIds !== null && transHierRelationSideObjectIds !== void 0 && transHierRelationSideObjectIds.length && !transHierRelationSideObjectIds.every(i => objectList.some(o => o.objectId === i))) {
         var _list;
         let list;
-        if (props.useExternalCmdbApi) {
-          list = await externalGetObjectRef.query([{
-            ref_object: transHierRelationSideObjectIds.join(","),
-            sourceId: props.externalSourceId
-          }]);
-        } else {
-          list = (await (0, _cmdbSdk.CmdbObjectApi_getObjectRef)({
-            ref_object: transHierRelationSideObjectIds.join(",")
-          })).data;
+        try {
+          if (!props.useExternalCmdbApi) {
+            list = (await (0, _cmdbSdk.CmdbObjectApi_list)({
+              page: 1,
+              page_size: transHierRelationSideObjectIds.length,
+              objectIds: transHierRelationSideObjectIds.join(",")
+            })).list;
+          }
+        } catch (e) {
+          // istanbul ignore next
+          (0, _brickKit.handleHttpError)(e);
         }
         if ((_list = list) !== null && _list !== void 0 && _list.length) {
           objectList.push(...list);