diff --git a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java index 3baa2ab56f..fe33df14eb 100644 --- a/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/template/manage/TemplateCenterManage.java @@ -103,7 +103,8 @@ public class TemplateCenterManage { config.setConnectTimeout(5000); config.setSocketTimeout(10000); config.setConnectionRequestTimeout(5000); - return HttpClientUtil.get(url, config); + return HttpClientUtil. + get(url, config); } private MarketTemplateV2BaseResponse templateQuery(Map templateParams) { diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 4dabfa5018..0fe45ee005 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -3304,7 +3304,7 @@ export default { apply: 'Apply', apply_this_template: 'Apply This Template', market_network_tips: - 'To view templates from the template market, your server must be connected to the template market (https://templates.dataease.cn). Please check your network connection...', + 'To view templates from the template market, your server must be connected to the template market ({0}). Please check your network connection...', enter_name_tips: 'Please enter the dashboard name.', apply_template: 'App Template', style_template: 'Style Template', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 1a48f4381b..d100d9ec4c 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3210,8 +3210,7 @@ export default { template_preview: '預覽模板', apply: '應用', apply_this_template: '應用此模板', - market_network_tips: - '查看模板市場模板需要服務器與模板市場(https://templates.dataease.cn)連通,請檢查網絡...', + market_network_tips: '查看模板市場模板需要服務器與模板市場({0})連通,請檢查網絡...', enter_name_tips: '請輸入儀表板名稱', apply_template: '應用模板', style_template: '樣式模板', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 805f028338..d92542deca 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3215,8 +3215,7 @@ export default { template_preview: '预览模板', apply: '应用', apply_this_template: '应用此模板', - market_network_tips: - '查看模板市场模板需要服务器与模板市场(https://templates.dataease.cn)连通,请检查网络...', + market_network_tips: `查看模板市场模板需要服务器与模板市场({0})连通,请检查网络...`, enter_name_tips: '请输入仪表板名称', apply_template: '应用模板', style_template: '样式模板', diff --git a/core/core-frontend/src/utils/utils.ts b/core/core-frontend/src/utils/utils.ts index f711721b10..5afebabba7 100644 --- a/core/core-frontend/src/utils/utils.ts +++ b/core/core-frontend/src/utils/utils.ts @@ -295,7 +295,7 @@ export const nameTrim = (target: {}, msg = '名称字段长度1-64个字符') => } export const getActiveCategories = contents => { - const result = [] + const result = ['最近使用'] if (contents) { contents.forEach(item => { if (item.showFlag) { diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue index a9ce089c7a..310542689b 100644 --- a/core/core-frontend/src/views/template-market/index.vue +++ b/core/core-frontend/src/views/template-market/index.vue @@ -175,7 +175,7 @@ - {{ t('visualization.market_network_tips') }} + 111 {{ t('visualization.market_network_tips', [state.baseUrl]) }} @@ -428,7 +428,8 @@ const initMarketTemplate = async () => { ) state.marketActiveTab = state.marketTabs[1].label }) - .catch(() => { + .catch(err => { + console.error('searchMarket:', err) state.networkStatus = false }) } diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue index 024174e8d2..ceb892f247 100644 --- a/core/core-frontend/src/views/workbranch/index.vue +++ b/core/core-frontend/src/views/workbranch/index.vue @@ -430,7 +430,7 @@ loadShareBase() - {{ t('visualization.market_network_tips') }} + {{ t('visualization.market_network_tips', [state.baseUrl]) }}