fast-cocos 1.0.0 → 1.0.3

package/dist/xlsx/src/XlsxParser.js

@@ -100,7 +100,8 @@ class XlsxParser {
             intros,
             types,
             fields,
-            data
+            data,
+            firstColumnMergedArray: SheetType.Array == sheetType && this.isFirstColumnMergedArray(data)
         };
         console.info("\x1b[36m%s\x1b[0m", "解析表: " + name);
         switch (sheetType) {
@@ -108,7 +109,12 @@ class XlsxParser {
                 this.parseMap(sheetInfo);
                 break;
             case SheetType.Array:
-                this.parseArray(sheetInfo);
+                if (sheetInfo.firstColumnMergedArray) {
+                    this.parseFirstColumnMergedArray(sheetInfo);
+                }
+                else {
+                    this.parseArray(sheetInfo);
+                }
                 break;
             case SheetType.KVMap:
                 this.parseKVMap(sheetInfo);
@@ -176,6 +182,62 @@ class XlsxParser {
         // 写json文件
         this.writeSheetSync(sheetInfo.outPath, content);
     }
+    /**
+     * 解析首列合并行数组
+     * @param sheetInfo 工作表信息
+     */
+    parseFirstColumnMergedArray(sheetInfo) {
+        const { types, fields, data } = sheetInfo;
+        // 类型声明
+        this.parseTypeDeclare(sheetInfo);
+        // 解析内容
+        const content = [];
+        let group;
+        for (let i = 0; i < data.length; ++i) {
+            const col = data[i];
+            if (col[0]) {
+                const columns = data.map((v) => v[0]);
+                group = {
+                    [fields[0]]: this.parseValue(types[0], col[0], columns),
+                    arr: []
+                };
+                content.push(group);
+            }
+            const info = this.parseRowInfo(sheetInfo, col);
+            if (group && Object.keys(info).length) {
+                group.arr.push(info);
+            }
+        }
+        // 写json文件
+        this.writeSheetSync(sheetInfo.outPath, content);
+    }
+    /**
+     * 解析行数据
+     * @param sheetInfo 工作表信息
+     * @param row 行数据
+     */
+    parseRowInfo(sheetInfo, row) {
+        const { types, fields, data } = sheetInfo;
+        const info = {};
+        for (let i = 0; i < row.length; ++i) {
+            const field = fields[i];
+            if (field) {
+                const columns = data.map((v) => v[i]);
+                info[field] = this.parseValue(types[i], row[i], columns);
+            }
+        }
+        return info;
+    }
+    /**
+     * 是否首列合并行数组
+     * @param data 数据行
+     */
+    isFirstColumnMergedArray(data) {
+        if (data.length <= 0 || !data[0][0]) {
+            return false;
+        }
+        return data.some((row, index) => index > 0 && !row[0] && row.some((value) => value));
+    }
     /**
      * 解析键值表
      * @param sheetInfo 工作表信息
@@ -446,7 +508,18 @@ class XlsxParser {
                 }
                 this.pushUnique(lines, `}\n`, 0);
                 this.pushUnique(lines, `/** ${xlsxName} */`, 0);
-                this.pushUnique(lines, `type ${typeName} = ${basename}[];`, 0);
+                if (sheetInfo.firstColumnMergedArray) {
+                    const type = this.removeExtraType(types[0]);
+                    lines.push(`interface ${basename}Group {`);
+                    lines.push(`    /** ${intros[0]} */`);
+                    lines.push(`    readonly ${fields[0]}: ${type};`);
+                    lines.push(`    readonly arr: ${basename}[];`);
+                    lines.push(`}\n`);
+                    lines.push(`type ${typeName} = ${basename}Group[];`);
+                }
+                else {
+                    this.pushUnique(lines, `type ${typeName} = ${basename}[];`, 0);
+                }
                 this.declareMap.set(typeName, lines);
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-cocos",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "scripts": {
     "clean": "rm -rf dist",
     "start": "node ./dist/index.js",