vxe-table 4.3.13 → 4.4.0-beta.0

package/lib/index.umd.js

@@ -2263,7 +2263,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.3.13"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.4.0-beta.0"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -4060,7 +4060,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.3.13",
+  version: "4.4.0-beta.0",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -10593,7 +10593,7 @@ function getOptUniqueId() {
       default: () => conf.select.transfer
     }
   },
-  emits: ['update:modelValue', 'change', 'clear'],
+  emits: ['update:modelValue', 'change', 'clear', 'blur', 'focus'],
   setup(props, context) {
     const {
       slots,
@@ -11228,13 +11228,15 @@ function getOptUniqueId() {
         });
       }
     };
-    const focusEvent = () => {
+    const focusEvent = evnt => {
       if (!props.disabled) {
         reactData.isActivated = true;
       }
+      selectMethods.dispatchEvent('focus', {}, evnt);
     };
-    const blurEvent = () => {
+    const blurEvent = evnt => {
       reactData.isActivated = false;
+      selectMethods.dispatchEvent('blur', {}, evnt);
     };
     const modelSearchEvent = value => {
       reactData.searchValue = value;
@@ -16550,7 +16552,7 @@ dynamicApp.component('VxeTableColgroup', src_group);
 
 
 const tableComponentPropKeys = Object.keys(props);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect'];
 const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit-invalid', 'form-reset', 'form-collapse', 'form-toggle-collapse', 'proxy-query', 'proxy-delete', 'proxy-save', 'toolbar-button-click', 'toolbar-tool-click', 'zoom'];
 /* harmony default export */ var grid = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'VxeGrid',
@@ -20520,6 +20522,9 @@ const VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defin
       } = item;
       const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
       const itemClassName = compConf ? compConf.itemClassName : '';
+      const itemStyle = compConf ? compConf.itemStyle : null;
+      const itemContentClassName = compConf ? compConf.itemContentClassName : '';
+      const itemContentStyle = compConf ? compConf.itemContentStyle : null;
       const defaultSlot = slots ? slots.default : null;
       const titleSlot = slots ? slots.title : null;
       const span = item.span || allSpan;
@@ -20605,7 +20610,8 @@ const VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defin
           'is--hidden': folding && collapseAll,
           'is--active': isActivetem($xeform, item),
           'is--error': showError
-        }]
+        }],
+        style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemStyle) ? itemStyle(params) : itemStyle
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-form--item-inner'
       }, [title || titleSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -20618,7 +20624,8 @@ const VxeFormConfigItem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.defin
         title: showTitle ? getFuncText(title) : null,
         ...ons
       }, renderTitle($xeform, item)) : null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: ['vxe-form--item-content', align ? `align--${align}` : null]
+        class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
+        style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
       }, contentVNs)])]);
     };
     const $xeformconfigitem = {
@@ -21467,6 +21474,9 @@ const formItemProps = {
       } = item;
       const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
       const itemClassName = compConf ? compConf.itemClassName : '';
+      const itemStyle = compConf ? compConf.itemStyle : null;
+      const itemContentClassName = compConf ? compConf.itemContentClassName : '';
+      const itemContentStyle = compConf ? compConf.itemContentStyle : null;
       const defaultSlot = slots ? slots.default : null;
       const titleSlot = slots ? slots.title : null;
       const span = item.span || props.span;
@@ -21540,7 +21550,8 @@ const formItemProps = {
           'is--hidden': folding && collapseAll,
           'is--active': isActivetem($xeform, item),
           'is--error': showError
-        }]
+        }],
+        style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemStyle) ? itemStyle(params) : itemStyle
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-form--item-inner'
       }, [title || titleSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -21553,7 +21564,8 @@ const formItemProps = {
         title: showTitle ? getFuncText(title) : null,
         ...ons
       }, renderTitle($xeform, item)) : null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: ['vxe-form--item-content', align ? `align--${align}` : null]
+        class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
+        style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
       }, contentVNs)])]);
     };
     const renderVN = () => {
@@ -23023,7 +23035,8 @@ const lineOffsetSizes = {
       } = rowOpts;
       const renderOpts = editRender || cellRender;
       const compConf = renderOpts ? VXETable.renderer.get(renderOpts.name) : null;
-      const cellClassName = compConf ? compConf.cellClassName : '';
+      const compCellClassName = compConf ? compConf.cellClassName : '';
+      const compCellStyle = compConf ? compConf.cellStyle : '';
       const showAllTip = tooltipOpts.showAll;
       const columnIndex = $xetable.getColumnIndex(column);
       const _columnIndex = $xetable.getVTColumnIndex(column);
@@ -23205,12 +23218,12 @@ const lineOffsetSizes = {
           'col--actived': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
           'col--valid-error': hasValidError,
           'col--current': currentColumn === column
-        }, getPropClass(cellClassName, params), getPropClass(className, params), getPropClass(allCellClassName, params)],
+        }, getPropClass(compCellClassName, params), getPropClass(className, params), getPropClass(allCellClassName, params)],
         key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
         ...attrs,
         style: Object.assign({
           height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
-        }, cellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle : null),
+        }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
         ...tdOns
       }, tdVNs);
     };
@@ -28235,7 +28248,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
         return new Promise(resolve => {
           // 还原滚动条位置
           if (lastScrollLeft || lastScrollTop) {
-            return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve).then(() => {
+            return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then().then(() => {
               // 存在滚动行为未结束情况
               setTimeout(resolve, 30);
             });
@@ -28758,13 +28771,16 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
        * 判断指定列是否为筛选状态，如果为空则判断所有列
        * @param {String} fieldOrColumn 字段名
        */
-      isFilter(fieldOrColumn) {
+      isActiveFilterByColumn(fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
         if (column) {
           return column.filters && column.filters.some(option => option.checked);
         }
         return $xetable.getCheckedFilters().length > 0;
       },
+      isFilter(fieldOrColumn) {
+        return tableMethods.isActiveFilterByColumn(fieldOrColumn);
+      },
       /**
        * 判断展开行是否懒加载完成
        * @param {Row} row 行对象
@@ -30597,7 +30613,7 @@ const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
           tooltipStore
         } = reactData;
         const cell = evnt.currentTarget;
-        handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
+        handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
           handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
         }