vxe-table 4.2.8 → 4.3.0-beta.10

package/es/checkbox/style.css

@@ -177,6 +177,38 @@
 .is--animat .vxe-radio > input:checked + span {
   transition: background-color 0.1s ease-in-out; }
 
+.vxe-checkbox .vxe-checkbox--icon {
+  font-size: 1.4em; }
+
+.vxe-checkbox .vxe-checkbox--icon {
+  color: #dcdfe6;
+  vertical-align: middle;
+  font-weight: 700;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none; }
+
+.is--checked.vxe-checkbox, .is--indeterminate.vxe-checkbox {
+  color: #409eff; }
+  .is--checked.vxe-checkbox .vxe-checkbox--icon, .is--indeterminate.vxe-checkbox .vxe-checkbox--icon {
+    color: #409eff; }
+
+.vxe-checkbox:not(.is--disabled) {
+  cursor: pointer; }
+  .vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon {
+    color: #409eff; }
+
+.is--disabled.vxe-checkbox {
+  color: #BFBFBF;
+  cursor: not-allowed; }
+  .is--disabled.vxe-checkbox .vxe-checkbox--icon {
+    color: #dcdfe6; }
+
+.vxe-checkbox .vxe-checkbox--label {
+  padding-left: 0.5em;
+  vertical-align: middle; }
+
 /*checkbox-group*/
 .vxe-checkbox-group {
   display: inline-block;
@@ -188,13 +220,7 @@
   display: inline-block;
   vertical-align: middle;
   white-space: nowrap;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  line-height: 1;
-  cursor: pointer;
-  color: #606266; }
+  line-height: 1; }
   .vxe-checkbox + .vxe-checkbox {
     margin-left: 10px; }
   .vxe-checkbox > input[type="checkbox"] {
@@ -205,60 +231,21 @@
     -webkit-appearance: none;
        -moz-appearance: none;
             appearance: none; }
-  .vxe-checkbox > input + .vxe-checkbox--icon {
-    position: relative;
-    display: inline-block;
-    width: 1em;
-    height: 1em;
-    background-color: #fff;
-    vertical-align: middle;
-    border-radius: 2px;
-    border: 2px solid #dcdfe6; }
-    .vxe-checkbox > input + .vxe-checkbox--icon:before {
-      content: "";
-      position: absolute; }
-  .vxe-checkbox > input:checked + .vxe-checkbox--icon {
-    background-color: #409eff;
-    border-color: #409eff; }
-    .vxe-checkbox > input:checked + .vxe-checkbox--icon:before {
-      height: 0.64em;
-      width: 0.32em;
-      left: 50%;
-      top: 50%;
-      border: 2px solid #fff;
-      border-left: 0;
-      border-top: 0;
-      transform: translate(-50%, -50%) rotate(45deg); }
-    .vxe-checkbox > input:checked + .vxe-checkbox--icon + .vxe-checkbox--label {
-      color: #409eff; }
   .vxe-checkbox.is--indeterminate > input:not(:checked) + .vxe-checkbox--icon {
-    background-color: #409eff;
-    border-color: #409eff; }
-    .vxe-checkbox.is--indeterminate > input:not(:checked) + .vxe-checkbox--icon:before {
-      border: 0;
-      left: 50%;
-      top: 50%;
-      height: 2px;
-      width: 0.6em;
-      background-color: #fff;
-      transform: translate(-50%, -50%); }
+    color: #409eff; }
   .vxe-checkbox:not(.is--disabled) > input:focus + .vxe-checkbox--icon {
-    border-color: #409eff;
+    color: #409eff;
     box-shadow: 0 0 0.2em 0 #409eff; }
   .vxe-checkbox:not(.is--disabled):hover > input + .vxe-checkbox--icon {
     border-color: #409eff; }
   .vxe-checkbox.is--disabled {
     cursor: not-allowed; }
     .vxe-checkbox.is--disabled > input + .vxe-checkbox--icon {
-      border-color: #dcdfe6;
-      background-color: #f3f3f3; }
-      .vxe-checkbox.is--disabled > input + .vxe-checkbox--icon:before {
-        border-color: #c0c4cc; }
+      color: #dcdfe6; }
       .vxe-checkbox.is--disabled > input + .vxe-checkbox--icon + .vxe-checkbox--label {
         color: #BFBFBF; }
     .vxe-checkbox.is--disabled > input:checked + .vxe-checkbox--icon {
-      border-color: #dcdfe6;
-      background-color: #f3f3f3; }
+      color: #dcdfe6; }
   .vxe-checkbox .vxe-checkbox--label {
     padding-left: 0.5em;
     vertical-align: middle;
@@ -267,17 +254,9 @@
 
 .vxe-checkbox {
   font-size: 14px; }
-  .vxe-checkbox .vxe-checkbox--icon {
-    font-size: 16px; }
   .vxe-checkbox.size--medium {
     font-size: 14px; }
-    .vxe-checkbox.size--medium .vxe-checkbox--icon {
-      font-size: 15px; }
   .vxe-checkbox.size--small {
     font-size: 13px; }
-    .vxe-checkbox.size--small .vxe-checkbox--icon {
-      font-size: 14px; }
   .vxe-checkbox.size--mini {
     font-size: 12px; }
-    .vxe-checkbox.size--mini .vxe-checkbox--icon {
-      font-size: 14px; }

package/es/checkbox-group/index.d.ts

@@ -1,4 +1,4 @@
-import { CheckboxGroup } from '../../types/checkbox-group'
+import { VxeCheckboxGroup } from '../../types/checkbox-group'
 
 export * from '../../types/checkbox-group'
-export default CheckboxGroup
+export default VxeCheckboxGroup

package/es/checkbox-group/index.js

@@ -1,9 +1,10 @@
 import VxeCheckboxGroupComponent from '../checkbox/src/group';
 import { dynamicApp } from '../dynamics';
-export var CheckboxGroup = Object.assign(VxeCheckboxGroupComponent, {
+export var VxeCheckboxGroup = Object.assign(VxeCheckboxGroupComponent, {
     install: function (app) {
         app.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent);
     }
 });
+export var CheckboxGroup = VxeCheckboxGroup;
 dynamicApp.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent);
-export default CheckboxGroup;
+export default VxeCheckboxGroup;

package/es/colgroup/index.d.ts

@@ -1,4 +1,4 @@
-import { Colgroup } from '../../types/colgroup'
+import { VxeColgroup } from '../../types/colgroup'
 
 export * from '../../types/colgroup'
-export default Colgroup
+export default VxeColgroup

package/es/colgroup/index.js

@@ -1,13 +1,14 @@
 import VxeTableColgroupComponent from '../table/src/group';
 import { dynamicApp } from '../dynamics';
-export var Colgroup = Object.assign(VxeTableColgroupComponent, {
+export var VxeColgroup = Object.assign(VxeTableColgroupComponent, {
     install: function (app) {
         app.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent);
         // 兼容旧用法
         app.component('VxeTableColgroup', VxeTableColgroupComponent);
     }
 });
+export var Colgroup = VxeColgroup;
 dynamicApp.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent);
 // 兼容旧用法
 dynamicApp.component('VxeTableColgroup', VxeTableColgroupComponent);
-export default Colgroup;
+export default VxeColgroup;

package/es/column/index.d.ts

@@ -1,4 +1,4 @@
-import { Column } from '../../types/column'
+import { VxeColumn } from '../../types/column'
 
 export * from '../../types/column'
-export default Column
+export default VxeColumn

package/es/column/index.js

@@ -1,13 +1,14 @@
 import VxeTableColumnComponent from '../table/src/column';
 import { dynamicApp } from '../dynamics';
-export var Column = Object.assign(VxeTableColumnComponent, {
+export var VxeColumn = Object.assign(VxeTableColumnComponent, {
     install: function (app) {
         app.component(VxeTableColumnComponent.name, VxeTableColumnComponent);
         // 兼容旧用法
         app.component('VxeTableColumn', VxeTableColumnComponent);
     }
 });
+export var Column = VxeColumn;
 dynamicApp.component(VxeTableColumnComponent.name, VxeTableColumnComponent);
 // 兼容旧用法
 dynamicApp.component('VxeTableColumn', VxeTableColumnComponent);
-export default Column;
+export default VxeColumn;

package/es/edit/index.d.ts

@@ -1,4 +1,4 @@
-import { Edit } from '../../types/edit'
+import { VxeModuleEdit } from '../../types/edit'
 
 export * from '../../types/edit'
-export default Edit
+export default VxeModuleEdit

package/es/edit/index.js

@@ -1,8 +1,9 @@
 import editHook from './src/hook';
 import { VXETable } from '../v-x-e-table';
-export var Edit = {
+export var VxeModuleEdit = {
     install: function () {
         VXETable.hooks.add('$tableEdit', editHook);
     }
 };
-export default Edit;
+export var Edit = VxeModuleEdit;
+export default VxeModuleEdit;

package/es/edit/src/hook.js

@@ -9,10 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
@@ -180,7 +184,7 @@ var editHook = {
                                     if (process.env.NODE_ENV === 'development') {
                                         if (item[treeOpts.parentField]) {
                                             if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[rowField]) {
-                                                errLog('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[rowField]]);
+                                                errLog('vxe.error.errProp', ["".concat(treeOpts.parentField, "=").concat(item[treeOpts.parentField]), "".concat(treeOpts.parentField, "=").concat(parentRow_1[rowField])]);
                                             }
                                         }
                                     }
@@ -217,8 +221,8 @@ var editHook = {
                             if (afIndex_1 === -1) {
                                 throw new Error(errLog('vxe.error.unableInsert'));
                             }
-                            afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
-                            tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords));
+                            afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords, false));
+                            tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords, false));
                             // 刷新单元格合并
                             mergeList.forEach(function (mergeItem) {
                                 var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
@@ -339,7 +343,7 @@ var editHook = {
                 }
                 // 如果当前行被激活编辑，则清除激活状态
                 if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
-                    editMethods.clearActived();
+                    editMethods.clearEdit();
                 }
                 // 从新增中移除已删除的数据
                 rows.forEach(function (row) {
@@ -572,7 +576,14 @@ var editHook = {
                     return $xetable.scrollToRow(row, column).then(function () {
                         var cell = $xetable.getCell(row, column);
                         if (cell) {
-                            editPrivateMethods.handleActived({ row: row, rowIndex: $xetable.getRowIndex(row), column: column, columnIndex: $xetable.getColumnIndex(column), cell: cell, $table: $xetable });
+                            editPrivateMethods.handleActived({
+                                row: row,
+                                rowIndex: $xetable.getRowIndex(row),
+                                column: column,
+                                columnIndex: $xetable.getColumnIndex(column),
+                                cell: cell,
+                                $table: $xetable
+                            });
                             internalData._lastCallTime = Date.now();
                         }
                         return nextTick();
@@ -585,14 +596,19 @@ var editHook = {
              */
             setSelectCell: function (row, fieldOrColumn) {
                 var tableData = reactData.tableData;
-                var visibleColumn = internalData.visibleColumn;
                 var editOpts = computeEditOpts.value;
                 var column = XEUtils.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                 if (row && column && editOpts.trigger !== 'manual') {
                     var rowIndex = $xetable.findRowIndexOf(tableData, row);
                     if (rowIndex > -1 && column) {
                         var cell = $xetable.getCell(row, column);
-                        var params = { row: row, rowIndex: rowIndex, column: column, columnIndex: visibleColumn.indexOf(column), cell: cell };
+                        var params = {
+                            row: row,
+                            rowIndex: rowIndex,
+                            column: column,
+                            columnIndex: $xetable.getColumnIndex(column),
+                            cell: cell
+                        };
                         $xetable.handleSelected(params, {});
                     }
                 }
@@ -628,7 +644,7 @@ var editHook = {
                             }
                             $xetable.closeTooltip();
                             if (actived.column) {
-                                editMethods.clearActived(evnt);
+                                editMethods.clearEdit(evnt);
                             }
                             type = 'edit-actived';
                             column.renderHeight = cell.offsetHeight;
@@ -739,7 +755,7 @@ var editHook = {
                 var selectMethod = function () {
                     if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
                         if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-                            editMethods.clearActived(evnt);
+                            editMethods.clearEdit(evnt);
                             editMethods.clearSelected();
                             if ($xetable.clearCellAreas) {
                                 $xetable.clearCellAreas();

package/es/export/index.d.ts

@@ -1,4 +1,4 @@
-import { Export } from '../../types/export'
+import { VxeModuleExport } from '../../types/export'
 
 export * from '../../types/export'
-export default Export
+export default VxeModuleExport

package/es/export/index.js

@@ -11,7 +11,7 @@ export var print = function (options) {
     });
     handlePrint(null, opts, opts.content);
 };
-export var Export = {
+export var VxeModuleExport = {
     ExportPanel: ExportPanelComponent,
     ImportPanel: ImportPanelComponent,
     install: function (app) {
@@ -33,6 +33,7 @@ export var Export = {
         app.component(ImportPanelComponent.name, ImportPanelComponent);
     }
 };
+export var Export = VxeModuleExport;
 dynamicApp.component(ExportPanelComponent.name, ExportPanelComponent);
 dynamicApp.component(ImportPanelComponent.name, ImportPanelComponent);
-export default Export;
+export default VxeModuleExport;

package/es/export/src/export-panel.js

@@ -134,7 +134,7 @@ export default defineComponent({
         };
         var renderVN = function () {
             var defaultOptions = props.defaultOptions, storeData = props.storeData;
-            var isAll = reactData.isAll, isIndeterminate = reactData.isIndeterminate;
+            var isAllChecked = reactData.isAll, isAllIndeterminate = reactData.isIndeterminate;
             var hasTree = storeData.hasTree, hasMerge = storeData.hasMerge, isPrint = storeData.isPrint, hasColgroup = storeData.hasColgroup;
             var isHeader = defaultOptions.isHeader;
             var cols = [];
@@ -145,11 +145,13 @@ export default defineComponent({
             XEUtils.eachTree(storeData.columns, function (column) {
                 var colTitle = formatText(column.getTitle(), 1);
                 var isColGroup = column.children && column.children.length;
+                var isChecked = column.checked;
+                var indeterminate = column.halfChecked;
                 cols.push(h('li', {
-                    class: ['vxe-export--panel-column-option', "level--" + column.level, {
+                    class: ['vxe-export--panel-column-option', "level--".concat(column.level), {
                             'is--group': isColGroup,
-                            'is--checked': column.checked,
-                            'is--indeterminate': column.halfChecked,
+                            'is--checked': isChecked,
+                            'is--indeterminate': indeterminate,
                             'is--disabled': column.disabled
                         }],
                     title: colTitle,
@@ -160,13 +162,7 @@ export default defineComponent({
                     }
                 }, [
                     h('span', {
-                        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                    }),
-                    h('span', {
-                        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                    }),
-                    h('span', {
-                        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                        class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                     }),
                     h('span', {
                         class: 'vxe-checkbox--label'
@@ -274,20 +270,14 @@ export default defineComponent({
                                                 }, [
                                                     h('li', {
                                                         class: ['vxe-export--panel-column-option', {
-                                                                'is--checked': isAll,
-                                                                'is--indeterminate': isIndeterminate
+                                                                'is--checked': isAllChecked,
+                                                                'is--indeterminate': isAllIndeterminate
                                                             }],
                                                         title: GlobalConfig.i18n('vxe.table.allTitle'),
                                                         onClick: allColumnEvent
                                                     }, [
                                                         h('span', {
-                                                            class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                                                        }),
-                                                        h('span', {
-                                                            class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                                                        }),
-                                                        h('span', {
-                                                            class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                                                            class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                                                         }),
                                                         h('span', {
                                                             class: 'vxe-checkbox--label'