vxe-table 4.2.2-beta.0 → 4.2.3-beta.0

package/packages/table/src/table.ts

@@ -986,12 +986,17 @@ export default defineComponent({
      * 支持 px、%、固定 混合分配
      * 支持动态列表调整分配
      * 支持自动分配偏移量
-     * @param {Element} headerElem
-     * @param {Element} bodyElem
-     * @param {Element} footerElem
-     * @param {Number} bodyWidth
      */
-    const autoCellWidth = (headerElem: any, bodyElem: any, footerElem: any) => {
+    const autoCellWidth = () => {
+      const tableHeader = refTableHeader.value
+      const tableBody = refTableBody.value
+      const tableFooter = refTableFooter.value
+      const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+      const headerElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
+      const footerElem = tableFooter ? tableFooter.$el as HTMLDivElement : null
+      if (!bodyElem) {
+        return
+      }
       let tableWidth = 0
       const minCellWidth = 40 // 列宽最少限制 40px
       const bodyWidth = bodyElem.clientWidth - 1
@@ -1086,6 +1091,7 @@ export default defineComponent({
           }
         })
       }
+      console.log(headerHeight)
       internalData.headerHeight = headerHeight
 
       let overflowX = false
@@ -1331,7 +1337,8 @@ export default defineComponent({
       const cellOffsetWidth = computeCellOffsetWidth.value
       const mouseOpts = computeMouseOpts.value
       const keyboardOpts = computeKeyboardOpts.value
-      const bodyWrapperElem = elemStore['main-body-wrapper']
+      const bodyWrapperRef = elemStore['main-body-wrapper']
+      const bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null
       if (emptyPlaceholderElem) {
         emptyPlaceholderElem.style.top = `${headerHeight}px`
         emptyPlaceholderElem.style.height = bodyWrapperElem ? `${bodyWrapperElem.offsetHeight - scrollbarHeight}px` : ''
@@ -1352,8 +1359,10 @@ export default defineComponent({
           fixedWrapperElem = isFixedLeft ? refLeftContainer.value : refRightContainer.value
         }
         layoutList.forEach(layout => {
-          const wrapperElem = elemStore[`${name}-${layout}-wrapper`]
-          const tableElem = elemStore[`${name}-${layout}-table`]
+          const wrapperRef = elemStore[`${name}-${layout}-wrapper`]
+          const wrapperElem = wrapperRef ? wrapperRef.value : null
+          const tableRef = elemStore[`${name}-${layout}-table`]
+          const tableElem = tableRef ? tableRef.value : null
           if (layout === 'header') {
             // 表头体样式处理
             // 横向滚动渲染
@@ -1383,12 +1392,14 @@ export default defineComponent({
               }
             }
 
-            const repairElem = elemStore[`${name}-${layout}-repair`]
+            const repairRef = elemStore[`${name}-${layout}-repair`]
+            const repairElem = repairRef ? repairRef.value : null
             if (repairElem) {
               repairElem.style.width = `${tableWidth}px`
             }
 
-            const listElem = elemStore[`${name}-${layout}-list`]
+            const listRef = elemStore[`${name}-${layout}-list`]
+            const listElem = listRef ? listRef.value : null
             if (isGroup && listElem) {
               XEUtils.arrayEach(listElem.querySelectorAll('.col--group'), (thElem: any) => {
                 const colNode = tableMethods.getColumnNode(thElem)
@@ -1415,7 +1426,8 @@ export default defineComponent({
               })
             }
           } else if (layout === 'body') {
-            const emptyBlockElem = elemStore[`${name}-${layout}-emptyBlock`]
+            const emptyBlockRef = elemStore[`${name}-${layout}-emptyBlock`]
+            const emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null
             if (isNodeElement(wrapperElem)) {
               if (customMaxHeight) {
                 wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight}px`
@@ -1489,7 +1501,8 @@ export default defineComponent({
               tableElem.style.width = tWidth ? `${tWidth + scrollbarWidth}px` : ''
             }
           }
-          const colgroupElem = elemStore[`${name}-${layout}-colgroup`]
+          const colgroupRef = elemStore[`${name}-${layout}-colgroup`]
+          const colgroupElem = colgroupRef ? colgroupRef.value : null
           if (colgroupElem) {
             XEUtils.arrayEach(colgroupElem.children, (colElem: any) => {
               const colid = colElem.getAttribute('name')
@@ -1512,7 +1525,8 @@ export default defineComponent({
                 const showTitle = cellOverflow === 'title'
                 const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
                 let hasEllipsis = showTitle || showTooltip || showEllipsis
-                const listElem = elemStore[`${name}-${layout}-list`]
+                const listRef = elemStore[`${name}-${layout}-list`]
+                const listElem = listRef ? listRef.value : null
                 // 纵向虚拟滚动不支持动态行高
                 if (scrollYLoad && !hasEllipsis) {
                   hasEllipsis = true
@@ -1771,7 +1785,7 @@ export default defineComponent({
               childRecords = []
             }
             if (childRecords) {
-              tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
+              return tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
                 if (childRows.length && $xetable.findRowIndexOf(treeExpandeds, row) === -1) {
                   treeExpandeds.push(row)
                 }
@@ -1779,17 +1793,18 @@ export default defineComponent({
                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
                   tableMethods.setCheckboxRow(childRows, true)
                 }
-                nextTick().then(() => {
+                return nextTick().then(() => {
                   if (transform) {
                     return tablePrivateMethods.handleTableData()
                   }
-                }).then(() => {
-                  return tableMethods.recalculate()
-                }).then(() => resolve())
+                })
               })
-            } else {
-              nextTick().then(() => tableMethods.recalculate()).then(() => resolve())
             }
+          }).catch(() => {
+            rest.treeLoaded = false
+            XEUtils.remove(treeLazyLoadeds, item => $xetable.eqRow(item, row))
+          }).finally(() => {
+            nextTick().then(() => tableMethods.recalculate()).then(() => resolve())
           })
         } else {
           resolve()
@@ -1811,18 +1826,20 @@ export default defineComponent({
     }
 
     const handleAsyncRowExpand = (row: any): Promise<void> => {
-      const { rowExpandeds, expandLazyLoadeds } = reactData
       const { fullAllDataRowIdData } = internalData
-      const rest = fullAllDataRowIdData[getRowid($xetable, row)]
       return new Promise(resolve => {
         const expandOpts = computeExpandOpts.value
         const { loadMethod } = expandOpts
         if (loadMethod) {
-          expandLazyLoadeds.push(row)
-          loadMethod({ $table: $xetable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).catch((e: any) => e).then(() => {
+          const rest = fullAllDataRowIdData[getRowid($xetable, row)]
+          reactData.expandLazyLoadeds.push(row)
+          loadMethod({ $table: $xetable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
             rest.expandLoaded = true
-            XEUtils.remove(expandLazyLoadeds, item => $xetable.eqRow(item, row))
-            rowExpandeds.push(row)
+            reactData.rowExpandeds.push(row)
+          }).catch(() => {
+            rest.expandLoaded = false
+          }).finally(() => {
+            XEUtils.remove(reactData.expandLazyLoadeds, item => $xetable.eqRow(item, row))
             resolve(nextTick().then(() => tableMethods.recalculate()))
           })
         } else {
@@ -2945,21 +2962,13 @@ export default defineComponent({
        * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
        */
       recalculate (refull?: boolean) {
-        const tableHeader = refTableHeader.value
-        const tableBody = refTableBody.value
-        const tableFooter = refTableFooter.value
-        const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
-        const headerElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
-        const footerElem = tableFooter ? tableFooter.$el as HTMLDivElement : null
-        if (bodyElem) {
-          autoCellWidth(headerElem, bodyElem, footerElem)
-          if (refull === true) {
-            // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-            return computeScrollLoad().then(() => {
-              autoCellWidth(headerElem, bodyElem, footerElem)
-              return computeScrollLoad()
-            })
-          }
+        autoCellWidth()
+        if (refull === true) {
+          // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
+          return computeScrollLoad().then(() => {
+            autoCellWidth()
+            return computeScrollLoad()
+          })
         }
         return computeScrollLoad()
       },
@@ -5338,7 +5347,8 @@ export default defineComponent({
           containerList.forEach(name => {
             const layoutList = ['header', 'body', 'footer']
             layoutList.forEach(layout => {
-              const xSpaceElem = elemStore[`${name}-${layout}-xSpace`]
+              const xSpaceRef = elemStore[`${name}-${layout}-xSpace`]
+              const xSpaceElem = xSpaceRef ? xSpaceRef.value : null
               if (xSpaceElem) {
                 xSpaceElem.style.width = scrollXLoad ? `${tableWidth + (layout === 'header' ? scrollbarWidth : 0)}px` : ''
               }
@@ -5363,12 +5373,14 @@ export default defineComponent({
         }
         containerList.forEach(name => {
           const layoutList = ['header', 'body', 'footer']
-          const tableElem = elemStore[`${name}-body-table`]
+          const tableRef = elemStore[`${name}-body-table`]
+          const tableElem = tableRef ? tableRef.value : null
           if (tableElem) {
             tableElem.style.marginTop = marginTop
           }
           layoutList.forEach(layout => {
-            const ySpaceElem = elemStore[`${name}-${layout}-ySpace`]
+            const ySpaceRef = elemStore[`${name}-${layout}-ySpace`]
+            const ySpaceElem = ySpaceRef ? ySpaceRef.value : null
             if (ySpaceElem) {
               ySpaceElem.style.height = ySpaceHeight
             }
@@ -5377,14 +5389,14 @@ export default defineComponent({
         nextTick(updateStyle)
       },
       updateScrollXData () {
-        reactData.tableColumn = []
+        // reactData.tableColumn = []
         nextTick(() => {
           handleTableColumn()
           tablePrivateMethods.updateScrollXSpace()
         })
       },
       updateScrollYData () {
-        reactData.tableData = []
+        // reactData.tableData = []
         nextTick(() => {
           tablePrivateMethods.handleTableData()
           tablePrivateMethods.updateScrollYSpace()

package/packages/tools/dom.ts

@@ -154,6 +154,6 @@ export function triggerEvent (targetElem: Element, type: string) {
   }
 }
 
-export function isNodeElement (elem: Element) {
+export function isNodeElement (elem: any): elem is HTMLElement {
   return elem && elem.nodeType === 1
 }

package/styles/header.scss

@@ -46,7 +46,7 @@
 .vxe-header--column {
   position: relative;
   font-weight: $vxe-table-header-font-weight;
-  user-select: none;
+  // user-select: none;
   &.col--ellipsis {
     & > .vxe-cell {
       display: flex;

package/styles/input.scss

@@ -380,6 +380,9 @@ $iconWidth: 1.6em;
   position: absolute;
   right: 0;
   top: 0;
+}
+.vxe-input--time-picker-confirm,
+.vxe-input--date-picker-confirm {
   outline: 0;
   border: 1px solid $vxe-input-border-color;
   border-radius: $vxe-border-radius;
@@ -429,8 +432,6 @@ $iconWidth: 1.6em;
 .vxe-input--date-picker-btn {
   display: inline-block;
   display: flex;
-  border-radius: $vxe-border-radius;
-  border: 1px solid $vxe-input-border-color;
   align-items: center;
   justify-content: center;
   background-color: $vxe-button-default-background-color;
@@ -496,6 +497,10 @@ $iconWidth: 1.6em;
     &.is--selected {
       color: $vxe-input-date-picker-selected-color;
       background-color: $vxe-primary-color;
+      &.is--prev,
+      &.is--next {
+        background-color: lighten($vxe-primary-color, 10%);
+      }
       .vxe-input--date-label,
       .vxe-input--date-festival {
         color: $vxe-input-date-picker-festival-selected-color;
@@ -779,9 +784,15 @@ $iconWidth: 1.6em;
   }
   .vxe-input--date-picker-btn-wrapper {
     .vxe-input--date-picker-btn {
-      width: 31px - $sizeIndex;
       margin-left: 9px - $sizeIndex;
     }
+    .vxe-input--date-picker-prev-btn,
+    .vxe-input--date-picker-current-btn,
+    .vxe-input--date-picker-next-btn {
+      width: 31px - $sizeIndex;
+      border-radius: $vxe-border-radius;
+      border: 1px solid $vxe-input-border-color;
+    }
   }
   .vxe-input--date-picker-type-wrapper {
     .vxe-input--date-picker-label,
@@ -841,7 +852,8 @@ $iconWidth: 1.6em;
       height: nth($titleRowHeightList, $sizeIndex);
     }
   }
-  .vxe-input--time-picker-confirm {
+  .vxe-input--time-picker-confirm,
+  .vxe-input--date-picker-confirm {
     height: 31px - $sizeIndex;
     padding: 0 10px - $sizeIndex;
   }

package/types/input.d.ts

@@ -55,6 +55,7 @@ export namespace VxeInputPropTypes {
   export type Disabled = boolean
   export type Placeholder = string
   export type Maxlength = string | number
+  export type Multiple = boolean
   export type Autocomplete = string
   export type Align = string
   export type Form = string
@@ -91,6 +92,7 @@ export type VxeInputProps = {
   disabled?: VxeInputPropTypes.Disabled
   placeholder?: VxeInputPropTypes.Placeholder
   maxlength?: VxeInputPropTypes.Maxlength
+  multiple?: VxeInputPropTypes.Multiple
   autocomplete?: VxeInputPropTypes.Autocomplete
   align?: VxeInputPropTypes.Align
   form?: VxeInputPropTypes.Form

package/types/table.d.ts

@@ -927,7 +927,9 @@ export interface TableReactData {
 
 export interface TableInternalData {
   tZindex: number
-  elemStore: any
+  elemStore: {
+    [key: string]: Ref<HTMLElement> | null
+  }
   // 存放横向 X 虚拟滚动相关的信息
   scrollXStore: {
     offsetSize: number