From 8893d06d49bf0f5379065bf84052a9c9fdc49405 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 18 May 2021 15:17:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=20excel=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E5=AD=97=E6=AE=B5=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 4e5016ca94..d05eceba77 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -508,7 +508,10 @@ public class DataSetTableService { createDorisView(DorisTableUtils.dorisName(datasetTable.getId()), getCustomSQL(dataTableInfoDTO, dataSetTableUnionService.listByTableId(dataTableInfoDTO.getList().get(0).getTableId()))); return; } - QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); + QueryProvider qp = null; + if(!ObjectUtils.isEmpty(ds)) { + qp = ProviderFactory.getQueryProvider(ds.getType()); + } if (CollectionUtils.isNotEmpty(fields)) { for (int i = 0; i < fields.size(); i++) { TableFiled filed = fields.get(i); From 4535dd2a5e9b95c656d497fff1b9a08f1e404f8d Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 18 May 2021 15:20:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(dashboard):ui=20fix;=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/enshrine/index.vue | 3 +- .../src/views/panel/list/EditPanel/index.vue | 16 +++++----- frontend/src/views/panel/list/PanelList.vue | 29 ++++++++++++++++--- .../src/views/panel/list/PanelViewShow.vue | 2 +- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue index 09be5a705a..7e944638c5 100644 --- a/frontend/src/views/panel/enshrine/index.vue +++ b/frontend/src/views/panel/enshrine/index.vue @@ -1,7 +1,6 @@ @@ -101,7 +101,7 @@ export default { }, save() { if (!this.editPanel.panelInfo.name) { - this.$warning( this.$t('commons.name_can_not_empty')) + this.$warning(this.$t('chart.name_can_not_empty')) return false } panelSave(this.editPanel.panelInfo).then(response => { diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 26d7362113..d336d589ba 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -1,5 +1,5 @@ From 31e5cca4395c8342e9038e3101b8243bb3dde95f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 18 May 2021 15:46:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/auth/entity/SysUserEntity.java | 2 + .../java/io/dataease/base/domain/SysUser.java | 2 + .../dataease/base/domain/SysUserExample.java | 70 +++++++++++++++++++ .../io/dataease/base/mapper/SysUserMapper.xml | 29 ++++++-- .../dataease/base/mapper/ext/AuthMapper.java | 1 - .../dataease/base/mapper/ext/AuthMapper.xml | 4 +- .../controller/sys/SysUserController.java | 12 ++++ .../dataease/service/sys/SysUserService.java | 8 +++ frontend/src/api/user.js | 7 ++ frontend/src/components/LangSelect/index.vue | 2 +- frontend/src/layout/components/Topbar.vue | 8 +-- frontend/src/store/getters.js | 2 +- frontend/src/store/modules/app.js | 12 +--- frontend/src/store/modules/user.js | 20 ++++-- 14 files changed, 150 insertions(+), 29 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java index 2d07480db9..e74ae836d0 100644 --- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java +++ b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java @@ -23,4 +23,6 @@ public class SysUserEntity implements Serializable { private String email; private String phone; + + private String language; } diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java index 56775ba68b..8f62905999 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUser.java +++ b/backend/src/main/java/io/dataease/base/domain/SysUser.java @@ -35,5 +35,7 @@ public class SysUser implements Serializable { private Long updateTime; + private String language; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java index 1bc5260883..27cef73bb8 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java +++ b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java @@ -1083,6 +1083,76 @@ public class SysUserExample { addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } + + public Criteria andLanguageIsNull() { + addCriterion("`language` is null"); + return (Criteria) this; + } + + public Criteria andLanguageIsNotNull() { + addCriterion("`language` is not null"); + return (Criteria) this; + } + + public Criteria andLanguageEqualTo(String value) { + addCriterion("`language` =", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageNotEqualTo(String value) { + addCriterion("`language` <>", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageGreaterThan(String value) { + addCriterion("`language` >", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageGreaterThanOrEqualTo(String value) { + addCriterion("`language` >=", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageLessThan(String value) { + addCriterion("`language` <", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageLessThanOrEqualTo(String value) { + addCriterion("`language` <=", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageLike(String value) { + addCriterion("`language` like", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageNotLike(String value) { + addCriterion("`language` not like", value, "language"); + return (Criteria) this; + } + + public Criteria andLanguageIn(List values) { + addCriterion("`language` in", values, "language"); + return (Criteria) this; + } + + public Criteria andLanguageNotIn(List values) { + addCriterion("`language` not in", values, "language"); + return (Criteria) this; + } + + public Criteria andLanguageBetween(String value1, String value2) { + addCriterion("`language` between", value1, value2, "language"); + return (Criteria) this; + } + + public Criteria andLanguageNotBetween(String value1, String value2) { + addCriterion("`language` not between", value1, value2, "language"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml index de12f32bbc..41f42fc47a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml @@ -17,6 +17,7 @@ + @@ -78,7 +79,7 @@ user_id, dept_id, username, nick_name, gender, phone, email, `password`, is_admin, - enabled, create_by, update_by, pwd_reset_time, create_time, update_time + enabled, create_by, update_by, pwd_reset_time, create_time, update_time, `language` @@ -275,6 +282,9 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, + + `language` = #{record.language,jdbcType=VARCHAR}, + @@ -296,7 +306,8 @@ update_by = #{record.updateBy,jdbcType=VARCHAR}, pwd_reset_time = #{record.pwdResetTime,jdbcType=BIGINT}, create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT} + update_time = #{record.updateTime,jdbcType=BIGINT}, + `language` = #{record.language,jdbcType=VARCHAR} @@ -346,6 +357,9 @@ update_time = #{updateTime,jdbcType=BIGINT}, + + `language` = #{language,jdbcType=VARCHAR}, + where user_id = #{userId,jdbcType=BIGINT} @@ -364,7 +378,8 @@ update_by = #{updateBy,jdbcType=VARCHAR}, pwd_reset_time = #{pwdResetTime,jdbcType=BIGINT}, create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT} + update_time = #{updateTime,jdbcType=BIGINT}, + `language` = #{language,jdbcType=VARCHAR} where user_id = #{userId,jdbcType=BIGINT} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java index 050702436a..418ac6375f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.java @@ -6,7 +6,6 @@ import io.dataease.auth.api.dto.CurrentRoleDto; import io.dataease.auth.entity.SysUserEntity; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; public interface AuthMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml index 8ec4698628..c99b962d5b 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml @@ -20,11 +20,11 @@