vxe-table 3.8.22 → 3.8.23

package/packages/table/src/methods.js

@@ -1371,7 +1371,7 @@ const Methods = {
             const { filterMethod, filterRender, field } = column
             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 defaultFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
             const cellValue = UtilTools.getCellValue(row, column)
             if (filterMethod) {
               return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
@@ -2773,7 +2773,6 @@ const Methods = {
         const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row
         const childrenField = treeOpts.children || treeOpts.childrenField
         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-        let params
         if (filterStore.visible) {
           if (isEsc) {
             this.closeFilter()
@@ -2819,7 +2818,7 @@ const Methods = {
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
-              params = actived.args
+              const params = actived.args
               this.clearEdit(evnt)
               // 如果配置了选中功能，则为选中状态
               if (mouseConfig && mouseOpts.selected) {
@@ -2849,7 +2848,7 @@ const Methods = {
               if (childrens && childrens.length) {
                 evnt.preventDefault()
                 const targetRow = childrens[0]
-                params = { $table: this, row: targetRow }
+                const params = { $table: this, row: targetRow }
                 this.setTreeExpand(currentRow, true)
                   .then(() => this.scrollToRow(targetRow))
                   .then(() => this.triggerCurrentRowEvent(evnt, params))
@@ -2877,23 +2876,24 @@ const Methods = {
           // 如果是删除键
           if (!isEditStatus) {
             const { delMethod } = keyboardOpts
-            const delPaqrams = {
+            const params = {
               row: selected.row,
               rowIndex: this.getRowIndex(selected.row),
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
-              $table: this
+              $table: this,
+              $grid: this.$xegrid
             }
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (delMethod) {
-                delMethod(delPaqrams)
+                delMethod(params)
               } else {
                 setCellValue(selected.row, selected.column, null)
               }
               // 如果按下 del 键，更新表尾数据
               this.updateFooter()
-              this.emitEvent('cell-delete-value', delPaqrams, evnt)
+              this.emitEvent('cell-delete-value', params, evnt)
             }
           }
         } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
@@ -2901,28 +2901,23 @@ const Methods = {
             const { backMethod } = keyboardOpts
             // 如果是删除键
             if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
-              const delPaqrams = {
+              const params = {
                 row: selected.row,
                 rowIndex: this.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: this.getColumnIndex(selected.column),
-                $table: this
+                $table: this,
+                $grid: this.$xegrid
               }
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (backMethod) {
-                  backMethod({
-                    row: selected.row,
-                    rowIndex: this.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: this.getColumnIndex(selected.column),
-                    $table: this
-                  })
+                  backMethod(params)
                 } else {
                   setCellValue(selected.row, selected.column, null)
                   this.handleActived(selected.args, evnt)
                 }
-                this.emitEvent('cell-backspace-value', delPaqrams, evnt)
+                this.emitEvent('cell-backspace-value', params, evnt)
               }
             }
           }
@@ -2931,11 +2926,12 @@ const Methods = {
           const { parent: parentRow } = XEUtils.findTree(this.afterTreeFullData, item => item === currentRow, { children: childrenField })
           if (parentRow) {
             evnt.preventDefault()
-            params = {
-              $table: this,
+            const params = {
               row: parentRow,
               rowIndex: this.getRowIndex(parentRow),
-              $rowIndex: this.getVMRowIndex(parentRow)
+              $rowIndex: this.getVMRowIndex(parentRow),
+              $table: this,
+              $grid: this.$xegrid
             }
             this.setTreeExpand(parentRow, false)
               .then(() => this.scrollToRow(parentRow))
@@ -2950,16 +2946,17 @@ const Methods = {
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-            if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: this, $grid: this.$xegrid })) {
+            const params = {
+              row: selected.row,
+              rowIndex: this.getRowIndex(selected.row),
+              column: selected.column,
+              columnIndex: this.getColumnIndex(selected.column),
+              $table: this,
+              $grid: this.$xegrid
+            }
+            if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
-                editMethod({
-                  row: selected.row,
-                  rowIndex: this.getRowIndex(selected.row),
-                  column: selected.column,
-                  columnIndex: this.getColumnIndex(selected.column),
-                  $table: this,
-                  $grid: this.$xegrid
-                })
+                editMethod(params)
               } else {
                 setCellValue(selected.row, selected.column, null)
                 this.handleActived(selected.args, evnt)
@@ -2967,14 +2964,7 @@ const Methods = {
               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
-                  })
+                  afterEditMethod(params)
                 })
               }
             }

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

@@ -185,6 +185,7 @@ export default {
     TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked-fill',
     TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
     TABLE_CUSTOM_SORT: iconPrefix + 'drag-handle',
+    TABLE_MENU_OPTIONS: iconPrefix + 'arrow-right',
 
     // button
     BUTTON_DROPDOWN: iconPrefix + 'arrow-down',

package/styles/button.scss

@@ -67,6 +67,15 @@ $btnThemeList: (
   user-select: none;
   appearance: none;
   @include createAnimationTransition(border, .2s);
+  &.align--left {
+    text-align: left;
+  }
+  &.align--center {
+    text-align: center;
+  }
+  &.align--right {
+    text-align: right;
+  }
   &:not(.is--disabled) {
     color: $vxe-font-color;
     cursor: pointer;

package/styles/custom.scss

@@ -146,21 +146,9 @@
   flex-direction: row;
   flex-shrink: 0;
   border-top: 1px solid $vxe-table-popup-border-color;
-  text-align: right;
   button {
-    background-color: transparent;
-    width: 50%;
+    flex-grow: 1;
     height: 2.8em;
-    border: 0;
-    color: $vxe-font-color;
-    text-align: center;
-    cursor: pointer;
-    &:focus {
-      outline: none;
-    }
-    &:hover {
-      color: $vxe-primary-color;
-    }
   }
 }
 
@@ -182,9 +170,15 @@
 .vxe-table-custom--sort-btn {
   padding-left: 0.2em;
   padding-right: 0.4em;
-  cursor: grabbing;
-  &:hover {
-    color: $vxe-primary-color;
+  &:not(.is--disabled) {
+    cursor: grabbing;
+    &:hover {
+      color: $vxe-primary-color;
+    }
+  }
+  &.is--disabled {
+    color: $vxe-input-disabled-color;
+    cursor: not-allowed;
   }
 }
 .vxe-table-custom--checkbox-label  {
@@ -203,22 +197,6 @@
   user-select: none;
 }
 
-.vxe-table-custom--fixed-left-option,
-.vxe-table-custom--fixed-right-option {
-  line-height: 1.34em;
-  font-size: 1.1em;
-  padding: 0 0.2em;
-  cursor: pointer;
-  &.is--checked,
-  &:hover {
-    color: $vxe-primary-color;
-  }
-  &.is--disabled {
-    cursor: no-drop;
-    color: $vxe-input-disabled-color;
-  }
-}
-
 .vxe-table-custom-popup--body {
   overflow: auto;
   height: 100%;
@@ -383,12 +361,18 @@
 .vxe-table-custom-popup--column-sort-btn {
   font-size: 1.2em;
   padding: 0.2em 0.5em;
-  cursor: grab;
-  &:hover {
-    color:  $vxe-primary-color;
+  &:not(.is--disabled) {
+    cursor: grab;
+    &:hover {
+      color:  $vxe-primary-color;
+    }
+    &:active {
+      cursor: grabbing;
+    }
   }
-  &:active {
-    cursor: grabbing;
+  &.is--disabled {
+    color: $vxe-input-disabled-color;
+    cursor: not-allowed;
   }
 }
 

package/styles/menu.scss

@@ -21,46 +21,28 @@
   font-family: $vxe-font-family;
   background-color: $vxe-table-menu-background-color;
 }
-.vxe-context-menu--link {
-  display: block;
-  padding: 0 2.5em;
-  width: $vxe-table-menu-item-width;
-  line-height: 26px;
-  color: $vxe-font-color;
-  cursor: pointer;
-  .vxe-context-menu--link-prefix,
-  .vxe-context-menu--link-suffix {
-    position: absolute;
-    top: 5px;
-    margin-right: 5px;
-    font-size: 16px;
-  }
-  .vxe-context-menu--link-prefix {
-    left: 5px;
-  }
-  .vxe-context-menu--link-suffix {
-    right: 5px;
-    &.suffix--haschild {
-      top: 8px;
-      &:before {
-        position: absolute;
-        content: "";
-        border: 4px solid transparent;
-        border-left-color: #727272;
-      }
-    }
-  }
-  .vxe-context-menu--link-content {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-.vxe-table--context-menu-clild-wrapper {
   .vxe-context-menu--link {
-    padding: 0 2em 0 2.5em;
-  }
+    display: flex;
+    flex-direction: row;
+    width: $vxe-table-menu-item-width;
+    line-height: 26px;
+    padding: 0 0.8em;
+    color: $vxe-font-color;
+    cursor: pointer;
+    .vxe-context-menu--link-prefix,
+    .vxe-context-menu--link-suffix {
+      min-width: 2em;
+      flex-shrink: 0;
+      text-align: center;
+      padding: 0 0.2em;
+    }
+    .vxe-context-menu--link-content {
+      flex-grow: 1;
+      padding: 0 0.2em;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
 }
 .vxe-context-menu--option-wrapper,
 .vxe-table--context-menu-clild-wrapper {

package/styles/variable.scss

@@ -130,7 +130,7 @@ $vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.
 $vxe-table-filter-panel-background-color: #fff !default;
 
 /*menu*/
-$vxe-table-menu-item-width: 178px !default;
+$vxe-table-menu-item-width: 198px !default;
 $vxe-table-menu-background-color: #fff !default;
 
 /*loading*/

package/types/module/menu.d.ts

@@ -21,8 +21,26 @@ export interface MenuOptions {
 export interface MenuFirstOption {
   code?: string;
   name?: string;
-  prefixIcon?: string;
-  suffixIcon?: string;
+  prefixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 prefixConfig
+   * @deprecated
+   */
+  prefixIcon?: string
+  suffixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 suffixConfig
+   * @deprecated
+   */
+  suffixIcon?: string
   className?: string;
   visible?: boolean;
   disabled?: boolean;
@@ -34,7 +52,26 @@ export interface MenuFirstOption {
 export interface MenuChildOption {
   code?: string;
   name?: string;
-  prefixIcon?: string;
+  prefixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 prefixConfig
+   * @deprecated
+   */
+  prefixIcon?: string
+  suffixConfig?: {
+    icon?: string
+    content?: string
+    className?: string
+  }
+  /**
+   * 请使用 suffixConfig
+   * @deprecated
+   */
+  suffixIcon?: string
   className?: string;
   visible?: boolean;
   disabled?: boolean;

package/types/v-x-e-table/renderer.d.ts

@@ -69,11 +69,16 @@ export interface RendererMapOptions {
   tableFilterResetMethod?(params: ColumnFilterResetParams): void;
 
   /**
-   * 已废弃，请使用 defaultTableFilterMethod
+   * 已废弃，请使用 tableFilterDefaultMethod
    * @deprecated
    */
   defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
+  /**
+   * 已废弃，请使用 tableFilterDefaultMethod
+   * @deprecated
+   */
   defaultTableFilterMethod?(params: ColumnFilterMethodParams): boolean;
+  tableFilterDefaultMethod?(params: ColumnFilterMethodParams): boolean;
 
   /**
    * 已废弃，请使用 tableCellClassName