nsgm-cli 2.1.37 → 2.1.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -11,16 +11,15 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
|
|
|
11
11
|
return `\`${this.controller}\``;
|
|
12
12
|
}
|
|
13
13
|
generate() {
|
|
14
|
-
//
|
|
15
|
-
// @ts-ignore - Variable is used in generated template string
|
|
14
|
+
// @ts-ignore - Used in string concatenation for generated code
|
|
16
15
|
const _selectFields = this.fields.map((f) => f.name).join(", ");
|
|
17
16
|
const insertFields = this.getFormFields();
|
|
18
17
|
const searchableFields = this.getSearchableFields();
|
|
19
|
-
// @ts-ignore -
|
|
18
|
+
// @ts-ignore - Used in string concatenation for generated code
|
|
20
19
|
const _quotedTableName = this.getQuotedTableName();
|
|
21
|
-
// @ts-ignore -
|
|
20
|
+
// @ts-ignore - Used in string concatenation for generated code
|
|
22
21
|
const _insertFieldNames = insertFields.map((f) => f.name).join(", ");
|
|
23
|
-
// @ts-ignore -
|
|
22
|
+
// @ts-ignore - Used in string concatenation for generated code
|
|
24
23
|
const _insertPlaceholders = insertFields.map(() => "?").join(", ");
|
|
25
24
|
const insertValues = insertFields
|
|
26
25
|
.map((f) => {
|
|
@@ -31,7 +30,7 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
|
|
|
31
30
|
})
|
|
32
31
|
.join(", ");
|
|
33
32
|
const searchConditions = this.generateSearchConditions(searchableFields);
|
|
34
|
-
// @ts-ignore -
|
|
33
|
+
// @ts-ignore - Used in string concatenation for generated code
|
|
35
34
|
const _updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
|
|
36
35
|
return `const { executeQuery, executePaginatedQuery } = require('../../utils/common')
|
|
37
36
|
const { validateInteger, validatePagination, validateId } = require('../../utils/validation')
|
|
@@ -42,8 +41,8 @@ module.exports = {
|
|
|
42
41
|
try {
|
|
43
42
|
const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
|
|
44
43
|
|
|
45
|
-
const sql =
|
|
46
|
-
const countSql =
|
|
44
|
+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' LIMIT ? OFFSET ?';
|
|
45
|
+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName;
|
|
47
46
|
const values = [validPageSize, validPage * validPageSize];
|
|
48
47
|
|
|
49
48
|
console.log('执行分页查询:', { sql, values, countSql });
|
|
@@ -113,8 +112,8 @@ module.exports = {
|
|
|
113
112
|
let whereSql = '';
|
|
114
113
|
${searchConditions}
|
|
115
114
|
|
|
116
|
-
const sql =
|
|
117
|
-
const countSql =
|
|
115
|
+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql + ' LIMIT ? OFFSET ?';
|
|
116
|
+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql;
|
|
118
117
|
|
|
119
118
|
values.push(validPageSize, validPage * validPageSize);
|
|
120
119
|
|
|
@@ -132,7 +131,7 @@ ${searchConditions}
|
|
|
132
131
|
try {
|
|
133
132
|
${this.generateNewValidationCalls(insertFields)}
|
|
134
133
|
|
|
135
|
-
const sql =
|
|
134
|
+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES (' + _insertPlaceholders + ')';
|
|
136
135
|
const values = [${insertValues}];
|
|
137
136
|
|
|
138
137
|
console.log('添加${this.controller}:', { sql, values });
|
|
@@ -171,8 +170,8 @@ ${this.generateBatchValidation(insertFields)}
|
|
|
171
170
|
}
|
|
172
171
|
});
|
|
173
172
|
|
|
174
|
-
const placeholders = validatedDatas.map(() =>
|
|
175
|
-
const sql =
|
|
173
|
+
const placeholders = validatedDatas.map(() => '(' + _insertPlaceholders + ')').join(',');
|
|
174
|
+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES ' + placeholders;
|
|
176
175
|
const values = validatedDatas.flatMap(data => [${this.generateBatchInsertValues(insertFields)}]);
|
|
177
176
|
|
|
178
177
|
console.log('批量添加${this.controller}:', { sql, values });
|
|
@@ -196,7 +195,7 @@ ${this.generateBatchValidation(insertFields)}
|
|
|
196
195
|
|
|
197
196
|
${this.generateUpdateValidation(insertFields)}
|
|
198
197
|
|
|
199
|
-
const sql =
|
|
198
|
+
const sql = 'UPDATE ' + _quotedTableName + ' SET ' + _updateFields + ' WHERE id = ?';
|
|
200
199
|
const values = [${this.generateUpdateValues(insertFields)}, validId];
|
|
201
200
|
|
|
202
201
|
console.log('更新${this.controller}:', { sql, values });
|
|
@@ -225,7 +224,7 @@ ${this.generateUpdateValidation(insertFields)}
|
|
|
225
224
|
try {
|
|
226
225
|
const validId = validateId(id);
|
|
227
226
|
|
|
228
|
-
const sql =
|
|
227
|
+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id = ?';
|
|
229
228
|
const values = [validId];
|
|
230
229
|
|
|
231
230
|
console.log('删除${this.controller}:', { sql, values });
|
|
@@ -266,7 +265,7 @@ ${this.generateUpdateValidation(insertFields)}
|
|
|
266
265
|
});
|
|
267
266
|
|
|
268
267
|
const placeholders = validIds.map(() => '?').join(',');
|
|
269
|
-
const sql =
|
|
268
|
+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id IN (' + placeholders + ')';
|
|
270
269
|
|
|
271
270
|
console.log('批量删除${this.controller}:', { sql, values: validIds });
|
|
272
271
|
|