合并

src/views/menu/menu.data.ts

@@ -11,12 +11,6 @@ export const columns: BasicColumn[] = [
     width: 200,
     align: 'left',
   },
-  {
-    title: '菜单标题',
-    dataIndex: 'meta.title',
-    width: 200,
-    align: 'left',
-  },
   {
     title: '图标',
     dataIndex: 'icon',
@@ -36,7 +30,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '排序',
-    dataIndex: 'order_no',
+    dataIndex: 'orderNo',
     width: 50,
   },
   {
@@ -59,7 +53,7 @@ export const columns: BasicColumn[] = [
 ];
 
 const isDir = (type: string) => type === '0';
-// const isMenu = (type: string) => type === '1';
+const isMenu = (type: string) => type === '1';
 const isButton = (type: string) => type === '2';
 
 export const searchFormSchema: FormSchema[] = [
@@ -84,40 +78,34 @@ export const searchFormSchema: FormSchema[] = [
 ];
 
 export const formSchema: FormSchema[] = [
-  // {
-  //   field: 'type',
-  //   label: '菜单类型',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: '0',
-  //   componentProps: {
-  //     options: [
-  //       { label: '目录', value: '0' },
-  //       { label: '菜单', value: '1' },
-  //       { label: '按钮', value: '2' },
-  //     ],
-  //   },
-  //   colProps: { lg: 24, md: 24 },
-  // },
   {
-    field: 'name',
+    field: 'type',
-    label: '菜单名称',
+    label: '菜单类型',
-    component: 'Input',
+    component: 'RadioButtonGroup',
-    required: true,
+    defaultValue: '0',
+    componentProps: {
+      options: [
+        { label: '目录', value: '0' },
+        { label: '菜单', value: '1' },
+        { label: '按钮', value: '2' },
+      ],
+    },
+    colProps: { lg: 24, md: 24 },
   },
   {
-    field: 'title',
+    field: 'menuName',
-    label: '菜单标题',
+    label: '菜单名称',
     component: 'Input',
     required: true,
   },
 
   {
-    field: 'parent',
+    field: 'parentMenu',
     label: '上级菜单',
     component: 'TreeSelect',
     componentProps: {
       replaceFields: {
-        title: 'name',
+        title: 'menuName',
         key: 'id',
         value: 'id',
       },
@@ -126,36 +114,31 @@ export const formSchema: FormSchema[] = [
   },
 
   {
-    field: 'order_no',
+    field: 'orderNo',
     label: '排序',
-    defaultValue: 0,
     component: 'InputNumber',
-    componentProps: {
-      min: 0,
-    },
     required: true,
   },
   {
     field: 'icon',
     label: '图标',
     component: 'IconPicker',
+    required: true,
     show: ({ values }) => !isButton(values.type),
   },
 
   {
-    field: 'path',
+    field: 'routePath',
     label: '路由地址',
     component: 'Input',
     required: true,
-    // show: ({ values }) => !isButton(values.type),
+    show: ({ values }) => !isButton(values.type),
   },
-
   {
     field: 'component',
     label: '组件路径',
     component: 'Input',
-    required: true,
+    show: ({ values }) => isMenu(values.type),
-    // show: ({ values }) => isMenu(values.type),
   },
   {
     field: 'permission',
@@ -163,75 +146,57 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     show: ({ values }) => !isDir(values.type),
   },
-  // {
-  //   field: 'isRedirect',
-  //   label: '是否重定向',
-  //   component: 'RadioButtonGroup',
-  //   defaultValue: 0,
-  //   componentProps: {
-  //     options: [
-  //       { label: '是', value: 1 },
-  //       { label: '否', value: 0 },
-  //     ],
-  //   },
-  // },
-  // {
-  //   field: 'redirect',
-  //   label: '路由重定向',
-  //   component: 'Input',
-  //   show: ({ values }) => !!values.isRedirect,
-  // },
   {
     field: 'status',
     label: '状态',
     component: 'RadioButtonGroup',
-    defaultValue: 1,
+    defaultValue: '0',
     componentProps: {
       options: [
-        { label: '启用', value: 1 },
+        { label: '启用', value: '0' },
-        { label: '禁用', value: 0 },
+        { label: '禁用', value: '1' },
       ],
     },
   },
-  // {
+  {
-  //   field: 'isExt',
+    field: 'isExt',
-  //   label: '是否外链',
+    label: '是否外链',
-  //   component: 'RadioButtonGroup',
+    component: 'RadioButtonGroup',
-  //   defaultValue: '0',
+    defaultValue: '0',
-  //   componentProps: {
+    componentProps: {
-  //     options: [
+      options: [
-  //       { label: '否', value: '0' },
+        { label: '否', value: '0' },
-  //       { label: '是', value: '1' },
+        { label: '是', value: '1' },
-  //     ],
+      ],
-  //   },
+    },
-  //   show: ({ values }) => !isButton(values.type),
+    show: ({ values }) => !isButton(values.type),
-  // },
+  },
 
-  // {
+  {
-  //   field: 'keepalive',
+    field: 'keepalive',
-  //   label: '是否缓存',
+    label: '是否缓存',
-  //   component: 'RadioButtonGroup',
+    component: 'RadioButtonGroup',
-  //   defaultValue: '0',
+    defaultValue: '0',
-  //   componentProps: {
+    componentProps: {
-  //     options: [
+      options: [
-  //       { label: '否', value: '0' },
+        { label: '否', value: '0' },
-  //       { label: '是', value: '1' },
+        { label: '是', value: '1' },
-  //     ],
+      ],
-  //   },
+    },
-  //   show: ({ values }) => isMenu(values.type),
+    show: ({ values }) => isMenu(values.type),
-  // },
+  },
 
-  // {
+  {
-  //   field: 'show',
+    field: 'show',
-  //   label: '是否显示',
+    label: '是否显示',
-  //   component: 'RadioButtonGroup',
+    component: 'RadioButtonGroup',
-  //   defaultValue: '0',
+    defaultValue: '0',
-  //   componentProps: {
+    componentProps: {
-  //     options: [
+      options: [
-  //       { label: '是', value: '0' },
+        { label: '是', value: '0' },
-  //       { label: '否', value: '1' },
+        { label: '否', value: '1' },
-  //     ],
+      ],
-  //   },
+    },
-  //   show: ({ values }) => !isButton(values.type),
+    show: ({ values }) => !isButton(values.type),
-  // },
+  },
 ];

src/views/sys/login/LoginForm.vue

@@ -107,8 +107,8 @@ const loading = ref(false);
 const rememberMe = ref(false);
 
   const formData = reactive({
-  account: '',
+    account: 'admin',
-  password: '',
+    password: '123456',
   });
 
 const { validForm } = useFormValid(formRef);