mirror of
https://github.com/dataease/dataease.git
synced 2026-05-15 05:22:13 +08:00
refactor: 保存名称时,去掉名称开头和结尾用户添加上去的空格 #14125
This commit is contained in:
@@ -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<IResponse> => {
|
||||
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<IResponse>
|
||||
|
||||
// create
|
||||
export const createDatasetTree = async (data: DatasetOrFolder): Promise<IResponse> => {
|
||||
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<IRespons
|
||||
|
||||
// rename
|
||||
export const renameDatasetTree = async (data: DatasetOrFolder): Promise<IResponse> => {
|
||||
nameTrim(data)
|
||||
return request.post({ url: '/datasetTree/rename', data }).then(res => {
|
||||
return res?.data
|
||||
})
|
||||
|
||||
@@ -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<Dataset> => {
|
||||
nameTrim(data)
|
||||
return request.post({ url: '/datasource/save', data }).then(res => {
|
||||
return res?.data
|
||||
})
|
||||
@@ -98,6 +100,7 @@ export const perDeleteDatasource = async (id): Promise<boolean> => {
|
||||
}
|
||||
|
||||
export const update = async (data = {}): Promise<Dataset> => {
|
||||
nameTrim(data)
|
||||
return request.post({ url: '/datasource/update', data }).then(res => {
|
||||
return res?.data
|
||||
})
|
||||
@@ -110,12 +113,14 @@ export const move = async (data = {}): Promise<Dataset> => {
|
||||
}
|
||||
|
||||
export const reName = async (data = {}): Promise<Dataset> => {
|
||||
nameTrim(data)
|
||||
return request.post({ url: '/datasource/reName', data }).then(res => {
|
||||
return res?.data
|
||||
})
|
||||
}
|
||||
|
||||
export const createFolder = async (data = {}): Promise<Dataset> => {
|
||||
nameTrim(data)
|
||||
return request.post({ url: '/datasource/createFolder', data }).then(res => {
|
||||
return res?.data
|
||||
})
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@ const saveDataset = () => {
|
||||
if (result) {
|
||||
const params: Omit<DatasetOrFolder, 'nodeType'> & { nodeType: 'folder' | 'datasource' } = {
|
||||
nodeType: nodeType.value as 'folder' | 'datasource',
|
||||
name: datasetForm.name
|
||||
name: datasetForm.name.trim()
|
||||
}
|
||||
switch (cmd.value) {
|
||||
case 'move':
|
||||
|
||||
2
de-xpack
2
de-xpack
Submodule de-xpack updated: f833440765...30ca22ce09
Reference in New Issue
Block a user