From feb67dba6ec3e07e3700fe039cca9e839fdb0087 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 23 Sep 2022 18:10:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B1=87=E6=80=BB=E8=A1=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5=E5=90=8E=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/custom-component/DeRichTextView.vue | 2 +- frontend/src/views/panel/LinkJumpSet/index.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue index 5ccbf081b9..1c78d8ac4f 100644 --- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue +++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue @@ -194,8 +194,8 @@ export default { if (this.editStatus&&this.canEdit===false) { this.canEdit = true this.element['editing'] = true - this.reShow() this.myValue = this.element.propValue.textValue + this.reShow() } }, reShow() { diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index 26cef164c6..62c567cce5 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -362,8 +362,10 @@ export default { const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields let checkJumpStr if (chartDetails.type === 'table-pivot') { - checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt - } else { + checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields + }else if(chartDetails.type === 'table-info') { + checkJumpStr = chartDetails.xaxis + chartDetails.drillFields + }else { checkJumpStr = checkAllAxisStr } // 获取可关联的仪表板 From 4b4e9f135f76046555d1b9cf10f374ed7610fb3a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 23 Sep 2022 18:12:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E5=AD=97=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E5=8F=B7=E6=97=B6=E6=95=B0=E5=AD=97=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E5=BC=82=E5=B8=B8=20#3099?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/TextAttr.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 6ebdf399ca..ab6926eefb 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -218,7 +218,7 @@ export default { innerOpacity: 0, mainWidthOffset: 600, initFontSize: 12, - miniFontSize: 12, + miniFontSize: 0, maxFontSize: 128, textAlignOptions: [ { From 4356d01c33f839a03875621b96a01289329706d1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 23 Sep 2022 18:31:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/i18n/messages_en_US.properties | 1 + backend/src/main/resources/i18n/messages_zh_CN.properties | 1 + backend/src/main/resources/i18n/messages_zh_TW.properties | 1 + frontend/src/lang/en.js | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index afd8a15af0..f7592ca718 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -43,6 +43,7 @@ \u91CD\u7F6E\u5BC6\u7801=Reset Password \u5173\u4E8E=About Us \u9996\u9875=Home Page +\u7528\u6237key=User Key i18n_auth_view=View i18n_auth_use=Use i18n_auth_export=Export diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index e0efdd38d8..946d37a153 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -43,6 +43,7 @@ \u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u7801 \u5173\u4E8E=\u5173\u4E8E \u9996\u9875=\u9996\u9875 +\u7528\u6237key=\u7528\u6237key i18n_auth_view=\u67E5\u770B i18n_auth_use=\u4F7F\u7528 i18n_auth_export=\u5BFC\u51FA diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 022e0606ac..eddffe3e99 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -43,6 +43,7 @@ \u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u78BC \u5173\u4E8E=\u95DC\u65BC \u9996\u9875=\u9996\u9801 +\u7528\u6237key=\u7528\u6236key i18n_auth_view=\u67E5\u770B i18n_auth_use=\u4F7F\u7528 i18n_auth_export=\u5C0E\u51FA diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a46b9dd1be..3ad71ba535 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1633,8 +1633,8 @@ export default { desensitization: 'Desensitization' }, row_permissions: 'Row Permissions', - column_permissions: '列权限', - row_column_permissions: '行列权限', + column_permissions: 'Column Permissions', + row_column_permissions: 'Row And Column Permissions', union_data: 'Union Dataset', add_union_table: 'Add Union Dataset', edit_union: 'Edit Union Dataset', From 73dd7bec01db73bd9ce2fc167e8226b4311c96d9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 23 Sep 2022 18:35:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?revert:=20=E6=9A=82=E6=97=B6=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E5=BA=94=E7=94=A8=E5=B8=82=E5=9C=BA=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V40__1.15.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/main/resources/db/migration/V40__1.15.sql b/backend/src/main/resources/db/migration/V40__1.15.sql index b4b31501c6..add04004e1 100644 --- a/backend/src/main/resources/db/migration/V40__1.15.sql +++ b/backend/src/main/resources/db/migration/V40__1.15.sql @@ -26,8 +26,6 @@ INSERT INTO `task_instance` (`task_id`) VALUES ('Datasource_check_status'); update sys_menu set menu_sort=10 where menu_id=1; -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 (41, 1, 1, 1, '应用管理', 'system-app-template', 'panel/appTemplate/index', 13, 'sys-param', 'panel/appTemplate/index', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389); -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 (203, 0, 0, 1, '应用市场', 'app-template-market', 'panel/appTemplateMarket/index', 6, 'dashboard', '/appTemplateMarket', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389); -- ---------------------------- -- Table structure for panel_app_template -- ----------------------------