export-table-plugin-csharp 1.1.189 → 1.1.190

package/dist/ExportCSPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAA6D,MAAM,kBAAkB,CAAA;AAMhL,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAsSpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAM3C,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}
+{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAA6D,MAAM,kBAAkB,CAAA;AAMhL,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuSpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAM3C,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}

package/dist/ExportCSPlugin.js

@@ -14,7 +14,7 @@ function export_stuff(paras) {
     }
     let RowClass = (0, CSParseTool_1.firstLetterUpper)(name);
     let initFunc = name + "Init";
-    let mapfield = fields.find(a => a.type == "key"); //如果是map，则生成对应的map
+    // let mapfield = fields.find(a => a.type == "key")//如果是map，则生成对应的map
     let mapName = name + "Map";
     let isValidField;
     let getFieldType2;
@@ -59,9 +59,10 @@ function export_stuff(paras) {
         isValidField = (f) => filterNote(f);
         getFieldType2 = CSParseTool_1.getFieldType;
     }
-    let validFields = fields.filter(f => isValidField(f));
+    let exportFields = fields.filter(f => filterNote(f));
+    let validFields = exportFields.filter(f => isValidField(f));
     let customFields = [];
-    for (let f2 of validFields) {
+    for (let f2 of exportFields) {
         customFields.push(f2);
         let f3 = (0, CSParseTool_1.convTupleArrayType)(f2);
         if (f3 != undefined) {
@@ -131,7 +132,7 @@ ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `
 
 	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
 #region get字段
-${(0, export_table_lib_1.foreach)(validFields, f => {
+${(0, export_table_lib_1.foreach)(exportFields, f => {
         if (f.nameOrigin != f.name) {
             return `	public ${getFieldType2(f)} ${(0, CSParseTool_1.getTitle)(f).replace(" ", "_")} => ${(0, CSParseTool_1.convMemberName)(f.name)};`;
         }
@@ -142,7 +143,7 @@ ${(0, export_table_lib_1.foreach)(validFields, f => {
 #endregion
 
 #region uid map
-${(0, export_table_lib_1.foreach)(validFields, f => {
+${(0, export_table_lib_1.foreach)(exportFields, f => {
         if (f.isUnique) {
             let memberName = (0, CSParseTool_1.convMemberName)(f.name);
             let paraName = (0, CSParseTool_1.convVarName)(memberName);
@@ -211,7 +212,7 @@ ${(0, export_table_lib_1.foreach)(validFields, f => {
 #endregion uid map
 
 #region 生成fk.get/set
-${(0, export_table_lib_1.foreach)(validFields, f => `
+${(0, export_table_lib_1.foreach)(exportFields, f => `
 ${(0, export_table_lib_1.iff)(f.type == "fk", () => `
 ${(0, export_table_lib_1.iff)((0, CSParseTool_1.getFkFieldType)(tables, f).toLowerCase() != "uid", () => `
 	protected ${(0, CSParseTool_1.convMemberName)(f.fkTableName)}[] _fk${(0, CSParseTool_1.convMemberName)(f.name)}=null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-plugin-csharp",
-  "version": "1.1.189",
+  "version": "1.1.190",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {},

package/src/ExportCSPlugin.ts

@@ -28,7 +28,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 
 	let RowClass = firstLetterUpper(name)
 	let initFunc = name + "Init"
-	let mapfield = fields.find(a => a.type == "key")//如果是map，则生成对应的map
+	// let mapfield = fields.find(a => a.type == "key")//如果是map，则生成对应的map
 	let mapName = name + "Map"
 
 	let isValidField: (f: Field) => boolean
@@ -71,10 +71,11 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		isValidField = (f: Field) => filterNote(f);
 		getFieldType2 = getFieldType
 	}
-	let validFields = fields.filter(f => isValidField(f))
-	
+	let exportFields = fields.filter(f => filterNote(f))
+	let validFields = exportFields.filter(f => isValidField(f))
+
 	let customFields: Field[] = []
-	for (let f2 of validFields) {
+	for (let f2 of exportFields) {
 		customFields.push(f2)
 		let f3 = convTupleArrayType(f2)
 		if (f3 != undefined) {
@@ -160,7 +161,7 @@ ${foreach(getDescripts(f), line =>
 
 	${cmm(/**生成get字段 */)}
 #region get字段
-${foreach(validFields, f => {
+${foreach(exportFields, f => {
 		if (f.nameOrigin != f.name) {
 			return `	public ${getFieldType2(f)} ${getTitle(f).replace(" ", "_")} => ${convMemberName(f.name)};`
 		} else {
@@ -171,7 +172,7 @@ ${foreach(validFields, f => {
 #endregion
 
 #region uid map
-${foreach(validFields, f => {
+${foreach(exportFields, f => {
 		if (f.isUnique) {
 			let memberName = convMemberName(f.name);
 			let paraName = convVarName(memberName);
@@ -239,7 +240,7 @@ ${foreach(validFields, f => {
 #endregion uid map
 
 #region 生成fk.get/set
-${foreach(validFields, f => `
+${foreach(exportFields, f => `
 ${iff(f.type == "fk", () => `
 ${iff(getFkFieldType(tables, f).toLowerCase() != "uid", () => `
 	protected ${convMemberName(f.fkTableName!)}[] _fk${convMemberName(f.name)}=null;