@next-libs/cmdb-instances 7.30.2 → 7.30.4

package/dist/cjs/instance-detail/InstanceDetail.js

@@ -21,6 +21,7 @@ var _brickKit = require("@next-core/brick-kit");
 var _instanceRelationTableShow = require("./components/instance-relation-table-show/instance-relation-table-show");
 var _instancesAttachmentDisplay = require("./components/instances-attachment-display/instances-attachment-display");
 var _cmdbUtils = require("@next-libs/cmdb-utils");
+var _cmdbSdk = require("@next-sdk/cmdb-sdk");
 var _basicComponents = require("@next-libs/basic-components");
 var _codeDisplayComponents = require("@next-libs/code-display-components");
 var _StructTable = require("../struct-components/StructTable");
@@ -577,13 +578,18 @@ class LegacyInstanceDetail extends _react.default.Component {
 
   // istanbul ignore next
   async searchInstanceRelationData(page, pageSize, attr, value, externalSourceId) {
-    var _modelData$view, _modelDataMap$objectI;
+    var _modelData$view, _modelDataMap$objectI7, _modelDataMap$objectI8;
+    const isTransHierRelation = attr.__isTransHierRelation;
     const {
       right_id,
       left_object_id,
       right_object_id,
       left_id
     } = attr;
+    let lastRelation = "";
+    let lastRelationSourceObjectId = "";
+    let lastRelationSourceObject = {};
+    let lastRelationSourceObjectRef = {};
     let objectId, queryId, oppositeId;
     const {
       modelData,
@@ -607,9 +613,22 @@ class LegacyInstanceDetail extends _react.default.Component {
       queryId = attr.__id === left_id ? right_id : left_id;
       oppositeId = attr.__id === left_id ? left_id : right_id;
     }
-    const defaultRelationFields = (0, _lodash.get)(modelData, ["view", "relation_default_attr", oppositeId]);
-    const fields = defaultRelationFields !== null && defaultRelationFields !== void 0 && defaultRelationFields.length ? defaultRelationFields.map(item => item.startsWith("#") ? item.slice(1) : item) : (0, _lodash.uniq)((0, _lodash.map)((_modelDataMap$objectI = modelDataMap[objectId]) === null || _modelDataMap$objectI === void 0 ? void 0 : _modelDataMap$objectI.attrList, "id"));
-    if (modelDataMap[objectId].isAbstract) {
+    if (isTransHierRelation) {
+      var _modelDataMap$objectI, _modelDataMap$objectI2, _modelDataMap$objectI3, _modelDataMap$objectI4, _modelDataMap$objectI5, _modelDataMap$objectI6;
+      objectId = attr.relation_object;
+      const paths = attr.query_path.split(".");
+      lastRelation = paths[paths.length - 1];
+      lastRelationSourceObjectId = ((_modelDataMap$objectI = modelDataMap[objectId]) === null || _modelDataMap$objectI === void 0 ? void 0 : (_modelDataMap$objectI2 = _modelDataMap$objectI.relation_list) === null || _modelDataMap$objectI2 === void 0 ? void 0 : (_modelDataMap$objectI3 = _modelDataMap$objectI2.find(item => item.left_id === lastRelation && item.right_object_id === objectId)) === null || _modelDataMap$objectI3 === void 0 ? void 0 : _modelDataMap$objectI3.left_object_id) || ((_modelDataMap$objectI4 = modelDataMap[objectId]) === null || _modelDataMap$objectI4 === void 0 ? void 0 : (_modelDataMap$objectI5 = _modelDataMap$objectI4.relation_list) === null || _modelDataMap$objectI5 === void 0 ? void 0 : (_modelDataMap$objectI6 = _modelDataMap$objectI5.find(item => item.right_id === lastRelation && item.left_object_id === objectId)) === null || _modelDataMap$objectI6 === void 0 ? void 0 : _modelDataMap$objectI6.right_object_id);
+      lastRelationSourceObject = modelDataMap[lastRelationSourceObjectId] || {};
+      if ((0, _lodash.isEmpty)(lastRelationSourceObject)) {
+        const lastRelationSourceObjectList = await (0, _dataProviders.fetchCmdbObjectRef)(objectId);
+        lastRelationSourceObjectRef = (0, _lodash.keyBy)(lastRelationSourceObjectList.data || [], "objectId");
+        lastRelationSourceObject = lastRelationSourceObjectRef[lastRelationSourceObjectId] || {};
+      }
+    }
+    const defaultRelationFields = (0, _lodash.get)(isTransHierRelation ? lastRelationSourceObject : modelData, ["view", "relation_default_attr", isTransHierRelation ? lastRelation : oppositeId]);
+    const fields = defaultRelationFields !== null && defaultRelationFields !== void 0 && defaultRelationFields.length ? defaultRelationFields.map(item => item.startsWith("#") ? item.slice(1) : item) : (0, _lodash.uniq)((0, _lodash.map)((_modelDataMap$objectI7 = modelDataMap[objectId]) === null || _modelDataMap$objectI7 === void 0 ? void 0 : _modelDataMap$objectI7.attrList, "id"));
+    if ((_modelDataMap$objectI8 = modelDataMap[objectId]) !== null && _modelDataMap$objectI8 !== void 0 && _modelDataMap$objectI8.isAbstract) {
       fields.unshift("_object_id");
     }
     let query = {};
@@ -644,12 +663,20 @@ class LegacyInstanceDetail extends _react.default.Component {
       }
     };
     let instanceRelationModalData;
-    if (this.props.ignorePermission) {
-      instanceRelationModalData = (await _brickHttp.http.post(`api/gateway/easyops.api.cmdb.instance.PostSearchV3WithAdmin/v3/object/${objectId}/instance/_search`, {
-        ...params
+    if (isTransHierRelation) {
+      instanceRelationModalData = (await _brickHttp.http.post(`/api/gateway/logic.cmdb.service/object/${this.props.objectId}/relation/${attr.relation_id}/instance/${this.props.instanceId}`, {
+        ...params,
+        query_relation: query,
+        query: {}
       })).data;
     } else {
-      instanceRelationModalData = await (0, _dataProviders.fetchCmdbInstanceSearch)(objectId, params, externalSourceId);
+      if (this.props.ignorePermission) {
+        instanceRelationModalData = (await _brickHttp.http.post(`api/gateway/easyops.api.cmdb.instance.PostSearchV3WithAdmin/v3/object/${objectId}/instance/_search`, {
+          ...params
+        })).data;
+      } else {
+        instanceRelationModalData = await (0, _dataProviders.fetchCmdbInstanceSearch)(objectId, params, externalSourceId);
+      }
     }
     this.setState({
       instanceRelationModalData,
@@ -743,7 +770,7 @@ class LegacyInstanceDetail extends _react.default.Component {
       modelData,
       basicInfoGroupList
     } = state;
-    const basicInfoList = this.formatBasicInfoGroupList(modelData, basicInfoGroupList);
+    const basicInfoList = this.formatBasicInfoGroupList((0, _cmdbUtils.modifyModelData)(modelData, true), basicInfoGroupList);
     this.setState({
       basicInfoGroupList: basicInfoList,
       basicInfoGroupListShow: basicInfoList
@@ -909,10 +936,14 @@ class LegacyInstanceDetail extends _react.default.Component {
       const modelData = modelDataMap[props.objectId];
       const transHierRelationSideObjectIds = (_modelData$view2 = modelData.view) === null || _modelData$view2 === void 0 ? void 0 : (_modelData$view2$tran = _modelData$view2.trans_hier_relation_list) === null || _modelData$view2$tran === void 0 ? void 0 : _modelData$view2$tran.map(i => i.relation_object);
       if (transHierRelationSideObjectIds !== null && transHierRelationSideObjectIds !== void 0 && transHierRelationSideObjectIds.length && !transHierRelationSideObjectIds.every(i => modelDataMap[i])) {
-        const transHierRelationSideObject = await (0, _dataProviders.fetchCmdbObjectRef)(transHierRelationSideObjectIds.join(","), externalSourceId);
+        const transHierRelationSideObjectList = (await (0, _cmdbSdk.CmdbObjectApi_list)({
+          page: 1,
+          page_size: transHierRelationSideObjectIds.length,
+          objectIds: transHierRelationSideObjectIds.join(",")
+        })).list;
         modelDataMap = {
           ...modelDataMap,
-          ...(0, _lodash.keyBy)(transHierRelationSideObject.data, "objectId")
+          ...(0, _lodash.keyBy)(transHierRelationSideObjectList, "objectId")
         };
       }
       const {