forked from github/dataease
Merge pull request #10681 from dataease/pr@dev-v2_st
fix(数据源): API数据源query中多了一个key,且提示步骤不正确
This commit is contained in:
commit
53ffe9c08b
@ -155,7 +155,7 @@ const rule = reactive<FormRules>({
|
||||
}
|
||||
]
|
||||
})
|
||||
const activeName = ref('third')
|
||||
const activeName = ref('table')
|
||||
provide('api-active-name', activeName)
|
||||
const initApiItem = (val: ApiItem, from, name) => {
|
||||
activeName.value = name
|
||||
@ -469,7 +469,7 @@ defineExpose({
|
||||
{{ active <= 1 ? '2' : '' }}
|
||||
</span>
|
||||
<span class="title">{{
|
||||
activeName === 'third' ? t('datasource.api_step_2') : '提取参数'
|
||||
activeName === 'table' ? t('datasource.api_step_2') : '提取参数'
|
||||
}}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -82,7 +82,6 @@ const options = [
|
||||
value: 'fixed'
|
||||
}
|
||||
]
|
||||
const value = ref('')
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -1,6 +1,6 @@
|
||||
<script lang="ts" setup>
|
||||
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 { KeyValue } from './ApiTestModel.js'
|
||||
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
|
||||
}
|
||||
}
|
||||
const activeName = inject('api-active-name')
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@ -149,7 +150,7 @@ const createFilter = (queryString: string) => {
|
||||
/>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="5">
|
||||
<el-col :span="activeName === 'params' ? 10 : 5">
|
||||
<el-input
|
||||
v-model="element.description"
|
||||
maxlength="200"
|
||||
@ -157,7 +158,7 @@ const createFilter = (queryString: string) => {
|
||||
show-word-limit
|
||||
/>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-col v-if="activeName !== 'params'" :span="5">
|
||||
<el-autocomplete
|
||||
v-if="suggestions"
|
||||
v-model="element.name"
|
||||
|
Loading…
Reference in New Issue
Block a user