diff --git a/src/api/mock/index.ts b/src/api/mock/index.ts index b0a65d27..7e2dbc02 100644 --- a/src/api/mock/index.ts +++ b/src/api/mock/index.ts @@ -4,6 +4,7 @@ import { RequestHttpEnum } from '@/enums/httpEnum' // 单个X数据 export const chartDataUrl = '/mock/chartData' +export const chartSingleDataUrl = '/mock/chartSingleData' export const numberFloatUrl = '/mock/number/float' export const numberIntUrl = '/mock/number/int' export const textUrl = '/mock/text' @@ -20,6 +21,11 @@ const mockObject: MockMethod[] = [ method: RequestHttpEnum.GET, response: () => test.fetchMockData }, + { + url: chartSingleDataUrl, + method: RequestHttpEnum.GET, + response: () => test.fetchMockSingleData + }, { url: numberFloatUrl, method: RequestHttpEnum.GET, diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts index 194e11ae..c907f490 100644 --- a/src/api/mock/test.mock.ts +++ b/src/api/mock/test.mock.ts @@ -1,4 +1,39 @@ export default { + // 单图表 + fetchMockSingleData: { + code: 0, + status: 200, + msg: '请求成功', + data: { + dimensions: ['product', 'dataOne'], + source: [ + { + product: '@name', + 'dataOne|0-900': 3, + }, + { + product: '@name', + 'dataOne|0-900': 3, + }, + { + product: '@name', + 'dataOne|0-900': 3, + }, + { + product: '@name', + 'dataOne|0-900': 3, + }, + { + product: '@name', + 'dataOne|0-900': 3, + }, + { + product: '@name', + 'dataOne|0-900': 3, + } + ] + } + }, // 图表 fetchMockData: { code: 0, diff --git a/src/packages/components/Charts/Mores/Funnel/config.ts b/src/packages/components/Charts/Mores/Funnel/config.ts index 40be9e29..fd48376c 100644 --- a/src/packages/components/Charts/Mores/Funnel/config.ts +++ b/src/packages/components/Charts/Mores/Funnel/config.ts @@ -31,7 +31,6 @@ export const option = { width: '80%', bottom: 10, min: 0, - max: 100, minSize: '0%', maxSize: '100%', sort: 'descending', // descending | ascending diff --git a/src/packages/components/Charts/Mores/Funnel/data.json b/src/packages/components/Charts/Mores/Funnel/data.json index ec6e1d65..a2ef37f3 100644 --- a/src/packages/components/Charts/Mores/Funnel/data.json +++ b/src/packages/components/Charts/Mores/Funnel/data.json @@ -1,10 +1,10 @@ { - "dimensions": ["product", "category"], + "dimensions": ["product", "dataOne"], "source": [ - { "product": "data1", "category": 20 }, - { "product": "data2", "category": 40 }, - { "product": "data3", "category": 60 }, - { "product": "data4", "category": 80 }, - { "product": "data5", "category": 100 } + { "product": "data1", "dataOne": 20 }, + { "product": "data2", "dataOne": 40 }, + { "product": "data3", "dataOne": 60 }, + { "product": "data4", "dataOne": 80 }, + { "product": "data5", "dataOne": 100 } ] } diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue index a9d74fd3..8d71f6f7 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataRequest/components/RequestTargetConfig/index.vue @@ -64,6 +64,7 @@ import { isDev } from '@/utils' import { icon } from '@/plugins' import { chartDataUrl, + chartSingleDataUrl, rankListUrl, scrollBoardUrl, numberFloatUrl, @@ -82,6 +83,9 @@ const apiList = [ { value: `【图表】${chartDataUrl}` }, + { + value: `【单数据图表】${chartSingleDataUrl}` + }, { value: `【文本】${textUrl}` },