dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7425 from dataease/pr@dev-v2_dzz

Browse Source 
Pr@dev v2 dzz
This commit is contained in:
dataeaseShu 2023-12-28 09:49:30 +08:00 committed by GitHub
commit 0541574096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/dashboard/DbToolbar.vue
View File

@ -66,7 +66,7 @@ const closeEditCanvasName = () => {
return return
} }
if (inputName.value.trim().length > 64 || inputName.value.trim().length < 2) { if (inputName.value.trim().length > 64 || inputName.value.trim().length < 2) {
ElMessage.warning('名称字段长度不能2-64个字符') ElMessage.warning('名称字段长度2-64个字符')
editCanvasName() editCanvasName()
return return
} }

2
core/core-frontend/src/components/data-visualization/DvToolbar.vue
View File

@ -34,7 +34,7 @@ const closeEditCanvasName = () => {
return return
} }
if (inputName.value.trim().length > 64 || inputName.value.trim().length < 2) { if (inputName.value.trim().length > 64 || inputName.value.trim().length < 2) {
ElMessage.warning('名称字段长度不能2-64个字符') ElMessage.warning('名称字段长度2-64个字符')
editCanvasName() editCanvasName()
return return
} }

8
core/core-frontend/src/views/visualized/data/datasource/form/ApiVariable.vue
View File

@ -63,7 +63,7 @@ const typeChange = item => {
} }
const remove = (index: number) => { const remove = (index: number) => {
if (isDisable(index)) return if (isDisable()) return
// 移除整行输入控件及内容 // 移除整行输入控件及内容
parameters.value.splice(index, 1) parameters.value.splice(index, 1)
} }
@ -77,8 +77,8 @@ const change = () => {
}) })
) )
} }
const isDisable = (index: number) => { const isDisable = () => {
return parameters.value.length - 1 === index return parameters.value.length === 1
} }
const querySearch = (queryString, cb) => { const querySearch = (queryString, cb) => {
const results = queryString const results = queryString
@ -169,7 +169,7 @@ const createFilter = (queryString: string) => {
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<el-button text :disabled="isDisable(index) || isReadOnly" @click="remove(index)"> <el-button text :disabled="isDisable() || isReadOnly" @click="remove(index)">
<template #icon> <template #icon>
<Icon name="icon_delete-trash_outlined"></Icon> <Icon name="icon_delete-trash_outlined"></Icon>
</template> </template>