From 8ee057aac332e0f57d6e1b6d5f0ad6c2cdd8f42e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 23 May 2022 15:06:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=89=B9=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/chart.js       |  4 ++-
 .../shape-attr/SizeSelectorAntV.vue           |  4 +--
 frontend/src/views/chart/view/ChartStyle.vue  | 25 ++++++++-----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index b3102a190f..dcf3b75094 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -57,7 +57,9 @@ export const DEFAULT_SIZE = {
   liquidWaveLength: 128,
   liquidWaveCount: 3,
   liquidShape: 'circle',
-  tablePageMode: 'page'
+  tablePageMode: 'page',
+  symbolOpacity: 0.7,
+  symbolStrokeWidth: 2
 }
 export const DEFAULT_LABEL = {
   show: false,
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index 57141bf676..3fa88f6dbb 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -411,8 +411,8 @@
           />
         </el-form-item>
         <!--liquid-end-->
-        <el-form-item v-if="showProperty(symbolOpacity)" :label="$t('chart.not_alpha')" class="form-item form-item-slider">
-          <el-slider v-model="sizeForm.symbolOpacity" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase" />
+        <el-form-item v-if="showProperty('symbolOpacity')" :label="$t('chart.not_alpha')" class="form-item form-item-slider">
+          <el-slider v-model="sizeForm.symbolOpacity" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase('symbolOpacity')" />
         </el-form-item>
 
         <el-form-item v-if="showProperty('symbolStrokeWidth') && sizeForm.scatterSymbol && sizeForm.scatterSymbol !== 'marker'" :label="$t('plugin_style.border')" class="form-item form-item-slider">
diff --git a/frontend/src/views/chart/view/ChartStyle.vue b/frontend/src/views/chart/view/ChartStyle.vue
index 85c323bea6..7f6fb161a8 100644
--- a/frontend/src/views/chart/view/ChartStyle.vue
+++ b/frontend/src/views/chart/view/ChartStyle.vue
@@ -29,17 +29,8 @@
       <el-row>
         <span class="padding-lr">{{ $t('chart.shape_attr') }}</span>
         <el-collapse v-model="attrActiveNames" class="style-collapse">
-          <el-collapse-item name="color" :title="$t('chart.color')">
-            <color-selector-ext
-              v-if="view.render && view.render === 'antv' && (view.type.includes('bar') || view.type.includes('line') || view.type.includes('pie') || view.type === 'funnel' || view.type === 'radar' || view.type === 'scatter')"
-              :param="param"
-              class="attr-selector"
-              :chart="chart"
-              @onColorChange="onColorChange"
-            />
-          <el-collapse-item name="color"  v-show="showPropertiesCollapse(['color-selector'])" :title="$t('chart.color')">
+          <el-collapse-item v-show="showPropertiesCollapse(['color-selector'])" name="color" :title="$t('chart.color')">
             <color-selector
-              v-else
               :param="param"
               class="attr-selector"
               :chart="chart"
@@ -283,7 +274,6 @@
 <script>
 import PluginCom from '@/views/system/plugin/PluginCom'
 import ColorSelector from '@/views/chart/components/shape-attr/ColorSelector'
-import ColorSelectorExt from '@/views/chart/components/shape-attr/ColorSelectorExt'
 import SizeSelector from '@/views/chart/components/shape-attr/SizeSelector'
 import SizeSelectorAntV from '@/views/chart/components/shape-attr/SizeSelectorAntV'
 import LabelSelector from '@/views/chart/components/shape-attr/LabelSelector'
@@ -330,8 +320,7 @@ export default {
     SizeSelectorAntV,
     SizeSelector,
     ColorSelector,
-    PluginCom,
-    ColorSelectorExt
+    PluginCom
   },
   props: {
     chart: {
@@ -352,11 +341,17 @@ export default {
     },
     dimensionData: {
       type: Array,
-      required: true
+      required: false,
+      default: function() {
+        return []
+      }
     },
     quotaData: {
       type: Array,
-      required: true
+      required: false,
+      default: function() {
+        return []
+      }
     },
     propertyInnerAll: {
       type: Object,