From 88764d77a8d347d15a4bdc10297cd62c3046637d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Wed, 7 Sep 2022 11:46:14 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Decorates/Decorates/Decorates03/config.ts   |  1 -
 .../ChartDataMatchingAndShow/index.vue          | 10 ++++++----
 .../components/ChartData/index.vue              | 17 +++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/packages/components/Decorates/Decorates/Decorates03/config.ts b/src/packages/components/Decorates/Decorates/Decorates03/config.ts
index 169688f1..3baa8a48 100644
--- a/src/packages/components/Decorates/Decorates/Decorates03/config.ts
+++ b/src/packages/components/Decorates/Decorates/Decorates03/config.ts
@@ -4,7 +4,6 @@ import { Decorates03Config } from './index'
 import cloneDeep from 'lodash/cloneDeep'
 
 export const option = {
-  dataset: '装饰-03',
   textColor: '#fff',
   textSize: 24,
   colors: ['#1dc1f5', '#1dc1f5'],
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 97d2c560..1025a3e0 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -164,21 +164,23 @@ const dimensionsAndSourceHandle = () => {
 watch(
   () => targetData.value?.option?.dataset,
   (
-    newData: {
+    newData?: {
       source: any
       dimensions: any
     } | null
   ) => {
-    if (newData && isObject(newData)) {
-      // 只有 Echarts 数据才有对应的格式
+    if (newData && targetData?.value?.chartConfig?.chartFrame === ChartFrameEnum.ECHARTS) {
+      // 只有 DataSet 数据才有对应的格式
       source.value = newData
       if (isCharts.value) {
         dimensions.value = newData.dimensions
         dimensionsAndSource.value = dimensionsAndSourceHandle()
       }
-    } else {
+    } else if (newData !== undefined && newData !== null) {
       dimensionsAndSource.value = null
       source.value = newData
+    } else {
+      source.value = '此组件无数据源'
     }
   },
   {
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/index.vue
index 20569814..19720a70 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/index.vue
@@ -1,16 +1,11 @@
 <template>
   <div class="go-chart-configurations-data" v-if="targetData">
     <setting-item-box name="请求方式" :alone="true">
-      <n-select
-        v-model:value="targetData.request.requestDataType"
-        :options="selectOptions"
-      />
+      <n-select v-model:value="targetData.request.requestDataType" :disabled="isNotData" :options="selectOptions" />
     </setting-item-box>
 
     <!-- 静态 -->
-    <chart-data-static
-      v-if="targetData.request.requestDataType === RequestDataTypeEnum.STATIC"
-    ></chart-data-static>
+    <chart-data-static v-if="targetData.request.requestDataType === RequestDataTypeEnum.STATIC"></chart-data-static>
 
     <!-- 动态 -->
     <chart-data-ajax v-else></chart-data-ajax>
@@ -18,6 +13,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
 import { useTargetData } from '../hooks/useTargetData.hook'
 import { ChartDataStatic } from './components/ChartDataStatic/index'
@@ -38,4 +34,9 @@ const selectOptions: SelectCreateDataType[] = [
     value: RequestDataTypeEnum.AJAX
   }
 ]
-</script>
\ No newline at end of file
+
+// 无数据源
+const isNotData = computed(() => {
+  return typeof targetData.value?.option?.dataset === 'undefined'
+})
+</script>