From 1b9a3f6f5b27a13219d8d82c5270f337be24d913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= <daidaibg@163.com>
Date: Fri, 18 Nov 2022 09:23:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=83=B6=E5=9B=8A=E6=9F=B1=E5=9B=BE?=
 =?UTF-8?q?source=E6=95=B0=E9=87=8F=E5=8F=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=E6=95=B0=E9=87=8F=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Bars/CapsuleChart/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/packages/components/Charts/Bars/CapsuleChart/index.vue b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
index 4a0ed72f..fbbdc7ac 100644
--- a/src/packages/components/Charts/Bars/CapsuleChart/index.vue
+++ b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
@@ -53,8 +53,6 @@
 
 <script setup lang="ts">
 import { onMounted, watch, reactive, PropType } from 'vue'
-import merge from 'lodash/merge'
-import cloneDeep from 'lodash/cloneDeep'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import config, { option } from './config'
@@ -114,12 +112,11 @@ watch(
 
 const calcData = (data: any) => {
   mergeConfig(props.chartConfig.option)
-
   calcCapsuleLengthAndLabelData()
 }
 
 const mergeConfig = (data: any) => {
-  state.mergedConfig = merge(cloneDeep(state.defaultConfig), data || {})
+  state.mergedConfig = data || {}
 }
 
 // 数据解析

From b95cf946a85b4c00605232bbba30f38fbf273d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= <daidaibg@163.com>
Date: Fri, 18 Nov 2022 10:16:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E8=83=B6=E5=9B=8A=E5=9B=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0cloneDeep=E9=98=B2=E6=AD=A2=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=92=E7=9B=B8=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/components/Charts/Bars/CapsuleChart/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/packages/components/Charts/Bars/CapsuleChart/index.vue b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
index fbbdc7ac..87971d01 100644
--- a/src/packages/components/Charts/Bars/CapsuleChart/index.vue
+++ b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
@@ -2,7 +2,7 @@
   <div
     v-if="state.mergedConfig"
     class="go-dv-capsule-chart"
-    :style="{ 
+    :style="{
       fontSize: numberSizeHandle(state.mergedConfig.valueFontSize),
       paddingLeft: numberSizeHandle(state.mergedConfig.paddingLeft),
       paddingRight: numberSizeHandle(state.mergedConfig.paddingRight)
@@ -56,6 +56,7 @@ import { onMounted, watch, reactive, PropType } from 'vue'
 import { useChartDataFetch } from '@/hooks'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import config, { option } from './config'
+import cloneDeep from 'lodash/cloneDeep'
 
 type DataProps = {
   name: string | number
@@ -116,7 +117,7 @@ const calcData = (data: any) => {
 }
 
 const mergeConfig = (data: any) => {
-  state.mergedConfig = data || {}
+  state.mergedConfig = cloneDeep(data || {})
 }
 
 // 数据解析

From 5454f19f3d95f7dca9cbd3202e1452cca9a71ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= <daidaibg@163.com>
Date: Fri, 18 Nov 2022 11:25:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=BB=9A=E5=8A=A8=E6=8E=92=E5=90=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=E5=BD=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8F=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=97=B6=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BC=9A=E7=9B=B4=E6=8E=A5=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Tables/Tables/TableList/index.vue   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/packages/components/Tables/Tables/TableList/index.vue b/src/packages/components/Tables/Tables/TableList/index.vue
index 5fd3e02d..24324ec6 100644
--- a/src/packages/components/Tables/Tables/TableList/index.vue
+++ b/src/packages/components/Tables/Tables/TableList/index.vue
@@ -62,7 +62,7 @@ const status = reactive({
 const calcRowsData = () => {
   let { dataset, rowNum, sort } = status.mergedConfig
   // @ts-ignore
-  sort && dataset.sort(({ value: a }, { value: b }) => {
+  sort &&dataset.sort(({ value: a }, { value: b  } )  => {
       if (a > b) return -1
       if (a < b) return 1
       if (a === b) return 0
@@ -94,6 +94,7 @@ const calcHeights = (onresize = false) => {
   const { rowNum, dataset } = status.mergedConfig
   const avgHeight = h.value / rowNum
   status.avgHeight = avgHeight
+
   if (!onresize) status.heights = new Array(dataset.length).fill(avgHeight)
 }
 
@@ -131,12 +132,17 @@ const stopAnimation = () => {
 const onRestart = async () => {
   try {
     if (!status.mergedConfig) return
+    let { dataset, rowNum, sort } = status.mergedConfig
     stopAnimation()
     calcRowsData()
-    calcHeights(true)
-    animation(true)
+    let flag = true
+    if (dataset.length <= rowNum) {
+      flag=false
+    }
+    calcHeights(flag)
+    animation(flag)
   } catch (error) {
-    console.log(error)
+    console.error(error)
   }
 }