菜单加中文修改

ui/dasadmin/.env.development

@@ -6,9 +6,9 @@ VITE_BASE_PATH = './'
 
 # 代理配置（开发使用），必须在一行中
 # 本地
-# VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]]
+ # VITE_APP_PROXY=[["/api","http://10.65.57.55:8080/api"]]
 # 线上
-VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]
+  VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]
 
 
 

ui/dasadmin/src/layouts/backend/components/menus/menuTree.vue

@@ -4,7 +4,7 @@
             <el-sub-menu @click="onClickSubMenu(menu)" :index="menu.path" :key="menu.path">
                 <template #title>
                     <Icon :color="config.getColorVal('menuColor')" :name="menu.meta?.icon ? menu.meta?.icon : config.layout.menuDefaultIcon" />
-                    <span>{{ menu.meta?.title ? menu.meta?.title : $t('noTitle') }}</span>
+                    <span>{{ menu.meta?.menuDesc ? menu.meta?.menuDesc : $t('noTitle') }}</span>
                 </template>
                 <menu-tree :extends="{ ...props.extends, level: props.extends.level + 1 }" :menus="menu.children"></menu-tree>
             </el-sub-menu>
@@ -12,7 +12,7 @@
         <template v-else>
             <el-menu-item :index="menu.path" :key="menu.path" @click="onClickMenu(menu)">
                 <Icon :color="config.getColorVal('menuColor')" :name="menu.meta?.icon ? menu.meta?.icon : config.layout.menuDefaultIcon" />
-                <span>{{ menu.meta?.title ? menu.meta?.title : $t('noTitle') }}</span>
+                <span>{{ menu.meta?.menuDesc ? menu.meta?.menuDesc : $t('noTitle') }}</span>
             </el-menu-item>
         </template>
     </template>

ui/dasadmin/src/layouts/backend/components/navBar/tabs.vue

@@ -9,7 +9,7 @@
             :ref="tabsRefs.set"
             :key="idx"
         >
-            {{ item.meta.title }}
+            {{ item.meta.menuDesc }}
             <transition @after-leave="selectNavTab(tabsRefs[navTabs.state.activeIndex])" name="el-fade-in">
                 <Icon v-show="navTabs.state.tabsView.length > 1" class="close-icon" @click.stop="closeTab(item)" size="15" name="el-icon-Close" />
             </transition>

ui/dasadmin/src/layouts/backend/index.vue

@@ -350,7 +350,7 @@ const menu = [
         ],
     },
 ]
-
+debugger
 function transformNode(menu: any) {
     menu = menu.map((node: any) => {
         return {
@@ -358,6 +358,7 @@ function transformNode(menu: any) {
             pid: node.parentMenuId,
             type: node.children.length != 0 ? 'menu_dir' : 'menu',
             title: node.menuName,
+            menuDesc: node.menuDesc,
             name: node.menuName,
             path: node.menuName,
             icon: node.menuIcon,

ui/dasadmin/src/layouts/backend/router-view/main.vue

@@ -1,13 +1,13 @@
 <template>
     <el-main class="layout-main">
         <el-scrollbar view-class="layout-main-scrollbar" :view-style="layoutMainScrollbarStyle" ref="layoutMainScrollbarRef">
-            <router-view v-slot="{ Component }">
             <transition :name="config.layout.mainAnimation" mode="out-in">
+                <router-view v-slot="{ Component }">
                     <keep-alive :include="state.keepAliveComponentNameList">
                         <component :is="Component" :key="state.componentKey" />
                     </keep-alive>
-                </transition>
                 </router-view>
+            </transition>
         </el-scrollbar>
     </el-main>
 </template>

ui/dasadmin/src/utils/router.ts

@@ -186,6 +186,7 @@ const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir
             meta: {
                 id: routes[key].id,
                 title: routes[key].title,
+                menuDesc: routes[key].menuDesc,
                 icon: routes[key].icon,
                 keepalive: routes[key].keepalive,
                 menu_type: routes[key].menu_type,
@@ -279,6 +280,7 @@ export const addRouteItem = (viewsComponent: Record<string, any>, route: any, pa
         component: component,
         meta: {
             title: route.title,
+            menuDesc: route.menuDesc,
             extend: route.extend,
             icon: route.icon,
             keepalive: route.keepalive,

ui/dasadmin/src/views/backend/auth/menu/index.vue

@@ -26,6 +26,7 @@
                 <el-main class="defaultMain">
                     <el-table :data="tableData" class="tablePart">
                         <el-table-column prop="menuName" label="菜单名称" />
+                        <el-table-column prop="menuDesc" label="菜单描述" />
                         <el-table-column prop="funParam" label="菜单路径" />
                         <el-table-column prop="menuOrder" label="菜单排序" />
                         <el-table-column label="图标">
@@ -56,6 +57,10 @@
                         <el-input v-model="fromUpDate.menuName" placeholder="" clearable />
                     </el-form-item>
 
+                    <el-form-item label="菜单描述:" prop="menuDesc">
+                        <el-input v-model="fromUpDate.menuDesc" placeholder="" clearable />
+                    </el-form-item>
+
                     <el-form-item label="&nbsp;&nbsp;菜单图标:">
                         <BaInput type="icon" v-model="fromUpDate.menuIcon" />
                     </el-form-item>
@@ -102,6 +107,10 @@
                         <el-input v-model="formInlineAdd.menuName" placeholder="" clearable />
                     </el-form-item>
 
+                    <el-form-item label="菜单描述:" prop="menuDesc">
+                        <el-input v-model="formInlineAdd.menuDesc" placeholder="" clearable />
+                    </el-form-item>
+
                     <el-form-item label="&nbsp;&nbsp;菜单图标:">
                         <BaInput type="icon" v-model="formInlineAdd.menuIcon" />
                     </el-form-item>
@@ -225,6 +234,7 @@ interface Tree {
     id: number
     menuIcon: string
     menuName: string
+    menuDesc: string
     menuOrder: number
     parentMenuId: number
     revision: number
@@ -266,7 +276,7 @@ const queryMenuMethod = (data: any) => {
 
 const defaultProps = {
     children: 'children',
-    label: 'menuName',
+    label: 'menuDesc',
 }
 
 // 菜单
@@ -276,6 +286,7 @@ const menuEdit = (data: any) => {
     fromUpDate.id = data.row.id
     fromUpDate.revision = data.row.revision
     fromUpDate.menuName = data.row.menuName
+    fromUpDate.menuDesc = data.row.menuDesc
     fromUpDate.menuOrder = data.row.menuOrder
     fromUpDate.menuIcon = data.row.menuIcon
     fromUpDate.funType = data.row.funType
@@ -293,6 +304,7 @@ const handleCloseAdd = () => {
 
 interface RuleForm {
     menuName: string | undefined
+    menuDesc: string | undefined
     menuOrder: number
     menuIcon: string
     funType: number
@@ -339,6 +351,13 @@ const rules = reactive<FormRules<RuleForm>>({
             trigger: 'blur',
         },
     ],
+    menuDesc: [
+        {
+            required: true,
+            message: '菜单描述不能为空',
+            trigger: 'blur',
+        },
+    ]
 })
 
 // 动作参数
@@ -353,6 +372,7 @@ interface RyReplaceFields {
 const fromUpDate = reactive({
     id: '',
     menuName: '',
+    menuDesc:'',
     menuOrder: 0,
     menuIcon: '',
     funType: 0,
@@ -451,6 +471,7 @@ const visibleAdd = ref(false)
 
 const formInlineAdd = reactive<RuleForm>({
     menuName: '',
+    menuDesc: '',
     menuOrder: 0,
     menuIcon: '',
     funType: 1,
@@ -470,6 +491,7 @@ const formInlineAdd = reactive<RuleForm>({
 const fromAdd = () => {
     visibleAdd.value = true
     formInlineAdd.menuName = ''
+    formInlineAdd.menuDesc =''
     formInlineAdd.menuOrder = 0
     formInlineAdd.menuIcon = ''
     formInlineAdd.funType = 1