vxe-table 4.1.18-beta.0 → 4.1.18

package/README.en.md

@@ -103,13 +103,15 @@ createApp(App).use(VXETable).mount('#app')
 
 ### CDN
 
+It is not recommended to use the public CDN address for production, because the connection may fail at any time, causing the project to hang up;  
+Remember to lock the version number by using CDN to avoid being affected by incompatible updates.
+
 ```HTML
 <!-- Style -->
 <link rel="stylesheet" href="https://unpkg.com/vxe-table@next/lib/style.css">
 <!-- Script -->
 <script src="https://unpkg.com/xe-utils"></script>
 <script src="https://unpkg.com/vxe-table@next"></script>
-<!-- It is recommended that users introduced by CDN lock the version on the link address to avoid the impact of incompatible updates -->
 ```
 
 ## Example

package/README.md

@@ -108,13 +108,15 @@ createApp(App).use(VXETable).mount('#app')
 
 ### CDN
 
+不建议将公共的 CDN 地址用于生产，因为该连接随时都可能会失效，导致项目挂掉;  
+使用 CDN 方式记得锁定版本号，避免受到非兼容性更新的影响
+
 ```HTML
 <!-- 引入样式 -->
 <link rel="stylesheet" href="https://unpkg.com/vxe-table@next/lib/style.css">
 <!-- 引入脚本 -->
 <script src="https://unpkg.com/xe-utils"></script>
 <script src="https://unpkg.com/vxe-table@next"></script>
-<!-- 建议使用 CDN 方式引入的用户在链接地址上锁定版本，避免受到非兼容性更新的影响 -->
 ```
 
 ## 示例

package/README.zh-TW.md

@@ -106,13 +106,15 @@ createApp(App).use(VXETable).mount('#app')
 
 ### CDN
 
+不建議將公共的CDN地址用於生產，因為該連接隨時都可能會失效，導致項目掛掉；  
+使用CDN管道記得鎖定版本號，避免受到非相容性更新的影響
+
 ```HTML
 <!-- 引入樣式 -->
 <link rel="stylesheet" href="https://unpkg.com/vxe-table@next/lib/style.css">
 <!-- 引入腳本 -->
 <script src="https://unpkg.com/xe-utils"></script>
 <script src="https://unpkg.com/vxe-table@next"></script>
-<!-- 建議使用 CDN 管道引入的用戶在連結位址上鎖定版本，避免受到非相容性更新的影響 -->
 ```
 
 ## 示例

package/es/export/src/hook.js

@@ -265,11 +265,18 @@ var tableExportHook = {
             var treeOpts = computeTreeOpts.value;
             return row[treeOpts.children] && row[treeOpts.children].length;
         };
-        var getSeq = function (row, rowIndex, column, columnIndex) {
+        var getSeq = function (row, $rowIndex, column, $columnIndex) {
             var seqOpts = computeSeqOpts.value;
             var seqMethod = seqOpts.seqMethod || column.seqMethod;
             if (seqMethod) {
-                return seqMethod({ row: row, rowIndex: rowIndex, column: column, columnIndex: columnIndex });
+                return seqMethod({
+                    row: row,
+                    rowIndex: $xetable.getRowIndex(row),
+                    $rowIndex: $rowIndex,
+                    column: column,
+                    columnIndex: $xetable.getColumnIndex(column),
+                    $columnIndex: $columnIndex
+                });
             }
             return $xetable.getRowSeq(row);
         };
@@ -277,7 +284,7 @@ var tableExportHook = {
             return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue;
         };
         var getLabelData = function (opts, columns, datas) {
-            var isAllExpand = opts.isAllExpand;
+            var isAllExpand = opts.isAllExpand, mode = opts.mode;
             var treeConfig = props.treeConfig;
             var radioOpts = computeRadioOpts.value;
             var checkboxOpts = computeCheckboxOpts.value;
@@ -289,7 +296,7 @@ var tableExportHook = {
                 // 如果是树表格只允许导出数据源
                 var rest_1 = [];
                 var expandMaps_1 = new Map();
-                XEUtils.eachTree(datas, function (item, rowIndex, items, path, parent, nodes) {
+                XEUtils.eachTree(datas, function (item, $rowIndex, items, path, parent, nodes) {
                     var row = item._row || item;
                     var parentRow = parent && parent._row ? parent._row : parent;
                     if ((isAllExpand || !parentRow || (expandMaps_1.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
@@ -300,7 +307,7 @@ var tableExportHook = {
                             _hasChild: hasRowChild,
                             _expand: hasRowChild && $xetable.isTreeExpandByRow(row)
                         };
-                        columns.forEach(function (column, columnIndex) {
+                        columns.forEach(function (column, $columnIndex) {
                             var cellValue = '';
                             var renderOpts = column.editRender || column.cellRender;
                             var exportLabelMethod = column.exportMethod;
@@ -316,7 +323,7 @@ var tableExportHook = {
                             else {
                                 switch (column.type) {
                                     case 'seq':
-                                        cellValue = getSeq(row, rowIndex, column, columnIndex);
+                                        cellValue = mode === 'all' ? path.map(function (num, i) { return i % 2 === 0 ? (Number(num) + 1) : '.'; }).join('') : getSeq(row, $rowIndex, column, $columnIndex);
                                         break;
                                     case 'checkbox':
                                         cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
@@ -355,11 +362,11 @@ var tableExportHook = {
                 }, treeOpts);
                 return rest_1;
             }
-            return datas.map(function (row, rowIndex) {
+            return datas.map(function (row, $rowIndex) {
                 var item = {
                     _row: row
                 };
-                columns.forEach(function (column, columnIndex) {
+                columns.forEach(function (column, $columnIndex) {
                     var cellValue = '';
                     var renderOpts = column.editRender || column.cellRender;
                     var exportLabelMethod = column.exportMethod;
@@ -375,7 +382,7 @@ var tableExportHook = {
                     else {
                         switch (column.type) {
                             case 'seq':
-                                cellValue = getSeq(row, rowIndex, column, columnIndex);
+                                cellValue = mode === 'all' ? $rowIndex + 1 : getSeq(row, $rowIndex, column, $columnIndex);
                                 break;
                             case 'checkbox':
                                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));

package/es/footer/src/footer.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { createCommentVNode, defineComponent, h, ref, inject, nextTick } from 'vue';
+import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { getPropClass } from '../../table/src/util';
 import { updateCellTitle } from '../../tools/dom';
@@ -78,15 +78,17 @@ export default defineComponent({
             }
             $xetable.dispatchEvent('scroll', { type: renderType, fixed: fixedType, scrollTop: bodyElem.scrollTop, scrollLeft: scrollLeft, isX: isX, isY: false }, evnt);
         };
-        nextTick(function () {
-            var fixedType = props.fixedType;
-            var elemStore = tableInternalData.elemStore;
-            var prefix = (fixedType || 'main') + "-footer-";
-            elemStore[prefix + "wrapper"] = refElem.value;
-            elemStore[prefix + "table"] = refFooterTable.value;
-            elemStore[prefix + "colgroup"] = refFooterColgroup.value;
-            elemStore[prefix + "list"] = refFooterTFoot.value;
-            elemStore[prefix + "xSpace"] = refFooterXSpace.value;
+        onMounted(function () {
+            nextTick(function () {
+                var fixedType = props.fixedType;
+                var elemStore = tableInternalData.elemStore;
+                var prefix = (fixedType || 'main') + "-footer-";
+                elemStore[prefix + "wrapper"] = refElem.value;
+                elemStore[prefix + "table"] = refFooterTable.value;
+                elemStore[prefix + "colgroup"] = refFooterColgroup.value;
+                elemStore[prefix + "list"] = refFooterTFoot.value;
+                elemStore[prefix + "xSpace"] = refFooterXSpace.value;
+            });
         });
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn, footerTableData = props.footerTableData;

package/es/grid/src/grid.js

@@ -25,7 +25,7 @@ import tableComponentEmits from '../../table/src/emits';
 import { useSize } from '../../hooks/size';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 var tableComponentPropKeys = Object.keys(tableComponentProps);
-var 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', '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', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'focus', 'blur', 'connect'];
+var 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'];
 var gridComponentEmits = __spreadArray(__spreadArray([], tableComponentEmits), [
     'page-change',
     'form-submit',
@@ -689,6 +689,7 @@ export default defineComponent({
                                     }
                                     sortList = defaultSort.map(function (item) {
                                         return {
+                                            field: item.field,
                                             property: item.field,
                                             order: item.order
                                         };

package/es/header/src/header.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { createCommentVNode, defineComponent, h, ref, inject, nextTick, watch } from 'vue';
+import { createCommentVNode, defineComponent, h, ref, inject, nextTick, watch, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { convertToRows } from './util';
 import { getColMinWidth } from '../../table/src/util';
@@ -130,18 +130,20 @@ export default defineComponent({
             }
         };
         watch(function () { return props.tableColumn; }, uploadColumn);
-        nextTick(function () {
-            var fixedType = props.fixedType;
-            var internalData = $xetable.internalData;
-            var elemStore = internalData.elemStore;
-            var prefix = (fixedType || 'main') + "-header-";
-            elemStore[prefix + "wrapper"] = refElem.value;
-            elemStore[prefix + "table"] = refHeaderTable.value;
-            elemStore[prefix + "colgroup"] = refHeaderColgroup.value;
-            elemStore[prefix + "list"] = refHeaderTHead.value;
-            elemStore[prefix + "xSpace"] = refHeaderXSpace.value;
-            elemStore[prefix + "repair"] = refHeaderBorderRepair.value;
-            uploadColumn();
+        onMounted(function () {
+            nextTick(function () {
+                var fixedType = props.fixedType;
+                var internalData = $xetable.internalData;
+                var elemStore = internalData.elemStore;
+                var prefix = (fixedType || 'main') + "-header-";
+                elemStore[prefix + "wrapper"] = refElem.value;
+                elemStore[prefix + "table"] = refHeaderTable.value;
+                elemStore[prefix + "colgroup"] = refHeaderColgroup.value;
+                elemStore[prefix + "list"] = refHeaderTHead.value;
+                elemStore[prefix + "xSpace"] = refHeaderXSpace.value;
+                elemStore[prefix + "repair"] = refHeaderBorderRepair.value;
+                uploadColumn();
+            });
         });
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn;

package/es/modal/src/modal.js

@@ -285,7 +285,7 @@ export default defineComponent({
         var maximize = function () {
             return nextTick().then(function () {
                 if (!reactData.zoomLocat) {
-                    var marginSize = XEUtils.toNumber(props.marginSize);
+                    var marginSize = Math.max(0, XEUtils.toNumber(props.marginSize));
                     var boxElem = getBox();
                     var _a = getDomNode(), visibleHeight = _a.visibleHeight, visibleWidth = _a.visibleWidth;
                     reactData.zoomLocat = {

package/es/pulldown/src/pulldown.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, Teleport, ref, onUnmounted, reactive, nextTick } from 'vue';
+import { defineComponent, h, Teleport, ref, onUnmounted, reactive, nextTick, watch } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { useSize } from '../../hooks/size';
@@ -8,6 +8,7 @@ import { GlobalEvent } from '../../tools/event';
 export default defineComponent({
     name: 'VxePulldown',
     props: {
+        modelValue: Boolean,
         disabled: Boolean,
         placement: String,
         size: { type: String, default: function () { return GlobalConfig.size; } },
@@ -15,6 +16,7 @@ export default defineComponent({
         transfer: Boolean
     },
     emits: [
+        'update:modelValue',
         'hide-panel'
     ],
     setup: function (props, context) {
@@ -144,6 +146,7 @@ export default defineComponent({
                     reactData.animatVisible = true;
                     setTimeout(function () {
                         reactData.visiblePanel = true;
+                        emit('update:modelValue', true);
                         updatePlacement();
                         setTimeout(function () {
                             resolve(updatePlacement());
@@ -161,6 +164,7 @@ export default defineComponent({
          */
         var hidePanel = function () {
             reactData.visiblePanel = false;
+            emit('update:modelValue', false);
             return new Promise(function (resolve) {
                 if (reactData.animatVisible) {
                     hidePanelTimeout = window.setTimeout(function () {
@@ -228,6 +232,14 @@ export default defineComponent({
             hidePanel: hidePanel
         };
         Object.assign($xepulldown, pulldownMethods);
+        watch(function () { return props.modelValue; }, function (value) {
+            if (value) {
+                showPanel();
+            }
+            else {
+                hidePanel();
+            }
+        });
         nextTick(function () {
             GlobalEvent.on($xepulldown, 'mousewheel', handleGlobalMousewheelEvent);
             GlobalEvent.on($xepulldown, 'mousedown', handleGlobalMousedownEvent);