vxe-pc-ui 4.4.9 → 4.4.11

package/packages/upload/src/upload.ts

@@ -1279,7 +1279,7 @@ export default defineComponent({
     }
 
     const renderAllMode = () => {
-      const { moreConfig, dragSort } = props
+      const { showList, moreConfig, dragSort } = props
       const { fileList, isDragMove } = reactData
       const moreOpts = computeMoreOpts.value
 
@@ -1296,49 +1296,53 @@ export default defineComponent({
       return h('div', {
         key: 'all',
         class: 'vxe-upload--file-wrapper'
-      }, [
-        showMoreButton && moreConfig && isHorizontal
-          ? createCommentVNode()
-          : renderFileAction(true),
-        currList.length || (showMoreButton && isHorizontal)
-          ? h('div', {
-            class: ['vxe-upload--file-list-wrapper', {
-              'is--horizontal': isHorizontal
-            }]
-          }, [
-            currList.length
-              ? (
-                  dragSort
-                    ? h(TransitionGroup, {
-                      name: `vxe-upload--drag-list${isDragMove ? '' : '-disabled'}`,
-                      tag: 'div',
-                      class: 'vxe-upload--file-list'
-                    }, {
-                      default: () => renderFileItemList(currList, false)
-                    })
-                    : h('div', {
-                      class: 'vxe-upload--file-list'
-                    }, renderFileItemList(currList, false))
-                )
-              : createCommentVNode(),
-            showMoreButton && overMaxNum
+      }, showList
+        ? [
+            showMoreButton && moreConfig && isHorizontal
+              ? createCommentVNode()
+              : renderFileAction(true),
+            (currList.length || (showMoreButton && isHorizontal))
               ? h('div', {
-                class: 'vxe-upload--file-over-more'
+                class: ['vxe-upload--file-list-wrapper', {
+                  'is--horizontal': isHorizontal
+                }]
               }, [
-                h(VxeButtonComponent, {
-                  mode: 'text',
-                  content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
-                  status: 'primary',
-                  onClick: handleMoreEvent
-                })
+                currList.length
+                  ? (
+                      dragSort
+                        ? h(TransitionGroup, {
+                          name: `vxe-upload--drag-list${isDragMove ? '' : '-disabled'}`,
+                          tag: 'div',
+                          class: 'vxe-upload--file-list'
+                        }, {
+                          default: () => renderFileItemList(currList, false)
+                        })
+                        : h('div', {
+                          class: 'vxe-upload--file-list'
+                        }, renderFileItemList(currList, false))
+                    )
+                  : createCommentVNode(),
+                showMoreButton && overMaxNum
+                  ? h('div', {
+                    class: 'vxe-upload--file-over-more'
+                  }, [
+                    h(VxeButtonComponent, {
+                      mode: 'text',
+                      content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
+                      status: 'primary',
+                      onClick: handleMoreEvent
+                    })
+                  ])
+                  : createCommentVNode(),
+                showMoreButton && moreConfig && isHorizontal
+                  ? renderFileAction(false)
+                  : createCommentVNode()
               ])
-              : createCommentVNode(),
-            showMoreButton && moreConfig && isHorizontal
-              ? renderFileAction(false)
               : createCommentVNode()
+          ]
+        : [
+            renderFileAction(false)
           ])
-          : createCommentVNode()
-      ])
     }
 
     const renderImageItemList = (currList: VxeUploadDefines.FileObjItem[], isMoreView: boolean) => {
@@ -1511,7 +1515,7 @@ export default defineComponent({
     }
 
     const renderImageMode = () => {
-      const { dragSort } = props
+      const { showList, dragSort } = props
       const { fileList, isDragMove } = reactData
       const moreOpts = computeMoreOpts.value
 
@@ -1526,48 +1530,56 @@ export default defineComponent({
       return h('div', {
         key: 'image',
         class: 'vxe-upload--image-wrapper'
-      }, [
-        dragSort
-          ? h(TransitionGroup, {
-            name: `vxe-upload--drag-list${isDragMove ? '' : '-disabled'}`,
-            tag: 'div',
-            class: 'vxe-upload--image-list'
-          }, {
-            default: () => renderImageItemList(currList, false).concat([
-              showMoreButton && overMaxNum
-                ? h('div', {
-                  key: 'om',
-                  class: 'vxe-upload--image-over-more'
-                }, [
-                  h(VxeButtonComponent, {
-                    mode: 'text',
-                    content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
-                    status: 'primary',
-                    onClick: handleMoreEvent
-                  })
+      }, showList
+        ? [
+            dragSort
+              ? h(TransitionGroup, {
+                name: `vxe-upload--drag-list${isDragMove ? '' : '-disabled'}`,
+                tag: 'div',
+                class: 'vxe-upload--image-list'
+              }, {
+                default: () => renderImageItemList(currList, false).concat([
+                  showMoreButton && overMaxNum
+                    ? h('div', {
+                      key: 'om',
+                      class: 'vxe-upload--image-over-more'
+                    }, [
+                      h(VxeButtonComponent, {
+                        mode: 'text',
+                        content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
+                        status: 'primary',
+                        onClick: handleMoreEvent
+                      })
+                    ])
+                    : createCommentVNode(),
+                  renderImageAction(false)
                 ])
-                : createCommentVNode(),
+              })
+              : h('div', {
+                class: 'vxe-upload--image-list'
+              }, renderImageItemList(currList, false).concat([
+                showMoreButton && overMaxNum
+                  ? h('div', {
+                    class: 'vxe-upload--image-over-more'
+                  }, [
+                    h(VxeButtonComponent, {
+                      mode: 'text',
+                      content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
+                      status: 'primary',
+                      onClick: handleMoreEvent
+                    })
+                  ])
+                  : createCommentVNode(),
+                renderImageAction(false)
+              ]))
+          ]
+        : [
+            h('div', {
+              class: 'vxe-upload--image-list'
+            }, [
               renderImageAction(false)
             ])
-          })
-          : h('div', {
-            class: 'vxe-upload--image-list'
-          }, renderImageItemList(currList, false).concat([
-            showMoreButton && overMaxNum
-              ? h('div', {
-                class: 'vxe-upload--image-over-more'
-              }, [
-                h(VxeButtonComponent, {
-                  mode: 'text',
-                  content: getI18n('vxe.upload.moreBtnText', [fileList.length]),
-                  status: 'primary',
-                  onClick: handleMoreEvent
-                })
-              ])
-              : createCommentVNode(),
-            renderImageAction(false)
-          ]))
-      ])
+          ])
     }
 
     const renderVN = () => {

package/types/components/pager.d.ts

@@ -155,6 +155,10 @@ export interface PagerMethods {
    * 向下翻页
    */
   nextJump(): Promise<any>
+  /**
+   * 跳转到指定页面
+   */
+  jumpPage(currentPage: number | string | null | undefined): Promise<any>
 }
 export interface VxePagerMethods extends PagerMethods { }
 
@@ -205,29 +209,45 @@ export namespace VxePagerSlotTypes {
   export interface RightSlotParams {}
   export interface HomeSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface PrevPageSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface PrevJumpSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface NextJumpSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface NextPageSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface EndSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
   }
   export interface NumberJumpSlotParams {
     numList: number[]
     currentPage: number
+    total: number
     pageCount: number
   }
   export interface SizesSlotParams {
     currentPage: number
+    total: number
+    pageCount: number
+    pageSize: number
     options: {
       label: number | string
       value: number | string
@@ -235,15 +255,18 @@ export namespace VxePagerSlotTypes {
   }
   export interface FullJumpSlotParams {
     currentPage: number
+    total: number
     pageCount: number
   }
   export interface PageCountSlotParams {
     currentPage: number
+    total: number
     pageCount: number
   }
   export interface TotalSlotParams {
     currentPage: number
     total: number
+    pageCount: number
   }
 }