vxe-table 3.8.0-beta.3 → 3.8.0-beta.4

package/packages/table/src/columnInfo.js

@@ -73,7 +73,7 @@ export class ColumnInfo {
       className: _vm.className,
       headerClassName: _vm.headerClassName,
       footerClassName: _vm.footerClassName,
-      formatter: formatter,
+      formatter,
       sortable: _vm.sortable,
       sortBy: _vm.sortBy,
       sortType: _vm.sortType,
@@ -124,7 +124,7 @@ export class ColumnInfo {
       renderHeader: renderHeader || _vm.renderHeader,
       renderCell: renderCell || _vm.renderCell,
       renderFooter: renderFooter || _vm.renderFooter,
-      renderData: renderData,
+      renderData,
       // 单元格插槽，只对 grid 有效
       slots: _vm.slots
     })

package/packages/table/src/methods.js

@@ -2403,9 +2403,10 @@ const Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent (evnt) {
-    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, filterStore, getRowNode } = this
+    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, filterStore, customStore, getRowNode } = this
     const { actived } = editStore
-    const { ctxWrapper, filterWrapper, validTip } = $refs
+    const { ctxWrapper, filterWrapper, customWrapper, validTip } = $refs
+    // 筛选
     if (filterWrapper) {
       if (getEventTargetNode(evnt, $el, 'vxe-cell--filter').flag) {
         // 如果点击了筛选按钮
@@ -2417,6 +2418,19 @@ const Methods = {
         }
       }
     }
+    // 自定义列
+    if (customWrapper) {
+      if (customStore.btnEl === evnt.target || getEventTargetNode(evnt, document.body, 'vxe-toolbar-custom-target').flag) {
+        // 如果点击了自定义列按钮
+      } else if (getEventTargetNode(evnt, customWrapper.$el).flag) {
+        // 如果点击自定义列容器
+      } else {
+        if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
+          this.preventEvent(evnt, 'event.clearCustom', {}, () => this.closeCustom())
+        }
+      }
+    }
+
     // 如果已激活了编辑状态
     if (actived.row) {
       if (!(editOpts.autoClear === false)) {
@@ -2734,6 +2748,19 @@ const Methods = {
                 setCellValue(selected.row, selected.column, null)
                 this.handleActived(selected.args, evnt)
               }
+              const afterEditMethod = editOpts.afterEditMethod
+              if (afterEditMethod) {
+                this.$nextTick(() => {
+                  afterEditMethod({
+                    row: selected.row,
+                    rowIndex: this.getRowIndex(selected.row),
+                    column: selected.column,
+                    columnIndex: this.getColumnIndex(selected.column),
+                    $table: this,
+                    $grid: this.$xegrid
+                  })
+                })
+              }
             }
           }
         }
@@ -3732,7 +3759,7 @@ const Methods = {
     if (selectRadioRow) {
       const rowid = getRowid(this, selectRadioRow)
       if (isFull) {
-        if (!fullDataRowIdData[rowid]) {
+        if (fullDataRowIdData[rowid]) {
           return selectRadioRow
         }
       } else {
@@ -5260,7 +5287,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -2,8 +2,8 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import VxeTableBody from './body'
-import VxeTableHeader from '../../header'
-import VxeTableFooter from '../../footer'
+import VxeTableHeader from './header'
+import VxeTableFooter from './footer'
 import vSize from '../../mixins/size'
 import { isEnableConf, getFuncText } from '../../tools/utils'
 import { createResizeEvent } from '../../tools/resize'
@@ -347,6 +347,16 @@ export default {
       pendingRowMaps: {},
       // 已标记的行
       pendingRowList: [],
+      // 自定义列相关的信息
+      customStore: {
+        btnEl: null,
+        isAll: false,
+        isIndeterminate: false,
+        activeBtn: false,
+        activeWrapper: false,
+        visible: false,
+        maxHeight: 0
+      },
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -1030,6 +1040,7 @@ export default {
       initStore,
       columnStore,
       filterStore,
+      customStore,
       ctxMenuStore,
       ctxMenuOpts,
       footerTableData,
@@ -1109,7 +1120,7 @@ export default {
           /**
            * 表尾
            */
-          showFooter ? h('vxe-table-footer', {
+          showFooter ? h(VxeTableFooter, {
             ref: 'tableFooter',
             props: {
               footerTableData,
@@ -1169,10 +1180,19 @@ export default {
           text: loadingOpts.text
         }
       }, this.callSlot($scopedSlots.loading, {}, h)),
+      /**
+       * 自定义列
+       */
+      h('vxe-table-custom-panel', {
+        ref: 'customWrapper',
+        props: {
+          customStore
+        }
+      }),
       /**
        * 筛选
        */
-      initStore.filter ? h('vxe-table-filter', {
+      initStore.filter ? h('vxe-table-filter-panel', {
         ref: 'filterWrapper',
         props: {
           filterStore
@@ -1181,7 +1201,7 @@ export default {
       /**
        * 导入
        */
-      initStore.import && this.importConfig ? h('vxe-import-panel', {
+      initStore.import && this.importConfig ? h('vxe-table-import-panel', {
         props: {
           defaultOptions: this.importParams,
           storeData: this.importStore
@@ -1190,7 +1210,7 @@ export default {
       /**
        * 导出/打印
        */
-      initStore.export && (this.exportConfig || this.printConfig) ? h('vxe-export-panel', {
+      initStore.export && (this.exportConfig || this.printConfig) ? h('vxe-table-export-panel', {
         props: {
           defaultOptions: this.exportParams,
           storeData: this.exportStore
@@ -1199,7 +1219,7 @@ export default {
       /**
        * 快捷菜单
        */
-      ctxMenuStore.visible && this.isCtxMenu ? h('vxe-table-context-menu', {
+      ctxMenuStore.visible && this.isCtxMenu ? h('vxe-table-menu-panel', {
         ref: 'ctxWrapper',
         props: {
           ctxMenuStore,

package/packages/textarea/index.d.ts

@@ -1,4 +1,4 @@
-import { Textarea } from '../../types/textarea'
+import { VxeTextarea } from '../../types/textarea'
 
 export * from '../../types/textarea'
-export default Textarea
+export default VxeTextarea

package/packages/textarea/index.js

@@ -1,9 +1,11 @@
-import VxeTextarea from './src/textarea'
+import VxeTextareaComponent from './src/textarea'
 
-export const Textarea = Object.assign(VxeTextarea, {
+export const VxeTextarea = Object.assign(VxeTextareaComponent, {
   install (Vue) {
-    Vue.component(VxeTextarea.name, VxeTextarea)
+    Vue.component(VxeTextareaComponent.name, VxeTextareaComponent)
   }
 })
 
-export default Textarea
+export const Textarea = VxeTextarea
+
+export default VxeTextarea

package/packages/toolbar/index.d.ts

@@ -1,4 +1,4 @@
-import { Toolbar } from '../../types/toolbar'
+import { VxeToolbar } from '../../types/toolbar'
 
 export * from '../../types/toolbar'
-export default Toolbar
+export default VxeToolbar

package/packages/toolbar/index.js

@@ -1,9 +1,11 @@
-import VxeToolbar from './src/toolbar'
+import VxeToolbarComponent from './src/toolbar'
 
-export const Toolbar = Object.assign(VxeToolbar, {
+export const VxeToolbar = Object.assign(VxeToolbarComponent, {
   install (Vue) {
-    Vue.component(VxeToolbar.name, VxeToolbar)
+    Vue.component(VxeToolbarComponent.name, VxeToolbarComponent)
   }
 })
 
-export default Toolbar
+export const Toolbar = VxeToolbar
+
+export default VxeToolbar