vxe-table 3.15.20 → 3.15.22

package/packages/locale/lang/hu-HU.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} Évek'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'január',

package/packages/locale/lang/hy-AM.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',

package/packages/locale/lang/id-ID.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} tahun'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Januari',

package/packages/locale/lang/it-IT.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} anni'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Gennaio',

package/packages/locale/lang/ja-JP.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '1月',

package/packages/locale/lang/ko-KR.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 년'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '1월',

package/packages/locale/lang/ms-MY.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} tahun'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 bulan',

package/packages/locale/lang/nb-NO.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} år'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'januar',

package/packages/locale/lang/pt-BR.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} anos'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Janeiro',

package/packages/locale/lang/ru-RU.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} Годы'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Январь',

package/packages/locale/lang/th-TH.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} ปี'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'มกราคม',

package/packages/locale/lang/ug-CN.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} يىل'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 ئاي',

package/packages/locale/lang/uk-UA.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} років'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Січень',

package/packages/locale/lang/uz-UZ.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} yillar'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 oy',

package/packages/locale/lang/vi-VN.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} năm'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Tháng Một',

package/packages/locale/lang/zh-CHT.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',

package/packages/locale/lang/zh-CN.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',

package/packages/table/render/index.ts

@@ -176,7 +176,7 @@ function getComponentOns (renderOpts: any, params: any, eFns?: {
   model: (cellValue: any) => void
   change?: (...args: any[]) => void
   blur?: (...args: any[]) => void
-}) {
+}, eventOns?: Record<string, any>) {
   const { events } = renderOpts
   const modelEvent = getModelEvent(renderOpts)
   const changeEvent = getChangeEvent(renderOpts)
@@ -214,7 +214,7 @@ function getComponentOns (renderOpts: any, params: any, eFns?: {
       }
     }
   }
-  return ons
+  return eventOns ? Object.assign(ons, eventOns) : ons
 }
 
 function getEditOns (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
@@ -834,6 +834,76 @@ renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleFilterMethod
   },
+  VxeDateRangePicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+      const { startField, endField } = renderOpts
+      const { $table, row, column } = params
+      const { model } = column
+      const cellValue = getCellValue(row, column)
+      const seProps: Record<string, any> = {}
+      const seOs: Record<string, any> = {}
+      if (startField && endField) {
+        seProps.startValue = XEUtils.get(row, startField)
+        seProps.endValue = XEUtils.get(row, endField)
+        seOs['update:startValue'] = (value: any) => {
+          if (startField) {
+            XEUtils.set(row, startField, value)
+          }
+        }
+        seOs['update:endValue'] = (value: any) => {
+          if (endField) {
+            XEUtils.set(row, endField, value)
+          }
+        }
+      }
+      return [
+        h(getDefaultComponent(renderOpts), {
+          props: getCellEditProps(renderOpts, params, cellValue, seProps),
+          on: getComponentOns(renderOpts, params, {
+            model (cellValue) {
+              model.update = true
+              model.value = cellValue
+              setCellValue(row, column, cellValue)
+            },
+            change () {
+              $table.updateStatus(params)
+            },
+            blur () {
+              $table.handleCellRuleUpdateStatus('blur', params)
+            }
+          }, seOs)
+        })
+      ]
+    },
+    renderTableCell (h, renderOpts, params) {
+      const { startField, endField } = renderOpts
+      const { row, column } = params
+      let startValue = ''
+      let endValue = ''
+      if (startField && endField) {
+        startValue = XEUtils.get(row, startField)
+        endValue = XEUtils.get(row, endField)
+      } else {
+        const cellValue = XEUtils.get(row, column.field)
+        if (cellValue) {
+          if (XEUtils.isArray(cellValue)) {
+            startValue = cellValue[0]
+            endValue = cellValue[1]
+          } else {
+            const strs = `${cellValue}`.split(',')
+            startValue = strs[0]
+            endValue = strs[1]
+          }
+        }
+      }
+      let cellLabel = ''
+      if (startValue && endValue) {
+        cellLabel = `${startValue} ~ ${endValue}`
+      }
+      return getCellLabelVNs(h, renderOpts, params, cellLabel)
+    }
+  },
   VxeTextarea: {
     tableAutoFocus: 'textarea',
     renderTableEdit: defaultEditRender

package/packages/table/src/methods.ts

@@ -1936,7 +1936,7 @@ const handleFooterMerge = ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
 function removeBodyMerges ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) {
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData } = internalData
+  const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData, mergeBodyMaps } = internalData
   const rest: VxeTableDefines.MergeItem[] = []
   if (merges) {
     const { handleGetRowId } = createHandleGetRowId($xeTable)
@@ -1971,6 +1971,9 @@ function removeBodyMerges ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
         const item = rItems[0]
         if (item) {
           rest.push(rItems[0])
+          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]
+          }
         }
       }
     })
@@ -1981,7 +1984,7 @@ function removeBodyMerges ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
 function removeFooterMerges ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) {
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { mergeFooterList, fullColumnIdData } = internalData
+  const { mergeFooterList, fullColumnIdData, mergeFooterMaps } = internalData
   const rest: VxeTableDefines.MergeItem[] = []
   if (merges) {
     if (!XEUtils.isArray(merges)) {
@@ -2006,6 +2009,9 @@ function removeFooterMerges ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
         const item = rItems[0]
         if (item) {
           rest.push(item)
+          if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]
+          }
         }
       }
     })

package/packages/toolbar/src/toolbar.ts

@@ -275,7 +275,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           $xeGrid.triggerToolbarTolEvent(item, evnt)
         } else {
           const gCommandOpts = commands.get(code)
-          const params = { code, tool: item, $table: $table!, $grid: $xeGrid, $event: evnt }
+          const params = { code, button: null, tool: item, $table: $table!, $grid: $xeGrid, $event: evnt }
           if (gCommandOpts) {
             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod
             if (tCommandMethod) {

package/styles/components/table.scss

@@ -138,6 +138,7 @@ $btnThemeList: (
         .vxe-select,
         .vxe-tree-select,
         .vxe-date-picker,
+        .vxe-date-range-picker,
         .vxe-number-input,
         .vxe-ico-picker {
           width: 100%;
@@ -160,6 +161,7 @@ $btnThemeList: (
         & > .vxe-select,
         & > .vxe-tree-select,
         & > .vxe-date-picker,
+        & > .vxe-date-range-picker,
         & > .vxe-number-input,
         & > .vxe-ico-picker {
           width: 100%;
@@ -174,6 +176,7 @@ $btnThemeList: (
           .vxe-select,
           .vxe-tree-select,
           .vxe-date-picker,
+          .vxe-date-range-picker,
           .vxe-number-input,
           .vxe-ico-picker {
             width: 100%;
@@ -194,6 +197,7 @@ $btnThemeList: (
   & > .vxe-select,
   & > .vxe-tree-select,
   & > .vxe-date-picker,
+  & > .vxe-date-range-picker,
   & > .vxe-number-input,
   & > .vxe-ico-picker {
     width: 100%;