vxe-table 4.17.0-beta.5 → 4.17.0-beta.7

package/es/table/render/index.js

@@ -533,13 +533,25 @@ function oldSelectEditRender(renderOpts, params) {
     ];
 }
 function getSelectCellValue(renderOpts, { row, column }) {
-    const { options, optionGroups, optionProps = {}, optionGroupProps = {} } = renderOpts;
+    const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props = {} } = renderOpts;
     const cellValue = XEUtils.get(row, column.field);
     let selectItem;
     const labelProp = optionProps.label || 'label';
     const valueProp = optionProps.value || 'value';
     if (!(cellValue === null || cellValue === undefined)) {
-        return XEUtils.map(XEUtils.isArray(cellValue) ? cellValue : [cellValue], optionGroups
+        let vals = [];
+        if (XEUtils.isArray(cellValue)) {
+            vals = cellValue;
+        }
+        else {
+            if (props.multiple && `${cellValue}`.indexOf(',') > -1) {
+                vals = `${cellValue}`.split(',');
+            }
+            else {
+                vals = [cellValue];
+            }
+        }
+        return XEUtils.map(vals, optionGroups
             ? (value) => {
                 const groupOptions = optionGroupProps.options || 'options';
                 for (let index = 0; index < optionGroups.length; index++) {

package/es/table/src/body.js

@@ -301,7 +301,6 @@ export default defineVxeComponent({
             else {
                 tcStyle.minHeight = `${cellHeight}px`;
             }
-            // console.log(lastScrollTime)
             const tdVNs = [];
             if (fixedHiddenColumn && isAllOverflow) {
                 tdVNs.push(h('div', {
@@ -470,7 +469,18 @@ export default defineVxeComponent({
                         seq = rowRest._tIndex + 1;
                     }
                 }
-                const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };
+                const params = {
+                    $table: $xeTable,
+                    seq,
+                    rowid,
+                    fixed: fixedType,
+                    type: renderType,
+                    level: rowLevel,
+                    row,
+                    rowIndex,
+                    $rowIndex,
+                    _rowIndex
+                };
                 // 行是否被展开
                 const isExpandRow = expandColumn && !!rowExpandedFlag && !!rowExpandedMaps[rowid];
                 // 树节点是否被展开

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.17.0-beta.5";
+export const version = "4.17.0-beta.7";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.17.0-beta.5"}`;
+const version = `table v${"4.17.0-beta.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.0-beta.5";
+const version = "4.17.0-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3650,7 +3650,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.0-beta.5"}`;
+const log_version = `table v${"4.17.0-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7655,7 +7655,6 @@ const renderType = 'body';
       } else {
         tcStyle.minHeight = `${cellHeight}px`;
       }
-      // console.log(lastScrollTime)
       const tdVNs = [];
       if (fixedHiddenColumn && isAllOverflow) {
         tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -18188,14 +18187,25 @@ function getSelectCellValue(renderOpts, {
     options,
     optionGroups,
     optionProps = {},
-    optionGroupProps = {}
+    optionGroupProps = {},
+    props = {}
   } = renderOpts;
   const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
   let selectItem;
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
   if (!(cellValue === null || cellValue === undefined)) {
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().map(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(cellValue) ? cellValue : [cellValue], optionGroups ? value => {
+    let vals = [];
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(cellValue)) {
+      vals = cellValue;
+    } else {
+      if (props.multiple && `${cellValue}`.indexOf(',') > -1) {
+        vals = `${cellValue}`.split(',');
+      } else {
+        vals = [cellValue];
+      }
+    }
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().map(vals, optionGroups ? value => {
       const groupOptions = optionGroupProps.options || 'options';
       for (let index = 0; index < optionGroups.length; index++) {
         /* eslint-disable eqeqeq */