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

Merge pull request #11576 from dataease/pr@dev-v2@fixDS

Browse Source 
fix: API 数据源支持时间函数格式错误
This commit is contained in:
taojinlong 2024-08-15 14:42:55 +08:00 committed by GitHub
commit 3457b4acf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,10 @@ const querySearch = (queryString, cb) => {
: suggestions.value
cb(results)
}
const changeNameType = element => {
element.value = ''
}
const createFilter = (queryString: string) => {
return restaurant => {
return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
@ -98,12 +102,12 @@ const options = [
const timeFunLists = [
{
label: '当天（yyyy-MM-DD）',
value: 'currentDay yyyy-MM-DD'
label: '当天（yyyy-MM-dd）',
value: 'currentDay yyyy-MM-dd'
},
{
label: '当天（yyyy/MM/DD）',
value: 'currentDay yyyy/MM/DD'
label: '当天（yyyy/MM/dd）',
value: 'currentDay yyyy/MM/dd'
}
]
</script>
@ -137,7 +141,7 @@ const timeFunLists = [
/>
</el-col>
<el-col :span="3" v-if="activeName === 'table'">
<el-select v-model="element.nameType">
<el-select v-model="element.nameType" @change="changeNameType(element)">
<el-option
v-for="item in options"
:key="item.value"

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

@ -96,7 +96,9 @@ const createFilter = (queryString: string) => {
return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
}
const changeNameType = element => {
element.value = ''
}
const activeName = inject('api-active-name')
const options = [
{
@ -118,12 +120,12 @@ const options = [
]
const timeFunLists = [
{
label: '当天（yyyy-MM-DD）',
value: 'currentDay yyyy-MM-DD'
label: '当天（yyyy-MM-dd）',
value: 'currentDay yyyy-MM-dd'
},
{
label: '当天（yyyy/MM/DD）',
value: 'currentDay yyyy/MM/DD'
label: '当天（yyyy/MM/dd）',
value: 'currentDay yyyy/MM/dd'
}
]
</script>
@ -173,7 +175,7 @@ const timeFunLists = [
/>
</el-col>
<el-col :span="3" v-if="activeName === 'table'">
<el-select v-model="element.nameType">
<el-select v-model="element.nameType" @change="changeNameType(element)">
<el-option
v-for="item in options"
:key="item.value"
@ -224,7 +226,7 @@ const timeFunLists = [
v-model="element.value"
:disabled="isReadOnly"
class="input-with-autocomplete"
:placeholder="valueText"
:placeholder="element.nameType === 'fixed' ? '值' : '可用${参数名}，使用参数'"
value-key="name"
highlight-first-item
/>