Ver código fonte

Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

xzc 1 semana atrás
pai
commit
5e5cc3113d

+ 1 - 1
yudao-ui-admin-vue3/src/components/DynamicReport/SpreadEditor.vue

@@ -280,7 +280,7 @@ const fetchTemplateData = async () => {
 
 
         element.note.split(',').forEach(dict => {
-          items.properties[dict.label] = {
+          items.properties[dict] = {
             type: 'string',
           }
         })

+ 7 - 0
yudao-ui-admin-vue3/src/views/Home/Index.vue

@@ -476,6 +476,13 @@ const handleRouteTo = (item: any) => {
   }
 
   if (item.routerName) {
+    // 检查路由是否存在(无菜单权限时路由不会被注册)
+    const routeExists = router.getRoutes().some(r => r.name === item.routerName)
+    if (!routeExists) {
+      ElMessage.warning('暂无权限访问该页面')
+      return
+    }
+
     // 特殊处理任务单跳转:默认带上 inspectorIds 和 taskStatusList 参数
     const query: any = {
       searchUserId: id,