Merge 07754975dad74045e10d148aa808447cf69d8d9a into 304b74bb495edd4d07aea4d97239a8c48c26b734

package.json

@@ -41,7 +41,6 @@
     "glob": "^11.0.0",
     "lint-staged": "^15.2.10",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.79.3",
     "simple-git-hooks": "^2.11.1",
     "taze": "^0.16.9",
     "unocss": "^0.62.4",

pnpm-lock.yaml

@@ -90,9 +90,6 @@ importers:
       rollup-plugin-visualizer:
         specifier: ^5.12.0
         version: 5.12.0(rollup@4.20.0)
-      sass:
-        specifier: ^1.79.3
-        version: 1.79.3
       simple-git-hooks:
         specifier: ^2.11.1
         version: 2.11.1
@@ -4753,6 +4750,7 @@ snapshots:
   chokidar@4.0.1:
     dependencies:
       readdirp: 4.0.1
+    optional: true
 
   chownr@2.0.0: {}
 
@@ -5498,7 +5496,8 @@ snapshots:
 
   ignore@5.3.2: {}
 
-  immutable@4.3.7: {}
+  immutable@4.3.7:
+    optional: true
 
   import-fresh@3.3.0:
     dependencies:
@@ -6336,7 +6335,8 @@ snapshots:
     dependencies:
       picomatch: 2.3.1
 
-  readdirp@4.0.1: {}
+  readdirp@4.0.1:
+    optional: true
 
   refa@0.12.1:
     dependencies:
@@ -6418,6 +6418,7 @@ snapshots:
       chokidar: 4.0.1
       immutable: 4.3.7
       source-map-js: 1.2.1
+    optional: true
 
   scslre@0.3.0:
     dependencies:

src/components/me/crud/index.vue

@@ -69,6 +69,13 @@ const props = defineProps({
   isPagination: {
     type: Boolean,
     default: true,
+  },
+    /**
+   * @isShowSizePicker 是否显示每页条数选择
+   */
+  isShowSizePicker: {
+    type: Boolean,
+    default: false,
   },
   scrollX: {
     type: Number,
@@ -116,6 +123,16 @@ const pagination = reactive({
   prefix({ itemCount }) {
     return `共 ${itemCount} 条数据`
   },
+  pageSizes: [10, 20, 50, 100],
+  showSizePicker: props.isShowSizePicker,
+  onChange: (page) => {
+    pagination.page = page
+  },
+  onUpdatePageSize: (pageSize) => {
+    pagination.pageSize = pageSize
+    pagination.page = 1
+    handleQuery()
+  },
 })
 
 // 是否展开

src/layouts/components/SideMenu.vue

@@ -59,7 +59,7 @@ function handleMenuSelect(key, item) {
 }
 </script>
 
-<style lang="scss">
+<style>
 .side-menu:not(.n-menu--collapsed) {
   .n-menu-item-content {
     &::before {

src/layouts/components/tab/index.vue

@@ -74,7 +74,7 @@ async function handleContextMenu(e, tagItem) {
 }
 </script>
 
-<style scoped lang="scss">
+<style scoped>
 :deep(.n-tabs) {
   .n-tabs-tab {
     padding-left: 16px;

src/main.js

@@ -15,8 +15,8 @@ import { setupDirectives } from './directives'
 import { setupRouter } from './router'
 import { setupStore } from './store'
 import { setupNaiveDiscreteApi } from './utils'
-import '@/styles/global.scss'
 import '@/styles/reset.css'
+import '@/styles/global.css'
 import 'uno.css'
 
 async function bootstrap() {

src/styles/global.css

@@ -26,12 +26,12 @@ body {
 
 .fade-slide-enter-from {
   opacity: 0;
-  transform: translateX(-30px);
+  transform: translateX(-2%);
 }
 
 .fade-slide-leave-to {
   opacity: 0;
-  transform: translateX(30px);
+  transform: translateX(2%);
 }
 
 /* 自定义滚动条样式 */