fix: 修复文件上传数量限制错误的bug

fast-crud · Aug 28, 2021 · 2db661c · 2db661c
1 parent 7781000
commit 2db661c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/docs/zh/guide/start/demo.md b/docs/zh/guide/start/demo.md
@@ -6,11 +6,10 @@
 src
   |--packages    
     |-- fast-crud                  //核心工程
-    |-- extends                    //扩展组件
-        |-- extends-uploader       //上传组件扩展
-    |-- fs-admin
+    |-- fast-extends               //官方扩展组件
+    |-- fast-admin
         |-- fs-admin-antdv         //Antdv版示例工程
-    |-- demo-element               //Element版示例工程,后续会改造成fs-admin-element
+        |-- demo-element           //Element版示例工程,后续会改造成fs-admin-element
 
 ```
 
@@ -47,17 +46,19 @@ npm run dev
 ```shell script
 git clone https://gitee.com/fast-crud/fast-crud.git
 cd fast-crud
+# 同步fast-admin子模块
+git submodule update --init --recursive
+
 # 可以通过lerna bootstrap命令一次性全部install
-# 安装lerna
 npm install lerna -g
-# 通过bootstrap命令将fast-crud和extends-uploader
 lerna bootstrap
 
-# 也可以手动进入fast-crud和extends-xxx目录，一个个单独install
+# 或者
+# 也可以手动进入fast-crud和fast-extends等子项目目录，一个个单独install
 cd ./packages/fast-crud
 npm install
 
-cd ./packages/extends/extends-uploader
+cd ./packages/extends/fast-extends
 npm install
 
 ```
@@ -71,14 +72,14 @@ cd fast-crud/packages/fs-admin/fs-admin-antdv
 npm install  
 #不启用权限模块
 npm run debug
-#启用权限
+#启用权限运行
 npm run debug:pm
 #启动成功后打开输出链接即可看到效果
 ```
 * 调试element版示例
 ```shell script
-# 运行 antdv版示例
-cd fast-crud/packages/demo-element  
+# 运行element版示例
+cd fast-crud/packages/fast-crud/demo-element  
 #如果第一步执行过，就无需再执行
 npm install  
 npm run debug

diff --git a/packages/fast-crud/src/use/use-crud.ts b/packages/fast-crud/src/use/use-crud.ts
@@ -80,7 +80,7 @@ registerMergeColumnPlugin(mergeColumnDict);
 // 导出useCrud
 export function useCrud(ctx: UseCrudProps) {
   const ui = uiContext.get();
-  const { t } = useI18n(); // call `useI18n`, and spread `t` from  `useI18n` returning
+  const { t } = useI18n();
   const options: CrudOptions = ctx.crudOptions;
   const expose = ctx.expose;
   const { crudBinding } = expose;
@@ -95,9 +95,10 @@ export function useCrud(ctx: UseCrudProps) {
       },
       setPageSize(pageSize) {
         crudBinding.value.pagination.pageSize = pageSize;
+        crudBinding.value.pagination.currentPage = 1; //重置页码到1
       },
       doAfterChange() {
-        doRefresh();
+        return doRefresh();
       }
     });
     return {

diff --git a/packages/fast-extends/src/uploader/components/fs-file-uploader.vue b/packages/fast-extends/src/uploader/components/fs-file-uploader.vue
@@ -225,12 +225,11 @@ export default {
           return;
         }
       }
+      checkLimit();
+      checkSizeLimit(file);
 
       fileList.value = [...fileList.value, file];
       fileListLocal.value = fileList.value;
-
-      checkLimit();
-      checkSizeLimit(file);
     };
 
     async function doUpload(option) {