Browse Source

🎨 修复菜单授权bug

master
wangxiang 3 years ago
parent
commit
75c3892b9e
  1. 9
      src/views/common/project/ProjectModal.vue
  2. 7
      src/views/common/project/index.vue
  3. 6
      src/views/common/project/project.data.ts

9
src/views/common/project/ProjectModal.vue

@ -37,7 +37,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data @@ -37,7 +37,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
await clearValidate();
//
tag.value = data._tag;
const topProject = { projectId: '0', name: '顶级项目', children: [] };
const topProject = { id: '0', name: '顶级项目', children: [] };
topProject.children = listToTree(await listProject());
await updateSchema({
field: 'parentId',
@ -45,17 +45,17 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data @@ -45,17 +45,17 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
treeData: [topProject]
}
});
const projectId = data.record?.projectId;
const id = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false };
// tag
switch (unref(tag)) {
case 'add':
props.title = '新增项目';
projectId && await setFieldsValue({ parentId: projectId });
id && await setFieldsValue({ parentId: id });
break;
case 'edit':
props.title = '编辑项目';
await setFieldsValue(await getProject(projectId));
await setFieldsValue(await getProject(id));
break;
}
// :
@ -85,5 +85,4 @@ async function handleSubmit() { @@ -85,5 +85,4 @@ async function handleSubmit() {
setModalProps({ confirmLoading: false });
}
}
</script>

7
src/views/common/project/index.vue

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
<template>
<div>
<BasicTable @register="registerTable">
@ -65,7 +64,7 @@ const [registerModal, { openModal }] = useModal(); @@ -65,7 +64,7 @@ const [registerModal, { openModal }] = useModal();
const [registerTable, { reload, expandAll, collapseAll }] = useTable({
title: '项目列表',
api: listProject,
rowKey: 'projectId',
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
@ -88,7 +87,7 @@ const [registerTable, { reload, expandAll, collapseAll }] = useTable({ @@ -88,7 +87,7 @@ const [registerTable, { reload, expandAll, collapseAll }] = useTable({
slots: { customRender: 'action' },
fixed: false
},
afterFetch: (result) => listToTree(result, { id: 'projectId' })
afterFetch: (result) => listToTree(result)
});
/** 新增按钮操作,行内新增与工具栏局域新增通用 */
@ -103,7 +102,7 @@ function handleEdit(record: Recordable) { @@ -103,7 +102,7 @@ function handleEdit(record: Recordable) {
/** 删除按钮操作,行内删除 */
async function handleDel(record: Recordable) {
await delProject(record.projectId);
await delProject(record.id);
createMessage.success('删除成功!');
handleRefreshTable();
}

6
src/views/common/project/project.data.ts

@ -84,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [ @@ -84,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [
/** 表单配置 */
export const formSchema: FormSchema[] = [
{
field: 'projectId',
field: 'id',
label: 'ID',
component: 'Input',
show: false
@ -97,8 +97,8 @@ export const formSchema: FormSchema[] = [ @@ -97,8 +97,8 @@ export const formSchema: FormSchema[] = [
componentProps: {
replaceFields: {
title: 'name',
key: 'projectId',
value: 'projectId',
key: 'id',
value: 'id',
},
getPopupContainer: () => document.body,
}

Loading…
Cancel
Save