vxe-pc-ui 4.20.13 → 4.20.15

package/lib/index.umd.js

@@ -5334,7 +5334,7 @@ function checkDynamic() {
 const {
   log: log_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}` : '';
@@ -5352,7 +5352,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.20.13";
+const ui_version = "4.20.15";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -42902,6 +42902,9 @@ function select_createInternalData() {
         }
         if (!reactData.initialized) {
           reactData.initialized = true;
+          (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+            bindScrollbarResize();
+          });
         }
         reactData.isActivated = true;
         reactData.isAniVisible = true;
@@ -44266,7 +44269,6 @@ function select_createInternalData() {
         }
       });
       reLayoutFlag.value++;
-      bindScrollbarResize();
       select_globalEvents.on($xeSelect, 'mousedown', handleGlobalMousedownEvent);
       select_globalEvents.on($xeSelect, 'keydown', handleGlobalKeydownEvent);
       select_globalEvents.on($xeSelect, 'blur', handleGlobalBlurEvent);
@@ -50712,11 +50714,27 @@ function table_select_createInternalData() {
     const computePropsOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return props.optionProps || {};
     });
+    const computeCheckboxOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        multiple
+      } = props;
+      const gridOpts = computeGridOpts.value;
+      return Object.assign({
+        reserve: multiple,
+        showReserveStatus: multiple
+      }, getConfig().table.checkboxConfig, gridOpts.checkboxConfig);
+    });
     const computeRowOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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().table.rowConfig, gridOpts.rowConfig);
     });
     const computeRowKeyField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const rowOpts = computeRowOpts.value;
@@ -50740,6 +50758,7 @@ function table_select_createInternalData() {
     });
     const computeSelectGridOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const gridOpts = computeGridOpts.value;
+      const checkboxOpts = computeCheckboxOpts.value;
       const {
         pagerConfig,
         proxyConfig
@@ -50779,11 +50798,14 @@ function table_select_createInternalData() {
             });
           }
           return Object.assign({}, gridOpts, {
+            checkboxConfig: checkboxOpts,
             proxyConfig: newProxyConfig
           });
         }
       }
-      return gridOpts;
+      return Object.assign({}, gridOpts, {
+        checkboxConfig: checkboxOpts
+      });
     });
     const computeSelectLabel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
@@ -50859,22 +50881,37 @@ function table_select_createInternalData() {
     };
     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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(modelValue) ? [] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 => {
@@ -51177,9 +51214,13 @@ function table_select_createInternalData() {
         $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];
         });