diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index de62f3c7..55321003 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -154,11 +154,7 @@
@:
@: {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}
@:
- } else if(@column.EffectType == "DatePicker") {
- @:
- @:{{ formatDate(new Date(row.@(@column.LowerPropertyName)), 'YYYY-mm-dd HH:MM:SS') }}
- @:
- }
+ }
}
}
@@ -303,7 +299,7 @@ const options = useVxeTable<@(@Model.ClassName)>({
} else if(@column.EffectType == "EnumSelector") {
@:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
} else if(@column.EffectType == "DatePicker") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', formatter: ({ cellValue }) => formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS'), @whethersortable },
} else {
@:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', @whethersortable},
}
diff --git a/Web/src/layout/component/columnsAside.vue b/Web/src/layout/component/columnsAside.vue
index 7eaf2603..68b4876c 100644
--- a/Web/src/layout/component/columnsAside.vue
+++ b/Web/src/layout/component/columnsAside.vue
@@ -79,8 +79,9 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
if (route.path.startsWith(redirect)) mittBus.emit('setSendColumnsChildren', setSendChildren(redirect));
else router.push(redirect);
} else {
- if (!v.children) {
+ if (!v.children || v.children?.length === 0) {
router.push(path);
+ onColumnsAsideDown(v.k);
} else {
// 显示子级菜单
const resData: MittMenu = setSendChildren(path);
@@ -92,7 +93,7 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
// 一个路由设置自动收起菜单
// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
- if (!v.children) themeConfig.value.isCollapse = true;
+ if (!v.children || v.children?.length === 0) themeConfig.value.isCollapse = true;
else if (v.children.length > 1) themeConfig.value.isCollapse = false;
};
// 鼠标移入时,显示当前的子级菜单