diff --git a/src/packages/components/Decorates/Borders/Border01/config.ts b/src/packages/components/Decorates/Borders/Border01/config.ts index 1e12251e..3715dfbb 100644 --- a/src/packages/components/Decorates/Borders/Border01/config.ts +++ b/src/packages/components/Decorates/Borders/Border01/config.ts @@ -6,8 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { dur: 0.5, colors: ['#4fd2dd', '#235fa7'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border02/config.ts b/src/packages/components/Decorates/Borders/Border02/config.ts index f43d2d19..89b90089 100644 --- a/src/packages/components/Decorates/Borders/Border02/config.ts +++ b/src/packages/components/Decorates/Borders/Border02/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#6586ec', '#2cf7fe'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig diff --git a/src/packages/components/Decorates/Borders/Border03/config.ts b/src/packages/components/Decorates/Borders/Border03/config.ts index f88a7a80..4e086673 100644 --- a/src/packages/components/Decorates/Borders/Border03/config.ts +++ b/src/packages/components/Decorates/Borders/Border03/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#6586ec', '#2cf7fe'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border04/config.ts b/src/packages/components/Decorates/Borders/Border04/config.ts index 6fa483f8..93b3a5da 100644 --- a/src/packages/components/Decorates/Borders/Border04/config.ts +++ b/src/packages/components/Decorates/Borders/Border04/config.ts @@ -10,8 +10,7 @@ export const option = { borderTitleSize: 18, borderTitleColor: '#fff', colors: ['#8aaafb', '#1f33a2'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border05/config.ts b/src/packages/components/Decorates/Borders/Border05/config.ts index 826204b1..b6baaf9b 100644 --- a/src/packages/components/Decorates/Borders/Border05/config.ts +++ b/src/packages/components/Decorates/Borders/Border05/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#1d48c4', '#d3e1f8'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border06/config.ts b/src/packages/components/Decorates/Borders/Border06/config.ts index 73223dec..31301475 100644 --- a/src/packages/components/Decorates/Borders/Border06/config.ts +++ b/src/packages/components/Decorates/Borders/Border06/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#3140ad', '#1089ff'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border07/config.ts b/src/packages/components/Decorates/Borders/Border07/config.ts index ace6e346..1b11dff8 100644 --- a/src/packages/components/Decorates/Borders/Border07/config.ts +++ b/src/packages/components/Decorates/Borders/Border07/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#11eefd', '#0078d2'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border08/config.ts b/src/packages/components/Decorates/Borders/Border08/config.ts index 19f8eeee..3b117c25 100644 --- a/src/packages/components/Decorates/Borders/Border08/config.ts +++ b/src/packages/components/Decorates/Borders/Border08/config.ts @@ -7,8 +7,7 @@ export const option = { colors: ['#235fa7', '#4fd2dd'], dur: 3, reverse: false, - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border09/config.ts b/src/packages/components/Decorates/Borders/Border09/config.ts index 618ceaa2..6cb98608 100644 --- a/src/packages/components/Decorates/Borders/Border09/config.ts +++ b/src/packages/components/Decorates/Borders/Border09/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#3140ad', '#235fa7'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border10/config.ts b/src/packages/components/Decorates/Borders/Border10/config.ts index d6a08d76..60f38a95 100644 --- a/src/packages/components/Decorates/Borders/Border10/config.ts +++ b/src/packages/components/Decorates/Borders/Border10/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#1089ff', '#0000ff'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border11/config.ts b/src/packages/components/Decorates/Borders/Border11/config.ts index e153311a..0ba75746 100644 --- a/src/packages/components/Decorates/Borders/Border11/config.ts +++ b/src/packages/components/Decorates/Borders/Border11/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#2862b7', '#2862b7'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border12/config.ts b/src/packages/components/Decorates/Borders/Border12/config.ts index 730bb906..48d59d7f 100644 --- a/src/packages/components/Decorates/Borders/Border12/config.ts +++ b/src/packages/components/Decorates/Borders/Border12/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#2862b7', '#2862b7'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Borders/Border13/config.ts b/src/packages/components/Decorates/Borders/Border13/config.ts index 7d27b612..36154e6a 100644 --- a/src/packages/components/Decorates/Borders/Border13/config.ts +++ b/src/packages/components/Decorates/Borders/Border13/config.ts @@ -5,8 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#2862b7', '#4b77b7'], - backgroundColor: '#00000000', - dataset: null + backgroundColor: '#00000000' } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Decorates/Decorates02/config.ts b/src/packages/components/Decorates/Decorates/Decorates02/config.ts index d8be28d3..c288e853 100644 --- a/src/packages/components/Decorates/Decorates/Decorates02/config.ts +++ b/src/packages/components/Decorates/Decorates/Decorates02/config.ts @@ -6,7 +6,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#ffffff4d', '#ffffff4d'], dur: 3, - lineHeight: 3, + lineHeight: 3 } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Decorates/Decorates/Decorates05/config.ts b/src/packages/components/Decorates/Decorates/Decorates05/config.ts index 65c019a0..dbf843a9 100644 --- a/src/packages/components/Decorates/Decorates/Decorates05/config.ts +++ b/src/packages/components/Decorates/Decorates/Decorates05/config.ts @@ -5,7 +5,7 @@ import cloneDeep from 'lodash/cloneDeep' export const option = { colors: ['#00c2ff', '#00c2ff4d'], - dur: 3, + dur: 3 } export default class Config extends publicConfig implements CreateComponentType { diff --git a/src/packages/components/Tables/Tables/TableList/index.vue b/src/packages/components/Tables/Tables/TableList/index.vue index 219ec569..22594d68 100644 --- a/src/packages/components/Tables/Tables/TableList/index.vue +++ b/src/packages/components/Tables/Tables/TableList/index.vue @@ -52,21 +52,29 @@ const { rowNum, unit, color, textColor, borderColor } = toRefs( const status = reactive({ mergedConfig: props.chartConfig.option, rowsData: [], - rows: [], - heights: [], + rows: [{ + scroll: 0, + ranking: 1, + name: '', + value: '', + percent: 0 + }], + heights: [0], animationIndex: 0, - animationHandler: '', + animationHandler: 0, updater: 0, + avgHeight: 0 }) const calcRowsData = () => { let { dataset, rowNum, sort } = status.mergedConfig - sort && - dataset.sort(({ value: a }, { value: b }) => { + // @ts-ignore + sort && dataset.sort(({ value: a }, { value: b }) => { if (a > b) return -1 if (a < b) return 1 if (a === b) return 0 }) + // @ts-ignore const value = dataset.map(({ value }) => value) const min = Math.min(...value) || 0 // abs of min @@ -75,7 +83,7 @@ const calcRowsData = () => { // abs of max const maxAbs = Math.abs(max) const total = max + minAbs - dataset = dataset.map((row, i) => ({ + dataset = dataset.map((row: any, i:number) => ({ ...row, ranking: i + 1, percent: ((row.value + minAbs) / total) * 100, @@ -84,7 +92,7 @@ const calcRowsData = () => { if (rowLength > rowNum && rowLength < 2 * rowNum) { dataset = [...dataset, ...dataset] } - dataset = dataset.map((d, i) => ({ ...d, scroll: i })) + dataset = dataset.map((d:any, i:number) => ({ ...d, scroll: i })) status.rowsData = dataset status.rows = dataset } @@ -118,7 +126,7 @@ const animation = async (start = false) => { if (back >= 0) animationIndex = back status.animationIndex = animationIndex - status.animationHandler = setTimeout(animation, waitTime * 1000 - 300) + status.animationHandler = setTimeout(animation, waitTime * 1000 - 300) as any } const stopAnimation = () => { diff --git a/src/settings/chartThemes/index.ts b/src/settings/chartThemes/index.ts index 9d2455ba..28bf108e 100644 --- a/src/settings/chartThemes/index.ts +++ b/src/settings/chartThemes/index.ts @@ -85,7 +85,7 @@ export const chartColorsSearch = { // 默认主题详细配置 type ThemeJsonType = typeof themeJson export interface GlobalThemeJsonType extends Partial { - dataset: any, + dataset?: any, [T:string]: any } -export const globalThemeJson = themeJson +export const globalThemeJson = {...themeJson, dataset: null,} diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index de39ad50..f81db879 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -4,7 +4,10 @@ import designColor from './designColor.json' // 默认语言 export const lang = LangEnum.zh +// 水印文字 +export const watermarkText = "GoView 低代码平台" +// 主题配置 export const theme = { // 默认是否开启深色主题 darkTheme: true, diff --git a/src/store/modules/langStore/langStore.ts b/src/store/modules/langStore/langStore.ts index 9eb7bdeb..6ac68d6d 100644 --- a/src/store/modules/langStore/langStore.ts +++ b/src/store/modules/langStore/langStore.ts @@ -1,3 +1,4 @@ +import type { WritableComputedRef } from 'vue' import { defineStore } from 'pinia' import { lang } from '@/settings/designSetting' import { LangStateType } from './langStore.d' @@ -28,7 +29,7 @@ export const useLangStore = defineStore({ changeLang(lang: LangEnum): void { if (this.lang === lang) return this.lang = lang - i18n.global.locale = lang + i18n.global.locale = (lang as unknown) as WritableComputedRef setLocalStorage(GO_LANG_STORE, this.$state) if (settingStore.getChangeLangReload) { diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue index 0ae17f90..faf35e75 100644 --- a/src/views/chart/ContentEdit/components/EditRange/index.vue +++ b/src/views/chart/ContentEdit/components/EditRange/index.vue @@ -6,7 +6,7 @@ >