From 229ed8ad45a2e70a95c503b871f4ea8770deedf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
<42510293+ziyujiahao@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:40:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=96=87?=
=?UTF-8?q?=E6=A1=88=E6=A0=B7=E5=BC=8F=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* refactor: UI
* refactor: UI
* refactor: UI
* refactor: UI
* refactor: 优化文案样式等
---
core/core-frontend/src/locales/en.ts | 4 ++++
core/core-frontend/src/locales/tw.ts | 4 ++++
core/core-frontend/src/locales/zh-CN.ts | 4 ++++
.../src/views/chart/components/editor/index.vue | 2 +-
.../views/template-market/component/CategoryTemplateV2.vue | 3 ---
core/core-frontend/src/views/template-market/index.vue | 5 ++---
core/core-frontend/src/views/workbranch/index.vue | 2 +-
.../java/io/dataease/api/template/vo/MarketMetaDataVO.java | 2 +-
8 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index d27f1fd1c7..e22264505a 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -119,5 +119,9 @@ export default {
minute_limit: 'Minutes cannot be less than 1 and greater than 59',
hour_limit: 'Hours cannot be less than 1 and greater than 23',
day_limit: 'Days cannot be less than 1 and greater than 31'
+ },
+ template_manage: {
+ name_already_exists_type: 'Classification name already exists',
+ the_same_category: 'The template name already exists under the same category'
}
}
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 863796e0a5..68e07d703e 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -148,5 +148,9 @@ export default {
minute_limit: '分鍾不能小於1，大於59',
hour_limit: '小時不能小於1，大於23',
day_limit: '天不能小於1，大於31'
+ },
+ template_manage: {
+ name_already_exists_type: '分类名称已存在',
+ the_same_category: '同一分类下，该模板名称已存在'
}
}
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index e97fe4a9e6..272ff5915d 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2127,5 +2127,9 @@ export default {
autoCreateUser: '第三方自动创建用户',
dsIntervalTime: '数据源检测时间间隔',
dsExecuteTime: '数据源检测频率'
+ },
+ template_manage: {
+ name_already_exists_type: '分类名称已存在',
+ the_same_category: '同一分类下，该模板名称已存在'
}
}
diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index 2c3721957d..192685cb88 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1082,7 +1082,7 @@ const calcEle = () => {
const setCacheId = () => {
nextTick(() => {
- if (!cacheId || !!view.value.tableId) return
+ if (!cacheId || !!view.value.tableId || templateStatusShow.value) return
view.value.tableId = cacheId as unknown as number
})
}
diff --git a/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue b/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue
index 30797a68eb..f32c06b02a 100644
--- a/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue
+++ b/core/core-frontend/src/views/template-market/component/CategoryTemplateV2.vue
@@ -42,9 +42,6 @@ const searchResult = computed(
)
const showFlagCheck = template => {
- if (!template.categoryNames) {
- console.log('===templateTest' + JSON.stringify(template))
- }
return template.showFlag && template.categoryNames?.includes(props.label)
}
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index 87f9e14cfb..6655b71054 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -174,7 +174,7 @@ const close = () => {
emits('close')
}
-const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模版新建'))
+const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模板新建'))
const state = reactive({
initReady: true,
@@ -273,7 +273,6 @@ const categoriesComputed = computed(() => {
category => category.source === 'public' || category.source === state.templateSourceType
)
}
- console.log('categoriesComputed=' + JSON.stringify(result))
return result
})
@@ -456,7 +455,7 @@ const templateShow = templateItem => {
const templatePreview = previewId => {
if (state.curPosition === 'branch') {
- // 模版中心模式
+ // 模板中心模式
state.templatePreviewId = previewId
previewModel.value = 'marketPreview'
} else {
diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue
index cb447cb1cf..34cbd5c8b1 100644
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@@ -297,7 +297,7 @@ initMarketTemplate()
- 使用模版新建
+ 使用模板新建
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java
index 2f3471c5f6..33aebc8343 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/template/vo/MarketMetaDataVO.java
@@ -16,7 +16,7 @@ public class MarketMetaDataVO {
private String value;
private String label;
- // market 模板中心 manage 模版管理 public 公共
+ // market 模板中心 manage 模板管理 public 公共
private String source = CommonConstants.TEMPLATE_SOURCE.MARKET;
public MarketMetaDataVO(String value, String label) {