bug fixes

src/api/base.ts

@@ -39,6 +39,11 @@ export function getMyList(params?: Partial<{ page: number; 'per-page': number }>
   return httpRequest.get('/api/resource/bi/v1/data/my/list', { params })
 }
 
+// 我的数据集列表
+export function getMyFile() {
+  return httpRequest.get('/api/resource/bi/v1/data/my/file', { responseType: 'arraybuffer' })
+}
+
 // 查看字段详情
 export function getMyField() {
   return httpRequest.get('/api/resource/bi/v1/data/my/field-detail')
@@ -48,41 +53,3 @@ export function getMyField() {
 export function getProcessProgress(params: { function_name: string }) {
   return httpRequest.get('/api/resource/bi/v1/processing/processing/progress', { params })
 }
-
-// 我的数据集列表
-export function getChartList(params?: Partial<{ page: number; 'per-page': number }>) {
-  return Promise.resolve({
-    code: 0,
-    message: 'OK',
-    data: {
-      total: 10,
-      list: [
-        {
-          pk_id: '1',
-          type: '柱状图',
-          name: '销量统计',
-          create_user: 'admin',
-          create_time: '2023-07-18 15:00:00',
-          update_time: '2023-07-18 15:00:00',
-        },
-        {
-          pk_id: '2',
-          type: '折线图',
-          name: '销售额趋势',
-          create_user: 'admin',
-          create_time: '2023-07-18 15:00:00',
-          update_time: '2023-07-18 15:00:00',
-        },
-        {
-          pk_id: '3',
-          type: '饼图',
-          name: '品类分布',
-          create_user: 'admin',
-          create_time: '2023-07-18 15:00:00',
-          update_time: '2023-07-18 15:00:00',
-        },
-      ],
-    },
-  })
-  return httpRequest.get('/api/resource/bi/v1/data/my/list', { params })
-}

src/api/data.ts

@@ -5,6 +5,11 @@ export function getMyList(params?: Partial<{ page: number; 'per-page': number }>
   return httpRequest.get('/api/resource/bi/v1/data/my/list', { params })
 }
 
+// 我的数据集列表
+export function getMyFile() {
+  return httpRequest.get('/api/resource/bi/v1/data/my/file', { responseType: 'arraybuffer' })
+}
+
 // 查看字段详情
 export function getMyField() {
   return httpRequest.get('/api/resource/bi/v1/data/my/field-detail')

src/hooks/useQuery.ts

 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { getUser, getMapList, getMyList, getMyField, getProcessProgress } from '@/api/base'
+import { getUser, getMapList, getMyList, getMyFile, getMyField, getProcessProgress } from '@/api/base'
 import { useUserStore } from '@/stores/user'
 import { useMapStore } from '@/stores/map'
-import axios from 'axios'
 import { read, utils } from 'xlsx'
 import { message } from 'antd'
 
@@ -39,33 +38,28 @@ export function useMapQuery() {
 
 // 我的数据集
 export function useDataQuery() {
+  const excelQuery = useExcelQuery()
   const query = useQuery({
     queryKey: ['data'],
-    queryFn: () => {
-      return getMyList({ page: 1, 'per-page': 1000 })
+    queryFn: async () => {
+      const res = await getMyList({ page: 1, 'per-page': 1000 })
+      if (res.data?.list?.length > 0) {
+        excelQuery.refetch()
+      }
+      return res
     },
     select: (res) => res.data,
     placeholderData: (): any => {
       return { data: { total: 0, list: [], title: [] } }
     },
   })
-  const file = query.data.info?.source || {}
-
-  useExcelQuery(file.url)
 
   return query
 }
 
 // 读取excel文件
-export function useExcelQuery(url: string) {
-  const query = useQuery({
-    queryKey: ['excel', url],
-    queryFn: () => {
-      return axios(url, { responseType: 'arraybuffer' })
-    },
-    select: (res) => res.data,
-    enabled: !!url,
-  })
+export function useExcelQuery() {
+  const query = useQuery({ queryKey: ['excel'], queryFn: getMyFile, enabled: false })
 
   useEffect(() => {
     if (query.data) {
@@ -76,6 +70,8 @@ export function useExcelQuery(url: string) {
       localStorage.setItem('dataset', JSON.stringify(jsonData))
     }
   }, [query.data])
+
+  return query
 }
 
 interface DataField {
@@ -181,10 +177,11 @@ export function useProcessProgressQuery(params: { function_name: string }) {
 
   useEffect(() => {
     if (!enabled) return
+    if (query.isFetching) return
     if (query.data?.result === 'FAIL' || query.data?.result === 'SUCCESS') {
       stop()
     }
-  }, [query.data, enabled, stop])
+  }, [query.data, enabled, stop, query.isFetching])
 
   useEffect(() => {
     return () => {
@@ -192,5 +189,5 @@ export function useProcessProgressQuery(params: { function_name: string }) {
     }
   }, [])
 
-  return { ...query, start, stop, remove }
+  return { ...query, start, stop, remove, enabled }
 }

src/modules/data/digging/linear/components/ButtonModal.tsx

@@ -111,18 +111,18 @@ json
       title: '设置算法',
       content: (
         <>
-          <Form.Item
-            label="请选择自变量"
-            name="independent_variables"
-            rules={[{ required: true, message: '请选择自变量' }]}>
-            <Select options={fieldNameOptions} placeholder="请选择" mode="multiple" optionFilterProp="label" />
-          </Form.Item>
           <Form.Item
             label="请选择因变量"
             name="dependent_variable"
             rules={[{ required: true, message: '请选择因变量' }]}>
             <Select options={fieldNameOptions} placeholder="请选择" />
           </Form.Item>
+          <Form.Item
+            label="请选择自变量"
+            name="independent_variables"
+            rules={[{ required: true, message: '请选择自变量' }]}>
+            <Select options={fieldNameOptions} placeholder="请选择" mode="multiple" optionFilterProp="label" />
+          </Form.Item>
           <Flex gap={20}>
             <div style={{ flex: 1 }}>
               <Form.Item label="请输入是否拟合截距项（fit_intercept）">

src/modules/data/digging/logistic/components/ButtonModal.tsx

@@ -107,18 +107,18 @@ json
       title: '设置算法',
       content: (
         <>
-          <Form.Item
-            label="请选择自变量"
-            name="independent_variables"
-            rules={[{ required: true, message: '请选择自变量' }]}>
-            <Select options={fieldNameOptions} placeholder="请选择" mode="multiple" optionFilterProp="label" />
-          </Form.Item>
           <Form.Item
             label="请选择因变量"
             name="dependent_variable"
             rules={[{ required: true, message: '请选择因变量' }]}>
             <Select options={fieldNameOptions} placeholder="请选择" />
           </Form.Item>
+          <Form.Item
+            label="请选择自变量"
+            name="independent_variables"
+            rules={[{ required: true, message: '请选择自变量' }]}>
+            <Select options={fieldNameOptions} placeholder="请选择" mode="multiple" optionFilterProp="label" />
+          </Form.Item>
           <Flex gap={20}>
             <div style={{ flex: 1 }}>
               <Form.Item label="请输入正则化强度（C）">

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'abnormal' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'abnormal' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'outOfRange' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'outOfRange' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'underRange' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'underRange' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -121,7 +121,7 @@ export default function ButtonModal() {
               </Form.Item>
 
               {rule === '特殊值填充' && (
-                <Form.Item label="请填写特殊值" name="special">
+                <Form.Item label="请填写特殊值" name="specify">
                   <Input placeholder="请输入" />
                 </Form.Item>
               )}
@@ -138,7 +138,7 @@ export default function ButtonModal() {
                   <Select options={ruleOptions} />
                 </Form.Item>
                 {rules[index]?.rule === '特殊值填充' && (
-                  <Form.Item label="请填写特殊值" name={['rules', index, 'special']}>
+                  <Form.Item label="请填写特殊值" name={['rules', index, 'specify']}>
                     <Input placeholder="请输入" />
                   </Form.Item>
                 )}

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'missing' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'missing' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'duplicate' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'duplicate' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'sort' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'sort' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'trim' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'trim' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'merge' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'merge' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'split' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'split' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'punctuation' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'punctuation' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'type' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'type' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -16,5 +16,5 @@ export function useProcessData() {
     },
   })
 
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'binning' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'binning' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'date' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'date' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'anonymization' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'anonymization' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'grouping' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'grouping' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'logic' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'logic' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'mapping' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'mapping' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'numeric' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'numeric' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }

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

@@ -5,7 +5,7 @@ import { useProcessProgressQuery } from '@/hooks/useQuery'
 
 // 处理数据
 export function useProcessData() {
-  const { data, start, remove } = useProcessProgressQuery({ function_name: 'text' })
+  const { data, start, remove, enabled } = useProcessProgressQuery({ function_name: 'text' })
 
   const query = useMutation({
     mutationFn: (data: ProcessDataParams) => {
@@ -15,5 +15,5 @@ export function useProcessData() {
       start()
     },
   })
-  return { ...query, progress: data.progress, message: data.message, remove }
+  return { ...query, progress: data.progress, message: data.message, remove, isPending: enabled || query.isPending }
 }