From 15b908773d07d9372f7b803d74b85c375c5942f8 Mon Sep 17 00:00:00 2001
From: mtruning <1262327911@qq.com>
Date: Sat, 19 Mar 2022 21:29:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E7=A6=BB=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E9=87=8C=E7=9A=84=E5=90=8D=E7=A7=B0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChartItemSetting/NameSetting.vue          | 26 +++++++++++++
 .../ChartItemSetting/PositionSetting.vue      |  4 +-
 src/components/ChartItemSetting/index.ts      |  4 +-
 .../components/CanvasPage/index.vue           | 38 +++++--------------
 .../components/ChartSetting/index.vue         | 15 +-------
 5 files changed, 41 insertions(+), 46 deletions(-)
 create mode 100644 src/components/ChartItemSetting/NameSetting.vue

diff --git a/src/components/ChartItemSetting/NameSetting.vue b/src/components/ChartItemSetting/NameSetting.vue
new file mode 100644
index 00000000..6194728e
--- /dev/null
+++ b/src/components/ChartItemSetting/NameSetting.vue
@@ -0,0 +1,26 @@
+<template>
+  <setting-item-box name="名称" :alone="true">
+    <n-input
+      type="text"
+      maxlength="6"
+      show-count
+      placeholder="请输入图表名称"
+      size="small"
+      v-model:value="chartConfig.title"
+    ></n-input>
+  </setting-item-box>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue'
+import { SettingItemBox } from '@/components/ChartItemSetting/index'
+import { ConfigType } from '@/packages/index.d'
+
+const props = defineProps({
+  chartConfig: {
+    type: Object as PropType<ConfigType>,
+    required: true
+  },
+})
+
+</script>
diff --git a/src/components/ChartItemSetting/PositionSetting.vue b/src/components/ChartItemSetting/PositionSetting.vue
index 467157db..f639bfdb 100644
--- a/src/components/ChartItemSetting/PositionSetting.vue
+++ b/src/components/ChartItemSetting/PositionSetting.vue
@@ -92,9 +92,7 @@ const props = defineProps({
     required: true
   },
   chartAttr: {
-    type: Object as PropType<
-      Omit<PickCreateComponentType<'attr'>, 'node' | 'conNode'>
-    >,
+    type: Object as PropType<PickCreateComponentType<'attr'>>,
     required: true
   }
 })
diff --git a/src/components/ChartItemSetting/index.ts b/src/components/ChartItemSetting/index.ts
index e0a722cc..e8c7ad66 100644
--- a/src/components/ChartItemSetting/index.ts
+++ b/src/components/ChartItemSetting/index.ts
@@ -5,6 +5,8 @@ import CollapseItem from './CollapseItem.vue'
 
 // 全局配置属性
 import GlobalSetting from './GlobalSetting.vue'
+// 名称
+import NameSetting from './NameSetting.vue'
 // 方向
 import PositionSetting from './PositionSetting.vue'
 // 尺寸
@@ -12,4 +14,4 @@ import SizeSetting from './SizeSetting.vue'
 // 样式
 import StylesSetting from './StylesSetting.vue'
 
-export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, PositionSetting, SizeSetting, StylesSetting }
+export { CollapseItem, SettingItemBox, SettingItem, GlobalSetting, NameSetting, PositionSetting, SizeSetting, StylesSetting }
diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
index eeb264e5..b34f8b06 100644
--- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
+++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
@@ -8,7 +8,7 @@
           v-model:value="canvasConfig.width"
           :validator="validator"
           @update:value="changeSizeHandle"
-       ></n-input-number>
+        ></n-input-number>
       </n-form-item>
       <n-form-item label="高度">
         <n-input-number
@@ -16,7 +16,7 @@
           v-model:value="canvasConfig.height"
           :validator="validator"
           @update:value="changeSizeHandle"
-       ></n-input-number>
+        ></n-input-number>
       </n-form-item>
     </n-form>
 
@@ -52,7 +52,7 @@
           :showPreview="true"
           :swatches="swatchesColors"
           v-model:value="canvasConfig.background"
-       ></n-color-picker>
+        ></n-color-picker>
       </n-space>
       <n-space>
         <n-text>使用颜色</n-text>
@@ -63,24 +63,12 @@
           :round="false"
           :disabled="!canvasConfig.backgroundImage"
           :onUpdate="switchSelectColorHandle"
-       ></n-switch>
+        ></n-switch>
       </n-space>
       <n-space>
         <n-text>背景</n-text>
-        <n-button
-          size="small"
-          :disabled="!canvasConfig.backgroundImage"
-          @click="clearImage"
-        >
-          清除背景图
-        </n-button>
-        <n-button
-          size="small"
-          :disabled="!canvasConfig.background"
-          @click="clearColor"
-        >
-          清除颜色
-        </n-button>
+        <n-button size="small" :disabled="!canvasConfig.backgroundImage" @click="clearImage">清除背景图</n-button>
+        <n-button size="small" :disabled="!canvasConfig.background" @click="clearColor">清除颜色</n-button>
       </n-space>
     </n-space>
 
@@ -110,6 +98,7 @@
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import { backgroundImageSize } from '@/settings/designSetting'
+import { FileTypeEnum } from '@/enums/fileTypeEnum'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { UploadCustomRequestOptions } from 'naive-ui'
@@ -175,7 +164,7 @@ const beforeUploadHandle = async ({ file }) => {
     )
     return false
   }
-  if (type !== 'image/png' && type !== 'image/jpeg' && type !== 'image/gif') {
+  if (type !== FileTypeEnum.PNG && type !== FileTypeEnum.JPEG && type !== FileTypeEnum.GIF) {
     window['$message'].warning('文件格式不符合，请重新上传！')
     return false
   }
@@ -224,16 +213,7 @@ const switchSelectColorHandle = () => {
 
 // 自定义上传操作
 const customRequest = (options: UploadCustomRequestOptions) => {
-  const {
-    file,
-    data,
-    headers,
-    withCredentials,
-    action,
-    onFinish,
-    onError,
-    onProgress
-  } = options
+  const { file } = options
 
   nextTick(() => {
     if (file.file) {
diff --git a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
index 2f657b3e..91b65e82 100644
--- a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
@@ -1,16 +1,7 @@
 <template>
   <div class="go-chart-configurations-setting" v-if="targetData">
     <!-- 名称 -->
-    <setting-item-box name="名称">
-      <n-input
-        type="text"
-        maxlength="6"
-        show-count
-        placeholder="请输入图表名称"
-        size="small"
-        v-model:value="targetData.chartConfig.title"
-     ></n-input>
-    </setting-item-box>
+    <name-setting :chartConfig="targetData.chartConfig"></name-setting>
     <!-- 尺寸 -->
     <size-setting :chartAttr="targetData.attr"></size-setting>
     <!-- 位置 -->
@@ -25,10 +16,8 @@
 </template>
 
 <script setup lang="ts">
-import { GlobalSetting, PositionSetting, SizeSetting, StylesSetting } from '@/components/ChartItemSetting/index'
-import { SettingItemBox } from '@/components/ChartItemSetting/index'
+import { GlobalSetting, NameSetting, PositionSetting, SizeSetting, StylesSetting } from '@/components/ChartItemSetting/index'
 import { useTargetData } from '../hooks/useTargetData.hook'
-
 const { targetData, chartEditStore } = useTargetData()
 
 </script>