From 6a7f7f4af12b0cb7a9bb392d86f1f657d2e6c6ef Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 10 Jan 2025 16:47:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=9D=E5=AD=98=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=97=B6=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BC=80=E5=A4=B4=E5=92=8C=E7=BB=93=E5=B0=BE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E5=8E=BB=E7=9A=84=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=20#14125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/api/dataset.ts | 4 ++++ core/core-frontend/src/api/datasource.ts | 5 +++++ core/core-frontend/src/utils/canvasUtils.ts | 3 ++- core/core-frontend/src/utils/utils.ts | 6 ++++++ .../views/visualized/data/datasource/form/CreatDsGroup.vue | 2 +- de-xpack | 2 +- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts index 6c5273ea65..3eeff28773 100644 --- a/core/core-frontend/src/api/dataset.ts +++ b/core/core-frontend/src/api/dataset.ts @@ -1,6 +1,7 @@ import request from '@/config/axios' import { type Field } from '@/api/chart' import type { BusiTreeRequest } from '@/models/tree/TreeNode' +import { nameTrim } from '@/utils/utils' export interface DatasetOrFolder { name: string action?: string @@ -70,6 +71,7 @@ export interface Table { // 获取权限路 // edit export const saveDatasetTree = async (data: DatasetOrFolder): Promise => { + nameTrim(data) return request.post({ url: '/datasetTree/save', data }).then(res => { return res?.data }) @@ -77,6 +79,7 @@ export const saveDatasetTree = async (data: DatasetOrFolder): Promise // create export const createDatasetTree = async (data: DatasetOrFolder): Promise => { + nameTrim(data) return request.post({ url: '/datasetTree/create', data }).then(res => { return res?.data }) @@ -84,6 +87,7 @@ export const createDatasetTree = async (data: DatasetOrFolder): Promise => { + nameTrim(data) return request.post({ url: '/datasetTree/rename', data }).then(res => { return res?.data }) diff --git a/core/core-frontend/src/api/datasource.ts b/core/core-frontend/src/api/datasource.ts index a0bb6a677c..4a6530d499 100644 --- a/core/core-frontend/src/api/datasource.ts +++ b/core/core-frontend/src/api/datasource.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import { nameTrim } from '@/utils/utils' export interface DatasetOrFolder { name: string @@ -86,6 +87,7 @@ export const latestUse = async (data = {}) => { export const validateById = (id: number) => request.get({ url: '/datasource/validate/' + id }) export const save = async (data = {}): Promise => { + nameTrim(data) return request.post({ url: '/datasource/save', data }).then(res => { return res?.data }) @@ -98,6 +100,7 @@ export const perDeleteDatasource = async (id): Promise => { } export const update = async (data = {}): Promise => { + nameTrim(data) return request.post({ url: '/datasource/update', data }).then(res => { return res?.data }) @@ -110,12 +113,14 @@ export const move = async (data = {}): Promise => { } export const reName = async (data = {}): Promise => { + nameTrim(data) return request.post({ url: '/datasource/reName', data }).then(res => { return res?.data }) } export const createFolder = async (data = {}): Promise => { + nameTrim(data) return request.post({ url: '/datasource/createFolder', data }).then(res => { return res?.data }) diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 0a9f10c651..a5fd3f0fa8 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -28,7 +28,7 @@ import { SENIOR_STYLE_SETTING_LIGHT } from '@/views/chart/components/editor/util/chart' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' -import { deepCopy } from '@/utils/utils' +import { deepCopy, nameTrim } from '@/utils/utils' import { ElMessage, ElMessageBox } from 'element-plus-secondary' import { guid } from '@/views/visualized/data/dataset/form/util' const dvMainStore = dvMainStoreWithOut() @@ -583,6 +583,7 @@ export async function canvasSave(callBack) { ElMessage.error('数据集分组名称已存在') return } + nameTrim(dvInfo.value) 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 718ee6b239..e590ce8e4c 100644 --- a/core/core-frontend/src/utils/utils.ts +++ b/core/core-frontend/src/utils/utils.ts @@ -236,3 +236,9 @@ export const getBrowserLocale = () => { export const getLocale = () => { return wsCache.get('user.language') || getBrowserLocale() || 'zh-CN' } + +export const nameTrim = (target: {}) => { + if (target.name) { + target.name = target.name.tri() + } +} diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue index 6dc953d520..2f72bcec06 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue @@ -250,7 +250,7 @@ const saveDataset = () => { if (result) { const params: Omit & { nodeType: 'folder' | 'datasource' } = { nodeType: nodeType.value as 'folder' | 'datasource', - name: datasetForm.name + name: datasetForm.name.trim() } switch (cmd.value) { case 'move': diff --git a/de-xpack b/de-xpack index f833440765..30ca22ce09 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit f833440765470bbc898e61acb3e5c0f65d7df076 +Subproject commit 30ca22ce095c756bb1dc067fc41854b760ca5739