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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
wangjiahao 2021-05-25 15:25:06 +08:00
commit 45eb0acbfa
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
View File

@ -18,6 +18,9 @@
<if test="sceneId != null"> <if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR} and scene_id = #{sceneId,jdbcType=VARCHAR}
</if> </if>
<if test="mode != null">
and mode = #{mode,jdbcType=INTEGER}
</if>
</where> </where>
<if test="sort != null"> <if test="sort != null">
order by ${sort} order by ${sort}

8
frontend/src/views/dataset/common/DatasetCustomField.vue
View File

@ -1,5 +1,9 @@
<template> <template>
<el-col> <el-col>
<el-row style="height: 25px;">
<span>{{ table.name }}</span>
</el-row>
<el-divider />
<el-checkbox v-model="checkAll" :disabled="!(fields.length > 0)" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{ $t('dataset.check_all') }}</el-checkbox> <el-checkbox v-model="checkAll" :disabled="!(fields.length > 0)" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{ $t('dataset.check_all') }}</el-checkbox>
<el-checkbox-group v-model="checkedFields" @change="handleCheckedFieldsChange"> <el-checkbox-group v-model="checkedFields" @change="handleCheckedFieldsChange">
<el-checkbox v-for="f in fields" :key="f.id" :label="f.id" style="display: block;margin-top: 4px;width: 100%;"> <el-checkbox v-for="f in fields" :key="f.id" :label="f.id" style="display: block;margin-top: 4px;width: 100%;">
@ -98,5 +102,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-divider--horizontal {
margin: 12px 0
}
</style> </style>