vxe-pc-ui 4.3.95 → 4.3.97

package/packages/pager/src/pager.ts

@@ -252,9 +252,16 @@ export default defineComponent({
 
     // 第一页
     const renderHomePage = () => {
+      const { currentPage } = props
+      const homeSlot = slots.home
+      if (homeSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-home-btn'
+        }, homeSlot({ currentPage }))
+      }
       return h('button', {
-        class: ['vxe-pager--prev-btn', {
-          'is--disabled': props.currentPage <= 1
+        class: ['vxe-pager--home-btn', {
+          'is--disabled': currentPage <= 1
         }],
         type: 'button',
         title: getI18n('vxe.pager.homePageTitle'),
@@ -268,9 +275,16 @@ export default defineComponent({
 
     // 上一页
     const renderPrevPage = () => {
+      const { currentPage } = props
+      const prevPageSlot = slots.prevPage || slots['prev-page']
+      if (prevPageSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-prev-btn'
+        }, prevPageSlot({ currentPage }))
+      }
       return h('button', {
         class: ['vxe-pager--prev-btn', {
-          'is--disabled': props.currentPage <= 1
+          'is--disabled': currentPage <= 1
         }],
         type: 'button',
         title: getI18n('vxe.pager.prevPageTitle'),
@@ -284,10 +298,17 @@ export default defineComponent({
 
     // 向上翻页
     const renderPrevJump = (tagName?: string) => {
+      const { currentPage } = props
+      const prevJumpSlot = slots.prevJump || slots['prev-jump']
+      if (prevJumpSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-jump-prev'
+        }, prevJumpSlot({ currentPage }))
+      }
       return h(tagName || 'button', {
         class: ['vxe-pager--jump-prev', {
           'is--fixed': !tagName,
-          'is--disabled': props.currentPage <= 1
+          'is--disabled': currentPage <= 1
         }],
         type: 'button',
         title: getI18n('vxe.pager.prevJumpTitle'),
@@ -306,11 +327,18 @@ export default defineComponent({
 
     // 向下翻页
     const renderNextJump = (tagName?: string) => {
+      const { currentPage } = props
+      const nextJumpSlot = slots.nextJump || slots['next-jump']
       const pageCount = computePageCount.value
+      if (nextJumpSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-jump-next'
+        }, nextJumpSlot({ currentPage }))
+      }
       return h(tagName || 'button', {
         class: ['vxe-pager--jump-next', {
           'is--fixed': !tagName,
-          'is--disabled': props.currentPage >= pageCount
+          'is--disabled': currentPage >= pageCount
         }],
         type: 'button',
         title: getI18n('vxe.pager.nextJumpTitle'),
@@ -329,10 +357,17 @@ export default defineComponent({
 
     // 下一页
     const renderNextPage = () => {
+      const { currentPage } = props
+      const nextPageSlot = slots.nextPage || slots['next-page']
       const pageCount = computePageCount.value
+      if (nextPageSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-next-btn'
+        }, nextPageSlot({ currentPage }))
+      }
       return h('button', {
         class: ['vxe-pager--next-btn', {
-          'is--disabled': props.currentPage >= pageCount
+          'is--disabled': currentPage >= pageCount
         }],
         type: 'button',
         title: getI18n('vxe.pager.nextPageTitle'),
@@ -346,10 +381,17 @@ export default defineComponent({
 
     // 最后一页
     const renderEndPage = () => {
+      const { currentPage } = props
+      const endSlot = slots.end
       const pageCount = computePageCount.value
+      if (endSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-end-btn'
+        }, endSlot({ currentPage, pageCount }))
+      }
       return h('button', {
-        class: ['vxe-pager--prev-btn', {
-          'is--disabled': props.currentPage >= pageCount
+        class: ['vxe-pager--end-btn', {
+          'is--disabled': currentPage >= pageCount
         }],
         type: 'button',
         title: getI18n('vxe.pager.endPageTitle'),
@@ -364,6 +406,7 @@ export default defineComponent({
     // 页数
     const renderNumber = (showJump?: boolean) => {
       const { currentPage, pagerCount } = props
+      const numberSlot = showJump ? (slots.numberJump || slots['number-jump']) : slots.number
       const nums = []
       const pageCount = computePageCount.value
       const numList = computeNumList.value
@@ -371,7 +414,9 @@ export default defineComponent({
       const isOv = pageCount > pagerCount
       const isLt = isOv && currentPage > offsetNumber + 1
       const isGt = isOv && currentPage < pageCount - offsetNumber
+      const restList: number[] = []
       let startNumber = 1
+
       if (isOv) {
         if (currentPage >= pageCount - offsetNumber) {
           startNumber = Math.max(pageCount - numList.length + 1, 1)
@@ -379,7 +424,9 @@ export default defineComponent({
           startNumber = Math.max(currentPage - offsetNumber, 1)
         }
       }
+
       if (showJump && isLt) {
+        restList.push(1)
         nums.push(
           h('button', {
             class: 'vxe-pager--num-btn',
@@ -392,6 +439,7 @@ export default defineComponent({
       numList.forEach((item, index) => {
         const number = startNumber + index
         if (number <= pageCount) {
+          restList.push(number)
           nums.push(
             h('button', {
               key: number,
@@ -405,6 +453,7 @@ export default defineComponent({
         }
       })
       if (showJump && isGt) {
+        restList.push(pageCount)
         nums.push(
           renderNextJump('button'),
           h('button', {
@@ -414,6 +463,11 @@ export default defineComponent({
           }, pageCount)
         )
       }
+      if (numberSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-btn-wrapper'
+        }, numberSlot({ numList: restList, currentPage, pageCount }))
+      }
       return h('span', {
         class: 'vxe-pager--btn-wrapper'
       }, nums)
@@ -426,12 +480,19 @@ export default defineComponent({
 
     // sizes
     const renderSizes = () => {
+      const { pageSize, pageSizePlacement, transfer } = props
+      const sizesSlot = slots.sizes
       const sizeList = computeSizeList.value
+      if (sizesSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-sizes'
+        }, sizesSlot({ pageSize, options: sizeList }))
+      }
       return h(VxeSelectComponent, {
         class: 'vxe-pager--sizes',
-        modelValue: props.pageSize,
-        placement: props.pageSizePlacement,
-        transfer: props.transfer,
+        modelValue: pageSize,
+        placement: pageSizePlacement,
+        transfer: transfer,
         options: sizeList,
         onChange: pageSizeEvent
       })
@@ -439,7 +500,14 @@ export default defineComponent({
 
     // Jump
     const renderJump = (isFull?: boolean) => {
+      const { inpCurrPage } = reactData
+      const jumpSlot = isFull ? (slots.fullJump || slots['full-jump']) : slots.jump
       const pageCount = computePageCount.value
+      if (jumpSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-jump'
+        }, jumpSlot({ currentPage: inpCurrPage, pageCount }))
+      }
       return h('span', {
         class: 'vxe-pager--jump'
       }, [
@@ -478,7 +546,14 @@ export default defineComponent({
 
     // PageCount
     const renderPageCount = () => {
+      const { currentPage } = props
+      const pageCountSlot = slots.pageCount || slots['page-count']
       const pageCount = computePageCount.value
+      if (pageCountSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-count'
+        }, pageCountSlot({ currentPage, pageCount }))
+      }
       return h('span', {
         class: 'vxe-pager--count'
       }, [
@@ -491,9 +566,16 @@ export default defineComponent({
 
     // total
     const renderTotal = () => {
+      const { currentPage, total } = props
+      const totalSlot = slots.total
+      if (totalSlot) {
+        return h('span', {
+          class: 'vxe-pager--custom-total'
+        }, totalSlot({ total, currentPage }))
+      }
       return h('span', {
         class: 'vxe-pager--total'
-      }, getI18n('vxe.pager.total', [props.total]))
+      }, getI18n('vxe.pager.total', [total]))
     }
 
     const dispatchEvent = (type: ValueOf<VxePagerEmits>, params: Record<string, any>, evnt: Event | null) => {

package/packages/row/src/col.ts

@@ -106,13 +106,14 @@ export default defineComponent({
     Object.assign($xeCol, colMethods, colPrivateMethods)
 
     const renderVN = () => {
-      const { span, fill, align, ellipsis } = props
+      const { span, fill, align, width, ellipsis } = props
       const colStyle = computeColStyle.value
       const defaultSlot = slots.default
       return h('div', {
         ref: refElem,
         class: ['vxe-col', span ? `span${span}` : '', align ? `align--${align}` : '', {
-          'is--span': span,
+          'is--span': !!span,
+          'is--width': !!width,
           'is--fill': fill,
           'is--ellipsis': ellipsis
         }],

package/styles/components/col.scss

@@ -32,8 +32,30 @@ $colSpanList: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 3
     }
   }
 }
+
 .vxe-col--inner {
   display: flex;
   flex-direction: column;
   width: 100%;
-}
+}
+
+.vxe-col {
+  &.is--span,
+  &.is--width {
+    & > .vxe-col--inner {
+      & > .vxe-default-textarea,
+      & > .vxe-default-select,
+      & > .vxe-input,
+      & > .vxe-number-input,
+      & > .vxe-password-input,
+      & > .vxe-date-picker,
+      & > .vxe-textarea,
+      & > .vxe-select,
+      & > .vxe-tree-select,
+      & > .vxe-table-select,
+      & > .vxe-ico-picker {
+        width: 100%;
+      }
+    }
+  }
+}

package/styles/components/date-picker.scss

@@ -164,7 +164,7 @@
 }
 
 .vxe-date-picker--panel-layout-wrapper {
-  display: flex;
+  display: inline-flex;
   flex-direction: column;
   pointer-events: auto;
   background-color: var(--vxe-ui-layout-background-color);

package/styles/components/pager.scss

@@ -29,6 +29,8 @@
       background-color: var(--vxe-ui-loading-background-color);
     }
   }
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--next-btn,
   .vxe-pager--num-btn,
@@ -54,6 +56,8 @@
   &.is--border,
   &.is--perfect {
     &:not(.is--background) {
+      .vxe-pager--home-btn,
+      .vxe-pager--end-btn,
       .vxe-pager--prev-btn,
       .vxe-pager--next-btn,
       .vxe-pager--num-btn,
@@ -65,6 +69,8 @@
   }
   &.is--background,
   &.is--perfect {
+    .vxe-pager--home-btn,
+    .vxe-pager--end-btn,
     .vxe-pager--prev-btn,
     .vxe-pager--next-btn,
     .vxe-pager--jump-prev,
@@ -118,6 +124,8 @@
   .vxe-pager--left-wrapper,
   .vxe-pager--right-wrapper,
   .vxe-pager--total,
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--next-btn,
   .vxe-pager--jump,
@@ -129,6 +137,8 @@
     vertical-align: middle;
     display: inline-block;
   }
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--jump-prev,
   .vxe-pager--num-btn,
@@ -140,6 +150,8 @@
   .vxe-pager--left-wrapper,
   .vxe-pager--right-wrapper,
   .vxe-pager--count,
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--next-btn,
   .vxe-pager--jump-prev,
@@ -153,6 +165,8 @@
     text-align: center;
   }
   .vxe-pager--jump-prev,
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--next-btn,
   .vxe-pager--jump-next,
@@ -181,6 +195,8 @@
     }
   }
   .vxe-pager--jump-prev,
+  .vxe-pager--home-btn,
+  .vxe-pager--end-btn,
   .vxe-pager--prev-btn,
   .vxe-pager--next-btn,
   .vxe-pager--jump-next,

package/types/components/pager.d.ts

@@ -201,11 +201,85 @@ export namespace VxePagerSlotTypes {
   export interface DefaultSlotParams {
     [key: string]: any
   }
+  export interface HomeSlotParams {
+    currentPage: number
+  }
+  export interface PrevPageSlotParams {
+    currentPage: number
+  }
+  export interface PrevJumpSlotParams {
+    currentPage: number
+  }
+  export interface NextJumpSlotParams {
+    currentPage: number
+  }
+  export interface NextPageSlotParams {
+    currentPage: number
+  }
+  export interface EndSlotParams {
+    currentPage: number
+  }
+  export interface NumberJumpSlotParams {
+    numList: number[]
+    currentPage: number
+    pageCount: number
+  }
+  export interface SizesSlotParams {
+    currentPage: number
+    options: {
+      label: number | string
+      value: number | string
+    }[]
+  }
+  export interface FullJumpSlotParams {
+    currentPage: number
+    pageCount: number
+  }
+  export interface PageCountSlotParams {
+    currentPage: number
+    pageCount: number
+  }
+  export interface TotalSlotParams {
+    currentPage: number
+    total: number
+  }
 }
 
 export interface VxePagerSlots {
   left?: (params: VxePagerSlotTypes.DefaultSlotParams) => any
+
   right?: (params: VxePagerSlotTypes.DefaultSlotParams) => any
+
+  home?: (params: VxePagerSlotTypes.HomeSlotParams) => any
+
+  prevPage?: (params: VxePagerSlotTypes.PrevPageSlotParams) => any
+  'prev-page'?: (params: VxePagerSlotTypes.PrevPageSlotParams) => any
+
+  prevJump?: (params: VxePagerSlotTypes.PrevJumpSlotParams) => any
+  'prev-jump'?: (params: VxePagerSlotTypes.PrevJumpSlotParams) => any
+
+  nextJump?: (params: VxePagerSlotTypes.NextJumpSlotParams) => any
+  'next-jump'?: (params: VxePagerSlotTypes.NextJumpSlotParams) => any
+
+  nextPage?: (params: VxePagerSlotTypes.NextPageSlotParams) => any
+  'next-page'?: (params: VxePagerSlotTypes.NextPageSlotParams) => any
+
+  end?: (params: VxePagerSlotTypes.EndSlotParams) => any
+
+  number?: (params: VxePagerSlotTypes.NumberJumpSlotParams) => any
+  numberJump?: (params: VxePagerSlotTypes.NumberJumpSlotParams) => any
+  'number-jump'?: (params: VxePagerSlotTypes.NumberJumpSlotParams) => any
+
+  sizes?: (params: VxePagerSlotTypes.SizesSlotParams) => any
+
+  fullJump?: (params: VxePagerSlotTypes.FullJumpSlotParams) => any
+  'full-jump'?: (params: VxePagerSlotTypes.FullJumpSlotParams) => any
+  jump?: (params: VxePagerSlotTypes.FullJumpSlotParams) => any
+
+  pageCount?: (params: VxePagerSlotTypes.PageCountSlotParams) => any
+  'page-count'?: (params: VxePagerSlotTypes.PageCountSlotParams) => any
+
+  total?: (params: VxePagerSlotTypes.TotalSlotParams) => any
 }
 
 export const Pager: typeof VxePager

package/types/components/table.d.ts

@@ -3115,6 +3115,12 @@ export interface TableReactData<D = any> {
   }
 
   scrollVMLoading: boolean
+  scrollYHeight: number
+  scrollYTop: number
+  isScrollYBig: boolean
+  scrollXLeft: number
+  scrollXWidth: number
+  isScrollXBig: boolean
 
   rowExpandHeightFlag: number
   calcCellHeightFlag: number
@@ -4329,6 +4335,7 @@ export namespace VxeTableDefines {
     items: VxeTableDefines.ColumnInfo<D>[]
     parent: VxeTableDefines.ColumnInfo<D> | null
     width: number
+    oLeft: number
   }
 
   /**