@next-libs/cmdb-instances 7.29.0 → 7.29.2

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

@@ -588,10 +588,21 @@ function LegacyInstanceList(props) {
     const sortType = modelData === null || modelData === void 0 ? void 0 : (_modelData$attrList2 = modelData.attrList) === null || _modelData$attrList2 === void 0 ? void 0 : (_modelData$attrList2$ = _modelData$attrList2.find(attr => attr.id === sort)) === null || _modelData$attrList2$ === void 0 ? void 0 : (_modelData$attrList2$2 = _modelData$attrList2$.value) === null || _modelData$attrList2$2 === void 0 ? void 0 : _modelData$attrList2$2.default_type;
     const order = ["series-number", "auto-increment-id"].includes(sortType) ? asc ? 2 : -2 : asc ? 1 : -1;
     if (sort) {
+      var _relationObjectShowKe;
       data.sort = {
         [sort]: order
       };
-      v3Data.sort = [{
+      let relationObjectShowKeys = [];
+      if (!props.useExternalCmdbApi && !props.useAutoDiscoveryProvider && !props.ignorePermission) {
+        var _modelData$relation_l, _props$objectList, _props$objectList$fin, _props$objectList$fin2;
+        const relation = modelData === null || modelData === void 0 ? void 0 : (_modelData$relation_l = modelData.relation_list) === null || _modelData$relation_l === void 0 ? void 0 : _modelData$relation_l.find(i => i.right_object_id === props.objectId ? sort === i.right_id : sort === i.left_id);
+        const relationObjectId = (relation === null || relation === void 0 ? void 0 : relation.right_object_id) === props.objectId ? relation === null || relation === void 0 ? void 0 : relation.left_object_id : relation === null || relation === void 0 ? void 0 : relation.right_object_id;
+        relationObjectShowKeys = (_props$objectList = props.objectList) === null || _props$objectList === void 0 ? void 0 : (_props$objectList$fin = _props$objectList.find(i => i.objectId === relationObjectId)) === null || _props$objectList$fin === void 0 ? void 0 : (_props$objectList$fin2 = _props$objectList$fin.view) === null || _props$objectList$fin2 === void 0 ? void 0 : _props$objectList$fin2.show_key;
+      }
+      v3Data.sort = (_relationObjectShowKe = relationObjectShowKeys) !== null && _relationObjectShowKe !== void 0 && _relationObjectShowKe.length ? relationObjectShowKeys.map(i => ({
+        key: `${sort}.${i}`,
+        order
+      })) : [{
         key: sort,
         order
       }];
@@ -762,7 +773,7 @@ function LegacyInstanceList(props) {
         });
       }
     }
-  }, [props.objectId, props.presetConfigs]);
+  }, [props.objectId, props.presetConfigs, processFixedFields]);
   (0, _react.useEffect)(() => {
     var _props$selectedRowKey2;
     setSelectedRowKeys((_props$selectedRowKey2 = props.selectedRowKeys) !== null && _props$selectedRowKey2 !== void 0 ? _props$selectedRowKey2 : []);
@@ -1496,8 +1507,8 @@ function LegacyInstanceListWrapper(props) {
     cache: false
   });
   (0, _react.useEffect)(() => {
-    var _props$objectList;
-    if ((_props$objectList = props.objectList) !== null && _props$objectList !== void 0 && _props$objectList.length) {
+    var _props$objectList2;
+    if ((_props$objectList2 = props.objectList) !== null && _props$objectList2 !== void 0 && _props$objectList2.length) {
       setObjectList(props.objectList);
     } else {
       (async () => {