@lambo-design/shared 1.0.0-beta.350 → 1.0.0-beta.352

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/utils/excel.js +4 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/shared",
3
- "version": "1.0.0-beta.350",
3
+ "version": "1.0.0-beta.352",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
package/utils/excel.js CHANGED
@@ -304,7 +304,9 @@ export const enums_vxe_transform = (paramData) => {
304
304
  export const enums_to_value = (enums,jsonData)=>{
305
305
  if(enums&&enums.length>0){
306
306
  return jsonData.map(v => enums.map(e =>{
307
- v[e.key] = e.enums[v[e.key]]
307
+ if(e.enums[v[e.key]]){
308
+ v[e.key] = e.enums[v[e.key]]
309
+ }
308
310
  return v
309
311
  })[0])
310
312
  }else{
@@ -378,7 +380,7 @@ function merge_cell({ws,data,startRow}) {
378
380
  // }
379
381
 
380
382
  // Expand the end row
381
- merge.e.r = i;
383
+ merge.e.r = i + startRow;
382
384
  }
383
385
 
384
386
  // Add the merge object to the array if it's not empty