vxe-pc-ui 4.20.13 → 4.20.15

package/dist/all.esm.js

@@ -101,7 +101,7 @@ function checkDynamic() {
 }
 
 const { log } = VxeUI;
-const uiVersion = `ui v${"4.20.13"}`;
+const uiVersion = `ui v${"4.20.15"}`;
 function createComponentLog(name) {
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -115,7 +115,7 @@ function createComponentLog(name) {
 const warnLog$j = log.create('warn', uiVersion);
 log.create('error', uiVersion);
 
-const version = "4.20.13";
+const version = "4.20.15";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -33826,6 +33826,9 @@ var VxeSelectComponent = defineVxeComponent({
                 }
                 if (!reactData.initialized) {
                     reactData.initialized = true;
+                    nextTick(() => {
+                        bindScrollbarResize();
+                    });
                 }
                 reactData.isActivated = true;
                 reactData.isAniVisible = true;
@@ -35107,7 +35110,6 @@ var VxeSelectComponent = defineVxeComponent({
                 }
             });
             reLayoutFlag.value++;
-            bindScrollbarResize();
             globalEvents$1.on($xeSelect, 'mousedown', handleGlobalMousedownEvent);
             globalEvents$1.on($xeSelect, 'keydown', handleGlobalKeydownEvent);
             globalEvents$1.on($xeSelect, 'blur', handleGlobalBlurEvent);
@@ -40905,11 +40907,21 @@ var VxeTableSelectComponent = defineVxeComponent({
         const computePropsOpts = computed(() => {
             return props.optionProps || {};
         });
+        const computeCheckboxOpts = computed(() => {
+            const { multiple } = props;
+            const gridOpts = computeGridOpts.value;
+            return Object.assign({
+                reserve: multiple,
+                showReserveStatus: multiple
+            }, getConfig$a().table.checkboxConfig, gridOpts.checkboxConfig);
+        });
         const computeRowOpts = computed(() => {
+            const { multiple } = props;
             const gridOpts = computeGridOpts.value;
-            return Object.assign({}, gridOpts.rowConfig, {
+            const valueField = computeValueField.value;
+            return Object.assign({
                 isCurrent: true
-            });
+            }, multiple ? { keyField: valueField } : {}, getConfig$a().table.rowConfig, gridOpts.rowConfig);
         });
         const computeRowKeyField = computed(() => {
             const rowOpts = computeRowOpts.value;
@@ -40933,6 +40945,7 @@ var VxeTableSelectComponent = defineVxeComponent({
         });
         const computeSelectGridOpts = computed(() => {
             const gridOpts = computeGridOpts.value;
+            const checkboxOpts = computeCheckboxOpts.value;
             const { pagerConfig, proxyConfig } = gridOpts;
             if (proxyConfig) {
                 const proxyAjax = proxyConfig.ajax;
@@ -40959,10 +40972,10 @@ var VxeTableSelectComponent = defineVxeComponent({
                             }
                         });
                     }
-                    return Object.assign({}, gridOpts, { proxyConfig: newProxyConfig });
+                    return Object.assign({}, gridOpts, { checkboxConfig: checkboxOpts, proxyConfig: newProxyConfig });
                 }
             }
-            return gridOpts;
+            return Object.assign({}, gridOpts, { checkboxConfig: checkboxOpts });
         });
         const computeSelectLabel = computed(() => {
             const { modelValue, lazyOptions } = props;
@@ -41031,20 +41044,38 @@ var VxeTableSelectComponent = defineVxeComponent({
         };
         const tableSelectPrivateMethods = {};
         const getRowid = (option) => {
-            const nodeKeyField = computeRowKeyField.value;
-            const rowid = option[nodeKeyField];
+            const rowKeyField = computeRowKeyField.value;
+            const rowid = option[rowKeyField];
             return rowid ? encodeURIComponent(rowid) : '';
         };
         const getRowsByValue = (modelValue) => {
             const { fullRowMaps } = internalData;
+            const checkboxOpts = computeCheckboxOpts.value;
+            const rowKeyField = computeRowKeyField.value;
+            const valueField = computeValueField.value;
+            const labelField = computeLabelField.value;
             const rows = [];
             const vals = XEUtils.eqNull(modelValue) ? [] : (XEUtils.isArray(modelValue) ? modelValue : [modelValue]);
-            vals.forEach(val => {
-                const cacheItem = fullRowMaps[val];
-                if (cacheItem) {
-                    rows.push(cacheItem.item);
-                }
-            });
+            if (checkboxOpts.reserve) {
+                vals.forEach(val => {
+                    const cacheItem = fullRowMaps[val];
+                    rows.push(cacheItem
+                        ? cacheItem.item
+                        : {
+                            [rowKeyField]: val,
+                            [valueField]: val,
+                            [labelField]: val
+                        });
+                });
+            }
+            else {
+                vals.forEach(val => {
+                    const cacheItem = fullRowMaps[val];
+                    if (cacheItem) {
+                        rows.push(cacheItem.item);
+                    }
+                });
+            }
             return rows;
         };
         const updateModel = (modelValue) => {
@@ -41307,9 +41338,13 @@ var VxeTableSelectComponent = defineVxeComponent({
         };
         const checkboxChangeEvent = (params) => {
             const { $grid, $event, row } = params;
+            const checkboxOpts = computeCheckboxOpts.value;
             const valueField = computeValueField.value;
             if ($grid) {
                 const checkboxRecords = $grid.getCheckboxRecords();
+                if (checkboxOpts.reserve) {
+                    checkboxRecords.push(...$grid.getCheckboxReserveRecords());
+                }
                 const value = checkboxRecords.map(row => {
                     return row[valueField];
                 });