vxe-table 4.3.8 → 4.3.10

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_hooks=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/hooks")),_setup=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.3.8",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_hooks=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/hooks")),_setup=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.3.10",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.3.8",
+  "version": "4.3.10",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/grid/src/grid.ts

@@ -25,6 +25,9 @@ const gridComponentEmits: VxeGridEmits = [
   'form-reset',
   'form-collapse',
   'form-toggle-collapse',
+  'proxy-query',
+  'proxy-delete',
+  'proxy-save',
   'toolbar-button-click',
   'toolbar-tool-click',
   'zoom'
@@ -296,7 +299,7 @@ export default defineComponent({
         if (selectRecords.length) {
           return VXETable.modal.confirm({ id: `cfm_${code}`, content: GlobalConfig.i18n(alertKey), escClosable: true }).then((type) => {
             if (type === 'confirm') {
-              callback()
+              return callback()
             }
           })
         } else {
@@ -324,7 +327,9 @@ export default defineComponent({
       tablePage.pageSize = pageSize
       gridMethods.dispatchEvent('page-change', params)
       if (proxyConfig) {
-        gridMethods.commitProxy('query')
+        gridMethods.commitProxy('query').then((rest) => {
+          gridMethods.dispatchEvent('proxy-query', rest, params.$event)
+        })
       }
     }
 
@@ -338,7 +343,9 @@ export default defineComponent({
         reactData.sortData = params.sortList
         if (proxyConfig) {
           reactData.tablePage.currentPage = 1
-          gridMethods.commitProxy('query')
+          gridMethods.commitProxy('query').then((rest) => {
+            gridMethods.dispatchEvent('proxy-query', rest, params.$event)
+          })
         }
       }
       gridMethods.dispatchEvent('sort-change', params)
@@ -354,7 +361,9 @@ export default defineComponent({
         reactData.filterData = params.filterList
         if (proxyConfig) {
           reactData.tablePage.currentPage = 1
-          gridMethods.commitProxy('query')
+          gridMethods.commitProxy('query').then((rest) => {
+            gridMethods.dispatchEvent('proxy-query', rest, params.$event)
+          })
         }
       }
       gridMethods.dispatchEvent('filter-change', params)
@@ -363,7 +372,9 @@ export default defineComponent({
     const submitFormEvent: VxeFormEvents.Submit = (params) => {
       const { proxyConfig } = props
       if (proxyConfig) {
-        gridMethods.commitProxy('reload')
+        gridMethods.commitProxy('reload').then((rest) => {
+          gridMethods.dispatchEvent('proxy-query', { ...rest, isReload: true }, params.$event)
+        })
       }
       gridMethods.dispatchEvent('form-submit', params)
     }
@@ -371,7 +382,9 @@ export default defineComponent({
     const resetFormEvent: VxeFormEvents.Reset = (params) => {
       const { proxyConfig } = props
       if (proxyConfig) {
-        gridMethods.commitProxy('reload')
+        gridMethods.commitProxy('reload').then((rest) => {
+          gridMethods.dispatchEvent('proxy-query', { ...rest, isReload: true }, params.$event)
+        })
       }
       gridMethods.dispatchEvent('form-reset', params)
     }
@@ -663,7 +676,9 @@ export default defineComponent({
         if (!proxyInited) {
           reactData.proxyInited = true
           if (proxyOpts.autoLoad !== false) {
-            nextTick(() => gridMethods.commitProxy('_init'))
+            nextTick().then(() => gridMethods.commitProxy('_init')).then((rest) => {
+              gridMethods.dispatchEvent('proxy-query', { ...rest, isInited: true }, new Event('init'))
+            })
           }
         }
       }
@@ -699,11 +714,9 @@ export default defineComponent({
         const btnParams = button ? button.params : null
         switch (code) {
           case 'insert':
-            $xetable.insert({})
-            break
+            return $xetable.insert({})
           case 'insert_actived':
-            $xetable.insert({}).then(({ row }) => $xetable.setActiveRow(row))
-            break
+            return $xetable.insert({}).then(({ row }) => $xetable.setEditRow(row))
           case 'mark_cancel':
             triggerPendingEvent(code)
             break
@@ -722,8 +735,7 @@ export default defineComponent({
             $xetable.openExport(btnParams)
             break
           case 'reset_custom':
-            $xetable.resetColumn(true)
-            break
+            return $xetable.resetColumn(true)
           case '_init':
           case 'reload':
           case 'query': {
@@ -769,9 +781,11 @@ export default defineComponent({
                   filterList = $xetable.getCheckedFilters()
                 }
               }
-              const params: any = {
+              const commitParams = {
                 code,
                 button,
+                isInited,
+                isReload,
                 $grid: $xegrid,
                 page: pageParams,
                 sort: sortList.length ? sortList[0] : {},
@@ -783,9 +797,8 @@ export default defineComponent({
               reactData.sortData = sortList
               reactData.filterData = filterList
               reactData.tableLoading = true
-              const applyArgs = [params].concat(args)
+              const applyArgs = [commitParams].concat(args)
               return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs))
-                .catch(e => e)
                 .then(rest => {
                   reactData.tableLoading = false
                   if (rest) {
@@ -807,6 +820,9 @@ export default defineComponent({
                   if (afterQuery) {
                     afterQuery(...applyArgs)
                   }
+                  return { status: true }
+                }).catch(() => {
+                  return { status: false }
                 })
             } else {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -821,7 +837,8 @@ export default defineComponent({
               const selectRecords = gridExtendTableMethods.getCheckboxRecords()
               const removeRecords = selectRecords.filter(row => !$xetable.isInsertByRow(row))
               const body = { removeRecords }
-              const applyArgs = [{ $grid: $xegrid, code, button, body, options: ajaxMethods }].concat(args)
+              const commitParams = { $grid: $xegrid, code, button, body, options: ajaxMethods }
+              const applyArgs = [commitParams].concat(args)
               if (selectRecords.length) {
                 return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
@@ -846,6 +863,7 @@ export default defineComponent({
                       } else {
                         gridMethods.commitProxy('query')
                       }
+                      return { status: true }
                     })
                     .catch(rest => {
                       reactData.tableLoading = false
@@ -857,6 +875,7 @@ export default defineComponent({
                         }
                         VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
+                      return { status: false }
                     })
                 })
               } else {
@@ -882,7 +901,8 @@ export default defineComponent({
             if (ajaxMethods) {
               const body = Object.assign({ pendingRecords: reactData.pendingRecords }, $xetable.getRecordset())
               const { insertRecords, removeRecords, updateRecords, pendingRecords } = body
-              const applyArgs = [{ $grid: $xegrid, code, button, body, options: ajaxMethods }].concat(args)
+              const commitParams = { $grid: $xegrid, code, button, body, options: ajaxMethods }
+              const applyArgs = [commitParams].concat(args)
               // 排除掉新增且标记为删除的数据
               if (insertRecords.length) {
                 body.pendingRecords = pendingRecords.filter((row) => $xetable.findRowIndexOf(insertRecords, row) === -1)
@@ -921,6 +941,7 @@ export default defineComponent({
                       } else {
                         gridMethods.commitProxy('query')
                       }
+                      return { status: true }
                     })
                     .catch(rest => {
                       reactData.tableLoading = false
@@ -933,6 +954,7 @@ export default defineComponent({
                         }
                         VXETable.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                       }
+                      return { status: false }
                     })
                 } else {
                   if (isMsg) {
@@ -1065,12 +1087,20 @@ export default defineComponent({
         }
         return 0
       },
+      triggerToolbarCommitEvent (params, evnt) {
+        const { code } = params
+        return gridMethods.commitProxy(params, evnt).then((rest) => {
+          if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
+            gridMethods.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code as 'delete' | 'save'}` : 'proxy-query', { ...rest, isReload: code === 'reload' }, evnt)
+          }
+        })
+      },
       triggerToolbarBtnEvent (button, evnt) {
-        gridMethods.commitProxy(button, evnt)
+        gridPrivateMethods.triggerToolbarCommitEvent(button, evnt)
         gridMethods.dispatchEvent('toolbar-button-click', { code: button.code, button }, evnt)
       },
       triggerToolbarTolEvent (tool, evnt) {
-        gridMethods.commitProxy(tool, evnt)
+        gridPrivateMethods.triggerToolbarCommitEvent(tool, evnt)
         gridMethods.dispatchEvent('toolbar-tool-click', { code: tool.code, tool, $event: evnt })
       },
       triggerZoomEvent (evnt) {

package/packages/input/src/input.ts

@@ -705,6 +705,10 @@ export default defineComponent({
 
     const focusEvent = (evnt: Event & { type: 'focus' }) => {
       reactData.isActivated = true
+      const isDatePickerType = computeIsDatePickerType.value
+      if (isDatePickerType) {
+        datePickerOpenEvent(evnt)
+      }
       triggerEvent(evnt)
     }
 
@@ -1582,10 +1586,6 @@ export default defineComponent({
     }
 
     const clickEvent = (evnt: Event & { type: 'click' }) => {
-      const isDatePickerType = computeIsDatePickerType.value
-      if (isDatePickerType) {
-        datePickerOpenEvent(evnt)
-      }
       triggerEvent(evnt)
     }
 

package/packages/list/src/list.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, PropType, ref, Ref, computed, onUnmounted, watch, reactive, nextTick } from 'vue'
+import { defineComponent, h, PropType, ref, Ref, computed, onUnmounted, watch, reactive, nextTick, onActivated } from 'vue'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { useSize } from '../../hooks/size'
@@ -287,6 +287,10 @@ export default defineComponent({
       }
     })
 
+    onActivated(() => {
+      recalculate().then(() => refreshScroll())
+    })
+
     let resizeObserver: XEResizeObserver
 
     nextTick(() => {

package/packages/pager/src/pager.ts

@@ -101,7 +101,7 @@ export default defineComponent({
 
     const triggerJumpEvent = (evnt: Event) => {
       const inputElem: HTMLInputElement = evnt.target as HTMLInputElement
-      const inpValue = XEUtils.toNumber(inputElem.value)
+      const inpValue = XEUtils.toInteger(inputElem.value)
       const pageCount = computePageCount.value
       const current = inpValue <= 0 ? 1 : inpValue >= pageCount ? pageCount : inpValue
       inputElem.value = XEUtils.toValueString(current)
@@ -165,8 +165,14 @@ export default defineComponent({
     const pageSizeEvent: VxeSelectEvents.Change = (params) => {
       const { value } = params
       const pageSize = XEUtils.toNumber(value)
+      const pageCount = getPageCount(props.total, pageSize)
+      let currentPage = props.currentPage
+      if (currentPage > pageCount) {
+        currentPage = pageCount
+        emit('update:currentPage', pageCount)
+      }
       emit('update:pageSize', pageSize)
-      pagerMethods.dispatchEvent('page-change', { type: 'size', pageSize, currentPage: Math.min(props.currentPage, getPageCount(props.total, pageSize)) })
+      pagerMethods.dispatchEvent('page-change', { type: 'size', pageSize, currentPage })
     }
 
     const jumpInputEvent = (evnt: KeyboardEvent) => {

package/packages/table/src/cell.ts

@@ -25,7 +25,7 @@ function renderHelpIcon (params: VxeTableDefines.CellRenderHeaderParams) {
   ] : []
 }
 
-function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams, content: SlotVNodeType[]) {
+function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams, content: SlotVNodeType | SlotVNodeType[]) {
   const { $table, column } = params
   const { props, internalData } = $table
   const { computeTooltipOpts } = $table.getComputeMaps()
@@ -164,7 +164,7 @@ export const Cell = {
         return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)))
       }
     }
-    return renderTitleContent(params, [formatText(column.getTitle(), 1)])
+    return renderTitleContent(params, formatText(column.getTitle(), 1))
   },
   renderDefaultHeader (params: VxeTableDefines.CellRenderHeaderParams) {
     return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params))
@@ -273,7 +273,7 @@ export const Cell = {
     const { $table, column } = params
     const { slots } = column
     const headerSlot = slots ? slots.header : null
-    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)])
+    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1))
   },
   renderSeqCell (params: VxeTableDefines.CellRenderBodyParams) {
     const { $table, column } = params