Merge branch 'dev'

src/components/GoVChart/register.ts

@@ -2,6 +2,7 @@ import { VChart } from '@visactor/vchart/esm/core';
 import { registerBarChart, registerAreaChart, registerLineChart, registerPieChart, registerFunnelChart, registerWordCloudChart, registerScatterChart } from '@visactor/vchart/esm/chart';
 import { registerTooltip, registerCartesianCrossHair, registerDiscreteLegend, registerLabel } from '@visactor/vchart/esm/component';
 import { registerDomTooltipHandler } from '@visactor/vchart/esm/plugin/components';
+import { registerAnimate } from '@visactor/vchart';
 
 export const registerChartsAndComponents = () => {
   VChart.useRegisters([
@@ -19,7 +20,10 @@ export const registerChartsAndComponents = () => {
     registerDomTooltipHandler,
     registerCartesianCrossHair,
     registerDiscreteLegend,
-    registerLabel
+    registerLabel,
+
+    // 动画
+    registerAnimate
   ]);
 }
 

src/i18n/en/project.ts

@@ -5,7 +5,7 @@ export default {
   my: 'My',
   new_project: 'New Project',
   all_project: 'All Project',
-  my_templete: 'My Templete',
+  my_template: 'My Template',
   template_market: 'Template Market',
 
   // items 

src/i18n/zh/project.ts

@@ -6,7 +6,7 @@ export default {
   my: '我的',
   new_project: '新项目',
   all_project: '全部项目',
-  my_templete: '我的模板',
+  my_template: '我的模板',
   template_market: '模板市场',
 
   // items 

src/packages/components/Tables/Tables/TableList/index.vue

@@ -10,7 +10,11 @@
         <div class="rank" :style="`color: ${color};font-size: ${indexFontSize}px`">No.{{ item.ranking }}</div>
         <div class="info-name" :style="`font-size: ${leftFontSize}px`" v-html="item.name" />
         <div class="ranking-value" :style="`color: ${textColor};font-size: ${rightFontSize}px`">
-          {{ status.mergedConfig.valueFormatter ? status.mergedConfig.valueFormatter(item) : item.value }}
+          {{
+            typeof status.mergedConfig.valueFormatter === 'function'
+              ? status.mergedConfig.valueFormatter(item)
+              : item.value
+          }}
           {{ unit }}
         </div>
       </div>
@@ -62,7 +66,8 @@ 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
@@ -137,7 +142,7 @@ const onRestart = async () => {
     calcRowsData()
     let flag = true
     if (dataset.length <= rowNum) {
-      flag=false
+      flag = false
     }
     calcHeights(flag)
     animation(flag)

src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue

@@ -57,7 +57,7 @@ const typeList = shallowRef([
     disabled: false
   },
   {
-    title: renderLang('project.my_templete'),
+    title: renderLang('project.my_template'),
     key: PageEnum.BASE_HOME_TEMPLATE_NAME,
     icon: ObjectStorageIcon,
     disabled: true

src/views/project/layout/components/ProjectLayoutSider/menu.ts

@@ -54,7 +54,7 @@ export const menuOptionsInit = () => {
                       name: PageEnum.BASE_HOME_TEMPLATE_NAME,
                     },
                   },
-                  { default: () => t('project.my_templete') }
+                  { default: () => t('project.my_template') }
                 ),
               key: PageEnum.BASE_HOME_TEMPLATE_NAME,
               icon: renderIcon(ObjectStorageIcon),