@next-libs/cmdb-instances 7.1.14 → 7.1.16

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

@@ -414,6 +414,43 @@ function LegacyInstanceList(props) {
   const [selectedRowKeys, setSelectedRowKeys] = (0, _react.useState)((_props$selectedRowKey = props.selectedRowKeys) !== null && _props$selectedRowKey !== void 0 ? _props$selectedRowKey : []);
   const cache = (0, _react.useRef)(new Map());
   const isFirstRunRef = (0, _react.useRef)(true);
+
+  // istanbul ignore next
+  const onSelectionChange = (0, _react.useCallback)(async selected => {
+    var _props$onSelectionCha;
+    let {
+      selectedItems,
+      selectedKeys
+    } = selected;
+    setSelectedRowKeys(selectedKeys);
+    if (selectedKeys.length > (0, _lodash.compact)(selectedItems).length) {
+      const ids = selectedKeys.filter(id => !cache.current.has(id));
+      if (ids.length) {
+        let resp;
+        const params = {
+          fields: ["instanceId"],
+          query: {
+            instanceId: {
+              $in: ids
+            }
+          },
+          page_size: ids.length
+        };
+        // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
+        if (props.useAutoDiscoveryProvider) {
+          resp = await listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
+        } else {
+          resp = await (0, _cmdbSdk.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
+    });
+  }, []);
   const getInstanceListData = async (sort, asc, page) => {
     var _modelData$attrList, _modelData$attrList$f2, _modelData$attrList$f3, _props$onSearchExecut;
     const data = {};
@@ -604,53 +641,62 @@ 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
+  (0, _react.useEffect)(() => {
+    if (isFirstRunRef.current) {
+      isFirstRunRef.current = false;
+      return;
+    }
+    let 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
   (0, _react.useEffect)(() => {
     if ((0, _lodash.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]);
+  }, [state.page]);
+
+  // on other condition change
+  (0, _react.useEffect)(() => {
+    if ((0, _lodash.isEmpty)(state.fieldIds)) return;
+    refreshInstanceList(state.sort, state.asc, state.page);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
+  }, [state.sort, state.asc, state.fieldIds, state.appSearchInstanceId, state.currentChangeSelect, state.searchByApp, props.dataSource, state.presetConfigsQuery]);
   const onChange = e => {
     setQ(e.target.value);
   };
-
-  // istanbul ignore next
-  const onSelectionChange = (0, _react.useCallback)(async selected => {
-    var _props$onSelectionCha;
-    let {
-      selectedItems,
-      selectedKeys
-    } = selected;
-    setSelectedRowKeys(selectedKeys);
-    if (selectedKeys.length > (0, _lodash.compact)(selectedItems).length) {
-      const ids = selectedKeys.filter(id => !cache.current.has(id));
-      if (ids.length) {
-        let resp;
-        const params = {
-          fields: ["instanceId"],
-          query: {
-            instanceId: {
-              $in: ids
-            }
-          },
-          page_size: ids.length
-        };
-        // useAutoDiscoveryProvider=true, 使用useProvider的接口，虽然这里列表用不到选择功能，但还是加上保持统一
-        if (props.useAutoDiscoveryProvider) {
-          resp = await listProvider.query([props.objectId, Object.assign(params, props.extraParams)]);
-        } else {
-          resp = await (0, _cmdbSdk.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
-    });
-  }, []);
   const onSearch = value => {
     var _props$onSearch;
     const q = value.trim();
@@ -658,6 +704,10 @@ function LegacyInstanceList(props) {
       q
     });
     (_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, q);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
   };
   const onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
     var _props$onAdvancedSear;
@@ -667,6 +717,10 @@ function LegacyInstanceList(props) {
       aqToShow: queriesToShow
     });
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
+    onSelectionChange({
+      selectedKeys: [],
+      selectedItems: []
+    });
   };
   const onSortingChange = (0, _react.useCallback)(info => {
     var _props$onSortingChang;
@@ -691,12 +745,12 @@ function LegacyInstanceList(props) {
     (_props$onSortingChang = props.onSortingChange) === null || _props$onSortingChang === void 0 ? void 0 : _props$onSortingChang.call(props, info);
   }, [state.sort]);
   const onPaginationChange = (0, _react.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);
   }, []);
   const onInstanceSourceChange = (0, _react.useCallback)(instanceSourceQuery => {
     var _props$onInstanceSour;