Commit88cefd9

committed

Merge branch 'lyhue1991-dev' into dev

2 parents580cc06 +8d61a8e commit88cefd9Copy full SHA for 88cefd9

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ const $readExcel = async (filePath: string, options: ExcelInputOptionsNode = {})`
`71`	`71`	`constarrBufInt8=newUint8Array(arrBuf);`
`72`	`72`	`constworkbook=read(arrBufInt8,{type:"array", ...parsingOptions});`
`73`	`73`	`constworksheet=workbook.Sheets[workbook.SheetNames[sheet]];`
`74`		`-constdata=utils.sheet_to_json(worksheet);`
	`74`	`+constdata=utils.sheet_to_json(worksheet,{defval:null});`
`75`	`75`	`constdf=newDataFrame(data,frameConfig);`
`76`	`76`	`resolve(df);`
`77`	`77`	`});`
`@@ -89,7 +89,7 @@ const $readExcel = async (filePath: string, options: ExcelInputOptionsNode = {})`
`89`	`89`
`90`	`90`	`constworkbook=readFile(filePath,parsingOptions);`
`91`	`91`	`constworksheet=workbook.Sheets[workbook.SheetNames[sheet]];`
`92`		`-constdata=utils.sheet_to_json(worksheet);`
	`92`	`+constdata=utils.sheet_to_json(worksheet,{defval:null});`
`93`	`93`	`constdf=newDataFrame(data,frameConfig);`
`94`	`94`	`resolve(df);`
`95`	`95`	`})`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,23 @@ describe("toExcel", function () {`
`106`	`106`	`assert.equal(fs.existsSync(filePath),true)`
`107`	`107`	`});`
`108`	`108`
	`109`	`+it("handles null values correctly",asyncfunction(){`
	`110`	`+constdata=[`
	`111`	`+{'name':'Alice','age':25},`
	`112`	`+{'name':null,'age':30},`
	`113`	`+{'name':'Charlie','age':35}`
	`114`	`+];`
	`115`	`+constdf:any=newDataFrame(data);`
	`116`	`+constfilePath=path.join(process.cwd(),"test","samples","people.xlsx");`
	`117`	`+`
	`118`	`+toExcel(df,{ filePath,sheetName:'Sheet1'});`
	`119`	`+constdf2:any=awaitreadExcel(filePath);`
	`120`	`+`
	`121`	`+assert.deepEqual(df2.values,[`
	`122`	`+['Alice',25],`
	`123`	`+[null,30],`
	`124`	`+['Charlie',35]`
	`125`	`+]);`
	`126`	`+assert.deepEqual(df2.columns,['name','age']);`
	`127`	`+});`
`109`	`128`	`})`

1.27 KB

Binary file not shown.

Comments

(0)