From ddac238fa0d3fb3fa8d25ee2bb64b7fe9aa60ec5 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 20 Jan 2025 10:35:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=99=90=E5=88=B6=E7=BA=AF?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/canvasUtils.ts | 2 +- core/core-frontend/src/utils/utils.ts | 9 ++++++++- .../src/views/common/DeResourceGroupOpt.vue | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 9d860adccd..50cdc8060c 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -585,7 +585,7 @@ export async function canvasSave(callBack) { ElMessage.error('数据集分组名称已存在') return } - nameTrim(dvInfo.value) + nameTrim(dvInfo.value, t('components.length_1_64_characters')) const method = dvInfo.value.id && dvInfo.value.optType !== 'copy' ? updateCanvas : saveCanvas if (method === updateCanvas) { await dvNameCheck({ diff --git a/core/core-frontend/src/utils/utils.ts b/core/core-frontend/src/utils/utils.ts index ceb6eb0921..f02de62423 100644 --- a/core/core-frontend/src/utils/utils.ts +++ b/core/core-frontend/src/utils/utils.ts @@ -1,6 +1,9 @@ import { BusiTreeNode } from '@/models/tree/TreeNode' import { useCache } from '@/hooks/web/useCache' import { loadScript } from '@/utils/RemoteJs' +import { ElMessage } from 'element-plus-secondary' +import { useI18n } from '@/hooks/web/useI18n' +const { t } = useI18n() const { wsCache } = useCache() export function deepCopy(target) { @@ -283,8 +286,12 @@ export const filterFreeFolder = (list, flagText) => { } } } -export const nameTrim = (target: {}) => { +export const nameTrim = (target: {}, msg = '名称字段长度1-64个字符') => { if (target.name) { target.name = target.name.trim() + if (target.name.length < 1 || target.name.length > 64) { + ElMessage.warning(msg) + throw new Error(msg) + } } } diff --git a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue index e3ae7290e9..e50ae35a90 100644 --- a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue +++ b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue @@ -273,7 +273,7 @@ const saveResource = () => { params.pid = resourceForm.pid || pid.value || '0' break } - nameTrim(params) + nameTrim(params, t('components.length_1_64_characters')) if (cmd.value === 'move' && !checkParent(params)) { return } @@ -291,7 +291,7 @@ const saveResource = () => { loading.value = false resourceDialogShow.value = false emits('finish') - ElMessage.success('保存成功') + ElMessage.success(t('visualization.save_success')) if (cmd.value === 'copy') { const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank' const baseUrl =