@next-libs/cmdb-instances 7.29.12 → 7.30.0

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import React, { useEffect, useReducer, useState, useRef, useMemo, useCallback } from "react";
-import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, compact, omit, keyBy, isNil, get, isArray } from "lodash";
+import { difference, isEmpty, isEqual, isString, map, uniq, union, filter, reject, uniqueId, find, startsWith, compact, omit, keyBy, isNil, get, isArray } from "lodash";
 import { BrickAsComponent, getRuntime, handleHttpError, useProvider } from "@next-core/brick-kit";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
@@ -122,8 +122,24 @@ export function updateSortFields(oldFields, sortInfo, sortType) {
   });
 }
 export function translateConditions(aq, idObjectMap, modelData, t) {
+  var _modelData$view, _modelData$view$trans;
   var conditions = [];
   var relations = [];
+  var 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;
+    var nameKeys = (_relation$display_key = relation.display_keys) !== null && _relation$display_key !== void 0 && _relation$display_key.length ? relation.display_keys : getInstanceNameKeys(idObjectMap[relation.relation_object]);
+    nameKeys.forEach(nameKey => {
+      transHierRelations.push({
+        id: "".concat(relation.relation_id, ".").concat(nameKey),
+        name: relation.relation_name,
+        value: {
+          type: "str"
+        },
+        relationSideId: relation.relation_id
+      });
+    });
+  });
   modelData.relation_list.forEach(relation => {
     var sidesArr = [];
     if (isSelfRelation(relation)) {
@@ -165,7 +181,7 @@ export function translateConditions(aq, idObjectMap, modelData, t) {
       });
     });
   });
-  var attrAndRelationList = [...modelData.attrList, ...relations];
+  var attrAndRelationList = [...modelData.attrList, ...relations, ...transHierRelations];
   if (!isEmpty(aq)) {
     for (var _query of aq) {
       var _queries = [_query];
@@ -415,7 +431,7 @@ export function LegacyInstanceList(props) {
     };
   };
 
-  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
+  // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 fieldIds 进行排序
   var _sortFieldIds = fieldIds => {
     var _props$presetConfigs2;
     var frontFields = [];
@@ -423,14 +439,7 @@ export function LegacyInstanceList(props) {
     if ((_props$presetConfigs2 = props.presetConfigs) !== null && _props$presetConfigs2 !== void 0 && _props$presetConfigs2.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 {
-        return foundIndex;
-      }
-    });
+    restFields = reject(fieldIds, id => frontFields.includes(id));
     return [...frontFields, ...restFields];
   };
   // istanbul ignore next
@@ -678,7 +687,7 @@ export function LegacyInstanceList(props) {
       var promise = (_props$onSearchExecut = props.onSearchExecute) === null || _props$onSearchExecut === void 0 ? void 0 : _props$onSearchExecut.call(props, data, v3Data);
       // useAutoDiscoveryProvider=true, 使用useProvider的接口
       // useExternalCmdbApi= true 使用外部接口externalPostSearchV3
-      return promise ? promise : props.useExternalCmdbApi ? externalPostSearchV3.query([_objectSpread(_objectSpread({}, v3Data), externalRequestParams)]) : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : InstanceApi_postSearchV3(props.objectId, v3Data);
+      return promise ? promise : props.useExternalCmdbApi ? externalPostSearchV3.query([_objectSpread(_objectSpread({}, v3Data), externalRequestParams)]) : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : props.ignorePermission ? ignorePermissionProvider.query([props.objectId, v3Data]) : InstanceApi_postSearchV3(props.objectId, v3Data); //涉及到v3data的请求
     });
     return function getInstanceListData(_x2, _x3, _x4) {
       return _ref6.apply(this, arguments);
@@ -1070,6 +1079,43 @@ export function LegacyInstanceList(props) {
         isReset,
         isAdminSetDisplay
       } = _ref12;
+      var onConfirm = /*#__PURE__*/function () {
+        var _ref14 = _asyncToGenerator(function* () {
+          if (props.saveFieldsBackend) {
+            try {
+              var sortFields = mergeFields(state.sortFields, fields);
+              if (props.useExternalCmdbApi) {
+                yield externalUpdateFieldsProvider.query([{
+                  object_id: props.objectId,
+                  sourceId: props.externalSourceId,
+                  sortFields
+                }]);
+              } else {
+                yield updateFieldsProvider.query([props.objectId, {
+                  sortFields
+                }]);
+              }
+              setState({
+                fieldIds: _sortFieldIds(fields),
+                sortFields
+              });
+            } catch (e) {
+              handleHttpError(e);
+            }
+          } else {
+            var _sortFields = mergeFields(state.sortFields, fields);
+            setState({
+              fieldIds: _sortFieldIds(fields),
+              sortFields: _sortFields
+            });
+            jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), _sortFieldIds(fields));
+          }
+          props.onFieldsModalConfirm(fields);
+        });
+        return function onConfirm() {
+          return _ref14.apply(this, arguments);
+        };
+      }();
       if (isReset) {
         // 恢复默认操作
         var fieldIds = defaultFields;
@@ -1102,34 +1148,7 @@ export function LegacyInstanceList(props) {
       } else {
         if (!isAdminSetDisplay) {
           // 点击确定按钮触发
-          if (props.saveFieldsBackend) {
-            try {
-              var _sortFields = mergeFields(state.sortFields, fields);
-              if (props.useExternalCmdbApi) {
-                yield externalUpdateFieldsProvider.query([{
-                  object_id: props.objectId,
-                  sourceId: props.externalSourceId,
-                  sortFields: _sortFields
-                }]);
-              } else {
-                yield updateFieldsProvider.query([props.objectId, {
-                  sortFields: _sortFields
-                }]);
-              }
-              setState({
-                fieldIds: _sortFieldIds(fields),
-                sortFields: _sortFields
-              });
-            } catch (e) {
-              handleHttpError(e);
-            }
-          } else {
-            setState({
-              fieldIds: _sortFieldIds(fields)
-            });
-            jsonLocalStorage.setItem("".concat(modelData.objectId, "-selectAttrIds"), fields);
-          }
-          props.onFieldsModalConfirm(fields);
+          yield onConfirm();
         } else {
           // 点击【默认显示】按钮触发，不影响当前列表显示。
           try {
@@ -1139,6 +1158,7 @@ export function LegacyInstanceList(props) {
               sortFields: _sortFields2,
               isDefault: true
             }]);
+            yield onConfirm();
             message.success(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SET_DEFAULT_DISPLAY_SUCCESS)));
             setState({
               backendDefaultFields: _sortFields2
@@ -1197,7 +1217,7 @@ export function LegacyInstanceList(props) {
       } else if (props.useAutoDiscoveryProvider) {
         resp = yield listProvider.query([props.objectId, v3Data]);
       } else {
-        resp = yield InstanceApi_postSearchV3(props.objectId, v3Data);
+        resp = yield InstanceApi_postSearchV3(props.objectId, v3Data); //涉及到v3data的请求
       }
       resp.list.forEach(i => cache.current.set(i.instanceId, i));
     })();
@@ -1511,6 +1531,7 @@ export function LegacyInstanceList(props) {
  */
 export function LegacyInstanceListWrapper(props) {
   var [objectList, setObjectList] = useState(props.objectList);
+  var [mergeObjectList, setMergeObjectList] = useState(props.objectList);
   var externalGetObjectRef = useProvider("easyops.api.cmdb.topo_center@ProxyGetObjectRef:1.0.0", {
     cache: false
   });
@@ -1546,9 +1567,36 @@ export function LegacyInstanceListWrapper(props) {
       })();
     }
   }, [props.objectId, props.objectList]);
-  if (!objectList || !objectList.find(item => item.objectId === props.objectId)) return null;
+  useEffect(() => {
+    if (!(objectList !== null && objectList !== void 0 && objectList.length) && isEqual(objectList, mergeObjectList)) return;
+    _asyncToGenerator(function* () {
+      var _object$view, _object$view$trans_hi;
+      var object = objectList === null || objectList === void 0 ? void 0 : objectList.find(item => item.objectId === props.objectId);
+      var 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;
+        var list;
+        if (props.useExternalCmdbApi) {
+          list = yield externalGetObjectRef.query([{
+            ref_object: transHierRelationSideObjectIds.join(","),
+            sourceId: props.externalSourceId
+          }]);
+        } else {
+          list = (yield CmdbObjectApi_getObjectRef({
+            ref_object: transHierRelationSideObjectIds.join(",")
+          })).data;
+        }
+        if ((_list = list) !== null && _list !== void 0 && _list.length) {
+          objectList.push(...list);
+          objectListCache.set(props.objectId, objectList);
+        }
+      }
+      setMergeObjectList(objectList);
+    })();
+  }, [objectList]);
+  if (!mergeObjectList || !mergeObjectList.find(item => item.objectId === props.objectId)) return null;
   return /*#__PURE__*/React.createElement(LegacyInstanceList, _extends({}, props, {
-    objectList: objectList
+    objectList: mergeObjectList
   }));
 }