Parcourir la source

修复column值为字符串问题

刘忠健 il y a 1 an
Parent
commit
4663f85bfa
7 fichiers modifiés avec 12 ajouts et 11 suppressions
  1. 1 0
      .gitignore
  2. 1 1
      excel/.gitignore
  3. 2 2
      excel/package-lock.json
  4. 1 1
      excel/package.json
  5. 6 6
      excel/src/libs/ExcelWriter.ts
  6. 1 1
      excel/src/libs/Yc.ts
  7. BIN
      excel/sync.ffs_db

+ 1 - 0
.gitignore

@@ -23,3 +23,4 @@ dist
 package-lock.json
 yarn-lock.json
 excel/sync.ffs_db
+excel/sync.ffs_db

+ 1 - 1
excel/.gitignore

@@ -20,4 +20,4 @@ dist
 *.njsproj
 *.sln
 *.sw?
-sync.ffs_db
+*.ffs_db

+ 2 - 2
excel/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@ycxxkj/uniapp",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@ycxxkj/uniapp",
-      "version": "1.0.27",
+      "version": "1.0.29",
       "license": "ISC",
       "dependencies": {
         "await-to-js": "^3.0.0"

+ 1 - 1
excel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycxxkj/excel",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "ycxxkj excel libs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

+ 6 - 6
excel/src/libs/ExcelWriter.ts

@@ -84,20 +84,20 @@ const ExcelWriter = {
 		//rowSpan span
 		let arrayOrg = data;
 		console.log("#debug#🚀 ~ file: test.vue:42 ~ testOne2Two ~ arrayOrg:", JSON.stringify(arrayOrg));
-		let maxRow = 0;
-		let maxColumn = 0;
+		let maxRow: number = 0;
+		let maxColumn: number = 0;
 		arrayOrg.forEach((item) => {
 			let letters = item.poi.replace(/[^a-z]/gi, "").toUpperCase();
-			let num = item.poi.replace(/\D/g, "");
-			let row = columnArray.indexOf(letters);
+			let column: number = parseInt(item.poi.replace(/\D/g, ""));
+			let row: number = columnArray.indexOf(letters);
 			if (row > maxRow) {
 				maxRow = row;
 			}
-			let column = num;
+
 			if (column > maxColumn) {
 				maxColumn = column;
 			}
-			console.log("#debug#🚀 ~ file: test.vue:47 ~ arrayOrg.forEach ~ num:", num);
+			console.log("#debug#🚀 ~ file: test.vue:47 ~ arrayOrg.forEach ~ num:", column, maxColumn);
 			console.log("#debug#🚀 ~ file: test.vue:46 ~ testOne2Two ~ letters:", letters, columnArray.indexOf(letters));
 		});
 		let excelData = [] as any;

+ 1 - 1
excel/src/libs/Yc.ts

@@ -1,6 +1,6 @@
 const Yc = {
 	getVersion() {
-		return "@ycxxkj/excel v1.0.28";
+		return "@ycxxkj/excel v1.0.30";
 	},
 	/**
 	 * X毫秒后执行

BIN
excel/sync.ffs_db