openxiangda 1.0.246 → 1.0.248

package/packages/sdk/dist/runtime/index.mjs

@@ -44436,6 +44436,7 @@ function AdminList(props) {
   const [notificationApi, notificationHolder] = notification.useNotification();
   const [modalApi, modalHolder] = Modal6.useModal();
   const sourceKey = dataSource.key || "anonymous";
+  const listIdentity = JSON.stringify([listKey, sourceKey]);
   const [rawPreference, setRawPreference] = useState15(null);
   const [preference, setPreference] = useState15(
     () => mergeAdminListPreference({
@@ -44455,7 +44456,8 @@ function AdminList(props) {
   const [settingsTab, setSettingsTab] = useState15("search");
   const [columnSearch, setColumnSearch] = useState15("");
   const [expanded, setExpanded] = useState15(false);
-  const [ready, setReady] = useState15(false);
+  const [readyIdentity, setReadyIdentity] = useState15(null);
+  const ready = readyIdentity === listIdentity;
   const [rows, setRows] = useState15([]);
   const [total, setTotal] = useState15(0);
   const [allowedColumnKeys, setAllowedColumnKeys] = useState15(void 0);
@@ -44478,9 +44480,12 @@ function AdminList(props) {
   const [draggedSearchKey, setDraggedSearchKey] = useState15("");
   const selectedKeysRef = useRef8([]);
   const dataSourceRef = useRef8(dataSource);
+  const listIdentityRef = useRef8(listIdentity);
+  const requestVersionRef = useRef8(0);
   const onQueryChangeRef = useRef8(onQueryChange);
   const onSelectionChangeRef = useRef8(onSelectionChange);
   dataSourceRef.current = dataSource;
+  listIdentityRef.current = listIdentity;
   onQueryChangeRef.current = onQueryChange;
   onSelectionChangeRef.current = onSelectionChange;
   const definitionFingerprint = JSON.stringify({
@@ -44551,10 +44556,19 @@ function AdminList(props) {
   }, [rowKey, rowSelectable, rows]);
   useEffect14(() => {
     let active = true;
-    setReady(false);
+    const initializationVersion = ++requestVersionRef.current;
+    setReadyIdentity(null);
+    setRows([]);
+    setTotal(0);
+    setAllowedColumnKeys(void 0);
+    setHiddenFieldsCount(0);
+    setLoading(false);
+    setError(null);
     const load = async () => {
       const saved = dataSourceRef.current.preferences ? await dataSourceRef.current.preferences.get(listKey).catch(() => null) : null;
-      if (!active) return;
+      if (!active || initializationVersion !== requestVersionRef.current || listIdentityRef.current !== listIdentity) {
+        return;
+      }
       setRawPreference(saved);
       const merged = mergeAdminListPreference({
         version: configVersion,
@@ -44582,7 +44596,7 @@ function AdminList(props) {
       selectedKeysRef.current = [];
       setSelectedKeys([]);
       previousFingerprintRef.current = "";
-      setReady(true);
+      setReadyIdentity(listIdentity);
     };
     void load();
     return () => {
@@ -44594,8 +44608,7 @@ function AdminList(props) {
     defaultVisibleSearchCount,
     definitionFingerprint,
     form,
-    listKey,
-    sourceKey
+    listIdentity
   ]);
   useEffect14(() => {
     if (!allowedColumnKeys) return;
@@ -44630,28 +44643,34 @@ function AdminList(props) {
   ]);
   const loadData = useCallback12(async () => {
     if (!ready) return;
+    const requestVersion = ++requestVersionRef.current;
+    const requestedIdentity = listIdentity;
+    const requestedDataSource = dataSourceRef.current;
+    const isCurrentRequest = () => requestVersion === requestVersionRef.current && requestedIdentity === listIdentityRef.current;
     setLoading(true);
     setError(null);
     onQueryChangeRef.current?.(query);
     try {
-      const result = await dataSourceRef.current.query(query);
+      const result = await requestedDataSource.query(query);
+      if (!isCurrentRequest()) return;
       setRows(result.rows || []);
       setTotal(Math.max(0, Number(result.total || 0)));
       setAllowedColumnKeys(result.allowedColumnKeys);
       setHiddenFieldsCount(Math.max(0, Number(result.hiddenFieldsCount || 0)));
     } catch (requestError) {
+      if (!isCurrentRequest()) return;
       setRows([]);
       setTotal(0);
       setError(
         requestError instanceof Error ? requestError : new Error(String(requestError || "\u6570\u636E\u52A0\u8F7D\u5931\u8D25"))
       );
     } finally {
-      setLoading(false);
+      if (isCurrentRequest()) setLoading(false);
     }
-  }, [query, ready]);
+  }, [listIdentity, query, ready]);
   useEffect14(() => {
     if (!ready) return;
-    const fingerprint = queryFingerprint(query, sourceKey);
+    const fingerprint = queryFingerprint(query, listIdentity);
     if (previousFingerprintRef.current && previousFingerprintRef.current !== fingerprint && selectedKeysRef.current.length) {
       clearSelection("\u67E5\u8BE2\u6761\u4EF6\u6216\u6392\u5E8F\u5DF2\u53D8\u5316\uFF0C\u5DF2\u6E05\u7A7A\u8DE8\u9875\u9009\u62E9");
     }
@@ -44662,7 +44681,7 @@ function AdminList(props) {
     loadData,
     query,
     ready,
-    sourceKey
+    listIdentity
   ]);
   const visibleSearchFields = useMemo17(() => {
     const searchMap = new Map(searchFields.map((field) => [field.key, field]));