Merge remote-tracking branch 'origin/dev' into dev

pull/92/head
李强 2023-04-05 00:34:45 +08:00
commit 288e92aefe
3 changed files with 15 additions and 20 deletions

View File

@ -27,6 +27,7 @@ class SystemConfigCreateSerializer(CustomModelSerializer):
"""
form_item_type_label = serializers.CharField(source='get_form_item_type_display', read_only=True)
class Meta:
model = SystemConfig
fields = "__all__"

View File

@ -182,17 +182,12 @@
</vxe-column>
<vxe-column title="操作" width="100" show-overflow>
<template #default="{ row,index }">
<el-popover
placement="top"
width="160"
v-model="childRemoveVisible">
<p>删除后无法恢复,确定删除吗</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="childRemoveVisible = false">取消</el-button>
<el-button type="primary" size="mini" @click="onRemoveChild(row,index,item.key)"></el-button>
</div>
<el-button type="text" slot="reference">删除</el-button>
</el-popover>
<el-popconfirm
title="删除后无法恢复,确定删除吗?"
@confirm="onRemoveChild(row,index,item.key)"
>
<el-button slot="reference" type="text" >删除</el-button>
</el-popconfirm>
</template>
</vxe-column>
</vxe-table>
@ -350,8 +345,8 @@ export default {
if (!child.id && child.key && child.value) {
child.parent = parentId
child.id = null
this.formList.push(child)
}
this.formList.push(child)
}
//
for (const arr of item.rule) {
@ -400,21 +395,19 @@ export default {
const { tableData } = $table.getTableData()
const tableLength = tableData.length
if (tableLength === 0) {
const { row: newRow } = $table.insert()
console.log(newRow)
const { row } = $table.insert()
} else {
const errMap = await $table.validate().catch(errMap => errMap)
if (errMap) {
this.$message.error('校验不通过!')
} else {
const { row: newRow } = $table.insert()
console.log(newRow)
const { row } = $table.insert()
console.log(row)
}
}
},
//
onRemoveChild (row, index, refName) {
console.log(row, index)
if (row.id) {
api.DelObj(row.id).then(res => {
this.refreshView()
@ -422,8 +415,7 @@ export default {
} else {
this.childTableData.splice(index, 1)
const tableName = 'xTable_' + refName
const tableData = this.$refs[tableName][0].remove(row)
console.log(tableData)
this.$refs[tableName][0].remove(row)
}
},
//

View File

@ -64,7 +64,9 @@
<addContent></addContent>
</el-col>
</el-row>
<formContent v-else :options="item" :editableTabsItem="item"></formContent>
<div v-else>
<formContent v-if="item.key===editableTabsValue" :options="item" :editableTabsItem="item"></formContent>
</div>
</el-tab-pane>
</el-tabs>
</d2-container>