diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts index 7cfc8922..2590e072 100644 --- a/src/api/mock/test.mock.ts +++ b/src/api/mock/test.mock.ts @@ -18,7 +18,7 @@ export default { }, { 'product': '@name', - 'dataOne1|100-900': 3, + 'dataOne|100-900': 3, 'dataTwo|100-900': 3, }, { 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 d0492e4d..703e9b75 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue @@ -8,7 +8,7 @@ - + {{ item.field }} {{ item.mapping }} @@ -91,52 +91,53 @@ const { DocumentAddIcon, DocumentDownloadIcon } = icon.carbon const uploadFileListRef = ref() const source = ref() const dimensions = ref() +const dimensionsAndSource = ref() // 获取数据 const getSource = computed(() => { return JSON.stringify(source.value) }) -watch(() => props.targetData?.option?.dataset, (newData) => { - if (newData) { - source.value = newData.source - dimensions.value = newData.dimensions - } -}, { - immediate: true -}) - // 处理映射列表状态结果 const matchingHandle = (mapping: string) => { let res = DataResultEnum.SUCCESS for (let i = 0; i < source.value.length; i++) { if (source.value[i][mapping] === undefined) { res = DataResultEnum.FAILURE - break + return res } - return res } return DataResultEnum.SUCCESS } // 处理映射列表 -const getDimensionsAndSource = computed(() => { +const dimensionsAndSourceHandle = () => { // 去除首项数据轴标识 - return dimensions.value.map((item: string, index: number) => { + return dimensions.value.map((dimensionsItem: string, index: number) => { return index === 0 ? { // 字段 field: '通用标识', // 映射 - mapping: item, + mapping: dimensionsItem, // 结果 result: DataResultEnum.NULL } : { field: `数据项-${index}`, - mapping: item, - result: matchingHandle(item) + mapping: dimensionsItem, + result: matchingHandle(dimensionsItem) } }) +} + +watch(() => props.targetData?.option?.dataset, (newData) => { + if (newData) { + source.value = newData.source + dimensions.value = newData.dimensions + dimensionsAndSource.value = dimensionsAndSourceHandle() + } +}, { + immediate: true }) //@ts-ignore diff --git a/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts new file mode 100644 index 00000000..a3a12412 --- /dev/null +++ b/src/views/chart/ContentConfigurations/components/ChartData/hooks/useFile.hooks.ts @@ -0,0 +1,3 @@ +const useFile = () => { + +} \ No newline at end of file