From d1831556b38ad79c2fbc13ccb17a8c6dbc27fe3c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Aug 2022 13:58:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=B7=B1=E8=89=B2=E4=B8=BB=E9=A2=98=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=A2=9C=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V39__1.14.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/src/main/resources/db/migration/V39__1.14.sql b/backend/src/main/resources/db/migration/V39__1.14.sql index 50e21a5ab2..9835b24525 100644 --- a/backend/src/main/resources/db/migration/V39__1.14.sql +++ b/backend/src/main/resources/db/migration/V39__1.14.sql @@ -72,3 +72,10 @@ UPDATE `sys_theme` set `origin_id` = 1 where `id` = 1; UPDATE `sys_theme` set `origin_id` = 2 where `id` = 2; UPDATE `sys_theme` set `origin_id` = 1 where origin_id is null; COMMIT; + + +UPDATE `panel_subject` +SET + `details` = '{\"width\":1600,\"height\":900,\"scale\":100,\"scaleWidth\":100,\"scaleHeight\":100,\"selfAdaption\":true,\"auxiliaryMatrix\":true,\"openCommonStyle\":true,\"panel\":{\"themeColor\":\"dark\",\"color\":\"#030B2E\",\"imageUrl\":{},\"backgroundType\":\"color\",\"gap\":\"yes\",\"resultMode\":\"all\",\"resultCount\":1000},\"aidedDesign\":{\"showGrid\":false,\"matrixBase\":4},\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"themeId\":\"c9d63e10-2827-11ed-afd9-69d86fea45a0\",\"chartInfo\":{\"chartTitle\":{\"show\":true,\"fontSize\":\"18\",\"color\":\"#FFFFFF\",\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"remarkBackgroundColor\":\"#ffffffff\",\"fontFamily\":\"Microsoft YaHei\",\"letterSpace\":\"0\",\"fontShadow\":false},\"chartColor\":{\"value\":\"default\",\"colors\":[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\"],\"alpha\":100,\"tableHeaderBgColor\":\"#4E81BB\",\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#ffffff\",\"tableStripe\":true,\"dimensionColor\":\"#ffffff\",\"quotaColor\":\"#4E81BB\",\"tableBorderColor\":\"#CCCCCC\",\"seriesColors\":[],\"areaBorderColor\":\"#EBEEF5\"},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"color\":\"#131E42\",\"alpha\":100,\"borderRadius\":5,\"innerPadding\":0},\"filterStyle\":{\"horizontal\":\"left\",\"vertical\":\"top\",\"color\":\"#FFFFFF\",\"brColor\":\"#4E4B4B\",\"wordColor\":\"#FFFFFF\",\"innerBgColor\":\"#131E42\"},\"tabStyle\":{\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"\",\"headBorderActiveColor\":\"\"}}}' +WHERE + `id` = 'system_2'; From 57366f42e9afa5ed0c8cd604578c95c2382751f6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Aug 2022 15:33:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AF=8C=E6=96=87=E6=9C=AC=E8=A7=86=E5=9B=BE=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=97=B6=E7=82=B9=E5=87=BB=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=8C=BA=E5=8F=AF=E8=83=BD=E6=9C=AA=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E8=BD=AC=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/DeRichTextView.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue index 455d49ac2d..5ccbf081b9 100644 --- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue +++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue @@ -112,6 +112,8 @@ export default { this.canEdit = false this.reShow() this.myValue = this.assignment(this.element.propValue.textValue) + const ed = tinymce.editors[this.tinymceId] + ed.setContent(this.myValue) } }, myValue(newValue) { From 1a4e654ce15f940864b6ec42ae40fbb2e7ba9b0f Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 30 Aug 2022 15:35:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20mysql?= =?UTF-8?q?=20YEAR=20=E7=B1=BB=E5=9E=8B=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/mysql/MysqlQueryProvider.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 00cddc4974..b96fc039f1 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -114,7 +114,11 @@ public class MysqlQueryProvider extends QueryProvider { if (f.getDeType() == 2 || f.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else { - fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); + if(f.getType().equalsIgnoreCase("YEAR")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else { + fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); + } } } else if (f.getDeExtractType() == 0) { if (f.getDeType() == 2) { @@ -167,7 +171,11 @@ public class MysqlQueryProvider extends QueryProvider { if (f.getDeType() == 2 || f.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else { - fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); + if(f.getType().equalsIgnoreCase("YEAR")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else { + fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); + } } } else if (f.getDeExtractType() == 0) { if (f.getDeType() == 2) { @@ -1125,8 +1133,12 @@ public class MysqlQueryProvider extends QueryProvider { if (x.getDeType() == 2 || x.getDeType() == 3) { fieldName = String.format(MySQLConstants.UNIX_TIMESTAMP, originField) + "*1000"; } else if (x.getDeType() == 1) { - String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); - fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, format); + if(x.getType().equalsIgnoreCase("YEAR")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", transDateFormat(x.getDateStyle(), x.getDatePattern())); + }else { + String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); + fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, format); + } } else { fieldName = originField; } From 9c24ebe6dee40bfe636caf815867379b24c42949 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 30 Aug 2022 15:47:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=A4=96=E8=A7=82=E9=85=8D=E7=BD=AE):=20=E5=A4=96=E8=A7=82?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95=E7=A7=BB=E8=87=B3xpack?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V39__1.14.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V39__1.14.sql b/backend/src/main/resources/db/migration/V39__1.14.sql index 50e21a5ab2..384bd05793 100644 --- a/backend/src/main/resources/db/migration/V39__1.14.sql +++ b/backend/src/main/resources/db/migration/V39__1.14.sql @@ -1,5 +1,5 @@ INSERT INTO `sys_menu` VALUES (700, 1, 2, 1, '系统配置', 'sys-settings', 'system/settings/index', 12, 'sys-tools', 'system-settings', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `sys_menu` VALUES (710, 700, 0, 1, '外观配置', 'sys-appearance', 'system/settings/AppearanceSetting', 2, 'sys-tools', 'appearance', b'0', b'0', b'0', 'appearance:read', NULL, NULL, NULL, NULL); + INSERT INTO `sys_menu` VALUES (730, 1, 0, 1, '数据同步表单', 'sys-task-ds-form', 'system/task/form', 11, NULL, '/task-ds-form', b'1', b'0', b'1', NULL, NULL, NULL, NULL, NULL); UPDATE `sys_menu` set pid = 700, menu_sort = 1 where menu_id = 6 and `name` = 'system-param'; From 7c7ad7c27bdf57d11f22a8ac054b3998b5673eec Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 30 Aug 2022 16:12:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E6=A0=91?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E5=85=A8=E5=B1=8F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=91=E8=BF=87=E6=BB=A4=E5=99=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/ElTreeSelect/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/ElTreeSelect/index.vue b/frontend/src/components/ElTreeSelect/index.vue index b94e91d902..4311d0f374 100644 --- a/frontend/src/components/ElTreeSelect/index.vue +++ b/frontend/src/components/ElTreeSelect/index.vue @@ -20,8 +20,8 @@ @clear="_selectClearFun" @focus="_popoverShowFun" /> - - + +

{{ $t('dataset.check_all') }}

@@ -229,6 +229,11 @@ export default { off(document, 'mouseup', this._popoverHideFun) }, methods: { + showPopover() { + this.$nextTick(() => { + this.$refs.input.focus() + }) + }, resetSelectAll() { this.selectAll = false }, From e607009d73a8033bd418b259d3c1b9a31d8387e6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Aug 2022 16:17:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E5=88=B6=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=A4=8D=E5=88=B6=E8=A7=86=E5=9B=BE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/ext/ExtChartViewMapper.java | 2 + .../io/dataease/ext/ExtChartViewMapper.xml | 47 +++++++++++++++++++ .../service/panel/PanelGroupService.java | 2 + 3 files changed, 51 insertions(+) diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java index 4f42e6bf1d..8856ff7922 100644 --- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java +++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.java @@ -28,6 +28,8 @@ public interface ExtChartViewMapper { void chartCopyWithPanel(@Param("copyId") String copyId); + void chartFiledCopyWithPanel(@Param("copyId") String copyId); + void deleteCircleView(@Param("pid") String pid); void deleteCircleGroup(@Param("pid") String pid); diff --git a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml index c4e3e49212..fbe2da6cb3 100644 --- a/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml @@ -592,4 +592,51 @@ + + + INSERT INTO chart_view_field ( + id, + table_id, + chart_id, + `name`, + dataease_name, + group_type, + `type`, + `size`, + de_type, + de_type_format, + de_extract_type, + ext_field, + `checked`, + column_index, + last_sync_time + ) SELECT + uuid() AS id, + chart_view_field.table_id, + chart_view_field.pv_copy.chart_view_id AS chart_id, + chart_view_field.`name`, + chart_view_field.dataease_name, + chart_view_field.group_type, + chart_view_field.`type`, + chart_view_field.`size`, + chart_view_field.de_type, + chart_view_field.de_type_format, + chart_view_field.de_extract_type, + chart_view_field.ext_field, + chart_view_field.`checked`, + chart_view_field.column_index, + chart_view_field.last_sync_time + FROM + ( + SELECT + panel_id, + copy_from_view, + chart_view_id + FROM + panel_view + WHERE + copy_id = #{copyId} + ) pv_copy + INNER JOIN chart_view_field ON chart_view_field.chart_id = pv_copy.copy_from_view + diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 16a39a302f..8791b91744 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -352,6 +352,8 @@ public class PanelGroupService { extPanelViewMapper.copyFromPanel(newPanelId, sourcePanelId, copyId); //TODO 复制视图 chart_view extChartViewMapper.chartCopyWithPanel(copyId); + //TODO 复制视图字段 chart_view_field + extChartViewMapper.chartFiledCopyWithPanel(copyId); //TODO 替换panel_data viewId 数据 List panelViewList = panelViewService.findPanelViews(copyId); //TODO 复制模板缓存数据 From 01bc8f4ed3b7fea07376702be20e7a726708fc32 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Aug 2022 16:42:56 +0800 Subject: [PATCH 7/7] =?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 --- .../src/main/resources/i18n/messages_en_US.properties | 1 + .../src/main/resources/i18n/messages_zh_CN.properties | 1 + .../src/main/resources/i18n/messages_zh_TW.properties | 1 + frontend/src/lang/en.js | 10 +++++----- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 965bd17c7c..1ff1bd26bc 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -1,5 +1,6 @@ \u4E2A\u4EBA\u4FE1\u606F=Personal Information \u4EEA\u8868\u677F=Dashboard +\u6A21\u677F\u5E02\u573A=Template Market \u4FEE\u6539\u5BC6\u7801=Change Password \u521B\u5EFA\u7528\u6237=Create User \u521B\u5EFA\u7EC4\u7EC7=Create Organization diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 49316a7434..dbd11c31bb 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -1,5 +1,6 @@ \u4E2A\u4EBA\u4FE1\u606F=\u4E2A\u4EBA\u4FE1\u606F \u4EEA\u8868\u677F=\u4EEA\u8868\u677F +\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u573A \u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u7801 \u521B\u5EFA\u7528\u6237=\u521B\u5EFA\u7528\u6237 \u521B\u5EFA\u7EC4\u7EC7=\u521B\u5EFA\u7EC4\u7EC7 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index c08d222579..591d15aac4 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -1,5 +1,6 @@ \u4E2A\u4EBA\u4FE1\u606F=\u500B\u4EBA\u4FE1\u606F \u4EEA\u8868\u677F=\u5100\u8868\u677F +\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u5834 \u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u78BC \u521B\u5EFA\u7528\u6237=\u5275\u5EFA\u7528\u6236 \u521B\u5EFA\u7EC4\u7EC7=\u5275\u5EFA\u7D44\u7E54 diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 3ed07e410e..8bef9a2cf6 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -607,7 +607,7 @@ export default { clear_filter: 'Empty condition', recover_pwd: 'Restore to the original password?', filter_method: 'Filter criteria', - filter: 'screen', + filter: 'Screen', list: 'List item', list_info: 'Please select the information to be displayed in the list', sure_delete: 'Are you sure to delete this user?' @@ -716,8 +716,8 @@ export default { search_by_name: 'Search by name', special_characters_are_not_supported: 'Format error (special characters are not supported and cannot start and end with \'-\')', select: 'Select organization', - member: 'member', - organization: 'organization', + member: 'Member', + organization: 'Organization', add_user: 'Add user', sure_move_user: 'Are you sure to remove this user from the organization?', move_success: 'Removed successfully', @@ -735,10 +735,10 @@ export default { edite_organization: 'Edit organization' }, system_parameter_setting: { - mailbox_service_settings: 'Mail Settings', + mailbox_service_settings: 'Mail Setting', test_connection: 'Test connection', SMTP_host: 'SMTP Host', - basic_setting: 'Basic setting', + basic_setting: 'Basic Setting', front_time_out: 'Request timeOut(unit: second, Attention: Refresh browser takes effect after saving)', msg_time_out: 'Message retention time(unit: day)', login_type: 'Default login type',