github/go-view
3
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2026-05-30 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into master-fetch-dev

Browse Source
This commit is contained in:
奔跑的面条
2023-03-16 20:02:18 +08:00
parent ca580db132 f51a6a8a46
commit 98b1380d0d
97 changed files with 1274 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataAjax/index.vue
+2 -1
View File
@@ -135,8 +135,9 @@ const sendHandle = async () => {
showMatching.value = true
return
}
window['$message'].warning('数据异常，请检查参数！')
window['$message'].warning('没有拿到返回值，请检查接口！')
} catch (error) {
console.error(error);
loading.value = false
window['$message'].warning('数据异常，请检查参数！')
}
src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue
+2 -1
View File
@@ -132,8 +132,9 @@ const fetchTargetData = async () => {
sourceData.value = res
return
}
window['$message'].warning('数据异常，请检查参数！')
window['$message'].warning('没有拿到返回值，请检查接口！')
} catch (error) {
console.error(error);
window['$message'].warning('数据异常，请检查参数！')
}
}
src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataPond/index.vue
+2 -5
View File
@@ -114,10 +114,6 @@ const sendHandle = async () => {
}
loading.value = true
try {
// const res = await customizeHttp(
// toRaw(pondData.value?.dataPondRequestConfig),
// toRaw(chartEditStore.getRequestGlobalConfig)
// )
const res = await customizeHttp(toRaw(targetData.value.request), toRaw(chartEditStore.getRequestGlobalConfig))
loading.value = false
if (res) {
@@ -126,8 +122,9 @@ const sendHandle = async () => {
showMatching.value = true
return
}
window['$message'].warning('数据异常，请检查参数！')
window['$message'].warning('没有拿到返回值，请检查接口！')
} catch (error) {
console.error(error);
loading.value = false
window['$message'].warning('数据异常，请检查参数！')
}
src/views/chart/ContentConfigurations/components/ChartData/index.vue
+6 -2
View File
@@ -16,9 +16,10 @@
import { computed } from 'vue'
import { loadAsyncComponent } from '@/utils'
import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
import { RequestDataTypeEnum } from '@/enums/httpEnum'
import { ChartFrameEnum } from '@/packages/index.d'
import { useTargetData } from '../hooks/useTargetData.hook'
import { SelectCreateDataType, SelectCreateDataEnum } from './index.d'
import { RequestDataTypeEnum } from '@/enums/httpEnum'
const ChartDataStatic = loadAsyncComponent(() => import('./components/ChartDataStatic/index.vue'))
const ChartDataAjax = loadAsyncComponent(() => import('./components/ChartDataAjax/index.vue'))
@@ -44,6 +45,9 @@ const selectOptions: SelectCreateDataType[] = [
// 无数据源
const isNotData = computed(() => {
return typeof targetData.value?.option?.dataset === 'undefined'
return (
targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC ||
typeof targetData.value?.option?.dataset === 'undefined'
)
})
</script>