fix

apps/web-ele/src/api/request.ts

@@ -194,6 +194,12 @@ function createRequestClient(baseURL: string) {
         ElMessage.error(timeoutMsg);
       }
 
+      // 当接口是/captchaImage时，不抛错
+      const requestUrl = response.config.url || '';
+      if (requestUrl.includes('/captchaImage')) {
+        return axiosResponseData;
+      }
+
       throw new Error(timeoutMsg || $t('http.apiRequestFailed'));
     },
   });

apps/web-ele/src/views/system/menu/index.vue

@@ -4,9 +4,13 @@ import type { VbenFormProps } from '@vben/common-ui';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { Menu } from '#/api/system/menu/model';
 
+import { ref } from 'vue';
+
 import { Page, useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
+import { ElTabPane, ElTabs } from 'element-plus';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { menuDel, menuList } from '#/api/system/menu';
 
@@ -17,6 +21,10 @@ import { columns, querySchema } from './table-data';
  * 不要问为什么有两个根节点 v-if会控制只会渲染一个
  */
 
+// 添加tab切换功能
+const activeTab = ref('pc'); // 默认PC端
+const sourceMap = { pc: 0, mobile: 1 };
+
 const formOptions: VbenFormProps = {
   commonConfig: {
     labelWidth: 80,
@@ -38,6 +46,7 @@ const gridOptions: VxeGridProps = {
       query: async (_, formValues = {}) => {
         const resp = await menuList({
           ...formValues,
+          source: sourceMap[activeTab.value], // 添加source参数
         });
         return { items: resp };
       },
@@ -79,15 +88,23 @@ const collapseAll = () => {
   gridApi.grid?.setAllTreeExpand(false);
 };
 const addMenu = () => {
-  drawerApi.setData({});
+  drawerApi.setData({ source: sourceMap[activeTab.value] }); // 传递source参数
   drawerApi.open();
 };
 function handleEditMenu(record: Menu) {
-  drawerApi.setData({ id: record.menuId, update: true });
+  drawerApi.setData({
+    id: record.menuId,
+    update: true,
+    source: sourceMap[activeTab.value],
+  }); // 传递source参数
   drawerApi.open();
 }
 function handleAddMenu(record: Menu) {
-  drawerApi.setData({ id: record.menuId, update: false });
+  drawerApi.setData({
+    id: record.menuId,
+    update: false,
+    source: sourceMap[activeTab.value],
+  }); // 传递source参数
   drawerApi.open();
 }
 async function confirmEvent(row: Menu) {
@@ -95,10 +112,19 @@ async function confirmEvent(row: Menu) {
   console.error(result);
   await gridApi.reload();
 }
+
+// 切换tab时重新加载数据
+const handleTabChange = () => {
+  gridApi.reload();
+};
 </script>
 
 <template>
-  <Page class="h-full">
+  <Page class="h-full" style="background-color: #fff">
+    <ElTabs v-model="activeTab" @tab-change="handleTabChange" class="mb-4">
+      <ElTabPane label="PC端" name="pc" />
+      <ElTabPane label="移动端" name="mobile" />
+    </ElTabs>
     <BasicTable :table-title="$t('menus.table-title')">
       <template #toolbar-tools>
         <ElSpace>

apps/web-ele/src/views/system/menu/menu-drawer.vue

@@ -234,9 +234,11 @@ const [Form, FormApi] = useVbenForm({
 interface ModalProps {
   id?: number | string;
   update: boolean;
+  source: number; // 添加source字段
 }
 // 新增还是修改的标识
 const isUpdate = ref<boolean>(false);
+const currentSource = ref<number>(0); // 默认PC端
 
 const [Drawer, DrawerApi] = useVbenDrawer({
   // 点击侧拉的确定按钮执行逻辑
@@ -248,7 +250,15 @@ const [Drawer, DrawerApi] = useVbenDrawer({
         return;
       }
       const data = await FormApi.getValues();
-      await (isUpdate.value ? menuUpdate(data) : menuAdd(data));
+      await (isUpdate.value
+        ? menuUpdate({
+            ...data,
+            source: currentSource.value, // 添加source参数
+          })
+        : menuAdd({
+            ...data,
+            source: currentSource.value, // 添加source参数
+          }));
       emit('reload');
       DrawerApi.close();
       await FormApi.resetForm();
@@ -263,8 +273,9 @@ const [Drawer, DrawerApi] = useVbenDrawer({
     if (!isOpen) {
       return null;
     }
-    const { id, update } = DrawerApi.getData() as ModalProps;
+    const { id, update, source } = DrawerApi.getData() as ModalProps;
     isUpdate.value = update;
+    currentSource.value = source; // 保存当前source值
     if (id) {
       await FormApi.setFieldValue('parentId', id);
       if (update) {
@@ -289,4 +300,3 @@ const [Drawer, DrawerApi] = useVbenDrawer({
   width: 100%;
 }
 </style>
-