From b8181c8f75da35e35780d52aae9a6d5deaead75e Mon Sep 17 00:00:00 2001 From: luyang351 Date: Tue, 18 Jan 2022 16:48:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=20README?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E6=94=AF=E6=8C=81=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 38366978b2..a9abdc98e7 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 - MongoDB - Amazon Redshift - Hive +- DB2 > 更多数据源支持持续增加中... From c0f0a6fa3d57ddefb8df07f1ce16e8b6179fe810 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 18 Jan 2022 16:52:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=B8=80=E7=9B=B4loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/custom-component/UserView.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 84f71aafa7..0ae214b946 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -118,9 +118,10 @@ export default { }, data() { return { + filterInit: false, // 标记是否已经通过watch.filters 进行初始化，如果filterInit=true 则create放弃数据初始化防止数据覆盖 refId: null, chart: BASE_CHART_STRING, - requestStatus: 'waiting', + requestStatus: 'success', message: null, drillClickDimensionList: [], drillFilters: [], @@ -242,7 +243,10 @@ export default { watch: { 'filters': function(val1, val2) { - isChange(val1, val2) && this.getData(this.element.propValue.viewId) + if (isChange(val1, val2)) { + this.filterInit = true + this.getData(this.element.propValue.viewId) + } }, linkageFilters: { handler(newVal, oldVal) { @@ -313,8 +317,8 @@ export default { created() { this.refId = uuid.v1 if (this.element && this.element.propValue && this.element.propValue.viewId) { - const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value && !(item.options.value instanceof Object) || (item.options.attrs && item.options.attrs.default && item.options.attrs.default.isDynamic)) - if (!hasFilter || this.filters.length > 0) { this.getData(this.element.propValue.viewId, false) } + // 如果watch.filters 已经进行数据初始化时候，此处放弃数据初始化 + !this.filterInit && this.getData(this.element.propValue.viewId, false) } }, methods: { From b00132a3fb62dd1dc9e54417160675d4189ea2af Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 18 Jan 2022 18:36:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=87=BD=E6=95=B0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V31__1.7.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/resources/db/migration/V31__1.7.sql b/backend/src/main/resources/db/migration/V31__1.7.sql index e244d139aa..11f4d27873 100644 --- a/backend/src/main/resources/db/migration/V31__1.7.sql +++ b/backend/src/main/resources/db/migration/V31__1.7.sql @@ -11,3 +11,6 @@ CREATE TABLE `dataset_column_permissions` ( INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (61, 0, 0, 1, '首页', 'wizard', 'wizard/index', 0, '', '/wizard', b'1', b'0', b'0', NULL, NULL, NULL, NULL, 1614915491036); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openHomePage', 'true', 'boolean', 13); +UPDATE `dataset_table_function` SET `desc` = '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不相等，则返回ELSE后面的rn' WHERE `id` = 47; +UPDATE `dataset_table_function` SET `desc` = '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不相等，则返回ELSE后面的rn' WHERE `id` = 96; + From 9ca2c3a2ee941789cdcd4fe415aaa0cf9839184f Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 18 Jan 2022 18:39:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + 3 files changed, 3 insertions(+) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 74d9debbe4..d6fba45893 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1216,6 +1216,7 @@ export default { auth_type: 'Authorization type', auth_obj: 'Authorized object', enable: 'Enable column permissions', + disable: '', prohibit: 'Prohibit', desensitization: 'Desensitization' }, diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 6844cb175d..fb6fc287e5 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1216,6 +1216,7 @@ export default { auth_type: '授權類型', auth_obj: '授權對象', enable: '啟用列權限', + disable: '', prohibit: '禁用', desensitization: '脫敏' }, diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 593f16ffec..0f703a7aa2 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1219,6 +1219,7 @@ export default { auth_type: '授权类型', auth_obj: '授权对象', enable: '启用列权限', + disable: '', prohibit: '禁用', desensitization: '脱敏' },