From bb97ff3b1ec22485afb284ee473535d02b7401a7 Mon Sep 17 00:00:00 2001
From: Geequlim <geequlim@gmail.com>
Date: Thu, 24 Dec 2020 17:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8A=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E8=87=B4=E6=95=B0=E7=BB=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E8=AF=AF=20=E6=B7=BB=E5=8A=A0=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/launch.json               |  9 +++++++--
 src/excel-exporter/TableParser.ts | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0f0f11c..e28d5de 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,8 +9,13 @@
 			"skipFiles": [
 				"<node_internals>/**"
 			],
-			// "cwd": "D:/work/repositories/zombie/config/新配表",
-			"cwd": "${workspaceFolder}",
+			"sourceMapPathOverrides": {
+				"webpack:///./~/*": "${workspaceRoot}/node_modules/*",
+				"webpack:///./*": "${workspaceRoot}/*",
+				"webpack:///*": "*"
+			},
+			"cwd": "D:/work/repositories/zombie/config/新配表",
+			// "cwd": "${workspaceFolder}",
 			"program": "${workspaceFolder}/dist/binary.js",
 			"args": [
 				"./excel-exporter.yaml"
diff --git a/src/excel-exporter/TableParser.ts b/src/excel-exporter/TableParser.ts
index 4530b6c..0bc9704 100644
--- a/src/excel-exporter/TableParser.ts
+++ b/src/excel-exporter/TableParser.ts
@@ -87,11 +87,12 @@ export class TableParser {
 			let row: RawTableCell[] = [];
 			for (let c = range.s.c; c <= range.e.c; c++) {
 				let C = xlsl.utils.encode_col(c);
-				let cell: RawTableCell = {
-					...(sheet[`${C}${R}`] as xlsl.CellObject),
+				let origin_cell = sheet[`${C}${R}`] as xlsl.CellObject;
+				let cell: RawTableCell = origin_cell ? {
+					...origin_cell,
 					column: c,
 					row: r,
-				};
+				} : null;
 				row.push(cell);
 			}
 			rows.push(row);
@@ -132,7 +133,6 @@ export class TableParser {
 				var t = this.get_data_type(cell);
 				if (type_order.indexOf(t) < type_order.indexOf(type)) {
 					if (type != DataType.null) {
-						// console.log(colors.yellow(`\t\t${first.v} 的数据类型被提升为 ${t}\n\t\t  ${this.dump_row_values(rows[start_raw + i])}`));
 						console.log(colors.yellow(`\t\t${first.v}(${this.format_cell_position(first).replace(/\d+/, '')}列) 的数据类型被提升为 ${t} 因为 ${this.format_cell_position(cell)} 的值为 ${cell.w}`));
 					}
 					type = t;
@@ -269,7 +269,7 @@ export class TableParser {
 		}
 	}
 
-	protected get_cell_value(cell: xlsl.CellObject, type: DataType) {
+	protected get_cell_value(cell: RawTableCell, type: DataType) {
 		switch (type) {
 			case DataType.bool:
 				return cell && cell.v as boolean == true;