diff --git a/src/api/axios.ts b/src/api/axios.ts
index 1eb87d16..56b6ebf9 100644
--- a/src/api/axios.ts
+++ b/src/api/axios.ts
@@ -26,11 +26,12 @@ axiosInstance.interceptors.response.use(
if (code === ResultEnum.DATA_SUCCESS) return Promise.resolve(res.data)
// 重定向
if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
- return Promise.reject(res.data)
+ return Promise.resolve(res.data)
},
(err: AxiosResponse) => {
const { code } = err.data as { code: number }
if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
+ window['$message'].error('接口异常,请检查!')
Promise.reject(err)
}
)
diff --git a/src/api/http.ts b/src/api/http.ts
index 8cd91192..13d69659 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -1,11 +1,10 @@
import axiosInstance from './axios'
import { RequestHttpEnum, ContentTypeEnum } from '@/enums/httpEnum'
-export const get = (url: string, params: object) => {
+export const get = (url: string) => {
return axiosInstance({
url: url,
method: RequestHttpEnum.GET,
- params
})
}
diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts
index 71be5933..7cfc8922 100644
--- a/src/api/mock/test.mock.ts
+++ b/src/api/mock/test.mock.ts
@@ -4,37 +4,37 @@ export default {
status: 200,
msg: "请求成功",
data: {
- dimensions: ["product", "data1", "data2"],
+ dimensions: ["product", "dataOne", "dataTwo"],
source: [
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne|100-900': 3,
+ 'dataTwo|100-900': 3,
},
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne|100-900': 3,
+ 'dataTwo|100-900': 3,
},
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne1|100-900': 3,
+ 'dataTwo|100-900': 3,
},
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne|100-900': 3,
+ 'dataTwo|100-900': 3,
},
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne|100-900': 3,
+ 'dataTwo|100-900': 3,
},
{
'product': '@name',
- 'data1|100-900': 3,
- 'data2|100-900': 3,
+ 'dataOne|100-900': 3,
+ 'dataTwo|100-900': 3,
},
]
}
diff --git a/src/packages/public/publicConfig.ts b/src/packages/public/publicConfig.ts
index 2edb4a94..98acdd90 100644
--- a/src/packages/public/publicConfig.ts
+++ b/src/packages/public/publicConfig.ts
@@ -23,6 +23,7 @@ export class publicConfig implements PublicConfigType {
public data = { ...requestConfig }
// 数据获取
public requestData = []
+
// 设置坐标
public setPosition(x: number, y: number): void {
this.attr.x = x
diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json
index 70f47e00..44e20308 100644
--- a/src/settings/chartThemes/global.theme.json
+++ b/src/settings/chartThemes/global.theme.json
@@ -79,7 +79,7 @@
}
},
"dataset": {
- "dimensions": [],
- "source": []
+ "dimensions": [""],
+ "source": [{}]
}
}
\ No newline at end of file
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue
index c031aa65..fedf4b06 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue
@@ -42,15 +42,17 @@
+
diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
index 89b80547..d0492e4d 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -36,7 +36,7 @@
@before-upload="beforeUpload"
>
-
+
@@ -76,6 +76,11 @@ const props = defineProps({
targetData: {
type: Object as PropType,
required: true
+ },
+ ajax: {
+ type: Boolean,
+ default: false,
+ required: true
}
})
@@ -103,10 +108,11 @@ watch(() => props.targetData?.option?.dataset, (newData) => {
// 处理映射列表状态结果
const matchingHandle = (mapping: string) => {
+ let res = DataResultEnum.SUCCESS
for (let i = 0; i < source.value.length; i++) {
- let res = DataResultEnum.FAILURE
- if (source.value[i][mapping] !== undefined) {
- return DataResultEnum.SUCCESS
+ if (source.value[i][mapping] === undefined) {
+ res = DataResultEnum.FAILURE
+ break
}
return res
}