vxe-table 3.15.0-beta.2 → 3.15.0-beta.4

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.0-beta.2";
+const version = "3.15.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.0-beta.2"}`;
+const log_version = `table v${"3.15.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4734,12 +4734,7 @@ const Cell = {
       return [h('span', {
         class: ['vxe-cell--filter', {
           'is--active': filterStore.visible && filterStore.column === column
-        }]
-      }, [h('i', {
-        class: ['vxe-filter--btn', hasFilter ? iconMatch || cell_getIcon().TABLE_FILTER_MATCH : iconNone || cell_getIcon().TABLE_FILTER_NONE],
-        attrs: {
-          title: cell_getI18n('vxe.table.filter')
-        },
+        }],
         on: {
           click(evnt) {
             if ($table.triggerFilterEvent) {
@@ -4747,6 +4742,11 @@ const Cell = {
             }
           }
         }
+      }, [h('i', {
+        class: ['vxe-filter--btn', hasFilter ? iconMatch || cell_getIcon().TABLE_FILTER_MATCH : iconNone || cell_getIcon().TABLE_FILTER_NONE],
+        attrs: {
+          title: cell_getI18n('vxe.table.filter')
+        }
       })])];
     }
     return [];
@@ -12578,13 +12578,14 @@ const Methods = {
    */
   triggerRadioRowEvent(evnt, params) {
     const $xeTable = this;
+    const reactData = $xeTable;
     const {
-      selectRadioRow: oldValue,
-      radioOpts
-    } = this;
+      selectRadioRow: oldValue
+    } = reactData;
     const {
       row
     } = params;
+    const radioOpts = $xeTable.computeRadioOpts;
     const {
       trigger
     } = radioOpts;
@@ -12600,11 +12601,11 @@ const Methods = {
       isChange = oldValue === newValue;
       if (isChange) {
         newValue = null;
-        this.clearRadioRow();
+        $xeTable.clearRadioRow();
       }
     }
     if (isChange) {
-      this.emitEvent('radio-change', {
+      $xeTable.dispatchEvent('radio-change', {
         oldValue,
         newValue,
         ...params
@@ -12613,17 +12614,31 @@ const Methods = {
   },
   triggerCurrentColumnEvent(evnt, params) {
     const $xeTable = this;
-    const columnOpts = $xeTable.computeColumnOpts;
+    const reactData = $xeTable;
     const {
-      currentMethod
-    } = columnOpts;
+      currentColumn: oldValue
+    } = reactData;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+    const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
     const {
-      column
+      column: newValue
     } = params;
-    if (!currentMethod || currentMethod({
-      column
+    const isChange = oldValue !== newValue;
+    if (!beforeRowMethod || beforeRowMethod({
+      column: newValue,
+      $table: $xeTable
     })) {
-      $xeTable.setCurrentColumn(column);
+      $xeTable.setCurrentColumn(newValue);
+      if (isChange) {
+        $xeTable.dispatchEvent('current-column-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
+      }
+    } else {
+      $xeTable.dispatchEvent('current-column-disabled', params, evnt);
     }
   },
   triggerCurrentRowEvent(evnt, params) {
@@ -12633,24 +12648,32 @@ const Methods = {
       currentRow: oldValue
     } = reactData;
     const rowOpts = $xeTable.computeRowOpts;
-    const {
-      currentMethod
-    } = rowOpts;
+    const currentRowOpts = $xeTable.computeCurrentRowOpts;
+    const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
     const {
       row: newValue
     } = params;
     const isChange = oldValue !== newValue;
-    if (!currentMethod || currentMethod({
-      row: newValue
+    if (!beforeRowMethod || beforeRowMethod({
+      row: newValue,
+      $table: $xeTable
     })) {
       $xeTable.setCurrentRow(newValue);
       if (isChange) {
+        $xeTable.dispatchEvent('current-row-change', {
+          oldValue,
+          newValue,
+          ...params
+        }, evnt);
+        // 已废弃
         $xeTable.dispatchEvent('current-change', {
           oldValue,
           newValue,
           ...params
         }, evnt);
       }
+    } else {
+      $xeTable.dispatchEvent('current-row-disabled', params, evnt);
     }
   },
   /**
@@ -20563,7 +20586,7 @@ const {
         return this.scrollToColumn(column).then(() => {
           const headerWrapperElem = elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper'];
           if (headerWrapperElem) {
-            const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-filter--btn`);
+            const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-cell--filter`);
             triggerEvent(filterBtnElem, 'click');
           }
         });
@@ -20622,16 +20645,9 @@ const {
         if (filterStore.column === column && filterStore.visible) {
           filterStore.visible = false;
         } else {
-          const {
-            clientY,
-            pageX
-          } = evnt;
           const el = $xeTable.$refs.refElem;
           const tableRect = el.getBoundingClientRect();
-          const targetElem = evnt.target;
-          const {
-            visibleWidth
-          } = getDomNode();
+          const btnElem = evnt.currentTarget;
           const {
             filters,
             filterMultiple,
@@ -20676,41 +20692,19 @@ const {
             if (!filterWrapperElem) {
               return;
             }
+            const btnRect = btnElem.getBoundingClientRect();
             const filterWidth = filterWrapperElem.offsetWidth;
             const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
             const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
             const centerWidth = filterWidth / 2;
-            const minMargin = 10;
-            const maxLeft = el.clientWidth - filterWidth - minMargin;
-            let left, right;
-            const thEl = targetElem.offsetParent;
-            const trEl = thEl.offsetParent;
-            const style = {
-              top: `${targetElem.offsetTop + thEl.offsetTop + targetElem.offsetHeight}px`
-            };
+            const left = btnRect.left - tableRect.left - centerWidth;
+            const top = btnRect.top - tableRect.top + btnElem.clientHeight;
             // 判断面板不能大于表格高度
-            const maxHeight = Math.max(40, el.clientHeight - (clientY - tableRect.y) - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
-            if (column.fixed === 'left') {
-              left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth;
-            } else if (column.fixed === 'right') {
-              right = thEl.offsetWidth - targetElem.offsetLeft + (trEl.offsetWidth - trEl.offsetLeft) - column.renderWidth - centerWidth;
-            } else {
-              left = targetElem.offsetLeft + thEl.offsetLeft - centerWidth - headerScrollElem.scrollLeft;
-            }
-            if (left) {
-              const overflowWidth = pageX + filterWidth - centerWidth + minMargin - visibleWidth;
-              if (overflowWidth > 0) {
-                left -= overflowWidth;
-              }
-              style.left = `${Math.min(maxLeft, Math.max(minMargin, left))}px`;
-            } else if (right) {
-              const overflowWidth = pageX + filterWidth - centerWidth + minMargin - visibleWidth;
-              if (overflowWidth > 0) {
-                right += overflowWidth;
-              }
-              style.right = `${Math.max(minMargin, right)}px`;
-            }
-            filterStore.style = style;
+            const maxHeight = Math.max(40, el.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+            filterStore.style = {
+              top: toCssUnit(top),
+              left: toCssUnit(left)
+            };
             filterStore.maxHeight = maxHeight;
           });
         }
@@ -27585,6 +27579,12 @@ function renderBody(h, $xeTable) {
     if (props.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.emptyRender)) {
       warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
     }
+    if (rowOpts.currentMethod) {
+      warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-row-config.beforeSelectMethod']);
+    }
+    if (columnOpts.currentMethod) {
+      warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-column-config.beforeSelectMethod']);
+    }
     if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)) {
       warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
     }
@@ -29679,16 +29679,16 @@ Object.keys(table.methods).forEach(name => {
       const btnParams = button ? button.params : null;
       switch (code) {
         case 'insert':
-          return this.insert();
+          return $xeTable.insert({});
         case 'insert_edit':
-          return this.insert().then(({
+          return $xeTable.insert({}).then(({
             row
-          }) => this.setEditRow(row));
+          }) => $xeTable.setEditRow(row));
         // 已废弃
         case 'insert_actived':
-          return this.insert().then(({
+          return $xeTable.insert({}).then(({
             row
-          }) => this.setEditRow(row));
+          }) => $xeTable.setEditRow(row));
         // 已废弃
         case 'mark_cancel':
           this.triggerPendingEvent(code);
@@ -29696,19 +29696,19 @@ Object.keys(table.methods).forEach(name => {
         case 'remove':
           return this.handleDeleteRow(code, 'vxe.grid.removeSelectRecord', () => this.removeCheckboxRow());
         case 'import':
-          this.importData(btnParams);
+          $xeTable.importData(btnParams);
           break;
         case 'open_import':
-          this.openImport(btnParams);
+          $xeTable.openImport(btnParams);
           break;
         case 'export':
-          this.exportData(btnParams);
+          $xeTable.exportData(btnParams);
           break;
         case 'open_export':
-          this.openExport(btnParams);
+          $xeTable.openExport(btnParams);
           break;
         case 'reset_custom':
-          this.resetCustom(true);
+          $xeTable.resetCustom(true);
           break;
         case '_init':
         case 'reload':