diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index 4d914de2eb..08dcd0a708 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -13,6 +13,10 @@ const props = defineProps({
type: Object,
required: true
},
+ commonBackgroundPop: {
+ type: Object,
+ required: true
+ },
themes: {
type: String as PropType,
default: 'dark'
@@ -20,7 +24,7 @@ const props = defineProps({
})
const predefineColors = COLOR_PANEL
-const { chart } = toRefs(props)
+const { chart, commonBackgroundPop } = toRefs(props)
@@ -64,6 +68,29 @@ const { chart } = toRefs(props)
:predefine="COLOR_PANEL"
/>
+
+
+ 自定义组件背景
+
+
+
+
+
- {{ t('chart.custom_case') + t('chart.backgroundColor') }}
+ 自定义查询条件背景
{
{
.ed-input-group__prepend {
padding: 0 11px;
+ margin-right: -1px;
.ed-select {
+ width: 178px !important;
margin: 0 -10px 0 -10px;
}
}
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
index 28de74dae1..268705ecd7 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
@@ -12,6 +12,7 @@ import { checkApiItem } from '@/api/datasource'
import { cloneDeep } from 'lodash-es'
import { fieldType } from '@/utils/attr'
import type { ApiConfiguration } from '@/views/visualized/data/datasource/form/option'
+import { cancelMap } from '@/config/axios/service'
export interface Field {
name: string
@@ -138,6 +139,7 @@ const showApiData = () => {
if (valid) {
const data = Base64.encode(JSON.stringify(apiItem))
loading.value = true
+ cancelMap['/datasource/checkApiDatasource']?.()
checkApiItem({ data: data, type: 'apiStructure' }).then(response => {
originFieldItem.jsonFields = response.data.jsonFields
})
@@ -202,6 +204,7 @@ const next = () => {
return
}
}
+ cancelMap['/datasource/checkApiDatasource']?.()
checkApiItem({ data: Base64.encode(JSON.stringify(apiItem)) }).then(response => {
apiItem.jsonFields = response.data.jsonFields
apiItem.fields = []
@@ -220,6 +223,7 @@ const validate = () => {
ElMessage.error(t('datasource.please_input_dataPath'))
return
}
+ cancelMap['/datasource/checkApiDatasource']?.()
checkApiItem({ data: Base64.encode(JSON.stringify(apiItem)) })
.then(response => {
apiItem.jsonFields = response.data.jsonFields
@@ -235,6 +239,7 @@ const validate = () => {
})
}
const closeEditItem = () => {
+ cancelMap['/datasource/checkApiDatasource']?.()
edit_api_item.value = false
}
@@ -571,7 +576,11 @@ defineExpose({
{{ t('datasource.data_preview') }}
-