github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
fix(仪表板): 时间范围规则动态时间设置可以输入小数
This commit is contained in:
dataeaseShu 2024-08-08 17:02:59 +08:00 committed by GitHub
commit 815311fea8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
View File

@ -508,7 +508,12 @@ defineExpose({
>
<div class="setting-label">开始时间</div>
<div class="setting-input with-date range">
<el-input-number v-model="curComponent.timeNum" :min="0" controls-position="right" />
<el-input-number
step-strictly
v-model="curComponent.timeNum"
:min="0"
controls-position="right"
/>
<el-select @focus="handleDialogClick" v-model="curComponent.relativeToCurrentType">
<el-option
v-for="item in relativeToCurrentTypeList"
@ -542,6 +547,7 @@ defineExpose({
<el-input-number
v-model="curComponent.timeNumRange"
:min="0"
step-strictly
controls-position="right"
/>
<el-select @focus="handleDialogClick" v-model="curComponent.relativeToCurrentTypeRange">

8
core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
View File

@ -339,7 +339,12 @@ const relativeToCurrentListRange = computed(() => {
>
<div class="setting-label">开始时间</div>
<div class="setting-input range">
<el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" />
<el-input-number
step-strictly
v-model="timeRange.timeNum"
:min="0"
controls-position="right"
/>
<el-select v-model="timeRange.relativeToCurrentType">
<el-option
v-for="item in relativeToCurrentTypeList"
@ -370,6 +375,7 @@ const relativeToCurrentListRange = computed(() => {
<el-input-number
v-model="timeRange.timeNumRange"
:min="0"
step-strictly
controls-position="right"
/>
<el-select v-model="timeRange.relativeToCurrentTypeRange">