diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26ee9473..61dd2934 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1154,6 +1154,15 @@ packages: /@types/node@17.0.43: resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==} dev: false + resolution: {integrity: sha512-jnUpgw8fL9kP2iszfIDyBQtw5Mf4/XSqy0Loc1J9pI14ejL83XcCEvSf50Gs/4ET0I9VCCDoOfufQysj0S66xA==, tarball: https://registry.npmmirror.com/@types/node/-/node-17.0.43.tgz} + + /@types/normalize-package-data@2.4.1: + resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} + dev: true + + /@types/parse-json@4.0.0: + resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} + dev: true /@types/node@22.9.0: resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} @@ -2161,7 +2170,7 @@ packages: dev: false /echarts-wordcloud@2.0.0(echarts@5.3.3): - resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==} + resolution: {integrity: sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==, tarball: https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz} peerDependencies: echarts: ^5.0.1 dependencies: diff --git a/src/packages/components/Icons/Default/Icon/config.vue b/src/packages/components/Icons/Default/Icon/config.vue index 961f6baa..a276816e 100644 --- a/src/packages/components/Icons/Default/Icon/config.vue +++ b/src/packages/components/Icons/Default/Icon/config.vue @@ -8,8 +8,8 @@ - - + + @@ -35,15 +35,15 @@ const rotateMode = [ label: '0°' }, { - value: 1, + value: 90, label: '90°' }, { - value: 2, + value: 180, label: '180°' }, { - value: 3, + value: 270, label: '270°' } ] diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue index f3580744..02c9523f 100644 --- a/src/packages/components/Tables/Tables/TablesBasic/index.vue +++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue @@ -36,6 +36,8 @@ import { computed, PropType, toRefs, watch, reactive, ref } from 'vue' import { CreateComponentType } from '@/packages/index.d' import { icon } from '@/plugins' +import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' +import { useChartDataFetch } from '@/hooks' const props = defineProps({ chartConfig: { @@ -83,6 +85,13 @@ watch( deep: true } ) + +// setdata 数据监听与更改 +useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => { + props.chartConfig.option.dataset = newData +}) + +