fix: bug#10455 10451 10448

This commit is contained in:
leiqiaochu 2023-03-16 15:29:13 +08:00
parent 914e495f2e
commit 1a3c10b18d
5 changed files with 27 additions and 8 deletions

View File

@ -93,7 +93,13 @@ const formModel = ref<formState>({
description: '', description: '',
}); });
const rules = ref({ const rules = ref({
name: [{ required: true, message: '请输入名称', trigger: 'blur' }], name: [
{ required: true, message: '请输入名称', trigger: 'blur' },
{
max: 64,
message: '最多可输入64个字符',
},
],
sortIndex: [{ required: true, message: '请输入排序', trigger: 'blur' }], sortIndex: [{ required: true, message: '请输入排序', trigger: 'blur' }],
}); });
const visible = ref(false); const visible = ref(false);
@ -112,7 +118,7 @@ const submitData = async () => {
addParams.value = { addParams.value = {
...formModel.value, ...formModel.value,
// sortIndex: // sortIndex:
// childArr.value[childArr.value.length - 1].sortIndex + 1, // childArr.value[childArr.value.length - 1].sortIndex + 1,
parentId: addObj.value.id, parentId: addObj.value.id,
}; };
} else if (props.isChild === 2) { } else if (props.isChild === 2) {

View File

@ -10,7 +10,7 @@
ref="tableRef" ref="tableRef"
:columns="table.columns" :columns="table.columns"
:dataSource="dataSource" :dataSource="dataSource"
model="table" model="TABLE"
:defaultParams="{ :defaultParams="{
paging: false, paging: false,
sorts: [ sorts: [
@ -35,7 +35,7 @@
</PermissionButton> </PermissionButton>
</template> </template>
<template #action="slotProps"> <template #action="slotProps">
<j-space :size="16"> <j-space>
<template <template
v-for="i in getActions(slotProps, 'table')" v-for="i in getActions(slotProps, 'table')"
:key="i.key" :key="i.key"
@ -222,23 +222,31 @@ const getActions = (
const table = reactive({ const table = reactive({
columns: [ columns: [
{ title: '名称', dataIndex: 'name', key: 'name' }, {
title: '名称',
dataIndex: 'name',
key: 'name',
ellipsis: true,
width:600
},
{ {
title: '排序', title: '排序',
dataIndex: 'sortIndex', dataIndex: 'sortIndex',
key: 'sortIndex', key: 'sortIndex',
scopedSlots: true, scopedSlots: true,
width:200
}, },
{ {
title: '说明', title: '说明',
dataIndex: 'description', dataIndex: 'description',
key: 'description', key: 'description',
width:700
}, },
{ {
title: '操作', title: '操作',
key: 'action', key: 'action',
fixed: 'right', fixed: 'right',
width: 250, ellipsis: true,
scopedSlots: true, scopedSlots: true,
}, },
], ],

View File

@ -269,7 +269,8 @@
<!-- 选择设备 --> <!-- 选择设备 -->
<j-modal <j-modal
title="设备接入配置" title="设备接入配置"
:visible="visible" v-if="visible"
visible
width="1200px" width="1200px"
okText="确定" okText="确定"
cancelText="取消" cancelText="取消"
@ -280,6 +281,7 @@
:columns="query.columns" :columns="query.columns"
target="deviceModal" target="deviceModal"
@search="search" @search="search"
type='simple'
/> />
<JProTable <JProTable
:columns="query.columns" :columns="query.columns"
@ -442,6 +444,7 @@ const showModal = () => {
* 关闭弹窗 * 关闭弹窗
*/ */
const cancel = () => { const cancel = () => {
queryParams.value = {};
visible.value = false; visible.value = false;
}; };
/** /**
@ -968,6 +971,7 @@ const submitData = async () => {
message.success('操作成功!'); message.success('操作成功!');
} }
visible.value = false; visible.value = false;
queryParams.value = {};
}); });
} }
} else { } else {

View File

@ -125,6 +125,7 @@
placeholder="请选择产品分类" placeholder="请选择产品分类"
:tree-data="treeList" :tree-data="treeList"
@change="valueChange" @change="valueChange"
allow-clear
:fieldNames="{ label: 'name', value: 'id' }" :fieldNames="{ label: 'name', value: 'id' }"
:filterTreeNode=" :filterTreeNode="
(v, option) => filterSelectNode(v, option) (v, option) => filterSelectNode(v, option)

View File

@ -202,7 +202,7 @@ const columns = [
scopedSlots: true, scopedSlots: true,
}, },
{ {
title: '名称', title: '产品名称',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
}, },