@next-libs/cmdb-instances 7.29.12 → 7.30.0

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

@@ -140,8 +140,24 @@ function updateSortFields(oldFields, sortInfo, sortType) {
   });
 }
 function translateConditions(aq, idObjectMap, modelData, t) {
+  var _modelData$view, _modelData$view$trans;
   const conditions = [];
   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]);
+    nameKeys.forEach(nameKey => {
+      transHierRelations.push({
+        id: `${relation.relation_id}.${nameKey}`,
+        name: relation.relation_name,
+        value: {
+          type: "str"
+        },
+        relationSideId: relation.relation_id
+      });
+    });
+  });
   modelData.relation_list.forEach(relation => {
     let sidesArr = [];
     if ((0, _cmdbUtils.isSelfRelation)(relation)) {
@@ -183,7 +199,7 @@ function translateConditions(aq, idObjectMap, modelData, t) {
       });
     });
   });
-  const attrAndRelationList = [...modelData.attrList, ...relations];
+  const attrAndRelationList = [...modelData.attrList, ...relations, ...transHierRelations];
   if (!(0, _lodash.isEmpty)(aq)) {
     for (const query of aq) {
       let queries = [query];
@@ -429,7 +445,7 @@ function LegacyInstanceList(props) {
     };
   };
 
-  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
+  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 fieldIds 进行排序
   const _sortFieldIds = fieldIds => {
     var _props$presetConfigs2;
     let frontFields = [];
@@ -437,14 +453,7 @@ function LegacyInstanceList(props) {
     if ((_props$presetConfigs2 = props.presetConfigs) !== null && _props$presetConfigs2 !== void 0 && _props$presetConfigs2.fieldIds) {
       frontFields = (0, _lodash.filter)(props.presetConfigs.fieldIds, id => fieldIds.includes(id));
     }
-    restFields = (0, _lodash.sortBy)((0, _lodash.reject)(fieldIds, id => frontFields.includes(id)), fieldId => {
-      const foundIndex = (0, _lodash.findIndex)(modelData.view.attr_order, orderId => orderId === fieldId);
-      if (foundIndex === -1) {
-        return null;
-      } else {
-        return foundIndex;
-      }
-    });
+    restFields = (0, _lodash.reject)(fieldIds, id => frontFields.includes(id));
     return [...frontFields, ...restFields];
   };
   // istanbul ignore next
@@ -693,7 +702,7 @@ 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);
+    }]) : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data); //涉及到v3data的请求
   };
   const refreshInstanceList = async (sort, asc, page) => {
     setState({
@@ -1063,6 +1072,38 @@ function LegacyInstanceList(props) {
     isReset,
     isAdminSetDisplay
   }) => {
+    const onConfirm = async () => {
+      if (props.saveFieldsBackend) {
+        try {
+          const sortFields = mergeFields(state.sortFields, fields);
+          if (props.useExternalCmdbApi) {
+            await externalUpdateFieldsProvider.query([{
+              object_id: props.objectId,
+              sourceId: props.externalSourceId,
+              sortFields
+            }]);
+          } else {
+            await updateFieldsProvider.query([props.objectId, {
+              sortFields
+            }]);
+          }
+          setState({
+            fieldIds: _sortFieldIds(fields),
+            sortFields
+          });
+        } catch (e) {
+          (0, _brickKit.handleHttpError)(e);
+        }
+      } else {
+        const sortFields = mergeFields(state.sortFields, fields);
+        setState({
+          fieldIds: _sortFieldIds(fields),
+          sortFields
+        });
+        jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, _sortFieldIds(fields));
+      }
+      props.onFieldsModalConfirm(fields);
+    };
     if (isReset) {
       // 恢复默认操作
       const fieldIds = defaultFields;
@@ -1095,34 +1136,7 @@ function LegacyInstanceList(props) {
     } else {
       if (!isAdminSetDisplay) {
         // 点击确定按钮触发
-        if (props.saveFieldsBackend) {
-          try {
-            const sortFields = mergeFields(state.sortFields, fields);
-            if (props.useExternalCmdbApi) {
-              await externalUpdateFieldsProvider.query([{
-                object_id: props.objectId,
-                sourceId: props.externalSourceId,
-                sortFields
-              }]);
-            } else {
-              await updateFieldsProvider.query([props.objectId, {
-                sortFields
-              }]);
-            }
-            setState({
-              fieldIds: _sortFieldIds(fields),
-              sortFields
-            });
-          } catch (e) {
-            (0, _brickKit.handleHttpError)(e);
-          }
-        } else {
-          setState({
-            fieldIds: _sortFieldIds(fields)
-          });
-          jsonLocalStorage.setItem(`${modelData.objectId}-selectAttrIds`, fields);
-        }
-        props.onFieldsModalConfirm(fields);
+        await onConfirm();
       } else {
         // 点击【默认显示】按钮触发，不影响当前列表显示。
         try {
@@ -1132,6 +1146,7 @@ function LegacyInstanceList(props) {
             sortFields: sortFields,
             isDefault: true
           }]);
+          await onConfirm();
           _antd.message.success(_i18next.default.t(`${_constants.NS_LIBS_CMDB_INSTANCES}:${_constants.K.SET_DEFAULT_DISPLAY_SUCCESS}`));
           setState({
             backendDefaultFields: sortFields
@@ -1189,7 +1204,7 @@ function LegacyInstanceList(props) {
       } else if (props.useAutoDiscoveryProvider) {
         resp = await listProvider.query([props.objectId, v3Data]);
       } else {
-        resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data);
+        resp = await (0, _cmdbSdk.InstanceApi_postSearchV3)(props.objectId, v3Data); //涉及到v3data的请求
       }
       resp.list.forEach(i => cache.current.set(i.instanceId, i));
     })();
@@ -1503,6 +1518,7 @@ function LegacyInstanceList(props) {
  */
 function LegacyInstanceListWrapper(props) {
   const [objectList, setObjectList] = (0, _react.useState)(props.objectList);
+  const [mergeObjectList, setMergeObjectList] = (0, _react.useState)(props.objectList);
   const externalGetObjectRef = (0, _brickKit.useProvider)("easyops.api.cmdb.topo_center@ProxyGetObjectRef:1.0.0", {
     cache: false
   });
@@ -1538,9 +1554,35 @@ function LegacyInstanceListWrapper(props) {
       })();
     }
   }, [props.objectId, props.objectList]);
-  if (!objectList || !objectList.find(item => item.objectId === props.objectId)) return null;
+  (0, _react.useEffect)(() => {
+    if (!(objectList !== null && objectList !== void 0 && objectList.length) && (0, _lodash.isEqual)(objectList, mergeObjectList)) return;
+    (async (_object$view, _object$view$trans_hi) => {
+      const object = objectList === null || objectList === void 0 ? void 0 : objectList.find(item => item.objectId === props.objectId);
+      const transHierRelationSideObjectIds = object === null || object === void 0 ? void 0 : (_object$view = object.view) === null || _object$view === void 0 ? void 0 : (_object$view$trans_hi = _object$view.trans_hier_relation_list) === null || _object$view$trans_hi === void 0 ? void 0 : _object$view$trans_hi.map(i => i.relation_object);
+      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;
+        }
+        if ((_list = list) !== null && _list !== void 0 && _list.length) {
+          objectList.push(...list);
+          _constants2.objectListCache.set(props.objectId, objectList);
+        }
+      }
+      setMergeObjectList(objectList);
+    })();
+  }, [objectList]);
+  if (!mergeObjectList || !mergeObjectList.find(item => item.objectId === props.objectId)) return null;
   return /*#__PURE__*/_react.default.createElement(LegacyInstanceList, (0, _extends2.default)({}, props, {
-    objectList: objectList
+    objectList: mergeObjectList
   }));
 }