vxe-table 3.8.9 → 3.8.10-beta.1

package/packages/export/src/mixin.js

@@ -826,7 +826,7 @@ function handleImport ($xetable, content, opts) {
     $xetable.createData(rows)
       .then((data) => {
         let loadRest
-        if (opts.mode === 'insert') {
+        if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
           loadRest = $xetable.insert(data)
         } else {
           loadRest = $xetable.reloadData(data)
@@ -894,7 +894,7 @@ function handleFileImport ($xetable, file, opts) {
     $xetable._importResolve = _importResolve
     $xetable._importReject = _importReject
     if (window.FileReader) {
-      const options = Object.assign({ mode: 'insert' }, opts, { type, filename })
+      const options = Object.assign({ mode: 'insertBottom' }, opts, { type, filename })
       if (options.remote) {
         if (importMethod) {
           Promise.resolve(importMethod({ file, options, $table: $xetable })).then(() => {
@@ -1044,28 +1044,40 @@ export function handlePrint ($xetable, opts, content) {
 }
 
 function handleExportAndPrint ($xetable, options, isPrint) {
-  const { initStore, customOpts, collectColumn, footerTableData, treeConfig, mergeList, isGroup, exportParams, exportOpts } = $xetable
+  const { $xegrid, initStore, customOpts, collectColumn, footerTableData, treeConfig, mergeList, isGroup, exportParams, exportOpts } = $xetable
+  const proxyOpts = $xegrid ? $xegrid.proxyOpts : {}
   const selectRecords = $xetable.getCheckboxRecords()
   const hasFooter = !!footerTableData.length
   const hasTree = treeConfig
   const hasMerge = !hasTree && mergeList.length
-  const defOpts = Object.assign({ message: true, isHeader: true }, options)
+  const defOpts = Object.assign({
+    message: true,
+    isHeader: true,
+    current: 'current',
+    modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+  }, options)
   const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
-  const modes = defOpts.modes
+  const modes = defOpts.modes || []
   const checkMethod = customOpts.checkMethod
   const exportColumns = collectColumn.slice(0)
   const { columns } = defOpts
   // 处理类型
-  const typeList = types.map(value => {
+  const typeList = types.map((value) => {
     return {
       value,
-      label: `vxe.export.types.${value}`
+      label: GlobalConfig.i18n(`vxe.export.types.${value}`)
     }
   })
-  const modeList = modes.map(value => {
+  const modeList = modes.map((item) => {
+    if (item && item.value) {
+      return {
+        value: item.value,
+        label: item.label || item.value
+      }
+    }
     return {
-      value,
-      label: `vxe.export.modes.${value}`
+      value: item,
+      label: GlobalConfig.i18n(`vxe.export.modes.${item}`)
     }
   })
   // 默认选中
@@ -1113,11 +1125,11 @@ function handleExportAndPrint ($xetable, options, isPrint) {
   Object.assign(exportParams, {
     mode: selectRecords.length ? 'selected' : 'current'
   }, defOpts)
-  if (modes.indexOf(exportParams.mode) === -1) {
-    exportParams.mode = modes[0]
+  if (!modeList.some(item => item.value === exportParams.mode)) {
+    exportParams.mode = modeList[0].value
   }
-  if (types.indexOf(exportParams.type) === -1) {
-    exportParams.type = types[0]
+  if (!typeList.some(item => item.value === exportParams.type)) {
+    exportParams.type = typeList[0].value
   }
   initStore.export = true
   return $xetable.$nextTick()
@@ -1297,7 +1309,7 @@ export default {
       }
 
       if (!opts.data) {
-        opts.data = afterFullData
+        opts.data = []
         if (mode === 'selected') {
           const selectRecords = this.getCheckboxRecords()
           if (['html', 'pdf'].indexOf(type) > -1 && treeConfig) {
@@ -1343,6 +1355,8 @@ export default {
                 })
             }
           }
+        } else if (mode === 'current') {
+          opts.data = afterFullData
         }
       }
       return handleExport(this, opts)
@@ -1427,11 +1441,13 @@ export default {
     _openImport (options) {
       const { importOpts } = this
       const defOpts = Object.assign({
-        mode: 'insert',
+        mode: 'insertBottom',
         message: true,
-        types: XEUtils.keys(importOpts._typeMaps)
+        types: XEUtils.keys(importOpts._typeMaps),
+        modes: ['insertBottom', 'covering']
       }, options, importOpts)
-      const { types } = defOpts
+      const types = defOpts.types || []
+      const modes = defOpts.modes || []
       const isTree = !!this.getTreeStatus()
       if (isTree) {
         if (defOpts.message) {
@@ -1443,16 +1459,22 @@ export default {
         errLog('vxe.error.reqProp', ['import-config'])
       }
       // 处理类型
-      const typeList = types.map(value => {
+      const typeList = types.map((value) => {
         return {
           value,
-          label: `vxe.export.types.${value}`
+          label: GlobalConfig.i18n(`vxe.export.types.${value}`)
         }
       })
-      const modeList = defOpts.modes.map(value => {
+      const modeList = modes.map((item) => {
+        if (item && item.value) {
+          return {
+            value: item.value,
+            label: item.label || item.value
+          }
+        }
         return {
-          value,
-          label: `vxe.import.modes.${value}`
+          value: item,
+          label: GlobalConfig.i18n(`vxe.import.modes.${item}`)
         }
       })
       Object.assign(this.importStore, {
@@ -1464,6 +1486,9 @@ export default {
         visible: true
       })
       Object.assign(this.importParams, defOpts)
+      if (!modeList.some(item => item.value === this.importParams.mode)) {
+        this.importParams.mode = modeList[0].value
+      }
       this.initStore.import = true
     },
     _openExport (options) {

package/packages/filter/src/mixin.js

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils'
 import DomTools from '../../tools/dom'
 import { toFilters, handleFieldOrColumn } from '../../table/src/util'
+import { isEnableConf } from '../../tools/utils'
 import VXETable from '../../v-x-e-table'
 
 export default {
@@ -29,12 +30,12 @@ export default {
      * @param {ColumnInfo} fieldOrColumn 列
      * @param {Array} options 选项
      */
-    _setFilter (fieldOrColumn, options) {
+    _setFilter (fieldOrColumn, options, update) {
       const column = handleFieldOrColumn(this, fieldOrColumn)
       if (column && column.filters) {
         column.filters = toFilters(options || [])
       }
-      return this.$nextTick()
+      return update ? this.updateData() : this.$nextTick()
     },
     checkFilterOptions () {
       const { filterStore } = this
@@ -57,7 +58,7 @@ export default {
       } else {
         const { target: targetElem, pageX } = evnt
         const { filters, filterMultiple, filterRender } = column
-        const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
+        const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
         const filterRecoverMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
         const { visibleWidth } = DomTools.getDomNode()
         Object.assign(filterStore, {
@@ -205,7 +206,7 @@ export default {
       if (column) {
         const { filters, filterRender } = column
         if (filters) {
-          const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
+          const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
           const filterResetMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null)
           filters.forEach((item) => {
             item._checked = false

package/packages/filter/src/panel.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import UtilTools from '../../tools/utils'
+import UtilTools, { isEnableConf } from '../../tools/utils'
 import { getSlotVNs } from '../../tools/vn'
 
 export default {
@@ -18,7 +18,7 @@ export default {
     const { $parent: $xetable, filterStore } = this
     const { args, column } = filterStore
     const filterRender = column ? column.filterRender : null
-    const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
+    const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
     const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
     return h('div', {
       class: [
@@ -120,7 +120,7 @@ export default {
       const { filterOpts } = $xetable
       const { column, multiple } = filterStore
       const filterRender = column.filterRender
-      const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
+      const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
       return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [
         h('div', {

package/packages/locale/lang/en-US.js

@@ -119,7 +119,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Visible',
-        colFixed: 'Freeze columns (Max. {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max. {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: 'Covering',
-        insert: 'Insert'
+        covering: 'Overwrite mode (directly overwrite table data)',
+        insert: 'Bottom append (appends new data to the bottom of the table)',
+        insertTop: 'Top append (appends new data to the top of the table)',
+        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
       },
       impTitle: 'Import data',
       impFile: 'Filename',
       impSelect: 'Select file',
       impType: 'File type',
       impOpts: 'Settings',
+      impMode: 'Import mode',
       impConfirm: 'Import',
       impCancel: 'Cancel'
     },

package/packages/locale/lang/es-ES.js

@@ -119,7 +119,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Visible',
-        colFixed: 'Freeze columns (Max {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: 'Cubriendo',
-        insert: 'Insertar'
+        covering: 'Overwrite mode (directly overwrite table data)',
+        insert: 'Bottom append (appends new data to the bottom of the table)',
+        insertTop: 'Top append (appends new data to the top of the table)',
+        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
       },
       impTitle: 'Importar datos',
       impFile: 'Nombre del archivo',
       impSelect: 'Seleccionar archivo',
       impType: 'Tipo de archivo',
       impOpts: 'Configuración',
+      impMode: 'Import mode',
       impConfirm: 'Importar',
       impCancel: 'Cancelar'
     },

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

@@ -119,7 +119,8 @@ export default {
         colTitle: 'タイトル',
         colResizable: 'Column width (px)',
         colVisible: '表示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '指定しない',
         fixedRight: '右側'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: '上書き',
-        insert: '追加'
+        covering: 'Overwrite mode (directly overwrite table data)',
+        insert: 'Bottom append (appends new data to the bottom of the table)',
+        insertTop: 'Top append (appends new data to the top of the table)',
+        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
       },
       impTitle: 'データインポート',
       impFile: 'ファイル名',
       impSelect: 'ファイル選択',
       impType: 'ファイルの種類',
       impOpts: 'パラメータ指定',
+      impMode: 'Import mode',
       impConfirm: 'インポート',
       impCancel: 'キャンセル'
     },

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

@@ -119,7 +119,8 @@ export default {
         colTitle: 'Title',
         colResizable: 'Column width (px)',
         colVisible: 'Visible',
-        colFixed: 'Freeze columns (Max {0})',
+        colFixed: 'Freeze columns',
+        colFixedMax: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: 'Sobrescrever',
-        insert: 'Inserir'
+        covering: 'Overwrite mode (directly overwrite table data)',
+        insert: 'Bottom append (appends new data to the bottom of the table)',
+        insertTop: 'Top append (appends new data to the top of the table)',
+        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
       },
       impTitle: 'Importar dados',
       impFile: 'Nome do arquivo',
       impSelect: 'Selecionar arquivo',
       impType: 'Tipo de arquivo',
       impOpts: 'Configurações',
+      impMode: 'Import mode',
       impConfirm: 'Importar',
       impCancel: 'Cancelar'
     },

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

@@ -119,7 +119,8 @@ export default {
         colTitle: '标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: '覆盖',
-        insert: '新增'
+        covering: '覆盖方式（直接覆盖表格数据）',
+        insert: '底部追加（在表格的底部追加新数据）',
+        insertTop: '顶部追加（在表格的顶部追加新数据）',
+        insertBottom: '底部追加（在表格的底部追加新数据）'
       },
       impTitle: '导入数据',
       impFile: '文件名',
       impSelect: '选择文件',
       impType: '文件类型',
       impOpts: '参数设置',
+      impMode: '导入模式',
       impConfirm: '导入',
       impCancel: '取消'
     },

package/packages/locale/lang/zh-TC.js

@@ -119,7 +119,8 @@ export default {
         colTitle: '標題',
         colResizable: '列宽（像素）',
         colVisible: '是否顯示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '不設定',
         fixedRight: '右側'
@@ -127,14 +128,17 @@ export default {
     },
     import: {
       modes: {
-        covering: '覆盖',
-        insert: '新增'
+        covering: '覆盖方式（直接覆盖表格数据）',
+        insert: '底部追加（在表格的底部追加新数据）',
+        insertTop: '顶部追加（在表格的顶部追加新数据）',
+        insertBottom: '底部追加（在表格的底部追加新数据）'
       },
       impTitle: '導入數據',
       impFile: '檔名',
       impSelect: '選擇檔案',
       impType: '檔案類型',
       impOpts: '參數設置',
+      impMode: '導入模式',
       impConfirm: '導入',
       impCancel: '取消'
     },

package/packages/table/src/header.js

@@ -283,6 +283,7 @@ export default {
           $xetable.saveCustomStore('update:visible')
           $xetable.updateCellAreas()
           $xetable.emitEvent('resizable-change', { ...params, resizeWidth }, evnt)
+          setTimeout(() => $xetable.recalculate(true), 300)
         })
         DomTools.removeClass($xetable.$el, 'drag--resize')
       }

package/packages/table/src/methods.js

@@ -1364,7 +1364,7 @@ const Methods = {
         return filterColumns.every(({ column, valueList, itemList }) => {
           if (valueList.length && !allRemoteFilter) {
             const { filterMethod, filterRender, field } = column
-            const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
+            const compConf = isEnableConf(filterRender) ? VXETable.renderer.get(filterRender.name) : null
             const compFilterMethod = compConf && compConf.renderFilter ? (compConf.tableFilterMethod || compConf.filterMethod) : null
             const defaultFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
             const cellValue = UtilTools.getCellValue(row, column)
@@ -1566,7 +1566,6 @@ const Methods = {
    */
   setColumnFixed (fieldOrColumn, fixed) {
     const { isMaxFixedColumn, columnOpts } = this
-    const { maxFixedSize } = columnOpts
     const column = handleFieldOrColumn(this, fieldOrColumn)
     const targetColumn = getRootColumn(this, column)
     if (targetColumn && targetColumn.fixed !== fixed) {
@@ -1575,7 +1574,7 @@ const Methods = {
         if (VXETable.modal) {
           VXETable.modal.message({
             status: 'error',
-            content: GlobalConfig.i18n('vxe.table.maxFixedCol', [maxFixedSize])
+            content: GlobalConfig.i18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
           })
         }
         return this.$nextTick()
@@ -1702,19 +1701,22 @@ const Methods = {
     if (resizableData || sortData || visibleData || fixedData) {
       tableFullColumn.forEach(column => {
         const colKey = column.getKey()
+        // 支持一级
+        if (!parent) {
+          if (fixedData && fixedData[colKey]) {
+            column.fixed = fixedData[colKey]
+          }
+          if (sortData && XEUtils.isNumber(sortData[colKey])) {
+            hasCustomSort = true
+            column.renderSortNumber = sortData[colKey]
+          }
+        }
         if (resizableData && XEUtils.isNumber(resizableData[colKey])) {
           column.resizeWidth = resizableData[colKey]
         }
         if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
           column.visible = visibleData[colKey]
         }
-        if (fixedData && fixedData[colKey]) {
-          column.fixed = fixedData[colKey]
-        }
-        if (sortData && XEUtils.isNumber(sortData[colKey])) {
-          hasCustomSort = true
-          column.renderSortNumber = sortData[colKey]
-        }
       })
       // 如果自定义了顺序
       if (hasCustomSort) {
@@ -1778,7 +1780,7 @@ const Methods = {
     let hasFixedt = 0
     let hasVisible = 0
     XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-      // 排序只支持一级
+      // 只支持一级
       if (!parent) {
         collectColumn.forEach((column) => {
           const colKey = column.getKey()
@@ -1787,6 +1789,13 @@ const Methods = {
             sortData[colKey] = column.renderSortNumber
           }
         })
+        if (column.fixed && column.fixed !== column.defaultFixed) {
+          const colKey = column.getKey()
+          if (colKey) {
+            hasFixedt = 1
+            fixedData[colKey] = column.fixed
+          }
+        }
       }
       if (column.resizeWidth) {
         const colKey = column.getKey()
@@ -1795,13 +1804,6 @@ const Methods = {
           resizableData[colKey] = column.renderWidth
         }
       }
-      if (column.fixed && column.fixed !== column.defaultFixed) {
-        const colKey = column.getKey()
-        if (colKey) {
-          hasFixedt = 1
-          fixedData[colKey] = column.fixed
-        }
-      }
       if (!checkMethod || checkMethod({ column })) {
         if (!column.visible && column.defaultVisible) {
           const colKey = column.getKey()
@@ -5219,7 +5221,9 @@ const Methods = {
       tableBodyElem.scrollLeft = 0
     }
     scrollXStore.startIndex = 0
+    scrollXStore.endIndex = scrollXStore.visibleSize
     scrollYStore.startIndex = 0
+    scrollYStore.endIndex = scrollYStore.visibleSize
     return this.$nextTick()
   },
   /**

package/packages/table/src/table.js

@@ -618,7 +618,7 @@ export default {
       const { collectColumn } = this
       let fixedSize = 0
       collectColumn.forEach((column) => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++
         }
       })

package/packages/v-x-e-table/src/conf.js

@@ -64,9 +64,16 @@ export default {
       allowFixed: true,
       allowSort: true,
       showFooter: true,
-      placement: 'topRight'
+      placement: 'topRight',
       //  storage: false,
-      //  checkMethod () {}
+      //  checkMethod () {},
+      modalOptions: {
+        showZoom: true,
+        mask: true,
+        lockView: true,
+        resize: true,
+        escClosable: true
+      }
     },
     sortConfig: {
       // remote: false,

package/styles/button.scss

@@ -103,6 +103,9 @@ $btnThemeList: (
       &:hover {
         color: $vxe-primary-lighten-color;
       }
+      &:active {
+        color: $vxe-primary-darken-color;
+      }
     }
     @for $index from 0 to length($btnThemeList) {
       $item: nth($btnThemeList, $index + 1);
@@ -115,6 +118,9 @@ $btnThemeList: (
           &:hover {
             color: map-get($item, btnLightenColor);
           }
+          &:active {
+            color: map-get($item, btnDarkenColor);
+          }
         }
         &.is--disabled {
           color: map-get($item, btnDisabledColor);