dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.4' into v1.4

Browse Source
This commit is contained in:
wangjiahao 2021-11-03 15:43:09 +08:00
commit 2d798d1b97
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
View File

@ -182,7 +182,7 @@ public class RedshiftQueryProvider extends QueryProvider {
@Override
public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
return createQuerySQL(sql, fields, isGroup, null) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
}
@Override

6
frontend/src/components/cron/cron.vue
View File

@ -126,9 +126,9 @@ export default {
})
}
const v = `${this.sVal} ${this.mVal} ${this.hVal} ${this.dVal} ${this.monthVal} ${this.weekVal} ${this.yearVal}`
if (v !== this.value) {
this.$emit('input', v)
}
// if (v !== this.value) {
this.$emit('input', v)
// }
return v
}
},

2
frontend/src/views/chart/group/Group.vue
View File

@ -267,7 +267,7 @@
class="dialog-css"
>
<el-row style="width: 800px;">
<el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
<el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item" @submit.native.prevent>
<el-col :span="12">
<el-form-item :label="$t('chart.view_name')">
<el-input v-model="chartName" style="height: 34px" size="mini" />

1
frontend/src/views/dataset/data/UnionView.vue
View File

@ -270,6 +270,7 @@ export default {
targetUnionRelation: ''
}
this.targetTable = {}
this.targetFieldOption = []
},
edit(item) {

2
frontend/src/views/dataset/data/ViewTable.vue
View File

@ -53,7 +53,7 @@
<el-tab-pane :label="$t('dataset.field_manage')" name="fieldEdit">
<field-edit :param="param" />
</el-tab-pane>
<el-tab-pane v-if="table.type !== 'custom'" :label="$t('dataset.join_view')" name="joinView">
<el-tab-pane v-if="table.type !== 'custom' && !(table.type === 'sql' && table.mode === 0)" :label="$t('dataset.join_view')" name="joinView">
<union-view :param="param" :table="table" />
</el-tab-pane>
<el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">

2
frontend/src/views/system/datasource/form.vue
View File

@ -285,7 +285,7 @@ export default {
} else {
this.$error(this.$t(res.message))
}
this.refreshTree()
this.refreshType(data)
}).catch(res => {
this.$error(res.message)
})