diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts index a58cac53..f84b8cc3 100644 --- a/src/api/mock/test.mock.ts +++ b/src/api/mock/test.mock.ts @@ -26,12 +26,8 @@ export default { msg: '请求成功', data: { dimensions: ['name', 'value'], - source: [ - { name: '厦门', 'value|0-40': 20 }, - { name: '南阳', 'value|20-60': 40 }, - { name: '北京', 'value|40-80': 60 }, - { name: '上海', 'value|60-100': 80 }, - { name: '新疆', value: 100 } + "source|2-5": [ + { 'name|+1': ["厦门","福州","北京","上海","新疆","郑州","湖南","内蒙古"], 'value|0-40': 20 }, ] } }, diff --git a/src/packages/components/Charts/Bars/CapsuleChart/index.vue b/src/packages/components/Charts/Bars/CapsuleChart/index.vue index 135ef1d0..804ae0dc 100644 --- a/src/packages/components/Charts/Bars/CapsuleChart/index.vue +++ b/src/packages/components/Charts/Bars/CapsuleChart/index.vue @@ -112,16 +112,12 @@ watch( ) const calcData = (data: any, type?: string) => { - mergeConfig(props.chartConfig.option) + let cloneConfig = cloneDeep(props.chartConfig.option || {}) + state.mergedConfig = cloneConfig if (type == 'preview') { - calcCapsuleLengthAndLabelData(data) - } else { - calcCapsuleLengthAndLabelData(state.mergedConfig.dataset) + cloneConfig.dataset = data } -} - -const mergeConfig = (data: any) => { - state.mergedConfig = cloneDeep(data || {}) + calcCapsuleLengthAndLabelData(state.mergedConfig.dataset) } // 数据解析