public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 13:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复飞书数据源

Browse Source
This commit is contained in:
taojinlong
2025-02-20 18:05:06 +08:00
committed by dataeaseShu
parent d7aa23dbc7
commit eec32b73a5
4 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@@ -1282,10 +1282,13 @@ public class DatasourceServer implements DatasourceApi {
try {
String ClassName = "io.dataease.datasource.provider.ApiUtils";
if (!dsType.equals(DatasourceConfiguration.DatasourceType.API.name())) {
ClassName = "io.dataease.datasource.provider.LarkUtils";
Provider provider = ProviderFactory.getProvider(dsType);
method = provider.getClass().getMethod(methodName, classes);
} else {
Class<?> clazz = Class.forName(ClassName);
method = clazz.getMethod(methodName, classes);
}
Class<?> clazz = Class.forName(ClassName);
method = clazz.getMethod(methodName, classes);
} catch (Exception e) {
DEException.throwException("Cant find method: " + e.getMessage());
}

73
core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
View File

@@ -355,16 +355,23 @@ const saveItem = () => {
const before = () => {
active.value -= 1
}
const next = () => {
console.log(apiItem)
if (isPlugin.value) {
xpackApiItemBasicInfo?.value?.invokeMethod({
methodName: 'submitForm',
args: [{ eventName: 'stepNext', args: apiItem }]
})
} else {
apiItemBasicInfo.value.validate(val => {
if (!val) {
return
if (val) {
stepNext()
}
})
}
}
const stepNext = () => {
if (apiItem.useJsonPath && !apiItem.jsonPath) {
ElMessage.error(t('datasource.please_input_dataPath'))
return
@@ -415,20 +422,24 @@ const next = () => {
console.warn(error?.message)
})
}
const validate = () => {
if (isPlugin.value) {
xpackApiItemBasicInfo?.value?.invokeMethod({
methodName: 'submitForm',
args: [apiItem]
args: [{ eventName: 'validateItem', args: apiItem }]
})
} else {
apiItemBasicInfo.value.validate(val => {
if (!val) {
return
} else {
validateItem()
}
})
}
}
const validateItem = () => {
if (apiItem.useJsonPath && !apiItem.jsonPath) {
ElMessage.error(t('datasource.please_input_dataPath'))
return
@@ -452,6 +463,20 @@ const validate = () => {
ElMessage.error(t('data_source.verification_failed'))
})
}
const handleSubmit = param => {
const validateFrom = param.validate
validateFrom(val => {
if (val) {
if (param.eventName === 'validateItem') {
validateItem()
} else {
stepNext()
}
}
})
}
const closeEditItem = () => {
cancelMap['/datasource/checkApiDatasource']?.()
edit_api_item.value = false
@@ -760,46 +785,10 @@ defineExpose({
:jsname="jsName"
:api-item="apiItem"
ref="xpackApiItemBasicInfo"
@submitForm="handleSubmit"
v-if="dsType !== 'API'"
>
</plugin-component>
<!-- <el-form-->
<!-- ref="xpackApiItemBasicInfo"-->
<!-- :model="apiItem"-->
<!-- label-position="top"-->
<!-- label-width="100px"-->
<!-- require-asterisk-position="right"-->
<!-- :rules="rule"-->
<!-- v-loading="formLoading"-->
<!-- >-->
<!-- <div class="title-form_primary base-info">-->
<!-- <span>{{ t('datasource.base_info') }}</span>-->
<!-- </div>-->
<!-- <el-form-item :label="t('common.name')">-->
<!-- <el-input v-model="apiItem.name" autocomplete="off" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('datasource.app_token')" prop="appToken">-->
<!-- <el-input-->
<!-- v-model="apiItem.appToken"-->
<!-- :placeholder="t('datasource.input_app_token')"-->
<!-- autocomplete="off"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('datasource.table_id')" prop="tableId">-->
<!-- <el-input-->
<!-- v-model="apiItem.tableId"-->
<!-- :placeholder="t('datasource.input_table_id')"-->
<!-- autocomplete="off"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('datasource.view_id')" prop="viewId">-->
<!-- <el-input-->
<!-- v-model="apiItem.viewId"-->
<!-- :placeholder="t('datasource.input_view_id')"-->
<!-- autocomplete="off"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
</el-row>
<el-row v-show="active === 1">
<el-form

19
core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
View File

@@ -52,7 +52,6 @@ const prop = defineProps({
},
type: Object
},
activeStep: {
required: false,
default: 1,
@@ -61,10 +60,22 @@ const prop = defineProps({
isSupportSetKey: {
type: boolean,
required: true
},
pluginDs: {
type: [],
required: true
},
pluginIndex: {
type: String,
required: true
},
isPlugin: {
type: boolean,
required: true
}
})
const { form, activeStep, isSupportSetKey } = toRefs(prop)
const { form, activeStep, isSupportSetKey, pluginDs, pluginIndex, isPlugin } = toRefs(prop)
const state = reactive({
itemRef: []
@@ -95,10 +106,6 @@ const defaultRule = {
const rule = ref<FormRules>(cloneDeep(defaultRule))
const api_table_title = ref('')
const editApiItem = ref()
const editLarkItem = ref()
const pluginDs = ref([])
const pluginIndex = ref('')
const isPlugin = ref(false)
const xpack = ref()
const visible = ref(false)
const defaultApiItem = {

3
core/core-frontend/src/views/visualized/data/datasource/form/index.vue
View File

@@ -809,6 +809,9 @@ defineExpose({
<editor-detail
ref="detail"
:form="form"
:is-plugin="isPlugin"
:plugin-ds="pluginDs"
:plugin-index="pluginIndex"
:editDs="editDs"
:active-step="activeApiStep"
:is-supportSetKey="isSupportSetKey"