vxe-table 4.19.9 → 4.19.11

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.9";
+const version$1 = "4.19.11";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -556,7 +556,7 @@ const modal = {
 const defineVxeComponent = defineComponent;
 
 const { log } = VxeUI;
-const version = `table v${"4.19.9"}`;
+const version = `table v${"4.19.11"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 
@@ -4307,11 +4307,21 @@ var TableBodyComponent = defineVxeComponent({
                         class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
                     }, column.renderCell(cellParams)));
                 }
+                tdVNs.push(h('div', {
+                    key: 'tc',
+                    class: ['vxe-cell', {
+                            'c--title': showTitle,
+                            'c--tooltip': showTooltip,
+                            'c--ellipsis': showEllipsis
+                        }],
+                    style: tcStyle,
+                    title: showTitle ? $xeTable.getCellLabel(row, column) : null
+                }, clVNs));
                 if (showValidTip && errorValidItem) {
                     const errRule = errorValidItem.rule;
                     const validSlot = slots ? slots.valid : null;
                     const validParams = Object.assign(Object.assign(Object.assign({}, cellParams), errorValidItem), { rule: errorValidItem });
-                    clVNs.push(h('div', {
+                    tdVNs.push(h('div', {
                         key: 'tcv',
                         class: ['vxe-cell--valid-error-tip', getPropClass(validOpts.className, validParams)],
                         style: errRule && errRule.maxWidth
@@ -4333,16 +4343,6 @@ var TableBodyComponent = defineVxeComponent({
                         ])
                     ]));
                 }
-                tdVNs.push(h('div', {
-                    key: 'tc',
-                    class: ['vxe-cell', {
-                            'c--title': showTitle,
-                            'c--tooltip': showTooltip,
-                            'c--ellipsis': showEllipsis
-                        }],
-                    style: tcStyle,
-                    title: showTitle ? $xeTable.getCellLabel(row, column) : null
-                }, clVNs));
             }
             let showAreaRowStatus = false;
             if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
@@ -16545,9 +16545,9 @@ var VxeTableComponent = defineVxeComponent({
                 if (expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
                     errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=inside']);
                 }
-                if (props.spanMethod) {
-                    warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null']);
-                }
+                // if (props.spanMethod) {
+                //   warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null'])
+                // }
             }
             if (htmlColumn) {
                 if (!columnOpts.useKey) {
@@ -30245,6 +30245,7 @@ var VxeGridComponent = defineVxeComponent({
                 return;
             }
             if (proxyConfig && isEnableConf(proxyOpts)) {
+                $xeGrid.dispatchEvent('form-submit', params, params.$event);
                 internalData.uFoot = true;
                 $xeGrid.commitProxy('reload').then((rest) => {
                     $xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), { isReload: true }), params.$event);
@@ -30252,7 +30253,9 @@ var VxeGridComponent = defineVxeComponent({
                 internalData.uFoot = false;
                 updateQueryFooter();
             }
-            $xeGrid.dispatchEvent('form-submit', params, params.$event);
+            else {
+                $xeGrid.dispatchEvent('form-submit', params, params.$event);
+            }
         };
         const resetFormEvent = (params) => {
             const $xeTable = refTable.value;
@@ -30260,6 +30263,7 @@ var VxeGridComponent = defineVxeComponent({
             const { $event } = params;
             const proxyOpts = computeProxyOpts.value;
             if (proxyConfig && isEnableConf(proxyOpts)) {
+                $xeGrid.dispatchEvent('form-reset', params, $event);
                 if ($xeTable) {
                     $xeTable.clearScroll();
                 }
@@ -30270,7 +30274,9 @@ var VxeGridComponent = defineVxeComponent({
                 internalData.uFoot = false;
                 updateQueryFooter();
             }
-            $xeGrid.dispatchEvent('form-reset', params, $event);
+            else {
+                $xeGrid.dispatchEvent('form-reset', params, $event);
+            }
         };
         const submitInvalidEvent = (params) => {
             $xeGrid.dispatchEvent('form-submit-invalid', params, params.$event);