Merge pull request #5377 from dataease/dev

merge dev

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

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
 

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=名稱不能為空！
+I18n_name_cant_empty=\u540D\u7A31\u4E0D\u80FD\u70BA\u7A7A\uFF01

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',

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: '導出用戶',

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: '导出用户',

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({

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