diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
index 65e3e8e5a4..1fd9f132a4 100644
--- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue
+++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
@@ -366,7 +366,7 @@ const openMessageLoading = cb => {
}
const callbackExport = () => {
- useEmitt().emitter.emit('data-export-center')
+ useEmitt().emitter.emit('data-export-center', { activeName: 'IN_PROGRESS' })
}
const exportAsExcel = () => {
diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
index 7ae698b3e6..c3320099f6 100644
--- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
+++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue
@@ -264,7 +264,7 @@ const downloadViewDetails = () => {
}
const exportData = () => {
- useEmitt().emitter.emit('data-export-center')
+ useEmitt().emitter.emit('data-export-center', { activeName: 'IN_PROGRESS' })
}
const openMessageLoading = cb => {
diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index 438059632f..c3b3c44047 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -45,8 +45,8 @@ const activeIndex = computed(() => {
const permissionStore = usePermissionStore()
const ExportExcelRef = ref()
-const downloadClick = () => {
- ExportExcelRef.value.init()
+const downloadClick = params => {
+ ExportExcelRef.value.init(params)
}
const routers: any[] = formatRoute(permissionStore.getRoutersNotHidden as AppCustomRouteRecordRaw[])
const showSystem = ref(false)
@@ -94,7 +94,9 @@ onMounted(() => {
initAiBase()
useEmitt({
name: 'data-export-center',
- callback: downloadClick
+ callback: function (params) {
+ ExportExcelRef.value.init(params)
+ }
})
})
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index b73bc0f088..f1bff61bc7 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -105,8 +105,11 @@ const handleClick = tab => {
})
}
-const init = () => {
+const init = params => {
drawer.value = true
+ if (params && params.activeName !== undefined) {
+ activeName.value = params.activeName
+ }
handleClick()
timer = setInterval(() => {
if (activeName.value === 'IN_PROGRESS') {
@@ -150,12 +153,16 @@ const taskExportTopicCall = task => {
openMessageLoading(
JSON.parse(task).exportFromName + ' 导出成功,前往',
'success',
- callbackExport
+ callbackExportSuc
)
return
}
if (JSON.parse(task).exportStatus === 'FAILED') {
- openMessageLoading(JSON.parse(task).exportFromName + ' 导出失败,前往', 'error', callbackExport)
+ openMessageLoading(
+ JSON.parse(task).exportFromName + ' 导出失败,前往',
+ 'error',
+ callbackExportError
+ )
}
}
@@ -185,8 +192,12 @@ const openMessageLoading = (text, type = 'success', cb) => {
})
}
-const callbackExport = () => {
- useEmitt().emitter.emit('data-export-center')
+const callbackExportError = () => {
+ useEmitt().emitter.emit('data-export-center', { activeName: 'FAILED' })
+}
+
+const callbackExportSuc = () => {
+ useEmitt().emitter.emit('data-export-center', { activeName: 'SUCCESS' })
}
const downLoadAll = () => {
@@ -424,17 +435,20 @@ defineExpose({
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -443,11 +457,13 @@ defineExpose({
-
-
-
-
-
+
+
+
+
+
+
+
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 0c2885af10..91b55aad2b 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
@@ -282,7 +282,8 @@ const validate = () => {
return
}
cancelMap['/datasource/checkApiDatasource']?.()
- checkApiItem({ data: Base64.encode(JSON.stringify(apiItem)) })
+ const params = Base64.encode(JSON.stringify(paramsList))
+ checkApiItem({ data: Base64.encode(JSON.stringify(apiItem)), paramsList: params })
.then(response => {
apiItem.jsonFields = response.data.jsonFields
apiItem.fields = []
@@ -308,6 +309,17 @@ const disabledByChildren = item => {
return false
}
}
+
+const disabledChangeFieldByChildren = item => {
+ if (apiItem.type == 'params') {
+ return true
+ }
+ if (item.hasOwnProperty('children') && item.children.length > 0) {
+ return true
+ } else {
+ return false
+ }
+}
const previewData = () => {
showEmpty.value = false
const data = []
@@ -602,7 +614,7 @@ defineExpose({