11

src/components/Table/src/BasicTable.tsx

@@ -2,7 +2,7 @@
 /* eslint-disable no-param-reassign */
 import PermSelect from '@/pages/Customer/Company/components/PermSelect'
 import { TABLE_COLUMNS_MAP, ColumnStateEnum } from '@/utils/cache/cacheEnum'
-import { isBoolean, isDef, isMobile, isNullOrUnDef, isObject } from '@/utils/is'
+import { isBoolean, isMobile, isNullOrUnDef, isObject, isUnDef } from '@/utils/is'
 import type { ColumnsState } from '@ant-design/pro-table'
 import ProTable from '@ant-design/pro-table'
 import { useModel } from 'umi'
@@ -137,11 +137,11 @@ const BasicTable: {
 
   // 判断是否是手机
   if (isMobile()) {
-    if (isDef(resetProps.pagination)) {
+    if (isUnDef(resetProps.pagination)) {
       resetProps.pagination = { simple: true }
     }
     if (isObject(resetProps.pagination)) {
-      resetProps.pagination = { ...resetProps.pagination, size: 'small' }
+      resetProps.pagination = { ...resetProps.pagination, simple: true }
     }
   }
   const handleOnColumnsChange = (map: Record<string, ColumnsState>) => {

src/global.less

@@ -203,6 +203,9 @@ input:-webkit-autofill:active {
       width: 100% !important;
     }
   }
+  .ant-pro-basicLayout-content {
+    margin: 0 !important;
+  }
 }
 // .react-resizable {
 //   background-clip: padding-box !important;

src/pages/Workbench/Dashboard/index.less

@@ -6,11 +6,11 @@
     margin: 24px 24px 0 24px !important;
   }
 
-  @media (max-width: 767.98px) {
-    .ant-pro-basicLayout-content {
-      margin: 0 !important;
-    }
-  }
+  // @media (max-width: 767.98px) {
+  //   .ant-pro-basicLayout-content {
+  //     margin: 0 !important;
+  //   }
+  // }
   &::-webkit-scrollbar {
     display: none;
   }