chore: update

ca05145b · 王鹏飞 · f694faae · ca05145b · ca05145b · ca05145b
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,8 +15,8 @@
        "@dnd-kit/sortable": "^10.0.0",
        "@dnd-kit/utilities": "^3.2.2",
        "@fortaine/fetch-event-source": "^3.0.6",
-        "@tanstack/react-query": "^5.69.0",
-        "@tanstack/react-query-devtools": "^5.69.0",
+        "@tanstack/react-query": "^5.76.2",
+        "@tanstack/react-query-devtools": "^5.76.2",
        "antd": "^5.24.8",
        "axios": "^1.8.4",
        "blueimp-md5": "^2.19.0",
@@ -1665,9 +1665,9 @@
      }
    },
    "node_modules/@tanstack/query-core": {
-      "version": "5.69.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.69.0.tgz",
-      "integrity": "sha512-Kn410jq6vs1P8Nm+ZsRj9H+U3C0kjuEkYLxbiCyn3MDEiYor1j2DGVULqAz62SLZtUZ/e9Xt6xMXiJ3NJ65WyQ==",
+      "version": "5.76.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.76.2.tgz",
+      "integrity": "sha512-PFGwWh5ss9cJQ67l6bZ7hqXbisX2gy13G2jP+VGY1bgdbCfOMWh6UBVnN62QbFXro6CCoX9hYzTnZHr6Rz00YQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
@@ -1675,9 +1675,9 @@
      }
    },
    "node_modules/@tanstack/query-devtools": {
-      "version": "5.67.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.67.2.tgz",
-      "integrity": "sha512-O4QXFFd7xqp6EX7sdvc9tsVO8nm4lpWBqwpgjpVLW5g7IeOY6VnS/xvs/YzbRhBVkKTMaJMOUGU7NhSX+YGoNg==",
+      "version": "5.76.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.76.0.tgz",
+      "integrity": "sha512-1p92nqOBPYVqVDU0Ua5nzHenC6EGZNrLnB2OZphYw8CNA1exuvI97FVgIKON7Uug3uQqvH/QY8suUKpQo8qHNQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
@@ -1685,12 +1685,12 @@
      }
    },
    "node_modules/@tanstack/react-query": {
-      "version": "5.69.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.69.0.tgz",
-      "integrity": "sha512-Ift3IUNQqTcaFa1AiIQ7WCb/PPy8aexZdq9pZWLXhfLcLxH0+PZqJ2xFImxCpdDZrFRZhLJrh76geevS5xjRhA==",
+      "version": "5.76.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.76.2.tgz",
+      "integrity": "sha512-rGkWberCrFdIxMdvSAJM/UOKeu0O/JVTbMmfhQoJpiU9Uq0EDx2EMCadnNuJWbXR4smDA2t7DY3NKkYFmDVS5A==",
      "license": "MIT",
      "dependencies": {
-        "@tanstack/query-core": "5.69.0"
+        "@tanstack/query-core": "5.76.2"
      },
      "funding": {
        "type": "github",
@@ -1701,19 +1701,19 @@
      }
    },
    "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.69.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.69.0.tgz",
-      "integrity": "sha512-sYklnou3IKAemqB5wJeBwjmG5bUGDKAL5/I4pVA+aqSnsNibVLt8/pAU976uuJ5K71w71bHtI/AMxiIs3gtkEA==",
+      "version": "5.76.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.76.2.tgz",
+      "integrity": "sha512-XQqPM7ByqhitYtzzRXpFcPXY2FIMGY13atJoQnDInxX+ko7wOhAJg51QGzSxQwZ2JEy91taj0IaIUh3pOz2buw==",
      "license": "MIT",
      "dependencies": {
-        "@tanstack/query-devtools": "5.67.2"
+        "@tanstack/query-devtools": "5.76.0"
      },
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/tannerlinsley"
      },
      "peerDependencies": {
-        "@tanstack/react-query": "^5.69.0",
+        "@tanstack/react-query": "^5.76.2",
        "react": "^18 || ^19"
      }
    },

--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@fortaine/fetch-event-source": "^3.0.6",
-    "@tanstack/react-query": "^5.69.0",
-    "@tanstack/react-query-devtools": "^5.69.0",
+    "@tanstack/react-query": "^5.76.2",
+    "@tanstack/react-query-devtools": "^5.76.2",
    "antd": "^5.24.8",
    "axios": "^1.8.4",
    "blueimp-md5": "^2.19.0",

--- a/src/hooks/useQuery.ts
+++ b/src/hooks/useQuery.ts
@@ -5,6 +5,7 @@ import { useUserStore } from '@/stores/user'
 import { useMapStore } from '@/stores/map'
 import axios from 'axios'
 import { read, utils } from 'xlsx'
+import { message } from 'antd'

 // 用户信息
 export function useUserQuery() {
@@ -164,25 +165,32 @@ export function useProcessProgressQuery(params: { function_name: string }) {
    queryClient.removeQueries({ queryKey: ['processProgress', params] })
  }

-  // 开始轮询的方法
  const start = () => {
    setEnabled(true)
  }

-  // 结束轮询的方法
  const stop = useCallback(() => {
    setEnabled(false)
-    queryClient.invalidateQueries({ queryKey: ['data'] })
-  }, [queryClient])
-  // 组件卸载时清理
+    if (query.data?.result === 'SUCCESS') {
+      queryClient.invalidateQueries({ queryKey: ['data'] })
+    }
+    if (query.data?.result === 'FAIL') {
+      message.error(Object.values(query.data?.message).join('\n'))
+    }
+  }, [query.data, queryClient])
+
  useEffect(() => {
-    if (query.data?.result === 'SUCCESS' || query.data?.result === 'FAIL') {
+    if (!enabled) return
+    if (query.data?.result === 'FAIL' || query.data?.result === 'SUCCESS') {
      stop()
    }
+  }, [query.data, enabled, stop])
+
+  useEffect(() => {
    return () => {
-      stop()
+      setEnabled(false)
    }
-  }, [query.data, enabled, stop])
+  }, [])

  return { ...query, start, stop, remove }
 }
--- a/src/modules/data/preprocess/sort/components/ButtonModal.tsx
+++ b/src/modules/data/preprocess/sort/components/ButtonModal.tsx
@@ -48,8 +48,8 @@ export default function ButtonModal() {
  const { mutate, isPending, progress, message, remove } = useProcessData()
  // 开始处理
  const handleStart = () => {
-    const fields = dataSource.map((item) => {
-      return { field: item.key, rule: item.new_value }
+    const fields = dataSource.map((item: any) => {
+      return { field: item.english_name, rule: item.new_value }
    })
    mutate({ fields: JSON.stringify(fields) })
  }

--- a/src/modules/data/preprocess/splice/components/ButtonModal.tsx
+++ b/src/modules/data/preprocess/splice/components/ButtonModal.tsx
@@ -16,7 +16,7 @@ export default function ButtonModal() {
  // 开始处理
  const handleStart = () => {
    form.validateFields().then((values) => {
-      mutate({ ...values, fields: JSON.stringify(fields) })
+      mutate({ ...values, fields: fields.map((item) => item.field).join(',') })
    })
  }


--- a/src/modules/data/process/date/components/ButtonModal.tsx
+++ b/src/modules/data/process/date/components/ButtonModal.tsx
@@ -153,7 +153,7 @@ export default function ButtonModal() {
    if (action === '快速日期计算') {
      fields.push(values.field)
    }
-    const params = { ...values, fields: JSON.stringify(fields) } // 将提取的参数赋值给 fields
+    const params = { ...values, fields } // 将提取的参数赋值给 fields
    mutate(params)
  }


--- a/src/modules/data/process/logic/components/ButtonModal.tsx
+++ b/src/modules/data/process/logic/components/ButtonModal.tsx
@@ -81,7 +81,7 @@ export default function ButtonModal() {
    // 提取 content 中的参数
    const fieldsMatch = content.match(/\((.*?)\)/) // 匹配括号内的内容
    const fields = fieldsMatch ? fieldsMatch[1].split(',').map((field: string) => field.trim()) : []
-    const params = { ...values, fields: JSON.stringify(fields) } // 将提取的参数赋值给 fields
+    const params = { ...values, fields } // 将提取的参数赋值给 fields
    mutate(params)
  }


--- a/src/modules/data/process/number/components/ButtonModal.tsx
+++ b/src/modules/data/process/number/components/ButtonModal.tsx
@@ -89,7 +89,7 @@ export default function ButtonModal() {
    // 提取 content 中的参数
    const fieldsMatch = content.match(/\((.*?)\)/) // 匹配括号内的内容
    const fields = fieldsMatch ? fieldsMatch[1].split(',').map((field: string) => field.trim()) : []
-    const params = { ...values, fields: JSON.stringify(fields) } // 将提取的参数赋值给 fields
+    const params = { ...values, fields } // 将提取的参数赋值给 fields
    mutate(params)
  }


--- a/src/modules/data/process/string/components/ButtonModal.tsx
+++ b/src/modules/data/process/string/components/ButtonModal.tsx
@@ -90,7 +90,7 @@ export default function ButtonModal() {
    // 提取 content 中的参数
    const fieldsMatch = content.match(/\((.*?)\)/) // 匹配括号内的内容
    const fields = fieldsMatch ? fieldsMatch[1].split(',').map((field: string) => field.trim()) : []
-    const params = { ...values, fields: JSON.stringify(fields) } // 将提取的参数赋值给 fields
+    const params = { ...values, fields } // 将提取的参数赋值给 fields
    mutate(params)
  }


--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -3,10 +3,10 @@ import { message } from 'antd'

 const axiosInstance = axios.create({
  // timeout: 60000,
-  // withCredentials: true,
-  // headers: {
-  //   'Content-Type': 'application/x-www-form-urlencoded',
-  // },
+  withCredentials: true,
+  headers: {
+    'Content-Type': 'application/x-www-form-urlencoded',
+  },
 })

 // 请求拦截