center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #10681 from dataease/pr@dev-v2_st

Browse Source 
fix(数据源): API数据源query中多了一个key，且提示步骤不正确
This commit is contained in:
dataeaseShu 2024-07-02 10:04:48 +08:00 committed by GitHub
commit 53ffe9c08b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ const rule = reactive<FormRules>({
} }
] ]
}) })
const activeName = ref('third') const activeName = ref('table')
provide('api-active-name', activeName) provide('api-active-name', activeName)
const initApiItem = (val: ApiItem, from, name) => { const initApiItem = (val: ApiItem, from, name) => {
activeName.value = name activeName.value = name
@ -469,7 +469,7 @@ defineExpose({
{{ active <= 1 ? '2' : '' }} {{ active <= 1 ? '2' : '' }}
</span> </span>
<span class="title">{{ <span class="title">{{
activeName === 'third' ? t('datasource.api_step_2') : '提取参数' activeName === 'table' ? t('datasource.api_step_2') : '提取参数'
}}</span> }}</span>
</div> </div>
</template> </template>

1
core/core-frontend/src/views/visualized/data/datasource/form/ApiKeyValue.vue
View File

@ -82,7 +82,6 @@ const options = [
value: 'fixed' value: 'fixed'
} }
] ]
const value = ref('')
</script> </script>
<template> <template>

7
core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
View File

@ -1,6 +1,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import { computed, onBeforeMount, PropType, toRefs } from 'vue' import { computed, onBeforeMount, PropType, toRefs, inject } from 'vue'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { KeyValue } from './ApiTestModel.js' import { KeyValue } from './ApiTestModel.js'
import { guid } from '@/views/visualized/data/dataset/form/util' import { guid } from '@/views/visualized/data/dataset/form/util'
@ -91,6 +91,7 @@ const createFilter = (queryString: string) => {
return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0 return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
} }
} }
const activeName = inject('api-active-name')
</script> </script>
<template> <template>
@ -149,7 +150,7 @@ const createFilter = (queryString: string) => {
/> />
</el-col> </el-col>
<el-col :span="5"> <el-col :span="activeName === 'params' ? 10 : 5">
<el-input <el-input
v-model="element.description" v-model="element.description"
maxlength="200" maxlength="200"
@ -157,7 +158,7 @@ const createFilter = (queryString: string) => {
show-word-limit show-word-limit
/> />
</el-col> </el-col>
<el-col :span="5"> <el-col v-if="activeName !== 'params'" :span="5">
<el-autocomplete <el-autocomplete
v-if="suggestions" v-if="suggestions"
v-model="element.name" v-model="element.name"