From 166b2bb98f9edbfa5414b075f563d545f6c5b2c8 Mon Sep 17 00:00:00 2001
From: MTrun <1262327911@qq.com>
Date: Thu, 24 Feb 2022 20:11:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChartItemSetting/GlobalSetting.vue        |  1 -
 .../ChartItemSetting/SettingItemBox.vue       |  1 +
 .../components/ChartDataSetting/index.vue     |  7 +++++
 .../components/ChartThemSetting/index.vue     | 11 --------
 .../components/CanvasPage/index.vue           |  8 +++---
 .../components/ChartSetting/index.vue         | 28 +++++++++++++------
 .../components/ListItem/index.vue             |  4 +--
 7 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue
 delete mode 100644 src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue

diff --git a/src/components/ChartItemSetting/GlobalSetting.vue b/src/components/ChartItemSetting/GlobalSetting.vue
index a1aca2d3..2a8d6307 100644
--- a/src/components/ChartItemSetting/GlobalSetting.vue
+++ b/src/components/ChartItemSetting/GlobalSetting.vue
@@ -257,7 +257,6 @@ const props = defineProps({
   }
 })
 
-console.log(props.data)
 const { title, xAxis, yAxis, legend } = toRefs(props.data)
 </script>
 
diff --git a/src/components/ChartItemSetting/SettingItemBox.vue b/src/components/ChartItemSetting/SettingItemBox.vue
index 78e37672..88edc3d3 100644
--- a/src/components/ChartItemSetting/SettingItemBox.vue
+++ b/src/components/ChartItemSetting/SettingItemBox.vue
@@ -25,6 +25,7 @@ $leftWidth: 60px;
   .item-left {
     width: $leftWidth;
     text-align: left;
+    margin-top: 4px;
     margin-left: 10px;
     font-size: 12px;
   }
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue
new file mode 100644
index 00000000..b0a11877
--- /dev/null
+++ b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue
@@ -0,0 +1,7 @@
+<template>
+  <h1>全局接口配置</h1>
+</template>
+
+<script setup lang="ts">
+ 
+</script>
\ No newline at end of file
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue
deleted file mode 100644
index 720876a4..00000000
--- a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <GlobalSetting :data="chartThemeSetting" />
-</template>
-
-<script setup lang="ts">
-import { useChartEditStoreStore } from '@/store/modules/chartEditStore/chartEditStore'
-import { GlobalSetting } from '@/components/ChartItemSetting/index'
-
-const chartEditStoreStore = useChartEditStoreStore()
-const { chartThemeSetting } = chartEditStoreStore.getEditCanvasConfig
-</script>
\ No newline at end of file
diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/index.vue
index 40077fe0..32355265 100644
--- a/src/views/chart/ContentDetails/components/CanvasPage/index.vue
+++ b/src/views/chart/ContentDetails/components/CanvasPage/index.vue
@@ -128,8 +128,8 @@ const switchSelectColorLoading = ref(false)
 const ChartThemeColor = loadAsyncComponent(() =>
   import('./components/ChartThemeColor/index.vue')
 )
-const ChartThemSetting = loadAsyncComponent(() =>
-  import('./components/ChartThemSetting/index.vue')
+const ChartDataSetting = loadAsyncComponent(() =>
+  import('./components/ChartDataSetting/index.vue')
 )
 
 // 页面设置
@@ -153,9 +153,9 @@ const globalTabList = [
   },
   {
     key: 'ChartSysSetting',
-    title: '全局图表',
+    title: '数据配置',
     icon: ZAxisIcon,
-    render: ChartThemSetting
+    render: ChartDataSetting
   }
 ]
 
diff --git a/src/views/chart/ContentDetails/components/ChartSetting/index.vue b/src/views/chart/ContentDetails/components/ChartSetting/index.vue
index 3a3b9f06..48ea3add 100644
--- a/src/views/chart/ContentDetails/components/ChartSetting/index.vue
+++ b/src/views/chart/ContentDetails/components/ChartSetting/index.vue
@@ -1,26 +1,35 @@
 <template>
-  <div class="go-chart-content-details">
-    <GlobalSetting
-      v-if="targetData"
-      :data="targetData.option"
-      :in-chart="true"
-    />
+  <div class="go-chart-content-details" v-if="targetData">
+    <div class="chart-config">
+      <SettingItemBox name="名称">
+        <n-input
+          type="text"
+          maxlength="6"
+          show-count
+          placeholder="请输入图表名称"
+          size="small"
+          v-model:value="targetData.chartConfig.title"
+        />
+      </SettingItemBox>
+    </div>
+    <GlobalSetting :data="targetData.option" :in-chart="true" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, Ref } from 'vue'
 import { loadAsyncComponent } from '@/utils'
 import { useChartEditStoreStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { GlobalSetting } from '@/components/ChartItemSetting/index'
 import { CreateComponentType } from '@/packages/index.d'
+import { SettingItemBox } from '@/components/ChartItemSetting/index'
 
 const GlobalSettingCom = loadAsyncComponent(() =>
   import('@/components/ChartItemSetting/index')
 )
 const chartEditStoreStore = useChartEditStoreStore()
 
-const targetData = computed(() => {
+const targetData: Ref<CreateComponentType> = computed(() => {
   const list = chartEditStoreStore.getComponentList
   const targetIndex = chartEditStoreStore.fetchTargetIndex()
   return list[targetIndex]
@@ -29,5 +38,8 @@ const targetData = computed(() => {
 
 <style lang="scss" scoped>
 @include go('chart-content-details') {
+  .chart-config {
+    padding: 20px 0;
+  }
 }
 </style>
diff --git a/src/views/chart/ContentLayers/components/ListItem/index.vue b/src/views/chart/ContentLayers/components/ListItem/index.vue
index b41eec6a..4c1990f3 100644
--- a/src/views/chart/ContentLayers/components/ListItem/index.vue
+++ b/src/views/chart/ContentLayers/components/ListItem/index.vue
@@ -13,7 +13,7 @@
       />
       <n-ellipsis>
         <n-text class="list-text">
-          {{ title }}
+          {{ props.componentData.chartConfig.title }}
         </n-text>
       </n-ellipsis>
     </div>
@@ -39,7 +39,7 @@ const props = defineProps({
   }
 })
 
-const { image, title } = toRefs(props.componentData.chartConfig)
+const { image } = toRefs(props.componentData.chartConfig)
 
 // 计算当前选中目标
 const select = computed(() => {