Merge branch 'main' of https://git.light120.com/zc/admin_core

src/views/system/sys_menu.vue

@@ -266,6 +266,7 @@ export default {
     async initCol() {
       let res = await menuServer.modelAll()
 
+      if ( res.data &&  typeof res.data === 'array') {
         let data = res.data.map((row) => {
           let { id, key, name } = row
           let value = key
@@ -276,6 +277,7 @@ export default {
           return { id, value, key }
         })
         this.modelRows = [{ id: 0, value: '自定义模板', key: 'custom_template' }, ...data] || []
+      }
     },
 
     calculate() {
@@ -400,6 +402,17 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
+.content-view {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
 
+.table-body {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
 </style>