Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

2025-09-23 23:39:47 +08:00 · 2025-07-14 22:38:08 +08:00
parent 5e49622ea8 2036391c41
commit 30878fb4d3
23 changed files with 948 additions and 775 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -11,6 +11,9 @@
  "i18n-ally.editor.preferEditor": true,
  "i18n-ally.keystyle": "nested",
  "i18n-ally.localesPaths": ["src/locales/langs"],
+  "i18n-ally.parsers.typescript.compilerOptions": {
+    "moduleResolution": "node"
+  },
  "prettier.enable": false,
  "typescript.tsdk": "node_modules/typescript/lib",
  "unocss.root": ["./"],
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,68 @@
+# Changelog
+
 # 更新日志

+## [v1.1.1](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.0...v1.1.1) (2025-07-11)
+
+### &nbsp;&nbsp;&nbsp;🚀 新功能
+
+- **hooks**:
+  - 重构下载方法，支持流式下载 &nbsp;-&nbsp; by @m-xlsea [<samp>(65067)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/650673e2)
+- **projects**:
+  - 角色分配用户新增部门与时间查询条件 &nbsp;-&nbsp; by @m-xlsea [<samp>(ad48d)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/ad48d8e8)
+  - 修改操作后列表查询方式 &nbsp;-&nbsp; by @m-xlsea [<samp>(d8542)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/d85424ee)
+
+### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
+
+- **hooks**:
+  - 解决 streamsaver 访问不到 Github 资源问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(566b2)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/566b2c2d)
+- **other**:
+  - 修复代码生成类型定义文件重复问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(f7c7f)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/f7c7fc41)
+- **packages**:
+  - 修复 cleanup 会删除富文本编辑器资源问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(9ca7c)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/9ca7ca8f)
+- **projects**:
+  - 修复字典数据重复获取问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(3628c)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/3628c249)
+  - 修改强退在线设备接口 &nbsp;-&nbsp; by **AN** [<samp>(dbcf8)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/dbcf8d42)
+  - 修复代码生成逻辑判断问题 &nbsp;-&nbsp; by **AN** [<samp>(6fc7b)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/6fc7b11b)
+  - 修复部门字典 sys_normal_disable 重复获取 Merge pull request !11 from 素还真/N/A &nbsp;-&nbsp; by @m-xlsea [<samp>(ad938)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/ad9386eb)
+  - 修复未清空文件列表，上传回显问题 &nbsp;-&nbsp; by **AN** [<samp>(229e0)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/229e0044)
+  - Fix i18n-ally not working when setting moduleResolution to bundler. fixed #780 &nbsp;-&nbsp; by @xiaobao0505 in https://github.com/m-xlsea/ruoyi-plus-soybean/issues/780 [<samp>(41191)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/41191d54)
+  - 修复角色列表操作栏展示不全问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(62f2c)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/62f2c6d5)
+  - 修复用户导入结果信息未渲染标签问题 &nbsp;-&nbsp; by **AN** [<samp>(efc95)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/efc953c0)
+  - 修复角色用户分配未调用接口问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(ff874)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/ff87415d)
+- **styles**:
+  - 修复登录页平板界面滚动问题 &nbsp;-&nbsp; by @m-xlsea [<samp>(90145)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/90145fa5)
+- **utils**:
+  - 修复isNull和IsNotNull判断方法潜在问题 &nbsp;-&nbsp; by **AN** [<samp>(90d32)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/90d32ee2)
+
+### &nbsp;&nbsp;&nbsp;💅 重构
+
+- **projects**: 调整租户套餐菜单接口 &nbsp;-&nbsp; by **AN** [<samp>(b9999)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/b9999935)
+
+### &nbsp;&nbsp;&nbsp;📖 文档
+
+- **other**: 修改文档内容 &nbsp;-&nbsp; by @m-xlsea [<samp>(3ae99)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/3ae9922d)
+- **projects**: 优化 cursor 规则及 mcp &nbsp;-&nbsp; by @m-xlsea [<samp>(a3199)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/a31994dc)
+- **readme**: 更新 README.md 文件 &nbsp;-&nbsp; by @m-xlsea [<samp>(99675)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/99675cbc)
+
+### &nbsp;&nbsp;&nbsp;🏡 杂项
+
+- **deps**:
+  - update NodeJS and pnpm version requirements in package.json and documentation &nbsp;-&nbsp; by **Junior25306** [<samp>(a5c4b)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/a5c4b4e3)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(5cb1c)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/5cb1cebd)
+  - update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(aeb63)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/aeb63690)
+  - update deps &nbsp;-&nbsp; by @m-xlsea [<samp>(89c71)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/89c716e1)
+- **packages**:
+  - update Vite version to 7 in package.json and documentation. &nbsp;-&nbsp; by **Azir** [<samp>(03dd6)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/03dd64c5)
+- **projects**:
+  - update pnpm-lock.yaml &nbsp;-&nbsp; by @m-xlsea [<samp>(7c6ca)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/7c6ca91e)
+- **vscode**:
+  - remove unused vue.server.hybridMode setting from .vscode/settings.json &nbsp;-&nbsp; by @soybeanjs [<samp>(13319)</samp>](https://github.com/m-xlsea/ruoyi-plus-soybean/commit/133196f3)
+
+### &nbsp;&nbsp;&nbsp;❤️ 贡献值
+
+[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![xiaobao0505](https://github.com/xiaobao0505.png?size=48)](https://github.com/xiaobao0505)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[Junior25306](mailto:dayu429@qq.com)
+
 ## [v1.1.0](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.0.0...v1.1.0) (2025-07-01)

 ### &nbsp;&nbsp;&nbsp;🚀 新功能
@ -90,7 +153,7 @@

 ### &nbsp;&nbsp;&nbsp;❤️ 贡献者

-[![xlsea](https://github.com/m-xlsea.png?size=48)](https://gitee.com/xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![wenyuanw](https://github.com/wenyuanw.png?size=48)](https://github.com/wenyuanw)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![wenyuanw](https://github.com/chen-ziwen.png?size=48)](https://github.com/chen-ziwen)&nbsp;&nbsp;
+[![xlsea](https://github.com/m-xlsea.png?size=48)](https://gitee.com/xlsea)&nbsp;&nbsp;[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![wenyuanw](https://github.com/wenyuanw.png?size=48)](https://github.com/wenyuanw)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![chen-ziwen](https://github.com/chen-ziwen.png?size=48)](https://github.com/chen-ziwen)&nbsp;&nbsp;
 [![wangzhongqi0917](https://gitee.com/wangzhongqi0917.png?width=48)](https://gitee.com/wangzhongqi0917)&nbsp;&nbsp;[![qq1822213252](https://gitee.com/qq1822213252.png?width=48)](https://gitee.com/qq1822213252)&nbsp;&nbsp;[![tangzc](https://gitee.com/tangzc.png?width=48)](https://gitee.com/tangzc),&nbsp;[metabytes](https://gitee.com/metabytes)


--- a/README.md
+++ b/README.md
@ -22,7 +22,7 @@

 # 📢 重要通知

-1.1.0 版本已发布，但仍然建议：
+1.1.1 版本已发布，但仍然建议：
 - 在生产环境使用前进行充分测试
 - 关注项目更新，及时获取最新版本
 - 积极反馈问题，帮助我们快速迭代
--- a/docs/template/typings/api.d.ts.vm
+++ b/docs/template/typings/api.d.ts.vm
@ -1,44 +1,51 @@
 #set($BaseEntity = ['createDept', 'createBy', 'createTime', 'updateBy', 'updateTime'])
 #set($ModuleName = $moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
 /**
- * namespace ${ModuleName}
+ * Namespace Api
 *
- * backend api module: "${ModuleName}"
+ * All backend api type
 */
-namespace ${ModuleName} {
-    /** ${businessname} */
-    type ${BusinessName} = Common.CommonRecord<{
-        #foreach($column in $columns)#if(!$BaseEntity.contains($column.javaField))
-        /** $column.columnComment */
-        $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) CommonType.IdType; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Boolean') boolean; #else string; #end
-        #end#end
-    }>;
+declare namespace Api {
+    /**
+     * namespace ${ModuleName}
+     *
+     * backend api module: "${ModuleName}"
+     */
+    namespace ${ModuleName} {
+        /** ${businessname} */
+        type ${BusinessName} = Common.CommonRecord<{
+            #foreach($column in $columns)#if(!$BaseEntity.contains($column.javaField))
+            /** $column.columnComment */
+                $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) CommonType.IdType; #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; #elseif($column.javaType == 'Boolean') boolean; #else string; #end
+            #end#end
+        }>;

-    /** ${businessname} search params */
-    type ${BusinessName}SearchParams = CommonType.RecordNullable<
-      Pick<
-        Api.${ModuleName}.${BusinessName},
-        #foreach($column in $columns)
-            #if($column.query && $column.queryType != 'BETWEEN')
-        | '${column.javaField}'
-            #end
-        #end
-      > &
-        Api.Common.CommonSearchParams
-    >;
+        /** ${businessname} search params */
+        type ${BusinessName}SearchParams = CommonType.RecordNullable<
+            Pick<
+                Api.${ModuleName}.${BusinessName},
+                #foreach($column in $columns)
+                    #if($column.query && $column.queryType != 'BETWEEN')
+                        | '${column.javaField}'
+                    #end
+                #end
+            > &
+            Api.Common.CommonSearchParams
+        >;

-    /** ${businessname} operate params */
-    type ${BusinessName}OperateParams = CommonType.RecordNullable<
-      Pick<
-        Api.${ModuleName}.${BusinessName},
-        #foreach($column in $columns)
-            #if($column.insert || $column.edit)
-        | '${column.javaField}'
-            #end
-        #end
-      >
-    >;
+        /** ${businessname} operate params */
+        type ${BusinessName}OperateParams = CommonType.RecordNullable<
+            Pick<
+                Api.${ModuleName}.${BusinessName},
+                #foreach($column in $columns)
+                    #if($column.insert || $column.edit)
+                        | '${column.javaField}'
+                    #end
+                #end
+            >
+        >;

-    /** ${businessname} list */
-    type ${BusinessName}List = Api.Common.PaginatingQueryRecord<${BusinessName}>;
+        /** ${businessname} list */
+        type ${BusinessName}List = Api.Common.PaginatingQueryRecord<${BusinessName}>;
+    }
 }
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "ruoyi-vue-plus",
  "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。",
  "author": {
    "name": "xlsea",
@ -21,7 +21,7 @@
    "Soybean Admin",
    "Vue3 admin ",
    "vue-admin-template",
-    "Vite6",
+    "Vite7",
    "TypeScript",
    "naive-ui",
    "naive-ui-admin",
@ -66,7 +66,7 @@
    "@sa/tinymce": "workspace:*",
    "@sa/utils": "workspace:*",
    "@types/streamsaver": "^2.0.5",
-    "@vueuse/core": "13.4.0",
+    "@vueuse/core": "13.5.0",
    "clipboard": "2.0.11",
    "dayjs": "1.11.13",
    "defu": "6.1.4",
@ -83,16 +83,16 @@
    "vue": "3.5.17",
    "vue-advanced-cropper": "^2.8.9",
    "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.7",
+    "vue-i18n": "11.1.9",
    "vue-router": "4.5.1"
  },
  "devDependencies": {
    "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.353",
+    "@iconify/json": "2.2.354",
    "@sa/scripts": "workspace:*",
    "@sa/uno-preset": "workspace:*",
    "@soybeanjs/eslint-config": "1.7.0",
-    "@types/node": "24.0.4",
+    "@types/node": "24.0.10",
    "@types/nprogress": "0.2.3",
    "@unocss/eslint-config": "66.3.2",
    "@unocss/preset-icons": "66.3.2",
@ -101,25 +101,25 @@
    "@unocss/transformer-variant-group": "66.3.2",
    "@unocss/vite": "66.3.2",
    "@vitejs/plugin-vue": "6.0.0",
-    "@vitejs/plugin-vue-jsx": "5.0.0",
+    "@vitejs/plugin-vue-jsx": "5.0.1",
    "consola": "3.4.2",
-    "eslint": "9.29.0",
-    "eslint-plugin-vue": "10.2.0",
+    "eslint": "9.30.1",
+    "eslint-plugin-vue": "10.3.0",
    "kolorist": "1.8.0",
    "sass": "1.89.2",
    "simple-git-hooks": "2.13.0",
    "tsx": "4.20.3",
    "typescript": "5.8.3",
    "unplugin-icons": "22.1.0",
-    "unplugin-vue-components": "28.7.0",
-    "vite": "7.0.0",
+    "unplugin-vue-components": "28.8.0",
+    "vite": "7.0.1",
    "vite-plugin-monaco-editor": "^1.1.0",
    "vite-plugin-progress": "0.0.7",
-    "vite-plugin-static-copy": "^3.0.2",
+    "vite-plugin-static-copy": "^3.1.0",
    "vite-plugin-svg-icons": "2.0.1",
    "vite-plugin-vue-devtools": "7.7.7",
-    "vue-eslint-parser": "10.1.4",
-    "vue-tsc": "2.2.10"
+    "vue-eslint-parser": "10.2.0",
+    "vue-tsc": "3.0.1"
  },
  "simple-git-hooks": {
    "commit-msg": "pnpm sa git-commit-verify",
--- a/packages/alova/package.json
+++ b/packages/alova/package.json
@ -15,6 +15,6 @@
  "dependencies": {
    "@alova/mock": "2.0.17",
    "@sa/utils": "workspace:*",
-    "alova": "3.3.3"
+    "alova": "3.3.4"
  }
 }
--- a/packages/materials/package.json
+++ b/packages/materials/package.json
@ -11,7 +11,7 @@
  },
  "dependencies": {
    "@sa/utils": "workspace:*",
-    "simplebar-vue": "2.4.1"
+    "simplebar-vue": "2.4.2"
  },
  "devDependencies": {
    "typed-css-modules": "0.9.1"
--- a/packages/scripts/src/config/index.ts
+++ b/packages/scripts/src/config/index.ts
@ -5,7 +5,7 @@ import type { CliOption } from '../types';
 const defaultOptions: CliOption = {
  cwd: process.cwd(),
  cleanupDirs: [
-    '**/dist',
+    'dist',
    '**/package-lock.json',
    '**/yarn.lock',
    '**/pnpm-lock.yaml',
--- a/packages/tinymce/package.json
+++ b/packages/tinymce/package.json
@ -1,6 +1,6 @@
 {
  "name": "@sa/tinymce",
-  "version": "1.3.13",
+  "version": "1.3.15",
  "exports": {
    ".": "./src/index.ts"
  },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@ -200,7 +200,7 @@ async function handleExport() {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@ -239,7 +239,7 @@ async function handleExport() {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@ -234,7 +234,7 @@ async function handleRefreshCache() {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@ -405,7 +405,7 @@ const selectable = computed(() => {
          :operate-type="operateType"
          :row-data="editingData"
          :dict-type="searchParams.dictType || ''"
-          @submitted="getDataByPage"
+          @submitted="getData"
        />
        <DictTypeOperateDrawer
          v-model:visible="dictTypeDrawerVisible"
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@ -194,7 +194,7 @@ async function edit(noticeId: CommonType.IdType) {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/oss-config/index.vue
+++ b/src/views/system/oss-config/index.vue
@ -252,7 +252,7 @@ async function handleStatusChange(
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@ -49,6 +49,8 @@ const {
    originalName: null,
    fileSuffix: null,
    service: null,
+    isAsc: 'desc',
+    orderByColumn: 'createTime',
    params: {}
  },
  columns: () => [
@ -333,7 +335,7 @@ function handleToOssConfig() {
        :pagination="mobilePagination"
        class="sm:h-full"
      />
-      <OssUploadModal v-model:visible="uploadVisible" :upload-type="fileUploadType" @close="getData" />
+      <OssUploadModal v-model:visible="uploadVisible" :upload-type="fileUploadType" @close="getDataByPage" />
    </NCard>
  </div>
 </template>
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@ -288,7 +288,7 @@ function handleResetSearch() {
          :operate-type="operateType"
          :row-data="editingData"
          :dept-data="deptData"
-          @submitted="getDataByPage"
+          @submitted="getData"
        />
      </NCard>
    </div>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -284,14 +284,10 @@ function handleAuthUser(row: Api.System.Role) {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
-      <RoleDataScopeDrawer
-        v-model:visible="dataScopeDrawerVisible"
-        :row-data="editingData"
-        @submitted="getDataByPage"
-      />
-      <RoleAuthUserDrawer v-model:visible="authUserDrawerVisible" :row-data="editingData" @submitted="getDataByPage" />
+      <RoleDataScopeDrawer v-model:visible="dataScopeDrawerVisible" :row-data="editingData" @submitted="getData" />
+      <RoleAuthUserDrawer v-model:visible="authUserDrawerVisible" :row-data="editingData" @submitted="getData" />
    </NCard>
  </div>
 </template>
--- a/src/views/system/tenant-package/index.vue
+++ b/src/views/system/tenant-package/index.vue
@ -233,7 +233,7 @@ async function handleStatusChange(
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@ -261,7 +261,7 @@ async function handleExport() {
        v-model:visible="drawerVisible"
        :operate-type="operateType"
        :row-data="editingData"
-        @submitted="getDataByPage"
+        @submitted="getData"
      />
    </NCard>
  </div>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -348,7 +348,7 @@ function handleResetSearch() {
          :pagination="mobilePagination"
          class="h-full"
        />
-        <UserImportModal v-model:visible="importVisible" @submitted="getDataByPage" />
+        <UserImportModal v-model:visible="importVisible" @submitted="getData" />
        <UserOperateDrawer
          v-model:visible="drawerVisible"
          :operate-type="operateType"
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@ -313,8 +313,8 @@ getDataNames();
        :pagination="mobilePagination"
        class="sm:h-full"
      />
-      <GenTableImportDrawer v-model:visible="importVisible" :options="dataNameOptions" @submitted="getDataByPage" />
-      <GenTableOperateDrawer v-model:visible="drawerVisible" :row-data="editingData" @submitted="getDataByPage" />
+      <GenTableImportDrawer v-model:visible="importVisible" :options="dataNameOptions" @submitted="getData" />
+      <GenTableOperateDrawer v-model:visible="drawerVisible" :row-data="editingData" @submitted="getData" />
      <GenTablePreviewDrawer
        v-model:visible="previewVisible"
        :row-data="editingData"