diff --git a/Docs/ExampleData.xlsx b/Docs/ExampleData.xlsx index 5433379..42d1c46 100644 Binary files a/Docs/ExampleData.xlsx and b/Docs/ExampleData.xlsx differ diff --git a/Docs/excel.png b/Docs/excel.png new file mode 100644 index 0000000..2bad35c Binary files /dev/null and b/Docs/excel.png differ diff --git a/Docs/gui.png b/Docs/gui.png index 0cf5d19..5806078 100644 Binary files a/Docs/gui.png and b/Docs/gui.png differ diff --git a/GUI/DataManager.cs b/GUI/DataManager.cs index 4b7b91b..b1e7787 100644 --- a/GUI/DataManager.cs +++ b/GUI/DataManager.cs @@ -96,7 +96,7 @@ public void loadExcel(Program.Options options) mCSharp = new CSDefineGenerator(excelPath, excel, options.ExcludePrefix); //-- 导出JSON - mJson = new JsonExporter(excel, options.Lowcase, options.ExportArray, options.DateFormat, options.ForceSheetName, header, options.ExcludePrefix); + mJson = new JsonExporter(excel, options.Lowcase, options.ExportArray, options.DateFormat, options.ForceSheetName, header, options.ExcludePrefix, options.CellJson); } } } diff --git a/GUI/MainForm.Designer.cs b/GUI/MainForm.Designer.cs index 683f87a..fc7ae33 100644 --- a/GUI/MainForm.Designer.cs +++ b/GUI/MainForm.Designer.cs @@ -49,6 +49,7 @@ private void InitializeComponent() { this.pictureBoxExcel = new System.Windows.Forms.PictureBox(); this.labelExcelFile = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.textBoxExculdePrefix = new System.Windows.Forms.TextBox(); this.comboBoxSheetName = new System.Windows.Forms.ComboBox(); this.comboBoxDateFormat = new System.Windows.Forms.ComboBox(); this.btnReimport = new System.Windows.Forms.Button(); @@ -60,7 +61,7 @@ private void InitializeComponent() { this.tabPageJSON = new System.Windows.Forms.TabPage(); this.tabCSharp = new System.Windows.Forms.TabPage(); this.backgroundWorker = new System.ComponentModel.BackgroundWorker(); - this.textBoxExculdePrefix = new System.Windows.Forms.TextBox(); + this.checkBoxCellJson = new System.Windows.Forms.CheckBox(); label2 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); @@ -86,7 +87,7 @@ private void InitializeComponent() { // label2.Location = new System.Drawing.Point(6, 49); label2.Name = "label2"; - label2.Size = new System.Drawing.Size(77, 12); + label2.Size = new System.Drawing.Size(102, 12); label2.TabIndex = 1; label2.Text = "Encoding:"; label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -94,7 +95,7 @@ private void InitializeComponent() { // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(6, 23); + label1.Location = new System.Drawing.Point(31, 23); label1.Name = "label1"; label1.Size = new System.Drawing.Size(77, 12); label1.TabIndex = 1; @@ -105,7 +106,7 @@ private void InitializeComponent() { // label4.Location = new System.Drawing.Point(6, 75); label4.Name = "label4"; - label4.Size = new System.Drawing.Size(77, 12); + label4.Size = new System.Drawing.Size(102, 12); label4.TabIndex = 6; label4.Text = "Lowcase:"; label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -114,7 +115,7 @@ private void InitializeComponent() { // label3.Location = new System.Drawing.Point(6, 101); label3.Name = "label3"; - label3.Size = new System.Drawing.Size(77, 12); + label3.Size = new System.Drawing.Size(102, 12); label3.TabIndex = 4; label3.Text = "Header:"; label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -123,7 +124,7 @@ private void InitializeComponent() { // label5.Location = new System.Drawing.Point(6, 127); label5.Name = "label5"; - label5.Size = new System.Drawing.Size(77, 12); + label5.Size = new System.Drawing.Size(102, 12); label5.TabIndex = 9; label5.Text = "Date Format:"; label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -132,11 +133,20 @@ private void InitializeComponent() { // label6.Location = new System.Drawing.Point(6, 153); label6.Name = "label6"; - label6.Size = new System.Drawing.Size(77, 12); + label6.Size = new System.Drawing.Size(102, 12); label6.TabIndex = 11; label6.Text = "SheetName:"; label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // label7 + // + label7.Location = new System.Drawing.Point(6, 179); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(102, 12); + label7.TabIndex = 13; + label7.Text = "ExculdePrefix:"; + label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -268,7 +278,7 @@ private void InitializeComponent() { // this.splitContainer1.Panel2.Controls.Add(this.tabControlCode); this.splitContainer1.Size = new System.Drawing.Size(784, 494); - this.splitContainer1.SplitterDistance = 261; + this.splitContainer1.SplitterDistance = 288; this.splitContainer1.TabIndex = 5; // // flowLayoutPanel1 @@ -279,7 +289,7 @@ private void InitializeComponent() { this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(259, 492); + this.flowLayoutPanel1.Size = new System.Drawing.Size(286, 492); this.flowLayoutPanel1.TabIndex = 0; // // panelExcelDropBox @@ -291,7 +301,7 @@ private void InitializeComponent() { this.panelExcelDropBox.Location = new System.Drawing.Point(8, 8); this.panelExcelDropBox.Margin = new System.Windows.Forms.Padding(8); this.panelExcelDropBox.Name = "panelExcelDropBox"; - this.panelExcelDropBox.Size = new System.Drawing.Size(245, 212); + this.panelExcelDropBox.Size = new System.Drawing.Size(270, 176); this.panelExcelDropBox.TabIndex = 1; this.panelExcelDropBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelExcelDropBox_DragDrop); this.panelExcelDropBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelExcelDropBox_DragEnter); @@ -304,7 +314,7 @@ private void InitializeComponent() { this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(243, 210); + this.flowLayoutPanel2.Size = new System.Drawing.Size(268, 174); this.flowLayoutPanel2.TabIndex = 0; // // pictureBoxExcel @@ -312,7 +322,7 @@ private void InitializeComponent() { this.pictureBoxExcel.Image = global::excel2json.Properties.Resources.excel_64; this.pictureBoxExcel.Location = new System.Drawing.Point(3, 3); this.pictureBoxExcel.Name = "pictureBoxExcel"; - this.pictureBoxExcel.Size = new System.Drawing.Size(237, 100); + this.pictureBoxExcel.Size = new System.Drawing.Size(262, 130); this.pictureBoxExcel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pictureBoxExcel.TabIndex = 0; this.pictureBoxExcel.TabStop = false; @@ -320,17 +330,17 @@ private void InitializeComponent() { // labelExcelFile // this.labelExcelFile.Font = new System.Drawing.Font("Microsoft YaHei", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.labelExcelFile.Location = new System.Drawing.Point(3, 106); + this.labelExcelFile.Location = new System.Drawing.Point(3, 136); this.labelExcelFile.Name = "labelExcelFile"; this.labelExcelFile.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.labelExcelFile.Size = new System.Drawing.Size(237, 70); + this.labelExcelFile.Size = new System.Drawing.Size(260, 35); this.labelExcelFile.TabIndex = 1; this.labelExcelFile.Text = "Drop you .xlsx file here!"; this.labelExcelFile.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // groupBox1 // - this.groupBox1.AutoSize = true; + this.groupBox1.Controls.Add(this.checkBoxCellJson); this.groupBox1.Controls.Add(this.textBoxExculdePrefix); this.groupBox1.Controls.Add(label7); this.groupBox1.Controls.Add(label6); @@ -347,14 +357,21 @@ private void InitializeComponent() { this.groupBox1.Controls.Add(this.comboBoxEncoding); this.groupBox1.Controls.Add(this.comboBoxType); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(8, 236); + this.groupBox1.Location = new System.Drawing.Point(8, 200); this.groupBox1.Margin = new System.Windows.Forms.Padding(8); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(245, 248); + this.groupBox1.Size = new System.Drawing.Size(270, 280); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Options"; // + // textBoxExculdePrefix + // + this.textBoxExculdePrefix.Location = new System.Drawing.Point(114, 180); + this.textBoxExculdePrefix.Name = "textBoxExculdePrefix"; + this.textBoxExculdePrefix.Size = new System.Drawing.Size(150, 21); + this.textBoxExculdePrefix.TabIndex = 14; + // // comboBoxSheetName // this.comboBoxSheetName.DisplayMember = "0"; @@ -363,7 +380,7 @@ private void InitializeComponent() { this.comboBoxSheetName.Items.AddRange(new object[] { "Yes", "No"}); - this.comboBoxSheetName.Location = new System.Drawing.Point(89, 150); + this.comboBoxSheetName.Location = new System.Drawing.Point(114, 153); this.comboBoxSheetName.Name = "comboBoxSheetName"; this.comboBoxSheetName.Size = new System.Drawing.Size(150, 20); this.comboBoxSheetName.TabIndex = 10; @@ -376,7 +393,7 @@ private void InitializeComponent() { this.comboBoxDateFormat.Items.AddRange(new object[] { "yyyy/MM/dd", "yyyy/MM/dd hh:mm:ss"}); - this.comboBoxDateFormat.Location = new System.Drawing.Point(89, 124); + this.comboBoxDateFormat.Location = new System.Drawing.Point(114, 127); this.comboBoxDateFormat.Name = "comboBoxDateFormat"; this.comboBoxDateFormat.Size = new System.Drawing.Size(150, 20); this.comboBoxDateFormat.TabIndex = 8; @@ -384,7 +401,7 @@ private void InitializeComponent() { // // btnReimport // - this.btnReimport.Location = new System.Drawing.Point(68, 205); + this.btnReimport.Location = new System.Drawing.Point(85, 238); this.btnReimport.Name = "btnReimport"; this.btnReimport.Size = new System.Drawing.Size(75, 23); this.btnReimport.TabIndex = 7; @@ -400,7 +417,7 @@ private void InitializeComponent() { this.comboBoxLowcase.Items.AddRange(new object[] { "Yes", "No"}); - this.comboBoxLowcase.Location = new System.Drawing.Point(89, 72); + this.comboBoxLowcase.Location = new System.Drawing.Point(114, 75); this.comboBoxLowcase.Name = "comboBoxLowcase"; this.comboBoxLowcase.Size = new System.Drawing.Size(150, 20); this.comboBoxLowcase.TabIndex = 5; @@ -416,7 +433,7 @@ private void InitializeComponent() { "4", "5", "6"}); - this.comboBoxHeader.Location = new System.Drawing.Point(89, 98); + this.comboBoxHeader.Location = new System.Drawing.Point(114, 101); this.comboBoxHeader.Name = "comboBoxHeader"; this.comboBoxHeader.Size = new System.Drawing.Size(150, 20); this.comboBoxHeader.TabIndex = 3; @@ -427,7 +444,7 @@ private void InitializeComponent() { this.comboBoxEncoding.DisplayMember = "0"; this.comboBoxEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxEncoding.FormattingEnabled = true; - this.comboBoxEncoding.Location = new System.Drawing.Point(89, 46); + this.comboBoxEncoding.Location = new System.Drawing.Point(114, 49); this.comboBoxEncoding.Name = "comboBoxEncoding"; this.comboBoxEncoding.Size = new System.Drawing.Size(150, 20); this.comboBoxEncoding.TabIndex = 0; @@ -441,7 +458,7 @@ private void InitializeComponent() { this.comboBoxType.Items.AddRange(new object[] { "Array", "Dict Object"}); - this.comboBoxType.Location = new System.Drawing.Point(89, 20); + this.comboBoxType.Location = new System.Drawing.Point(114, 23); this.comboBoxType.Name = "comboBoxType"; this.comboBoxType.Size = new System.Drawing.Size(150, 20); this.comboBoxType.TabIndex = 0; @@ -455,7 +472,7 @@ private void InitializeComponent() { this.tabControlCode.Location = new System.Drawing.Point(0, 0); this.tabControlCode.Name = "tabControlCode"; this.tabControlCode.SelectedIndex = 0; - this.tabControlCode.Size = new System.Drawing.Size(517, 492); + this.tabControlCode.Size = new System.Drawing.Size(490, 492); this.tabControlCode.TabIndex = 0; // // tabPageJSON @@ -463,7 +480,7 @@ private void InitializeComponent() { this.tabPageJSON.Location = new System.Drawing.Point(4, 22); this.tabPageJSON.Name = "tabPageJSON"; this.tabPageJSON.Padding = new System.Windows.Forms.Padding(3); - this.tabPageJSON.Size = new System.Drawing.Size(509, 466); + this.tabPageJSON.Size = new System.Drawing.Size(482, 466); this.tabPageJSON.TabIndex = 0; this.tabPageJSON.Text = "JSON"; this.tabPageJSON.UseVisualStyleBackColor = true; @@ -473,7 +490,7 @@ private void InitializeComponent() { this.tabCSharp.Location = new System.Drawing.Point(4, 22); this.tabCSharp.Name = "tabCSharp"; this.tabCSharp.Padding = new System.Windows.Forms.Padding(3); - this.tabCSharp.Size = new System.Drawing.Size(509, 466); + this.tabCSharp.Size = new System.Drawing.Size(482, 466); this.tabCSharp.TabIndex = 1; this.tabCSharp.Text = "C#"; this.tabCSharp.UseVisualStyleBackColor = true; @@ -483,21 +500,15 @@ private void InitializeComponent() { this.backgroundWorker.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker_DoWork); this.backgroundWorker.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker_RunWorkerCompleted); // - // label7 + // checkBoxCellJson // - label7.Location = new System.Drawing.Point(6, 179); - label7.Name = "label7"; - label7.Size = new System.Drawing.Size(77, 12); - label7.TabIndex = 13; - label7.Text = "Exculde Prefix:"; - label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // textBoxExculdePrefix - // - this.textBoxExculdePrefix.Location = new System.Drawing.Point(89, 177); - this.textBoxExculdePrefix.Name = "textBoxExculdePrefix"; - this.textBoxExculdePrefix.Size = new System.Drawing.Size(150, 21); - this.textBoxExculdePrefix.TabIndex = 14; + this.checkBoxCellJson.AutoSize = true; + this.checkBoxCellJson.Location = new System.Drawing.Point(54, 207); + this.checkBoxCellJson.Name = "checkBoxCellJson"; + this.checkBoxCellJson.Size = new System.Drawing.Size(186, 16); + this.checkBoxCellJson.TabIndex = 15; + this.checkBoxCellJson.Text = "Convert Json String in Cell"; + this.checkBoxCellJson.UseVisualStyleBackColor = true; // // MainForm // @@ -521,7 +532,6 @@ private void InitializeComponent() { ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); - this.flowLayoutPanel1.PerformLayout(); this.panelExcelDropBox.ResumeLayout(false); this.flowLayoutPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxExcel)).EndInit(); @@ -564,5 +574,6 @@ private void InitializeComponent() { private System.Windows.Forms.ToolStripButton btnCopyCSharp; private System.Windows.Forms.ToolStripButton btnSaveCSharp; private System.Windows.Forms.TextBox textBoxExculdePrefix; + private System.Windows.Forms.CheckBox checkBoxCellJson; } } \ No newline at end of file diff --git a/GUI/MainForm.cs b/GUI/MainForm.cs index 1adc083..acd63ff 100644 --- a/GUI/MainForm.cs +++ b/GUI/MainForm.cs @@ -144,6 +144,7 @@ private void loadExcelAsync(string path) options.DateFormat = this.comboBoxDateFormat.Text; options.ForceSheetName = this.comboBoxSheetName.SelectedIndex == 0; options.ExcludePrefix = this.textBoxExculdePrefix.Text; + options.CellJson = this.checkBoxCellJson.Checked; //-- start import this.backgroundWorker.RunWorkerAsync(options); diff --git a/GUI/MainForm.resx b/GUI/MainForm.resx index 2db9a0b..ed926af 100644 --- a/GUI/MainForm.resx +++ b/GUI/MainForm.resx @@ -135,15 +135,15 @@ False + + False + 127, 17 17, 17 - - False - 241, 17 diff --git a/JsonExporter.cs b/JsonExporter.cs index 9fb4ec3..1c7b233 100644 --- a/JsonExporter.cs +++ b/JsonExporter.cs @@ -25,17 +25,17 @@ public string context { /// 构造函数：完成内部数据创建 /// /// ExcelLoader Object - public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string dateFormat, bool forceSheetName, int headerRows, string excludePrefix) + public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string dateFormat, bool forceSheetName, int headerRows, string excludePrefix, bool cellJson) { - mHeaderRows = headerRows-1; + mHeaderRows = headerRows - 1; List validSheets = new List(); for (int i = 0; i < excel.Sheets.Count; i++) { DataTable sheet = excel.Sheets[i]; - + // 过滤掉包含特定前缀的表单 string sheetName = sheet.TableName; - if (excludePrefix.Length>0 && sheetName.StartsWith(excludePrefix)) + if (excludePrefix.Length > 0 && sheetName.StartsWith(excludePrefix)) continue; if (sheet.Columns.Count > 0 && sheet.Rows.Count > 0) @@ -52,7 +52,7 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da { // single sheet //-- convert to object - object sheetValue = convertSheet(validSheets[0], exportArray, lowcase, excludePrefix); + object sheetValue = convertSheet(validSheets[0], exportArray, lowcase, excludePrefix, cellJson); //-- convert to json string mContext = JsonConvert.SerializeObject(sheetValue, jsonSettings); @@ -63,7 +63,7 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da Dictionary data = new Dictionary(); foreach (var sheet in validSheets) { - object sheetValue = convertSheet(sheet, exportArray, lowcase, excludePrefix); + object sheetValue = convertSheet(sheet, exportArray, lowcase, excludePrefix, cellJson); data.Add(sheet.TableName, sheetValue); } @@ -72,15 +72,15 @@ public JsonExporter(ExcelLoader excel, bool lowcase, bool exportArray, string da } } - private object convertSheet(DataTable sheet, bool exportArray, bool lowcase, string excludePrefix) + private object convertSheet(DataTable sheet, bool exportArray, bool lowcase, string excludePrefix, bool cellJson) { if (exportArray) - return convertSheetToArray(sheet, lowcase, excludePrefix); + return convertSheetToArray(sheet, lowcase, excludePrefix, cellJson); else - return convertSheetToDict(sheet, lowcase, excludePrefix); + return convertSheetToDict(sheet, lowcase, excludePrefix, cellJson); } - private object convertSheetToArray(DataTable sheet, bool lowcase, string excludePrefix) + private object convertSheetToArray(DataTable sheet, bool lowcase, string excludePrefix, bool cellJson) { List values = new List(); @@ -90,7 +90,7 @@ private object convertSheetToArray(DataTable sheet, bool lowcase, string exclude DataRow row = sheet.Rows[i]; values.Add( - convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix) + convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix, cellJson) ); } @@ -100,7 +100,7 @@ private object convertSheetToArray(DataTable sheet, bool lowcase, string exclude /// /// 以第一列为ID，转换成ID->Object的字典对象 /// - private object convertSheetToDict(DataTable sheet, bool lowcase, string excludePrefix) + private object convertSheetToDict(DataTable sheet, bool lowcase, string excludePrefix, bool cellJson) { Dictionary importData = new Dictionary(); @@ -113,7 +113,7 @@ private object convertSheetToDict(DataTable sheet, bool lowcase, string excludeP if (ID.Length <= 0) ID = string.Format("row_{0}", i); - var rowObject = convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix); + var rowObject = convertRowToDict(sheet, row, lowcase, firstDataRow, excludePrefix, cellJson); // 多余的字段 // rowObject[ID] = ID; importData[ID] = rowObject; @@ -125,7 +125,7 @@ private object convertSheetToDict(DataTable sheet, bool lowcase, string excludeP /// /// 把一行数据转换成一个对象，每一列是一个属性 /// - private Dictionary convertRowToDict(DataTable sheet, DataRow row, bool lowcase, int firstDataRow, string excludePrefix) + private Dictionary convertRowToDict(DataTable sheet, DataRow row, bool lowcase, int firstDataRow, string excludePrefix, bool cellJson) { var rowData = new Dictionary(); int col = 0; @@ -138,6 +138,24 @@ private Dictionary convertRowToDict(DataTable sheet, DataRow row object value = row[column]; + // 尝试将单元格字符串转换成 Json Array 或者 Json Object + if (cellJson) + { + string cellText = value.ToString().Trim(); + if (cellText.StartsWith("[") || cellText.StartsWith("{")) + { + try + { + object cellJsonObj = JsonConvert.DeserializeObject(cellText); + if (cellJsonObj != null) + value = cellJsonObj; + } + catch (Exception exp) + { + } + } + } + if (value.GetType() == typeof(System.DBNull)) { value = getColumnDefault(sheet, column, firstDataRow); diff --git a/Program.Options.cs b/Program.Options.cs index 2615a2a..6b22c5a 100644 --- a/Program.Options.cs +++ b/Program.Options.cs @@ -79,6 +79,12 @@ public string ExcludePrefix { get; set; } + + [Option('l', "cell_json", Required = false, DefaultValue = false, HelpText = "convert json string in cell")] + public bool CellJson { + get; + set; + } } } } diff --git a/Program.cs b/Program.cs index 86159a9..3bae395 100644 --- a/Program.cs +++ b/Program.cs @@ -106,7 +106,7 @@ private static void Run(Options options) ExcelLoader excel = new ExcelLoader(excelPath, header); //-- export - JsonExporter exporter = new JsonExporter(excel, options.Lowcase, options.ExportArray, dateFormat, options.ForceSheetName, header, options.ExcludePrefix); + JsonExporter exporter = new JsonExporter(excel, options.Lowcase, options.ExportArray, dateFormat, options.ForceSheetName, header, options.ExcludePrefix, options.CellJson); exporter.SaveToFile(exportPath, cd); //-- 生成C#定义文件 diff --git a/README.md b/README.md index 144b650..09db024 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ * -a 序列化成数组 * -d, --date:指定日期格式化字符串，例如：dd / MM / yyy hh: mm:ss * -s 序列化时强制带上sheet name，即使只有一个sheet +* -exclude_prefix： 导出时，排除掉包含指定前缀的表单和列，例如：-exclude_prefix # +* -cell_json：自动识别单元格中的Json对象和Json数组，Default：false + + +![Excel](./Docs/excel.png) +![GUI](./Docs/gui.png) +![CMd](./Docs/cmd.png) -![COVER](https://neil3d.github.io/assets/img/excel2json/cover.jpg)