diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 5725b06a..6e64375d 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -97,49 +97,58 @@ let tableColumns: ColumnsType = [ title: t('views.system.menu.menuName'), dataIndex: 'menuName', align: 'left', + width: 200, }, { title: t('views.system.menu.menuId'), dataIndex: 'menuId', - align: 'center', + align: 'left', + width: 120, }, { title: t('views.system.menu.menuSort'), dataIndex: 'menuSort', - align: 'center', + align: 'left', + width: 100, }, { title: t('views.system.menu.menuTitle'), dataIndex: 'icon', key: 'icon', align: 'center', + width: 100, }, { title: t('views.system.menu.perId'), dataIndex: 'perms', align: 'left', + width: 200, }, { title: t('views.system.menu.formLoc'), dataIndex: 'component', align: 'left', + width: 200, }, { title: t('views.system.menu.status'), dataIndex: 'visible', key: 'visible', align: 'center', + width: 120, }, { title: t('views.system.menu.menuStatus'), dataIndex: 'status', key: 'status', align: 'center', + width: 120, }, { title: t('views.system.menu.createTime'), dataIndex: 'createTime', align: 'center', + width: 150, customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); @@ -148,7 +157,7 @@ let tableColumns: ColumnsType = [ { title: t('common.operate'), key: 'menuId', - align: 'center', + align: 'left', }, ]; @@ -419,7 +428,7 @@ function fnModalCancel() { function fnRecordDelete(menuId: string | number) { Modal.confirm({ title: t('common.tipTitle'), - content: t('views.system.menu.menuInfo', { menuId }), + content: t('views.system.menu.delSure', { menuId }), onOk() { const key = 'delMenu'; message.loading({ content: t('common.loading'), key }); @@ -634,7 +643,7 @@ onMounted(() => { :size="tableState.size" :row-class-name="fnTableStriped" :pagination="false" - :scroll="{ x: true }" + :scroll="{ x: tableColumns.length * 150 }" children-column-name="children" :expanded-row-keys="tableState.expandedRowKeys" @expandedRowsChange="fnTableExpandedRowsChange" @@ -719,34 +728,42 @@ onMounted(() => { :title="modalState.title" @cancel="fnModalCancel" > - + + + + + + + + {{ modalState.from.menuName }} + - - - - - - - {{ modalState.from.menuId }} - + { - - {{ modalState.from.menuName }} - - - { - + { :gutter="16" v-if="modalState.from.menuType !== MENU_TYPE_BUTTON" > - + {{ @@ -840,7 +849,7 @@ onMounted(() => { - + { - + {{ @@ -866,7 +875,7 @@ onMounted(() => { - + { {{ modalState.from.perms }} - + {{ modalState.from.remark }} @@ -909,11 +925,18 @@ onMounted(() => { @ok="fnModalOk" @cancel="fnModalCancel" > - + { - + { :label="t('views.system.menu.formLoc')" name="component" v-bind="modalStateFrom.validateInfos.component" + :label-col="{ span: 3 }" + :label-wrap="true" v-if="modalState.from.menuType === MENU_TYPE_MENU" > @@ -1126,6 +1156,8 @@ onMounted(() => { name="perms" v-if="modalState.from.menuType !== MENU_TYPE_DIR" v-bind="modalStateFrom.validateInfos.perms" + :label-col="{ span: 3 }" + :label-wrap="true" >