修复空值问题

x-extends · Dec 2, 2019 · 0549fa2 · 0549fa2
1 parent 1a5eaa8
commit 0549fa2
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 12 deletions.
diff --git a/dist/index.common.js b/dist/index.common.js
diff --git a/dist/index.js b/dist/index.js
@@ -279,14 +279,37 @@
             optionProps = _renderOpts$optionPro2 === void 0 ? {} : _renderOpts$optionPro2,
             _renderOpts$optionGro2 = renderOpts.optionGroupProps,
             optionGroupProps = _renderOpts$optionGro2 === void 0 ? {} : _renderOpts$optionGro2;
-        var row = params.row,
+        var $table = params.$table,
+            row = params.row,
             column = params.column;
         var labelProp = optionProps.label || 'label';
         var valueProp = optionProps.value || 'value';
         var groupOptions = optionGroupProps.options || 'options';
 
         var cellValue = _xeUtils["default"].get(row, column.property);
 
+        var colid = column.id;
+        var rest;
+        var cellData;
+
+        if (props.remote) {
+          var fullAllDataRowMap = $table.fullAllDataRowMap;
+          var cacheCell = fullAllDataRowMap.has(row);
+
+          if (cacheCell) {
+            rest = fullAllDataRowMap.get(row);
+            cellData = rest.cellData;
+
+            if (!cellData) {
+              cellData = fullAllDataRowMap.get(row).cellData = {};
+            }
+          }
+
+          if (rest && cellData[colid] && cellData[colid].value === cellValue) {
+            return cellData[colid].label;
+          }
+        }
+
         if (!(cellValue === null || cellValue === undefined || cellValue === '')) {
           return cellText(h, _xeUtils["default"].map(props.multiple ? cellValue : [cellValue], optionGroups ? function (value) {
             var selectItem;
@@ -301,13 +324,31 @@
               }
             }
 
-            return selectItem ? selectItem[labelProp] : null;
+            var cellLabel = selectItem ? selectItem[labelProp] : value;
+
+            if (cellData && options && options.length) {
+              cellData[colid] = {
+                value: cellValue,
+                label: cellLabel
+              };
+            }
+
+            return cellLabel;
           } : function (value) {
             var selectItem = _xeUtils["default"].find(options, function (item) {
               return item[valueProp] === value;
             });
 
-            return selectItem ? selectItem[labelProp] : null;
+            var cellLabel = selectItem ? selectItem[labelProp] : value;
+
+            if (cellData && options && options.length) {
+              cellData[colid] = {
+                value: cellValue,
+                label: cellLabel
+              };
+            }
+
+            return cellLabel;
           }).join(';'));
         }
 

diff --git a/dist/index.min.js b/dist/index.min.js
diff --git a/index.ts b/index.ts
@@ -208,11 +208,28 @@ const renderMap = {
     },
     renderCell(h: Function, renderOpts: any, params: any) {
       let { options, optionGroups, props = {}, optionProps = {}, optionGroupProps = {} } = renderOpts
-      let { row, column } = params
+      let { $table, row, column } = params
       let labelProp = optionProps.label || 'label'
       let valueProp = optionProps.value || 'value'
       let groupOptions = optionGroupProps.options || 'options'
       let cellValue = XEUtils.get(row, column.property)
+      let colid: string = column.id
+      let rest: any
+      let cellData: any
+      if (props.remote) {
+        let fullAllDataRowMap: Map<any, any> = $table.fullAllDataRowMap
+        let cacheCell: any = fullAllDataRowMap.has(row)
+        if (cacheCell) {
+          rest = fullAllDataRowMap.get(row)
+          cellData = rest.cellData
+          if (!cellData) {
+            cellData = fullAllDataRowMap.get(row).cellData = {}
+          }
+        }
+        if (rest && cellData[colid] && cellData[colid].value === cellValue) {
+          return cellData[colid].label
+        }
+      }
       if (!(cellValue === null || cellValue === undefined || cellValue === '')) {
         return cellText(h, XEUtils.map(props.multiple ? cellValue : [cellValue], optionGroups ? (value: any) => {
           let selectItem
@@ -222,10 +239,18 @@ const renderMap = {
               break
             }
           }
-          return selectItem ? selectItem[labelProp] : null
+          let cellLabel: any = selectItem ? selectItem[labelProp] : value
+          if (cellData && options && options.length) {
+            cellData[colid] = { value: cellValue, label: cellLabel }
+          }
+          return cellLabel
         } : (value: any) => {
           let selectItem = XEUtils.find(options, (item: any) => item[valueProp] === value)
-          return selectItem ? selectItem[labelProp] : null
+          let cellLabel: any = selectItem ? selectItem[labelProp] : value
+          if (cellData && options && options.length) {
+            cellData[colid] = { value: cellValue, label: cellLabel }
+          }
+          return cellLabel
         }).join(';'))
       }
       return cellText(h, '')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table-plugin-iview",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "基于 vxe-table 表格的适配插件，用于兼容 iview 组件库",
   "scripts": {
     "lib": "gulp build"