diff --git a/apps/web-antd/src/components/tree/src/menu-select-table.vue b/apps/web-antd/src/components/tree/src/menu-select-table.vue index 2a554a14a..6251f5c9e 100644 --- a/apps/web-antd/src/components/tree/src/menu-select-table.vue +++ b/apps/web-antd/src/components/tree/src/menu-select-table.vue @@ -36,7 +36,7 @@ defineOptions({ const props = withDefaults( defineProps<{ - checkedKeys: (number | string)[]; + checkedKeys?: (number | string)[]; defaultExpandAll?: boolean; menus: MenuOption[]; }>(), @@ -168,7 +168,9 @@ function setCheckedByKeys( if (keys.includes(permission.id)) { permission.checked = true; // 手动触发onChange来选中 节点独立情况不需要处理 - triggerOnchange && handlePermissionChange(item); + if (triggerOnchange) { + handlePermissionChange(item); + } } }); } @@ -298,7 +300,9 @@ function getKeys(records: MenuPermissionOption[], addCurrent: boolean) { allKeys.push(...keys); } else { // 当前行的id - addCurrent && allKeys.push(item.id); + if (addCurrent) { + allKeys.push(item.id); + } // 当前行权限id 获取已经选中的 if (item.permissions && item.permissions.length > 0) { const ids = item.permissions @@ -360,7 +364,13 @@ defineExpose({ option-type="button" @change="handleAssociationChange" /> - + - - diff --git a/apps/web-antd/src/views/system/role/data.tsx b/apps/web-antd/src/views/system/role/data.tsx index f84391ea2..f314da9d4 100644 --- a/apps/web-antd/src/views/system/role/data.tsx +++ b/apps/web-antd/src/views/system/role/data.tsx @@ -70,9 +70,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'dataScope', slots: { default: ({ row }) => { - const found = authScopeOptions.find( - (item) => item.value === row.dataScope, - ); + const found = authScopeOptions.find((item) => item.value === row.dataScope); if (found) { return {found.label}; } @@ -132,6 +130,9 @@ export const drawerSchema: FormSchemaGetter = () => [ label: '角色排序', rules: 'required', defaultValue: 1, + componentProps: { + rootClass: 'flex-1', + }, }, { component: 'Select', diff --git a/apps/web-antd/src/views/演示使用自行删除/form/index.vue b/apps/web-antd/src/views/演示使用自行删除/form/index.vue index 3126a03a9..3cf2aebc6 100644 --- a/apps/web-antd/src/views/演示使用自行删除/form/index.vue +++ b/apps/web-antd/src/views/演示使用自行删除/form/index.vue @@ -1,19 +1,19 @@ @@ -398,9 +401,6 @@ function handleSetFormValue() {

-