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

Merge pull request #4681 from dataease/pr@dev_memory_component

Browse Source 
feat: 参数设置 时间选择组件改造
This commit is contained in:
dataeaseShu 2023-03-02 13:33:23 +08:00 committed by GitHub
commit 380b46318a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -517,7 +517,21 @@
/> />
</el-select> </el-select>
</el-input> </el-input>
<div v-if="['DATETIME-YEAR', 'DATETIME-YEAR-MONTH', 'DATETIME-YEAR-MONTH-DAY', 'DATETIME'].includes(scope.row.type[0])" class="el-input-group el-input-group--prepend de-group__prepend">
<div class="el-input-group__prepend">
<el-select
v-model="scope.row.defaultValueScope"
style="width: 100px"
size="small"
>
<el-option
v-for="item in defaultValueScopeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
<el-date-picker <el-date-picker
v-if="scope.row.type[0] === 'DATETIME-YEAR'" v-if="scope.row.type[0] === 'DATETIME-YEAR'"
v-model="scope.row.defaultValue" v-model="scope.row.defaultValue"
@ -525,21 +539,7 @@
size="small" size="small"
value-format="yyyy" value-format="yyyy"
:placeholder="$t('dataset.select_year')" :placeholder="$t('dataset.select_year')"
> />
<el-select
slot="prepend"
v-model="scope.row.defaultValueScope"
style="width: 100px"
size="small"
>
<el-option
v-for="item in defaultValueScopeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-date-picker>
<el-date-picker <el-date-picker
v-if="scope.row.type[0] === 'DATETIME-YEAR-MONTH'" v-if="scope.row.type[0] === 'DATETIME-YEAR-MONTH'"
@ -570,6 +570,7 @@
:value-format="scope.row.type[1]" :value-format="scope.row.type[1]"
:placeholder="$t('dataset.select_time')" :placeholder="$t('dataset.select_time')"
/> />
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -1141,8 +1142,13 @@ export default {
padding-bottom: 80px; padding-bottom: 80px;
} }
.de-group__prepend {
width: 100%;
}
.el-date-editor { .el-date-editor {
width: 100%; width: 100%;
display: inline-block;
} }
.select-type { .select-type {