Merge branch 'master' of http://ssl.ycxxkj.com:38091/yckj/npm_libs

.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+*.lock
+
+node_modules
+.DS_Store
+dist
+*.local
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+package-lock.json
+yarn-lock.json

excel/.prettierrc

@@ -0,0 +1,9 @@
+{
+    "printWidth": 1000,
+    "tabWidth": 2,
+    "useTabs": true,
+    "singleQuote": false,
+    "semi": true,
+    "trailingComma": "none",
+    "bracketSpacing": true
+}

excel/package-lock.json

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

excel/package.json

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

excel/readme.md

@@ -8,3 +8,9 @@ npm i @ycxxkj/excel
 # yarn 安装
 yarn add @ycxxkj/excel
 ```
+
+# api说明
+
+
+
+# 使用示例

excel/src/libs/ExcelInterface.ts

@@ -1,12 +1,48 @@
-
+interface merge {
+	startRow: String | number;
+	StartColumn: String | number;
+	endRow: String | number;
+	endColumn: String | number;
+}
+interface cell {
+	row: String | number;
+	column: String | number;
+}
 /**
  * 导出的excel类型
  */
 interface Options {
-    type: typeof String;
-    border: boolean;
-    borderColor: string;
-    fileName: string;
-    columns: Array<any>;   
+	/**
+	 * 类型,暂时好像无用
+	 */
+	type: typeof String;
+	/**
+	 * 边框,true有边框，false无边框
+	 */
+	border: boolean;
+	/**
+	 * 边框颜色
+	 */
+	borderColor: string;
+	/**
+	 * 文件名
+	 */
+	fileName: string;
+	/**
+	 * 列配置
+	 */
+	columns: Array<any>;
+	/**
+	 * 合并单元格
+	 */
+	merges: Array<merge>;
+	/**
+	 * 最后1个单元格
+	 */
+	endCell: cell;
+	/**
+	 * 表头所在行
+	 */
+	headerRow: number;
 }
-export { Options };
+export { Options };

excel/src/libs/ExcelWriter.ts

@@ -1,236 +1,224 @@
-
 import writeXlsxFile from "write-excel-file";
 import { Options } from "./ExcelInterface";
 
 const columnNames = getColumnNames();
 
 function getColumnNames() {
-    let wordList = Array.from(new Array(26), (ele, index) => {
-        return String.fromCharCode(65 + index);
-    });
-    let columnNames = [];
-    for (let i = 0; i < 26; i++) {
-        columnNames.push(wordList[i]);
-    }
-    for (let i = 0; i < 26; i++) {
-        for (let j = 0; j < 26; j++) {
-            columnNames.push(wordList[i] + wordList[j]);
-        }
-    }
-    return columnNames;
+	let wordList = Array.from(new Array(26), (ele, index) => {
+		return String.fromCharCode(65 + index);
+	});
+	let columnNames = [];
+	for (let i = 0; i < 26; i++) {
+		columnNames.push(wordList[i]);
+	}
+	for (let i = 0; i < 26; i++) {
+		for (let j = 0; j < 26; j++) {
+			columnNames.push(wordList[i] + wordList[j]);
+		}
+	}
+	return columnNames;
 }
-console.log("#debug#🚀 ~ file: ExcelWriter.js:6 ~ columnNames ~ columnNames:", columnNames)
-function convertType(value:any, type:any) {
-    switch (type) {
-        case String:
-            return String(value);
-        case Number:
-            let output = Number(value);
-            if (isNaN(output)) {
-                output = 0;
-            }
-            return output;
-        case Boolean:
-            return Boolean(value);
-        case Array:
-            return Array.isArray(value) ? value : [value];
-        case Object:
-            return Object(value);
-        case null:
-            return null;
-        case undefined:
-            return undefined;
-        default:
-            return String(value);
-    }
+function convertType(value: any, type: any) {
+	switch (type) {
+		case String:
+			return String(value);
+		case Number:
+			let output = Number(value);
+			if (isNaN(output)) {
+				output = 0;
+			}
+			return output;
+		case Boolean:
+			return Boolean(value);
+		case Array:
+			return Array.isArray(value) ? value : [value];
+		case Object:
+			return Object(value);
+		case null:
+			return null;
+		case undefined:
+			return undefined;
+		default:
+			return String(value);
+	}
 }
 const ExcelWriter = {
-
-    async outputExcel(header:Array<any>, data:Array<any>, options:Options) {
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:24 ~ outputExcel ~ options:", options)
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:24 ~ outputExcel ~ header:", header)
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:24 ~ outputExcel ~ data:", data)
-        let excelData = [];
-
-        let excelDataHeader = [] as any;
-        header.forEach((headerItem, headerIndex) => {
-            let column = this._dealCellData(headerItem.title, headerItem, options);
-            column.type = String;
-            column.value = headerItem.title;
-            excelDataHeader.push(column);
-        });
-        let excelDataBody = [] as any;
-        data.forEach((row, rowIndex) => {
-            let rowObject = [] as any;
-            header.forEach((headerItem, headerIndex) => {
-                let column = this._dealCellData(row[headerItem.key], headerItem, options);
-
-                rowObject.push(column);
-            })
-            excelDataBody.push(rowObject);
-        });
-        excelData = [excelDataHeader, ...excelDataBody];
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:45 ~ outputExcel ~ excelData:", excelData)
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:55 ~ outputExcel ~ options:", options)
-        await this._output(excelData, options);
-
-    },
-    //==================私有方法============================
-
-    /**
-     * 生成单元格数据
-     * @param {*} columnCellValue 
-     * @param {*} header 
-     * @param {*} options 
-     * @returns 
-     */
-    _dealCellData(columnCellValue:any, header:any, options:Options) {
-        let cell = {
-            value: convertType(columnCellValue, header?.type ? header?.type : String)// columnCellValue.toString().trim()
-        } as any;
-        if (header?.width) {
-            cell.width = header.width;
-        }
-        if (header?.type) {
-            cell.type = header.type;
-        }
-        if (options.border) {
-            //如果有边框
-            cell.borderColor = options?.borderColor ?? "#000000";
-        }
-        return cell;
-    },
-    /**
-     * 导出excel表格
-     * @param {*} data 
-     * @param {*} options 
-     */
-    async _output(data:Array<any>, options:Options) {
-
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:6 ~ outputExcel ~ outputExcel:导出开始");
-        let excelRows = [];
-        data.forEach((row:Array<any>, rowIndex) => {
-            row.forEach((cell, cellIndex) => {
-                let column = {
-                    value: cell
-                };
-                excelRows.push(column);
-            })
-        });
-        let fileName = options?.fileName ? options.fileName : '导出.xlsx';
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:73 ~ _output ~ options:", options)
-        let columns = options?.columns ? options.columns : [];
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:74 ~ _output ~ columns:", columns)
-        let optionsOutput = {
-            columns, // (optional) column widths, etc.
-            fileName,
-        }
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:60 ~ _output ~ data:", data)
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:76 ~ _output ~ optionsOutput:", optionsOutput)
-        await writeXlsxFile(data, optionsOutput)
-
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:6 ~ outputExcel ~ outputExcel:导出结束");
-    },
-    /**
-     * 导出示例
-     */
-    async outputTest() {
-        console.log("#debug#🚀 ~ file: ExcelWriter.js:6 ~ outputTest ~ outputTest:测试导出开始", columnNames);
-
-        const HEADER_ROW = [
-            {
-                value: 'Name',
-                fontWeight: 'bold'
-            },
-            {
-                value: 'Date of Birth',
-                fontWeight: 'bold'
-            },
-            {
-                value: 'Cost',
-                fontWeight: 'bold'
-            },
-            {
-                value: 'Paid',
-                fontWeight: 'bold'
-            }
-        ]
-
-        const DATA_ROW_1 = [
-            [
-                // "Name"
-                {
-                    type: String,
-                    value: 'John Smith',
-                    borderColor: "#000000"
-                },
-
-                // "Date of Birth"
-                {
-                    type: Date,
-                    value: new Date(),
-                    format: 'mm/dd/yyyy'
-                },
-
-                // "Cost"
-                {
-                    type: Number,
-                    value: 1800
-                },
-
-                // "Paid"
-                {
-                    type: Boolean,
-                    value: true
-                }
-            ],
-            [
-                // "Name"
-                {
-                    type: String,
-                    value: '第2行',
-                    borderColor: "#000000"
-                },
-
-                // "Date of Birth"
-                {
-                    type: Date,
-                    value: new Date(),
-                    format: 'yyyy-mm-dd'
-                },
-
-                // "Cost"
-                {
-                    type: Number,
-                    value: 1800,
-                    span: 3,
-                    borderColor: "#ff0000"
-                },
-
-                // "Paid"
-                null,
-                null,
-                {
-                    type: String,
-                    value: '第2行00',
-                    borderColor: "#000000",
-                    fontSize: 18
-                },
-            ]
-        ];
-
-        const data = [
-            HEADER_ROW,
-            ...DATA_ROW_1,
-
-        ] as any;
-        let options = {
-            // columns, // (optional) column widths, etc.
-            fileName: 'file.xlsx'
-        };
-        await writeXlsxFile(data, options);
-
-    }
-}
-
-export default ExcelWriter;
+	async getColumnNames() {
+		return columnNames;
+	},
+	async outputExcel(headerConfig: Array<any>, data: Array<any>, options: Options) {
+		let excelData: Array<any> = [];
+
+		data.forEach((row, rowIndex) => {
+			let rowObject = [] as any;
+			headerConfig.forEach((headerItem, headerIndex) => {
+				let column = this._dealCellData(row[headerItem.key], headerItem, options);
+
+				rowObject.push(column);
+			});
+			excelData.push(rowObject);
+		});
+
+		if (!options.hasOwnProperty("headerRow")) {
+			// 对象 options 上没有名为 "headerRow" 的属性
+			options.headerRow = 1;
+		}
+		if (options.headerRow > 0) {
+			let excelDataHeader = [] as any;
+			headerConfig.forEach((headerItem, headerIndex) => {
+				let column = this._dealCellData(headerItem.title, headerItem, options);
+				column.type = String;
+				column.value = headerItem.title;
+				excelDataHeader.push(column);
+			});
+			excelData.splice(options.headerRow - 1, 0, excelDataHeader);
+			//excelDataBody.unshift(excelDataHeader);
+		}
+		//excelData = [excelDataHeader, ...excelDataBody];
+		await this._output(excelData, options);
+	},
+	//==================私有方法============================
+
+	/**
+	 * 生成单元格数据
+	 * @param {*} columnCellValue
+	 * @param {*} header
+	 * @param {*} options
+	 * @returns
+	 */
+	_dealCellData(columnCellValue: any, header: any, options: Options) {
+		let cell = {
+			value: convertType(columnCellValue, header?.type ? header?.type : String) // columnCellValue.toString().trim()
+		} as any;
+		if (header?.width) {
+			cell.width = header.width;
+		}
+		if (header?.type) {
+			cell.type = header.type;
+		}
+		if (options?.border) {
+			//如果有边框
+			cell.borderColor = options?.borderColor ?? "#000000";
+		}
+		return cell;
+	},
+	/**
+	 * 导出excel表格
+	 * @param {*} data
+	 * @param {*} options
+	 */
+	async _output(data: Array<any>, options: Options) {
+		let excelRows = [];
+		data.forEach((row: Array<any>, rowIndex) => {
+			row.forEach((cell, cellIndex) => {
+				let column = {
+					value: cell
+				};
+				excelRows.push(column);
+			});
+		});
+		let fileName = options?.fileName ? options.fileName : "导出.xlsx";
+		let columns = options?.columns ? options.columns : [];
+		let optionsOutput = {
+			columns, // (optional) column widths, etc.
+			fileName
+		};
+		await writeXlsxFile(data, optionsOutput);
+	},
+
+	/**
+	 * 导出示例
+	 */
+	async outputTest() {
+		const HEADER_ROW = [
+			{
+				value: "Name",
+				fontWeight: "bold"
+			},
+			{
+				value: "Date of Birth",
+				fontWeight: "bold"
+			},
+			{
+				value: "Cost",
+				fontWeight: "bold"
+			},
+			{
+				value: "Paid",
+				fontWeight: "bold"
+			}
+		];
+
+		const DATA_ROW_1 = [
+			[
+				// "Name"
+				{
+					type: String,
+					value: "John Smith",
+					borderColor: "#000000"
+				},
+
+				// "Date of Birth"
+				{
+					type: Date,
+					value: new Date(),
+					format: "mm/dd/yyyy"
+				},
+
+				// "Cost"
+				{
+					type: Number,
+					value: 1800
+				},
+
+				// "Paid"
+				{
+					type: Boolean,
+					value: true
+				}
+			],
+			[
+				// "Name"
+				{
+					type: String,
+					value: "第2行",
+					borderColor: "#000000"
+				},
+
+				// "Date of Birth"
+				{
+					type: Date,
+					value: new Date(),
+					format: "yyyy-mm-dd"
+				},
+
+				// "Cost"
+				{
+					type: Number,
+					value: 1800,
+					span: 3,
+					borderColor: "#ff0000"
+				},
+
+				// "Paid"
+				null,
+				null,
+				{
+					type: String,
+					value: "第2行00",
+					borderColor: "#000000",
+					fontSize: 18
+				}
+			]
+		];
+
+		const data = [HEADER_ROW, ...DATA_ROW_1] as any;
+		let options = {
+			// columns, // (optional) column widths, etc.
+			fileName: "file.xlsx"
+		};
+		await writeXlsxFile(data, options);
+	}
+};
+
+export default ExcelWriter;

excel/src/libs/Yc.ts

@@ -1,21 +1,19 @@
-
 const Yc = {
-    getVersion() {
-        return "@ycxxkj/uniapp v1.0.7";
-        
-    },
-    /**
-     * X毫秒后执行
-     * @param milliseconds 
-     * @returns 
-     */
-    delay (milliseconds: number): Promise<boolean> {
+	getVersion() {
+		return "@ycxxkj/excel v1.0.14";
+	},
+	/**
+	 * X毫秒后执行
+	 * @param milliseconds
+	 * @returns
+	 */
+	delay(milliseconds: number): Promise<boolean> {
 		return new Promise((resolve, reject) => {
 			setTimeout(function (e: any) {
 				e = true;
 				resolve(e);
 			}, milliseconds);
 		});
-	},
+	}
 };
-export default Yc;
+export default Yc;

readme.md

@@ -7,5 +7,3 @@ excel组件
 # uniapp
 
 uniapp 通用代码
-
-