From 559bf2fe5723e5f537d93ec3862d1685b5a3070e Mon Sep 17 00:00:00 2001
From: MTrun <1262327911@qq.com>
Date: Tue, 22 Mar 2022 11:41:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=BD=E7=A6=BBupdate=20hook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 +-
 src/hooks/index.ts                            |  6 +--
 src/hooks/{code.hook.ts => useCode.hook.ts}   |  2 +-
 ...wScale.hook.ts => usePreviewScale.hook.ts} |  0
 src/hooks/{theme.hook.ts => useTheme.hook.ts} |  0
 .../ChartDataMatchingAndShow/index.vue        | 44 ++-------------
 .../ChartData/hooks/useFile.hooks.ts          | 54 +++++++++++++++++--
 7 files changed, 61 insertions(+), 49 deletions(-)
 rename src/hooks/{code.hook.ts => useCode.hook.ts} (89%)
 rename src/hooks/{previewScale.hook.ts => usePreviewScale.hook.ts} (100%)
 rename src/hooks/{theme.hook.ts => useTheme.hook.ts} (100%)

diff --git a/src/App.vue b/src/App.vue
index 4de0dd1a..f88d28f2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@ import { zhCN, dateZhCN, NConfigProvider } from 'naive-ui'
 import { AppProvider } from '@/components/AppProvider'
 import { I18n } from '@/components/I18n'
 
-import { useDarkThemeHook, useThemeOverridesHook, useHook } from '@/hooks'
+import { useDarkThemeHook, useThemeOverridesHook, useCode } from '@/hooks'
 
 // 暗黑主题
 const darkTheme = useDarkThemeHook()
@@ -27,5 +27,5 @@ const darkTheme = useDarkThemeHook()
 const overridesTheme = useThemeOverridesHook()
 
 // 代码主题
-const hljsTheme = useHook()
+const hljsTheme = useCode()
 </script>
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index b8cd73c8..37dbe176 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -1,3 +1,3 @@
-export * from '@/hooks/theme.hook'
-export * from '@/hooks/previewScale.hook'
-export * from '@/hooks/code.hook'
\ No newline at end of file
+export * from '@/hooks/useTheme.hook'
+export * from '@/hooks/usePreviewScale.hook'
+export * from '@/hooks/useCode.hook'
\ No newline at end of file
diff --git a/src/hooks/code.hook.ts b/src/hooks/useCode.hook.ts
similarity index 89%
rename from src/hooks/code.hook.ts
rename to src/hooks/useCode.hook.ts
index 40b0c9e1..52dd381c 100644
--- a/src/hooks/code.hook.ts
+++ b/src/hooks/useCode.hook.ts
@@ -2,7 +2,7 @@ import hljs from 'highlight.js/lib/core'
 import json from 'highlight.js/lib/languages/json'
 import typescript from 'highlight.js/lib/languages/typescript'
 
-export const useHook = () => {
+export const useCode = () => {
   hljs.registerLanguage('json', json)
   hljs.registerLanguage('typescript', typescript)
   return hljs
diff --git a/src/hooks/previewScale.hook.ts b/src/hooks/usePreviewScale.hook.ts
similarity index 100%
rename from src/hooks/previewScale.hook.ts
rename to src/hooks/usePreviewScale.hook.ts
diff --git a/src/hooks/theme.hook.ts b/src/hooks/useTheme.hook.ts
similarity index 100%
rename from src/hooks/theme.hook.ts
rename to src/hooks/useTheme.hook.ts
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
index 703e9b75..8035da73 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -64,13 +64,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, nextTick, PropType } from 'vue'
-import { UploadCustomRequestOptions } from 'naive-ui'
-import { FileTypeEnum } from '@/enums/fileTypeEnum'
-import { readFile, downloadFile } from '@/utils'
+import { ref, computed, watch, PropType } from 'vue'
 import { CreateComponentType } from '@/packages/index.d'
 import { icon } from '@/plugins'
 import { DataResultEnum, TimelineTitleEnum } from '../../index.d'
+import { useFile } from '../../hooks/useFile.hooks'
 
 const props = defineProps({
   targetData: {
@@ -88,11 +86,12 @@ const props = defineProps({
 const tableTitle = ['字段', '映射', '状态']
 
 const { DocumentAddIcon, DocumentDownloadIcon } = icon.carbon
-const uploadFileListRef = ref()
 const source = ref()
 const dimensions = ref()
 const dimensionsAndSource = ref()
 
+const { uploadFileListRef, customRequest, beforeUpload, download} = useFile(props.targetData)
+
 // 获取数据
 const getSource = computed(() => {
   return JSON.stringify(source.value)
@@ -139,41 +138,6 @@ watch(() => props.targetData?.option?.dataset, (newData) => {
 }, {
   immediate: true
 })
-
-//@ts-ignore
-const beforeUpload = ({ file }) => {
-  uploadFileListRef.value = []
-  const type = file.file.type
-  if (type !== FileTypeEnum.JSON && type !== FileTypeEnum.TXT) {
-    window['$message'].warning('仅支持上传 【JSON】 格式文件，请重新上传！')
-    return false
-  }
-  return true
-}
-
-// 自定义上传操作
-const customRequest = (options: UploadCustomRequestOptions) => {
-  const { file } = options
-  nextTick(() => {
-    if (file.file) {
-      readFile(file.file).then((fileData: any) => {
-        props.targetData.option.dataset = JSON.parse(fileData)
-      });
-    } else {
-      window['$message'].error('导入数据失败，请稍后重试或联系管理员！')
-    }
-  })
-}
-
-// 下载文件
-const download = () => {
-  try {
-    window['$message'].success('下载中，请耐心等待...')
-    downloadFile(JSON.stringify(props.targetData?.option?.dataset), undefined, 'json')
-  } catch (error) {
-    window['$message'].success('下载失败，数据错误！')
-  }
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts
index a3a12412..07846417 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts
+++ b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts
@@ -1,3 +1,51 @@
-const useFile = () => {
-  
-}
\ No newline at end of file
+import { ref, toRef, nextTick } from 'vue'
+import { UploadCustomRequestOptions } from 'naive-ui'
+import { FileTypeEnum } from '@/enums/fileTypeEnum'
+import { readFile, downloadFile } from '@/utils'
+
+export const useFile = (targetData: any) => {
+  const uploadFileListRef = ref()
+  const option = toRef(targetData, 'option')
+  console.log(option)
+  //@ts-ignore
+  const beforeUpload = ({ file }) => {
+    uploadFileListRef.value = []
+    const type = file.file.type
+    if (type !== FileTypeEnum.JSON && type !== FileTypeEnum.TXT) {
+      window['$message'].warning('仅支持上传 【JSON】 格式文件，请重新上传！')
+      return false
+    }
+    return true
+  }
+
+  // 自定义上传操作
+  const customRequest = (options: UploadCustomRequestOptions) => {
+    const { file } = options
+    nextTick(() => {
+      if (file.file) {
+        readFile(file.file).then((fileData: any) => {
+          option.value.dataset = JSON.parse(fileData)
+          console.log(option.value.dataset)
+        })
+      } else {
+        window['$message'].error('导入数据失败，请稍后重试或联系管理员！')
+      }
+    })
+  }
+
+  // 下载文件
+  const download = () => {
+    try {
+      window['$message'].success('下载中，请耐心等待...')
+      downloadFile(JSON.stringify(option.value.dataset), undefined, 'json')
+    } catch (error) {
+      window['$message'].success('下载失败，数据错误！')
+    }
+  }
+  return {
+    uploadFileListRef,
+    beforeUpload,
+    customRequest,
+    download
+  }
+}