Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit afc1faa

Browse files
committed
fix(srcgen): Fix write wrong field names on grid generator
1 parent d45b429 commit afc1faa

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/bin/app.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class App {
6060
this.program
6161
.command('prepare')
6262
.description('extract-translate + po2ts + make-ts-list')
63-
.option('-lcp, --list-components-postfix [name]',
63+
.option('-p, --list-components-postfix [name]',
6464
'components postfix for collect to name-value object, example {\'users\': UsersGridComponent} it for list-components-postfix="grid" with component class file name="users-grid.component.ts"')
6565
.action(async (dummy, command) => {
6666
await (new PrepareCommand(_.merge(this.program, command, dummy))).process();
@@ -103,7 +103,7 @@ export class App {
103103
});
104104
this.program
105105
.command('make-ts-list')
106-
.option('-lcp, --list-components-postfix [name]',
106+
.option('-p, --list-components-postfix [name]',
107107
'components postfix for collect to name-value object, example {\'users\': UsersGridComponent} it for list-components-postfix="grid" with component class file name="users-grid.component.ts"')
108108
.description('make index.ts with import all ts files in application/library')
109109
.action(async (dummy, command) => {
@@ -112,10 +112,10 @@ export class App {
112112
this.program
113113
.command('grid')
114114
.option('-t, --template [name]', 'template folder name or path', 'web-grid')
115-
.option('-en, --entity-name [name]', 'entity name')
116-
.option('-pf, --pk-field [name]', 'primary key name', 'id')
117-
.option('-fi, --fields [names]', 'fields of entity', '"\'name\',\'title\',\'createdAt\',\'updatedAt\'"')
118-
.option('-dfi, --date-fields [names]', 'fields of entity', '"\'name\',\'title\',\'createdAt\',\'updatedAt\'"')
115+
.option('-n, --entity-name [name]', 'entity name')
116+
.option('-p, --pk-field [name]', 'primary key name', 'id')
117+
.option('-f, --fields [names]', 'fields of entity', '\'name\',\'title\',\'createdAt\',\'updatedAt\'')
118+
.option('-d, --date-fields [names]', 'fields of entity', '\'createdAt\',\'updatedAt\'')
119119
.option('-cl, --core-lib [name]', 'core library name, by default it is first app from ".angular-cli.json" with empty "appRoot"')
120120
.option('-cf, --core-folder [path]', 'core library path')
121121
.option('-pl, --platform-lib [name]', 'platform library name, by default it is next app from ".angular-cli.json" with empty "appRoot"')
@@ -127,8 +127,8 @@ export class App {
127127
this.program
128128
.command('page')
129129
.option('-t, --template [name]', 'template folder name or path', 'web-page')
130-
.option('-pn, --page-name [name]', 'page name')
131-
.option('-al, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
130+
.option('-n, --page-name [name]', 'page name')
131+
.option('-an, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
132132
.option('-af, --app-folder [path]', 'app path, by default it is first app from ".angular-cli.json"')
133133
.description('scaffold empty page')
134134
.action(async (dummy, command) => {
@@ -137,9 +137,9 @@ export class App {
137137
this.program
138138
.command('page+frame')
139139
.option('-t, --template [name]', 'template folder name or path', 'web-page+frame')
140-
.option('-pn, --page-name [name]', 'page name')
141-
.option('-fn, --frame-name [name]', 'frame name')
142-
.option('-al, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
140+
.option('-p, --page-name [name]', 'page name')
141+
.option('-f, --frame-name [name]', 'frame name')
142+
.option('-an, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
143143
.option('-af, --app-folder [path]', 'app path, by default it is first app from ".angular-cli.json"')
144144
.description('scaffold empty frame on page')
145145
.action(async (dummy, command) => {
@@ -148,9 +148,9 @@ export class App {
148148
this.program
149149
.command('frame')
150150
.option('-t, --template [name]', 'template folder name or path', 'web-frame')
151-
.option('-pn, --page-name [name]', 'page name')
152-
.option('-fn, --frame-name [name]', 'frame name')
153-
.option('-al, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
151+
.option('-p, --page-name [name]', 'page name')
152+
.option('-f, --frame-name [name]', 'frame name')
153+
.option('-an, --app-name [name]', 'app name, by default it is first app from ".angular-cli.json"')
154154
.option('-af, --app-folder [path]', 'app path, by default it is first app from ".angular-cli.json"')
155155
.description('scaffold empty frame')
156156
.action(async (dummy, command) => {

src/generators/grid.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ export class GridGenerator extends Base {
9393
pkField = customOptions.pkField;
9494
}
9595
if (customOptions && customOptions.fields) {
96-
fields = customOptions.fields.split(',').map(word => word.trim());
96+
fields = customOptions.fields.split(',').map(word => _.trim(word,'\'\"').trim());
9797
}
9898
if (customOptions && customOptions.dateFields) {
99-
dateFields = customOptions.dateFields.split(',').map(word => word.trim());
99+
dateFields = customOptions.dateFields.split(',').map(word => _.trim(word,'\'\"').trim());
100100
}
101101
const options = _.merge(
102102
{

0 commit comments

Comments
 (0)