Browse Source

调整 存储列设置

王飞 1 year ago
parent
commit
1852706442

+ 3 - 3
mock/menu/index.ts

@@ -211,7 +211,7 @@ export default [
                       noTagsView: true,
                       noCache: true,
                       hidden: true,
-                      showMainRoute: true,
+                      canTo: true,
                       activeMenu: '/example/example-page',
                       permission: ['delete', 'add']
                     }
@@ -229,7 +229,7 @@ export default [
                       noTagsView: true,
                       noCache: true,
                       hidden: true,
-                      showMainRoute: true,
+                      canTo: true,
                       activeMenu: '/example/example-page',
                       permission: ['delete', 'add']
                     }
@@ -247,7 +247,7 @@ export default [
                       noTagsView: true,
                       noCache: true,
                       hidden: true,
-                      showMainRoute: true,
+                      canTo: true,
                       activeMenu: '/example/example-page',
                       permission: ['delete', 'edit']
                     }

+ 7 - 7
mock/role/index.ts

@@ -67,7 +67,7 @@ const adminList = [
           noTagsView: true,
           noCache: true,
           hidden: true,
-          showMainRoute: true,
+          canTo: true,
           activeMenu: '/example/example-page'
         }
       },
@@ -80,7 +80,7 @@ const adminList = [
           noTagsView: true,
           noCache: true,
           hidden: true,
-          showMainRoute: true,
+          canTo: true,
           activeMenu: '/example/example-page'
         }
       },
@@ -93,7 +93,7 @@ const adminList = [
           noTagsView: true,
           noCache: true,
           hidden: true,
-          showMainRoute: true,
+          canTo: true,
           activeMenu: '/example/example-page'
         }
       }
@@ -406,7 +406,7 @@ const menus = [
             noTagsView: true,
             noCache: true,
             hidden: true,
-            showMainRoute: true,
+            canTo: true,
             activeMenu: '/example/example-page',
             permission: ['edit', 'add', 'delete']
           }
@@ -423,7 +423,7 @@ const menus = [
             noTagsView: true,
             noCache: true,
             hidden: true,
-            showMainRoute: true,
+            canTo: true,
             activeMenu: '/example/example-page',
             permission: ['edit', 'add', 'delete']
           }
@@ -440,7 +440,7 @@ const menus = [
             noTagsView: true,
             noCache: true,
             hidden: true,
-            showMainRoute: true,
+            canTo: true,
             activeMenu: '/example/example-page',
             permission: ['edit', 'add', 'delete']
           }
@@ -614,7 +614,7 @@ const menus = [
             noTagsView: true,
             noCache: true,
             hidden: true,
-            showMainRoute: true,
+            canTo: true,
             activeMenu: '/example/example-page',
             permission: ['edit', 'add', 'delete']
           }

+ 2 - 2
src/router/index.ts

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
 import type { App } from 'vue'
 import { Layout, getParentLayout } from '@/utils/routerHelper'
@@ -571,7 +571,7 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [
 ]
 
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHistory(),
   strict: true,
   routes: constantRouterMap as RouteRecordRaw[],
   scrollBehavior: () => ({ left: 0, top: 0 })

+ 1 - 1
src/store/modules/app.ts

@@ -61,7 +61,7 @@ export const useAppStore = defineStore('app', {
       fixedMenu: getStorage('fixedMenu') || true, // 是否固定菜单
 
       layout: getStorage('layout') || 'classic', // layout布局
-      isDark: getStorage('isDark') || false, // 是否是暗黑模式
+      isDark: false, // 是否是暗黑模式
       currentSize: getStorage('default') || 'default', // 组件尺寸
       theme: getStorage('theme') || {
         // 主题色

+ 5 - 7
src/views/Example/Page/ExamplePage.vue

@@ -64,7 +64,7 @@ useEmitt({
 
 const { t } = useI18n()
 const appStore = usePageStore()
-const allSchema: CrudSchema[] = [
+const crudSchemas: CrudSchema[] = [
   {
     field: 'selection',
     search: {
@@ -268,7 +268,7 @@ const allSchema: CrudSchema[] = [
     }
   }
 ]
-let crudSchemas = allSchema
+
 // @ts-ignore
 const getSchemas = () => {
   let localSchemas = appStore.getPageData['ExamplePage']
@@ -276,13 +276,11 @@ const getSchemas = () => {
     let localSchemasArr = localSchemas.schemas
     for (let i = 0; i < localSchemasArr.length; i++) {
       let item = localSchemasArr[i]
-      let index = allSchema.findIndex((e) => {
+      let index = crudSchemas.findIndex((e) => {
         return e.field == item.field
       })
-      if (index < 0) {
-        localSchemasArr.splice(i, 1)
-      } else {
-        set(allSchema[index], 'table.hidden', item.table.hidden)
+      if (index > 0) {
+        set(crudSchemas[index], 'table.hidden', item.table.hidden)
       }
     }
   }

+ 3 - 0
src/views/Example/Page/components/Write.vue

@@ -39,6 +39,9 @@ const schema = reactive<FormSchema[]>([
     component: 'Input',
     formItemProps: {
       rules: [required()]
+    },
+    componentProps: {
+      placeholder: '请输入作者'
     }
   },
   {