From ac4e4aa0a2472266715f8aceac7c7f34894473eb 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: Thu, 21 Dec 2023 21:25:05 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9F=B1=E7=8A=B6?=
 =?UTF-8?q?=E5=9B=BE&=E6=8A=98=E7=BA=BF=E5=9B=BE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Bars/BarLine/config.vue | 59 ++++++++++++++++---
 .../components/Charts/Bars/BarLine/index.vue  | 37 +++++++++---
 2 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/src/packages/components/Charts/Bars/BarLine/config.vue b/src/packages/components/Charts/Bars/BarLine/config.vue
index 6a76ebdb..17e401ee 100644
--- a/src/packages/components/Charts/Bars/BarLine/config.vue
+++ b/src/packages/components/Charts/Bars/BarLine/config.vue
@@ -4,9 +4,30 @@
   <CollapseItem
     v-for="(item, index) in seriesList"
     :key="index"
-    :name="`${item.type == 'bar' ? '柱状图' : '折线图'}`"
+    :name="`系列${index + 1}`"
     :expanded="true"
   >
+    <template #header>
+      <n-text class="go-fs-13" depth="3">
+        {{ item.type == 'bar' ? '「柱状图」' : '「折线图」' }}
+      </n-text>
+    </template>
+    <SettingItemBox name="类型">
+      <SettingItem name="宽度">
+        <n-select
+          :value="item.type"
+          size="small"
+          :options="[
+            { label: '柱状图', value: 'bar' },
+            { label: '折线图', value: 'line' }
+          ]"
+          @update:value="(value) => {
+            updateHandle(item, value)
+          }"
+        />
+      </SettingItem>
+ 
+    </SettingItemBox>
     <SettingItemBox name="图形" v-if="item.type == 'bar'">
       <SettingItem name="宽度">
         <n-input-number
@@ -34,6 +55,12 @@
       <SettingItem name="类型">
         <n-select v-model:value="item.lineStyle.type" size="small" :options="lineConf.lineStyle.type"></n-select>
       </SettingItem>
+      <setting-item>
+        <n-space>
+          <n-switch v-model:value="item.smooth" size="small" />
+          <n-text>曲线</n-text>
+        </n-space>
+      </setting-item>
     </SettingItemBox>
     <SettingItemBox name="实心点" v-if="item.type == 'line'">
       <SettingItem name="大小">
@@ -63,10 +90,10 @@
         <n-select
           v-model:value="item.label.position"
           :options="[
-            { label: 'top', value: 'top' },
-            { label: 'left', value: 'left' },
-            { label: 'right', value: 'right' },
-            { label: 'bottom', value: 'bottom' }
+            { label: '顶部', value: 'top' },
+            { label: '左侧', value: 'left' },
+            { label: '右侧', value: 'right' },
+            { label: '底部', value: 'bottom' }
           ]"
         />
       </setting-item>
@@ -75,10 +102,18 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, computed } from 'vue'
-import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
+import { PropType, computed, toRaw } from 'vue'
+import { merge, cloneDeep } from 'lodash';
+
+import GlobalSetting from '@/components/Pages/ChartItemSetting/GlobalSetting.vue'
+import CollapseItem from '@/components/Pages/ChartItemSetting/CollapseItem.vue'
+import SettingItemBox from '@/components/Pages/ChartItemSetting/SettingItemBox.vue'
+import SettingItem from '@/components/Pages/ChartItemSetting/SettingItem.vue'
+
 import { lineConf } from '@/packages/chartConfiguration/echarts'
 import { GlobalThemeJsonType } from '@/settings/chartThemes'
+import { barSeriesItem, lineSeriesItem } from './config'
+
 
 const props = defineProps({
   optionData: {
@@ -90,4 +125,14 @@ const props = defineProps({
 const seriesList = computed(() => {
   return props.optionData.series
 })
+
+const updateHandle = (item:any, value:string) => {
+  const _label = cloneDeep(toRaw(item.label))
+  lineSeriesItem.label = _label
+  if (value === 'line') {
+    merge(item, lineSeriesItem)
+  } else {
+    merge(item, barSeriesItem)
+  }
+}
 </script>
diff --git a/src/packages/components/Charts/Bars/BarLine/index.vue b/src/packages/components/Charts/Bars/BarLine/index.vue
index 2f221a55..73c884df 100644
--- a/src/packages/components/Charts/Bars/BarLine/index.vue
+++ b/src/packages/components/Charts/Bars/BarLine/index.vue
@@ -12,6 +12,7 @@
 <script setup lang="ts">
 import { ref, computed, watch, PropType, nextTick } from 'vue'
 import VChart from 'vue-echarts'
+import { isObject, cloneDeep } from 'lodash'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
@@ -52,16 +53,34 @@ const option = computed(() => {
 watch(
   () => props.chartConfig.option.dataset,
   (newData, oldData) => {
-    if (newData.dimensions.length !== oldData.dimensions.length) {
-      const seriesArr = []
-      for (let i = 0; i < newData.dimensions.length - 1; i++) {
-        seriesArr.push(barSeriesItem, lineSeriesItem)
+    try {
+      if (!isObject(newData) || !('dimensions' in newData)) return
+      if (Array.isArray(newData?.dimensions)) {
+        const seriesArr: (typeof barSeriesItem)[] = []
+        // 对oldData进行判断，防止传入错误数据之后对旧维度判断产生干扰
+        // 此处计算的是dimensions的Y轴维度，若是dimensions.length为0或1，则默认为1，排除X轴维度干扰
+        const oldDimensions =
+          Array.isArray(oldData?.dimensions) && oldData.dimensions.length >= 1 ? oldData.dimensions.length : 1
+        const newDimensions = newData.dimensions.length >= 1 ? newData.dimensions.length : 1
+        const dimensionsGap = newDimensions - oldDimensions
+        if (dimensionsGap < 0) {
+          props.chartConfig.option.series.splice(newDimensions - 1)
+        } else if (dimensionsGap > 0) {
+          if (!oldData || !oldData?.dimensions || !Array.isArray(oldData?.dimensions) || !oldData?.dimensions.length) {
+            props.chartConfig.option.series = []
+          }
+          for (let i = 0; i < dimensionsGap; i++) {
+            seriesArr.push(cloneDeep(barSeriesItem))
+          }
+          props.chartConfig.option.series.push(...seriesArr)
+        }
+        replaceMergeArr.value = ['series']
+        nextTick(() => {
+          replaceMergeArr.value = []
+        })
       }
-      replaceMergeArr.value = ['series']
-      props.chartConfig.option.series = seriesArr
-      nextTick(() => {
-        replaceMergeArr.value = []
-      })
+    } catch (error) {
+      console.log(error)
     }
   },
   {

From 2dec349f18f4e5cc512c77b73d8da9a0f7f25ca5 Mon Sep 17 00:00:00 2001
From: chillley <chillley@163.com>
Date: Fri, 22 Dec 2023 06:45:29 +0000
Subject: [PATCH 2/6] =?UTF-8?q?update=20src/utils/type.ts.=20toNumber?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=A0=E5=85=A5=E5=8F=82=E6=95=B0toFixedNu?=
 =?UTF-8?q?mber=E5=B9=B6=E6=9C=AA=E7=94=9F=E6=95=88=20,=20toFixed(2)=20?=
 =?UTF-8?q?=E4=B8=BA=E5=9B=BA=E5=AE=9A=E4=BF=9D=E5=AD=98=E4=B8=A4=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=20,=20=E6=AD=A4=E5=A4=84PR=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E5=8F=82=E6=95=B0=E4=BC=A0=E5=85=A5=E5=B9=B6=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chillley <chillley@163.com>
---
 src/utils/type.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/type.ts b/src/utils/type.ts
index 7b86c022..f01506e9 100644
--- a/src/utils/type.ts
+++ b/src/utils/type.ts
@@ -24,8 +24,8 @@ export function isArray(p: any): p is [] {
   return Array.isArray(p)
 }
 
-export const toNumber = (number: number | string, toFixedNumber = 2) => {
-  return isString(number) ? parseFloat(parseFloat(number).toFixed(2)) : number
+export const toNumber = (number: number | string, toFixedNumber: number = 2) => {
+  return isString(number) ? parseFloat(parseFloat(number).toFixed(toFixedNumber)) : number
 }
 
 export const toString = (str: any) => {

From f4de3189ec230771b6c682907c4fd377b5e30d22 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: Sun, 7 Jan 2024 00:28:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E6=95=A3?=
 =?UTF-8?q?=E7=82=B9=E5=9B=BE=E7=9A=84tooltip=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Scatters/ScatterCommon/config.ts         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/packages/components/Charts/Scatters/ScatterCommon/config.ts b/src/packages/components/Charts/Scatters/ScatterCommon/config.ts
index e0a847ec..916d43ba 100644
--- a/src/packages/components/Charts/Scatters/ScatterCommon/config.ts
+++ b/src/packages/components/Charts/Scatters/ScatterCommon/config.ts
@@ -47,10 +47,9 @@ export const option = {
   tooltip: {
     showDelay: 0,
     formatter: (params: { value: string | any[]; seriesName: string; name: string }) => {
-      // console.log(params)
       return params.value.length > 1
         ? `${params.seriesName}：<br />${params.value[0]} ${params.value[1]}`
-        : `${params.seriesName}：<br />${params.name} ${params.value}`
+        : `${params.name} ${params.value}`
     },
     axisPointer: {
       show: true,

From a8ea82e125947984b90eb9b54718ac77cd0bafb8 Mon Sep 17 00:00:00 2001
From: Async <1827951482@qq.com>
Date: Sun, 3 Mar 2024 12:01:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E4=B8=AD=E8=BF=9B=E8=A1=8C=E6=8B=96=E6=8B=BD=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=BD=86=E6=9C=AA=E7=A7=BB=E5=8A=A8=E6=97=B6=E4=BB=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=B0=86=E8=AF=A5=E6=93=8D=E4=BD=9C=E4=BF=9D=E5=AD=98=E8=87=B3?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/ContentEdit/hooks/useDrag.hook.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
index 2796f471..758680ff 100644
--- a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
+++ b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
@@ -302,7 +302,11 @@ export const useMouseHandle = () => {
               }
             })
           })
-          chartEditStore.moveComponentList(prevComponentInstance)
+
+          const moveComponentInstance = prevComponentInstance.filter(
+            item => item.attr.offsetX !== 0 && item.attr.offsetY !== 0
+          )
+          moveComponentInstance.length && chartEditStore.moveComponentList(moveComponentInstance)
         }
         document.removeEventListener('mousemove', mousemove)
         document.removeEventListener('mouseup', mouseup)

From bbb1c97c4194cc23486af3428ebf3264e4339ddc 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, 6 Mar 2024 11:03:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?build:=20=E8=A7=A3=E5=86=B3=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91ts=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Bars/BarLine/config.vue | 2 +-
 src/packages/components/Charts/Bars/BarLine/index.vue  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/packages/components/Charts/Bars/BarLine/config.vue b/src/packages/components/Charts/Bars/BarLine/config.vue
index 17e401ee..a098bdac 100644
--- a/src/packages/components/Charts/Bars/BarLine/config.vue
+++ b/src/packages/components/Charts/Bars/BarLine/config.vue
@@ -21,7 +21,7 @@
             { label: '柱状图', value: 'bar' },
             { label: '折线图', value: 'line' }
           ]"
-          @update:value="(value) => {
+          @update:value="(value: any) => {
             updateHandle(item, value)
           }"
         />
diff --git a/src/packages/components/Charts/Bars/BarLine/index.vue b/src/packages/components/Charts/Bars/BarLine/index.vue
index 73c884df..50b2e794 100644
--- a/src/packages/components/Charts/Bars/BarLine/index.vue
+++ b/src/packages/components/Charts/Bars/BarLine/index.vue
@@ -52,16 +52,16 @@ const option = computed(() => {
 
 watch(
   () => props.chartConfig.option.dataset,
-  (newData, oldData) => {
+  (newData: any, oldData) => {
     try {
       if (!isObject(newData) || !('dimensions' in newData)) return
-      if (Array.isArray(newData?.dimensions)) {
-        const seriesArr: (typeof barSeriesItem)[] = []
+      if (Array.isArray((newData as any)?.dimensions)) {
+        const seriesArr: typeof barSeriesItem[] = []
         // 对oldData进行判断，防止传入错误数据之后对旧维度判断产生干扰
         // 此处计算的是dimensions的Y轴维度，若是dimensions.length为0或1，则默认为1，排除X轴维度干扰
         const oldDimensions =
           Array.isArray(oldData?.dimensions) && oldData.dimensions.length >= 1 ? oldData.dimensions.length : 1
-        const newDimensions = newData.dimensions.length >= 1 ? newData.dimensions.length : 1
+        const newDimensions = (newData as any).dimensions.length >= 1 ? (newData as any).dimensions.length : 1
         const dimensionsGap = newDimensions - oldDimensions
         if (dimensionsGap < 0) {
           props.chartConfig.option.series.splice(newDimensions - 1)

From 5d6646ccda50fba3f41f032cc2fab427fe79461b 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, 6 Mar 2024 02:48:54 +0000
Subject: [PATCH 6/6] =?UTF-8?q?!222=20build.brotliSize=EF=BC=88=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BA=86=20build.reportCompressedSize=EF=BC=89=20Merg?=
 =?UTF-8?q?e=20pull=20request=20!222=20from=20uglyp/master-fetch-dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vite.config.ts b/vite.config.ts
index 93caff76..60413744 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -77,7 +77,7 @@ export default defineConfig({
     // minify: 'terser', // 如果需要用terser混淆，可打开这两行
     // terserOptions: terserOptions,
     rollupOptions: rollupOptions,
-    brotliSize: brotliSize,
+    reportCompressedSize: brotliSize,
     chunkSizeWarningLimit: chunkSizeWarningLimit
   }
 })