Skip to content

feat(CRUD):支持点击添加字段，比拖拽方便一点 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

feat(CRUD):支持点击添加字段，比拖拽方便一点 #46

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19b7cd2
feat(CRUD):支持点击添加字段，比拖拽方便一点
ximu-tao Feb 17, 2025
a069318
Merge remote-tracking branch 'origin/v2' into v2
ximu-tao Feb 17, 2025
7b68e44
Merge remote-tracking branch 'origin/v2' into v2
ximu-tao Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 61 additions & 44 deletions web/src/views/backend/crud/design.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,21 @@
<el-collapse class="field-collapse" v-model="state.fieldCollapseName">
<el-collapse-item :title="t('crud.crud.Common Fields')" name="common">
<div class="field-box" :ref="tabsRefs.set">
<div v-for="(field, index) in fieldItem.common" :key="index" class="field-item">
<div v-for="(field, index) in fieldItem.common" :key="index" class="field-item" @click.stop="clickAddSortable(field)">
<span>{{ field.title }}</span>
</div>
</div>
</el-collapse-item>
<el-collapse-item :title="t('crud.crud.Base Fields')" name="base">
<div class="field-box" :ref="tabsRefs.set">
<div v-for="(field, index) in fieldItem.base" :key="index" class="field-item">
<div v-for="(field, index) in fieldItem.base" :key="index" class="field-item" @click.stop="clickAddSortable(field)">
<span>{{ field.title }}</span>
</div>
</div>
</el-collapse-item>
<el-collapse-item :title="t('crud.crud.Advanced Fields')" name="senior">
<div class="field-box" :ref="tabsRefs.set">
<div v-for="(field, index) in fieldItem.senior" :key="index" class="field-item">
<div v-for="(field, index) in fieldItem.senior" :key="index" class="field-item" @click.stop="clickAddSortable(field)">
<span>{{ field.title }}</span>
</div>
</div>
Expand Down Expand Up @@ -1381,6 +1381,55 @@ const autoRenameRepeatField = (fieldName: string) => {
}
}

const tableFieldAdd = (field?: FieldItem, position?: number) => {
const data = handleFieldAttr(cloneDeep(field!))

// 主键重复检测
if (data.primaryKey) {
if (primaryKeyRepeatCheck(data)) {
// 设置为默认排序字段、快速搜索字段
state.table.defaultSortField = data.name
state.table.quickSearchField.push(data.name)
} else {
return false;
}
}

// 出现权重字段则以其排序
if (data.designType == 'weigh') {
state.table.defaultSortField = data.name
}

// name 重复时，自动重命名
data.name = autoRenameRepeatField(data.name)

// 插入字段
state.fields.splice(position!, 0, data)

logTableDesignChange({
type: 'add-field',
index: position!,
newName: data.name,
oldName: '',
after: position === 0 ? 'FIRST FIELD' : state.fields[position! - 1].name,
})

// 远程下拉参数预填
if (['remoteSelect', 'remoteSelects'].includes(data.designType)) {
showRemoteSelectPre(position!, true)
}

// 表单表格字段预定义
if (!data.formBuildExclude) {
state.table.formFields.push(data.name)
}
if (!data.tableBuildExclude) {
state.table.columnFields.push(data.name)
}

return true
}

onMounted(() => {
loadData()
const sortable = Sortable.create(designWindowRef.value, {
Expand All @@ -1393,47 +1442,8 @@ onMounted(() => {
if (field && field[evt.oldIndex!]) {
const data = handleFieldAttr(cloneDeep(field[evt.oldIndex!]))

// 主键重复检测
if (data.primaryKey) {
if (primaryKeyRepeatCheck(data)) {
// 设置为默认排序字段、快速搜索字段
state.table.defaultSortField = data.name
state.table.quickSearchField.push(data.name)
} else {
return evt.item.remove()
}
}

// 出现权重字段则以其排序
if (data.designType == 'weigh') {
state.table.defaultSortField = data.name
}

// name 重复时，自动重命名
data.name = autoRenameRepeatField(data.name)

// 插入字段
state.fields.splice(evt.newIndex!, 0, data)

logTableDesignChange({
type: 'add-field',
index: evt.newIndex!,
newName: data.name,
oldName: '',
after: evt.newIndex === 0 ? 'FIRST FIELD' : state.fields[evt.newIndex! - 1].name,
})

// 远程下拉参数预填
if (['remoteSelect', 'remoteSelects'].includes(data.designType)) {
showRemoteSelectPre(evt.newIndex!, true)
}

// 表单表格字段预定义
if (!data.formBuildExclude) {
state.table.formFields.push(data.name)
}
if (!data.tableBuildExclude) {
state.table.columnFields.push(data.name)
if ( !tableFieldAdd(data, evt.newIndex) ){
evt.item.remove()
}
}
evt.item.remove()
Expand Down Expand Up @@ -1482,6 +1492,13 @@ onMounted(() => {
})
})

const clickAddSortable = (field: FieldItem) => {
if (field) {
const data = handleFieldAttr(cloneDeep(field))
tableFieldAdd(data, state.fields.length)
}
}

/**
* 修改表名
* @param val 新表名
Expand Down