From 618ac675b7d24ab211ca34edd4407c4778bbf49a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 31 May 2023 14:19:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E6=9C=AA=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/DsTree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue index e3c2be026d..7e6d1aabce 100644 --- a/frontend/src/views/system/datasource/DsTree.vue +++ b/frontend/src/views/system/datasource/DsTree.vue @@ -477,7 +477,7 @@ export default { }, filterNode(value, data) { if (!value) return true - return data.name.indexOf(value) !== -1 + return data?.name?.toLowerCase().includes(value.toLowerCase()) }, showSearchWidget() { this.showSearchInput = true From 6252a92e6aba536161881c0bf7d5be69ec342261 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Wed, 31 May 2023 15:36:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=20pdf=E5=AF=BC=E5=87=BA=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9=20#5152?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/i18n/messages_en_US.properties | 2 +- backend/src/main/resources/i18n/messages_zh_CN.properties | 4 ++-- backend/src/main/resources/i18n/messages_zh_TW.properties | 4 ++-- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 9f52ae39b0..5583a54bf4 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -260,7 +260,7 @@ I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011 \u6C34\u5370\u7BA1\u7406=Watermark \u8840\u7F18\u5173\u7CFB=Relationship I18N_CRON_ERROR=Cron expression error -I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=Default template with params +I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=Default template with description I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=Default template only screenshot \u8FB9\u68461=Border 1 \u8FB9\u68462=Border 2 diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 7634ab45ad..7a2810cf0f 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -260,7 +260,7 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF -I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u53C2\u6570\u6837\u5F0F) +I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u4EEA\u8868\u677F\u63CF\u8FF0) I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8BA4\u6A21\u677F(\u53EA\u622A\u56FE) -I18n_name_cant_empty=名称不能为空！ +I18n_name_cant_empty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index fe4718a71d..acc0018ed3 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -256,7 +256,7 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB I18N_CRON_ERROR=cron\u8868\u9054\u5F0F\u932F\u8AA4 -I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8A8D\u6A21\u677F(\u52A0\u53C3\u6578\u6A23\u5F0F) +I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8A8D\u6A21\u95C6(\u52A0\u5100\u9336\u95C6\u63CF\u8FF0) I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716) \u8FB9\u68461=\u908A\u6846 1 \u8FB9\u68462=\u908A\u6846 2 @@ -268,4 +268,4 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716) \u8FB9\u68468=\u908A\u6846 8 \u8FB9\u68469=\u908A\u6846 9 \u8FB9\u684610=\u908A\u6846 10 -I18n_name_cant_empty=名稱不能為空！ \ No newline at end of file +I18n_name_cant_empty=\u540D\u7A31\u4E0D\u80FD\u70BA\u7A7A\uFF01 \ No newline at end of file diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index c6b4eb561e..a0325236d8 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2349,7 +2349,7 @@ export default { expand: 'Expand', pdf_export: 'PDF Export', switch_pdf_template: 'Switch PDF Template', - pdf_template_with_params: 'Default template(with params)', + pdf_template_with_params: 'Default template(with description)', pdf_template_only_pic: 'Default template(only screenshot)', panel_name: 'Panel name', export_user: 'Export User', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index d3a421ef11..d1e027a919 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2343,7 +2343,7 @@ export default { expand: '展開', pdf_export: 'PDF 導出', switch_pdf_template: '切換 PDF 模板', - pdf_template_with_params: '默認模板(加參數樣式)', + pdf_template_with_params: '默認模闆(加儀錶闆描述)', pdf_template_only_pic: '默認模板(只截圖)', panel_name: '儀錶板名稱', export_user: '導出用戶', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 69525742ad..ac40d61414 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2358,7 +2358,7 @@ export default { expand: '展开', pdf_export: 'PDF 导出', switch_pdf_template: '切换 PDF 模板', - pdf_template_with_params: '默认模板(加参数样式)', + pdf_template_with_params: '默认模板(加仪表板描述)', pdf_template_only_pic: '默认模板(只截图)', panel_name: '仪表板名称', export_user: '导出用户', From 8d3654e790bac806457afd6de8f7e24294ff54a1 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 31 May 2023 15:50:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=B5=81=E5=90=91=E5=9C=B0=E5=9B=BE):?= =?UTF-8?q?=20=E6=B5=81=E5=90=91=E5=9C=B0=E5=9B=BE=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/map/map_antv.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/map/map_antv.js b/frontend/src/views/chart/chart/map/map_antv.js index db7afc8516..3db4064e75 100644 --- a/frontend/src/views/chart/chart/map/map_antv.js +++ b/frontend/src/views/chart/chart/map/map_antv.js @@ -14,7 +14,12 @@ export function baseFlowMapOption(chartDom, chartId, chart, action) { const mapStyle = `amap://styles/${color.mapStyle ? color.mapStyle : 'normal'}` const lang = getLanguage().includes('zh') ? 'zh' : 'en' let init = false - if (!chartDom) { + if (!chartDom?.map) { + try { + chartDom.destroy() + } catch (e) { + // ignore + } chartDom = new Scene({ id: chartId, map: new GaodeMap({