@next-libs/cmdb-instances 7.1.14 → 7.1.16

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

@@ -403,8 +403,50 @@ export function LegacyInstanceList(props) {
   var [selectedRowKeys, setSelectedRowKeys] = useState((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
   var cache = useRef(new Map());
   var isFirstRunRef = useRef(true);
+
+  // istanbul ignore next
+  var onSelectionChange = useCallback( /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator(function* (selected) {
+      var _props$onSelectionCha;
+      var {
+        selectedItems,
+        selectedKeys
+      } = selected;
+      setSelectedRowKeys(selectedKeys);
+      if (selectedKeys.length > compact(selectedItems).length) {
+        var ids = selectedKeys.filter(id => !cache.current.has(id));
+        if (ids.length) {
+          var resp;
+          var params = {
+            fields: ["instanceId"],
+            query: {
+              instanceId: {
+                $in: ids
+              }
+            },
+            page_size: ids.length
+          };
+          // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
+          if (props.useAutoDiscoveryProvider) {
+            resp = yield listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
+          } else {
+            resp = yield InstanceApi_postSearchV3(props.objectId, params);
+          }
+          resp.list.forEach(i => cache.current.set(i.instanceId, i));
+        }
+        selectedItems = selectedKeys.map(id => cache.current.get(id));
+      }
+      (_props$onSelectionCha = props.onSelectionChange) === null || _props$onSelectionCha === void 0 ? void 0 : _props$onSelectionCha.call(props, {
+        selectedItems,
+        selectedKeys
+      });
+    });
+    return function (_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), []);
   var getInstanceListData = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(function* (sort, asc, page) {
+    var _ref6 = _asyncToGenerator(function* (sort, asc, page) {
       var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
       var data = {};
       var v3Data = {
@@ -505,12 +547,12 @@ export function LegacyInstanceList(props) {
       // useAutoDiscoveryProvider=true, 使用useProvider的接口
       return promise ? promise : props.useAutoDiscoveryProvider ? listProvider.query([props.objectId, v3Data]) : InstanceApi_postSearchV3(props.objectId, v3Data);
     });
-    return function getInstanceListData(_x2, _x3, _x4) {
-      return _ref5.apply(this, arguments);
+    return function getInstanceListData(_x3, _x4, _x5) {
+      return _ref6.apply(this, arguments);
     };
   }();
   var refreshInstanceList = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(function* (sort, asc, page) {
+    var _ref7 = _asyncToGenerator(function* (sort, asc, page) {
       setState({
         loading: true
       });
@@ -547,8 +589,8 @@ export function LegacyInstanceList(props) {
         });
       }
     });
-    return function refreshInstanceList(_x5, _x6, _x7) {
-      return _ref6.apply(this, arguments);
+    return function refreshInstanceList(_x6, _x7, _x8) {
+      return _ref7.apply(this, arguments);
     };
   }();
   useEffect(() => {
@@ -599,58 +641,62 @@ export function LegacyInstanceList(props) {
       return;
     }
     refreshInstanceList(state.sort, state.asc, 1);
-  }, [state.q, state.aq, state.instanceSourceQuery, state.pageSize, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
+  }, [state.q, state.aq, state.instanceSourceQuery, state.aliveHosts, state.relatedToMe, props.objectId, props.permission, props.defaultQuery]);
+
+  // on pageSize condition change
+  useEffect(() => {
+    if (isFirstRunRef.current) {
+      isFirstRunRef.current = false;
+      return;
+    }
+    var skip = false;
+    if (state.page !== 1) {
+      var _props$onPaginationCh2;
+      setState({
+        page: 1
+      });
+      (_props$onPaginationCh2 = props.onPaginationChange) === null || _props$onPaginationCh2 === void 0 ? void 0 : _props$onPaginationCh2.call(props, {
+        page: 1,
+        pageSize: state.pageSize
+      });
+      skip = true;
+    }
+
+    // 当 prop.objectId 改变时先跳过，等 state.fieldIds 更新后再获取数据
+    if (props.objectId !== state.objectId) {
+      setState({
+        objectId: props.objectId
+      });
+      skip = true;
+    }
+    if (skip) {
+      return;
+    }
+    refreshInstanceList(state.sort, state.asc, 1);
+  }, [state.pageSize]);
+
+  // on other condition change
+  useEffect(() => {
+    if (isEmpty(state.fieldIds)) return;
+    refreshInstanceList(state.sort, state.asc, state.page);
+  }, [state.page]);
 
   // on other condition change
   useEffect(() => {
     if (isEmpty(state.fieldIds)) return;
     refreshInstanceList(state.sort, state.asc, state.page);
-  }, [state.page, state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
+  }, [state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
   var onChange = e => {
     setQ(e.target.value);
   };
-
-  // istanbul ignore next
-  var onSelectionChange = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(function* (selected) {
-      var _props$onSelectionCha;
-      var {
-        selectedItems,
-        selectedKeys
-      } = selected;
-      setSelectedRowKeys(selectedKeys);
-      if (selectedKeys.length > compact(selectedItems).length) {
-        var ids = selectedKeys.filter(id => !cache.current.has(id));
-        if (ids.length) {
-          var resp;
-          var params = {
-            fields: ["instanceId"],
-            query: {
-              instanceId: {
-                $in: ids
-              }
-            },
-            page_size: ids.length
-          };
-          // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
-          if (props.useAutoDiscoveryProvider) {
-            resp = yield listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
-          } else {
-            resp = yield InstanceApi_postSearchV3(props.objectId, params);
-          }
-          resp.list.forEach(i => cache.current.set(i.instanceId, i));
-        }
-        selectedItems = selectedKeys.map(id => cache.current.get(id));
-      }
-      (_props$onSelectionCha = props.onSelectionChange) === null || _props$onSelectionCha === void 0 ? void 0 : _props$onSelectionCha.call(props, {
-        selectedItems,
-        selectedKeys
-      });
-    });
-    return function (_x8) {
-      return _ref7.apply(this, arguments);
-    };
-  }(), []);
   var onSearch = value => {
     var _props$onSearch;
     var q = value.trim();
@@ -658,6 +704,10 @@ export function LegacyInstanceList(props) {
       q
     });
     (_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, q);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
   };
   var onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
     var _props$onAdvancedSear;
@@ -667,6 +717,10 @@ export function LegacyInstanceList(props) {
       aqToShow: queriesToShow
     });
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
   };
   var onSortingChange = useCallback(info => {
     var _props$onSortingChang;
@@ -691,12 +745,12 @@ export function LegacyInstanceList(props) {
     (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
   }, [state.sort]);
   var onPaginationChange = useCallback(pagination => {
-    var _props$onPaginationCh2;
+    var _props$onPaginationCh3;
     setState({
       page: pagination.page,
       pageSize: pagination.pageSize
     });
-    (_props$onPaginationCh2 = props.onPaginationChange) === null || _props$onPaginationCh2 === void 0 ? void 0 : _props$onPaginationCh2.call(props, pagination);
+    (_props$onPaginationCh3 = props.onPaginationChange) === null || _props$onPaginationCh3 === void 0 ? void 0 : _props$onPaginationCh3.call(props, pagination);
   }, []);
   var onInstanceSourceChange = useCallback(instanceSourceQuery => {
     var _props$onInstanceSour;