chore: update

src/components/chart/ChartButtonModal.tsx

@@ -5,11 +5,15 @@ import { useCreateChart } from '@/hooks/useChartQuery'
 import { useAI } from '@/hooks/useAI'
 import { Column } from '@ant-design/plots'
 
-export default function ButtonModal({ title = '新建柱状图', type = '1' }) {
+interface Props {
+  type: string
+  setOpen: (open: boolean) => void
+}
+
+const ModalContent = ({ setOpen, type }: Props) => {
   const { data } = useDataQuery()
   const { fieldOptions } = useDataFieldQuery()
 
-  const [open, setOpen] = useState(false)
   const [form] = Form.useForm()
 
   const [results, setResults] = useState({})
@@ -63,30 +67,8 @@ export default function ButtonModal({ title = '新建柱状图', type = '1' }) {
       })
     })
   }
-
   return (
     <>
-      <Button type="primary" onClick={() => setOpen(true)}>
-        {title}
-      </Button>
-      <Modal
-        title={title}
-        open={open}
-        footer={
-          <Flex justify="center" gap={20}>
-            <Button type="primary" onClick={handlePreview}>
-              预览组件效果
-            </Button>
-            <Button type="primary">AI对话调整</Button>
-            <Button type="primary" autoInsertSpace onClick={handleSubmit}>
-              保存
-            </Button>
-          </Flex>
-        }
-        destroyOnClose
-        width={1000}
-        onCancel={() => setOpen(false)}>
-        <div style={{ minHeight: 300, padding: '20px 0' }}>
       <Form
         form={form}
         preserve={false}
@@ -190,7 +172,29 @@ export default function ButtonModal({ title = '新建柱状图', type = '1' }) {
         </Divider>
         {!!Object.keys(results).length && <Column {...config} />}
       </Form>
-        </div>
+
+      <Flex justify="center" gap={20}>
+        <Button type="primary" onClick={handlePreview}>
+          预览组件效果
+        </Button>
+        <Button type="primary">AI对话调整</Button>
+        <Button type="primary" autoInsertSpace onClick={handleSubmit}>
+          保存
+        </Button>
+      </Flex>
+    </>
+  )
+}
+
+export default function ButtonModal({ title = '新建柱状图', type = '1' }) {
+  const [open, setOpen] = useState(false)
+  return (
+    <>
+      <Button type="primary" onClick={() => setOpen(true)}>
+        {title}
+      </Button>
+      <Modal title={title} open={open} footer={null} destroyOnClose width={1000} onCancel={() => setOpen(false)}>
+        <ModalContent type={type} setOpen={(open) => setOpen(open)} />
       </Modal>
     </>
   )

src/hooks/useQuery.ts

 import { useEffect, useState } from 'react'
-import { useQuery } from '@tanstack/react-query'
+import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { getUser, getMapList, getMyList, getMyField, getProcessProgress } from '@/api/base'
 import { useUserStore } from '@/stores/user'
 import { useMapStore } from '@/stores/map'
@@ -111,7 +111,9 @@ export function useDataFieldQuery() {
 
 // 进度查询
 export function useProcessProgressQuery(params: { function_name: string }) {
+  const queryClient = useQueryClient()
   const [enabled, setEnabled] = useState(false)
+
   const query = useQuery({
     queryKey: ['processProgress', params],
     queryFn: () => {
@@ -119,11 +121,18 @@ export function useProcessProgressQuery(params: { function_name: string }) {
     },
     select: (res) => res.data,
     enabled,
-    refetchInterval: enabled ? 10000 : false,
+    refetchInterval: enabled ? 1000 : false,
     staleTime: 0,
     gcTime: 0,
+    placeholderData: (): any => {
+      return { data: { progress: -1, message: {} } }
+    },
   })
 
+  const remove = () => {
+    queryClient.removeQueries({ queryKey: ['processProgress', params] })
+  }
+
   // 开始轮询的方法
   const start = () => {
     setEnabled(true)
@@ -133,7 +142,6 @@ export function useProcessProgressQuery(params: { function_name: string }) {
   const stop = () => {
     setEnabled(false)
   }
-  console.log(query.data)
   // 组件卸载时清理
   useEffect(() => {
     if (query.data?.result === 'SUCCESS' || query.data?.result === 'FAIL' || query.data?.result === null) {
@@ -142,7 +150,7 @@ export function useProcessProgressQuery(params: { function_name: string }) {
     return () => {
       stop()
     }
-  }, [query.data])
+  }, [query.data, enabled])
 
-  return { ...query, start, stop }
+  return { ...query, start, stop, remove }
 }

src/modules/data/preprocess/null/components/ButtonModal.tsx

@@ -65,14 +65,12 @@ export default function ButtonModal() {
   const rule = Form.useWatch('rule', form)
   const rules = Form.useWatch('rules', form) || {}
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
   // 开始处理
   const handleStart = () => {
     form.validateFields().then((values) => {
       const params = { ...values, fields: values.fields.join(','), rules: JSON.stringify(values.rules) }
-      mutate(params, {
-        onSuccess: handleClose,
-      })
+      mutate(params)
     })
   }
 
@@ -80,7 +78,7 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
-    form.resetFields()
+    remove()
   }
 
   const steps = [

src/modules/data/preprocess/null/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'missing' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'missing' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,6 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/preprocess/splice/components/ButtonModal.tsx

@@ -220,7 +220,6 @@ export default function ButtonModal() {
     setCurrent(0)
     setStep(-1)
     setConcatenatedFields([])
-    form.resetFields()
   }
 
   return (

src/modules/data/process/binning/components/ButtonModal.tsx

@@ -31,7 +31,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -46,8 +46,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   const [groupName, setGroupName] = useState('')
 
   // 步骤定义

src/modules/data/process/binning/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'mapping' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'mapping' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/date/components/ButtonModal.tsx

@@ -103,7 +103,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -126,8 +126,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   const handleFunctionChange = (value: string) => {
     form.setFieldsValue({ content: `${value}()` })
   }

src/modules/data/process/date/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'date' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'date' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/desensitization/components/ButtonModal.tsx

@@ -27,7 +27,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -42,8 +42,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   // 步骤定义
   const steps = [
     {

src/modules/data/process/desensitization/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'anonymization' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'anonymization' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/group/components/ButtonModal.tsx

@@ -44,7 +44,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -69,8 +69,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   const [groupName, setGroupName] = useState('')
   // 步骤定义
   const steps = [

src/modules/data/process/group/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'grouping' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'grouping' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/logic/components/ButtonModal.tsx

@@ -43,7 +43,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -63,8 +63,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   const handleFunctionChange = (value: string) => {
     form.setFieldsValue({ content: `${value}()` })
   }

src/modules/data/process/logic/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'logic' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'logic' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/mapping/components/ButtonModal.tsx

@@ -45,7 +45,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -63,8 +63,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   // 步骤定义
   const steps = [
     {

src/modules/data/process/mapping/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'mapping' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'mapping' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/number/components/ButtonModal.tsx

@@ -43,7 +43,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -63,8 +63,8 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
-
   const handleFunctionChange = (value: string) => {
     form.setFieldsValue({ content: `${value}()` })
   }

src/modules/data/process/number/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'numeric' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'numeric' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }

src/modules/data/process/string/components/ButtonModal.tsx

@@ -44,7 +44,7 @@ export default function ButtonModal() {
     setCurrent(current + 1)
   }
 
-  const { mutate, isPending, progress, message } = useProcessData()
+  const { mutate, isPending, progress, message, remove } = useProcessData()
 
   // 开始处理
   const handleStart = () => {
@@ -64,6 +64,7 @@ export default function ButtonModal() {
   const handleClose = () => {
     setOpen(false)
     setCurrent(0)
+    remove()
   }
 
   const handleFunctionChange = (value: string) => {

src/modules/data/process/string/query.ts

@@ -7,7 +7,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 // 处理数据
 export function useProcessData() {
   const queryClient = useQueryClient()
-  const { data, start } = useProcessProgressQuery({ function_name: 'text' })
+  const { data, start, remove } = useProcessProgressQuery({ function_name: 'text' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -19,5 +19,5 @@ export function useProcessData() {
       queryClient.invalidateQueries({ queryKey: ['data'] })
     },
   })
-  return { ...query, progress: data?.progress ?? -1, message: data?.message ?? {} }
+  return { ...query, progress: data.progress, message: data.message, remove }
 }