@shys/crud 1.0.1-beta.5 → 1.0.1-beta.7

package/dist/db.js

@@ -52,7 +52,7 @@ export async function getTableFieldsFromDb(dbConfig, tableName) {
             database: database || '',
         });
         try {
-            const [rows] = await connection.execute(`SELECT column_name, data_type, is_nullable, column_type, column_comment, column_default, character_maximum_length, extra 
+            const [rows] = await connection.execute(`SELECT column_name, data_type, is_nullable, column_type, column_comment, column_default, character_maximum_length, extra, column_key 
          FROM information_schema.COLUMNS 
          WHERE table_schema = ? AND table_name = ? 
          ORDER BY ordinal_position`, [database, tableName]);
@@ -68,7 +68,8 @@ export async function getTableFieldsFromDb(dbConfig, tableName) {
                 const defaultVal = row.COLUMN_DEFAULT || row.column_default;
                 const length = row.CHARACTER_MAXIMUM_LENGTH || row.character_maximum_length;
                 const extra = row.EXTRA || row.extra || '';
-                const isPk = extra.includes('PRI') || columnName.toLowerCase().includes('id');
+                const columnKey = row.COLUMN_KEY || row.column_key || '';
+                const isPk = columnKey === 'PRI';
                 const isAuto = extra.includes('auto_increment');
                 return {
                     name: columnName,

package/dist/generator.js

@@ -186,8 +186,10 @@ export function buildFiles(params) {
     const desc = `${tableName} 表增删改查接口`;
     const modRoot = resolve(outputPath || baseSrcPath, 'modules', moduleName);
     const resultFiles = [];
-    const originalPkInfo = fields.find(f => f.pk);
-    const hasPk = !!originalPkInfo;
+    const pkFields = fields.filter(f => f.pk);
+    const originalPkInfo = pkFields[0] || null;
+    const hasPk = pkFields.length > 0;
+    const autoPkFields = pkFields.filter(f => f.auto);
     const entityFields = fields.filter(f => {
         if (finalBaseFieldNames.includes(f.camel))
             return false;
@@ -200,6 +202,7 @@ export function buildFiles(params) {
     const hasDateField = entityFields.some(f => /datetime|date|timestamp/i.test(f.type));
     const enhancedEntityFields = entityFields.map(f => enhanceField(f, { idx: idxFields.some(i => i.name === f.name) }));
     const enhancedPkInfo = originalPkInfo ? enhanceField(originalPkInfo) : null;
+    const enhancedPkInfos = pkFields.map(f => enhanceField(f));
     // Entity
     resultFiles.push({
         path: resolve(modRoot, `entity/${Camel}.entity.ts`),
@@ -211,6 +214,7 @@ export function buildFiles(params) {
             Pascal,
             Camel,
             pkInfo: enhancedPkInfo,
+            pkInfos: enhancedPkInfos,
             hasPk,
             hasDateField,
             idxCount: idxFields.length,
@@ -227,20 +231,23 @@ export function buildFiles(params) {
             searchable: [],
         };
     }
-    const createFields = entityFields.filter(f => !(f.pk && f.auto));
+    const createFields = fields.filter(f => {
+        if (finalBaseFieldNames.includes(f.camel))
+            return false;
+        if (f.pk && f.auto)
+            return false;
+        return true;
+    });
     const writable = createFields.filter(f => !excludeWritableRegex.test(f.name));
     const isSensitive = (f) => /password|passwd|salt|token|secret|private_key/i.test(f.name + f.camel);
     const pkCamel = originalPkInfo?.camel || '';
-    const sortableBase = entityFields
+    const pkCamels = pkFields.map(f => f.camel);
+    const sortableBase = [...entityFields, ...pkFields]
         .filter(f => !isSensitive(f))
         .map(f => f.camel);
-    const sortable = pkCamel && !sortableBase.includes(pkCamel)
-        ? [pkCamel, ...sortableBase]
-        : sortableBase;
-    const filterableBase = entityFields.filter(f => !isSensitive(f));
-    const filterableArr = pkCamel && !filterableBase.some(f => f.camel === pkCamel)
-        ? [originalPkInfo, ...filterableBase]
-        : filterableBase;
+    const sortable = [...new Set([...pkCamels, ...sortableBase])];
+    const filterableBase = [...entityFields, ...pkFields].filter(f => !isSensitive(f));
+    const filterableArr = [...new Map([...pkFields, ...filterableBase].map(f => [f.camel, f])).values()];
     const filterable = filterableArr.map(f => f.camel);
     const searchable = filterableArr
         .filter(f => /char|varchar|text/i.test(f.type))
@@ -325,7 +332,7 @@ export function buildFiles(params) {
     });
     // Single VO
     const allVoFields = [
-        ...(originalPkInfo ? [originalPkInfo] : []),
+        ...pkFields,
         ...entityFields,
     ].map(f => enhanceField(f));
     const voHasTransform = allVoFields.some(f => f.isDate || f.isSensitive);
@@ -366,6 +373,7 @@ export function buildFiles(params) {
     // Controller
     const sArr = (arr) => arr.map(x => JSON.stringify(x)).join(', ');
     const idField = pkCamel || 'id';
+    const idFields = pkCamels.length ? pkCamels : ['id'];
     const defaultSort = searchable && searchable.length
         ? `[{ field: ${JSON.stringify(sortable[0] || idField)}, order: 'DESC' }]`
         : `[{ field: 'id', order: 'DESC' }]`;
@@ -389,7 +397,9 @@ export function buildFiles(params) {
             filterable: sArr(filterable),
             searchable: sArr(searchable),
             pkCamel,
+            pkCamels,
             idField,
+            idFields,
             defaultSort,
         }),
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shys/crud",
-  "version": "1.0.1-beta.5",
+  "version": "1.0.1-beta.7",
   "description": "MidwayJS v4 模块化 CRUD CLI 生成器",
   "license": "MIT",
   "author": {

package/templates/entity.njk

@@ -2,7 +2,9 @@
 // {{ orm }} Entity 模板占位（TypeORM 是当前唯一完整生成的 ORM）
 export class {{ Pascal }} {}
 {%- else -%}
-import { Entity, Column{% if hasPk %}, PrimaryGeneratedColumn{% endif %}{% if idxCount %}, Index{% endif %} } from 'typeorm';
+{% set hasAutoPk = pkInfos | selectattr('auto') | list | length > 0 -%}
+{% set hasNonAutoPk = pkInfos | rejectattr('auto') | list | length > 0 -%}
+import { Entity, Column{% if hasPk and hasAutoPk %}, PrimaryGeneratedColumn{% endif %}{% if hasPk and hasNonAutoPk %}, PrimaryColumn{% endif %}{% if idxCount %}, Index{% endif %} } from 'typeorm';
 import { Expose{% if hasDateField %}, Transform{% endif %} } from 'class-transformer';
 import { ApiProperty, ApiPropertyOptional } from '@midwayjs/swagger';
 import { Rule } from '@midwayjs/validation';
@@ -13,21 +15,29 @@ import { BaseEntity } from '../../../framework/entity/base.entity';
   comment: {{ (tableName + ' 表') | json }},
 })
 export class {{ Pascal }} extends BaseEntity {
-{% if hasPk and pkInfo -%}
+{% for pk in pkInfos -%}
+{% if pk.auto -%}
   @PrimaryGeneratedColumn({
-    type: {{ pkInfo.type | json }},
-    name: {{ pkInfo.name | json }},
-    comment: {{ (pkInfo.comment or '主键') | json }},
+    type: {{ pk.type | json }},
+    name: {{ pk.name | json }},
+    comment: {{ (pk.comment or '主键') | json }},
   })
+{% else -%}
+  @PrimaryColumn({
+    type: {{ pk.type | json }},
+    name: {{ pk.name | json }},
+    comment: {{ (pk.comment or '主键') | json }},
+  })
+{% endif -%}
   @ApiProperty({
     type: 'integer',
-    description: {{ (pkInfo.comment or '主键ID') | json }},
+    description: {{ (pk.comment or '主键ID') | json }},
   })
   @Expose()
-  @Rule(Joi.number().integer().label({{ (pkInfo.comment or '主键ID') | json }}).required())
-  {{ pkInfo.camel }}: number;
+  @Rule(Joi.number().integer().label({{ (pk.comment or '主键ID') | json }}).required())
+  {{ pk.camel }}: number;
 
-{% endif -%}
+{% endfor -%}
 {% for f in fields -%}
 {% if f.idx -%}  @Index()
 {% endif -%}  @Column({

package/templates/service.njk

@@ -2,12 +2,12 @@
 import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { Repository } from 'typeorm';
-import { {{ ormInfo.serviceParent }} } from '@midwayjs/crud/typeorm';
+import { BaseTypeOrmCrudService } from '@shys/core';
 import { {{ Pascal }} } from '../entity/{{ Camel }}.entity';
 
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
-export class {{ ServiceName }} extends {{ ormInfo.serviceParent }}<{{ Pascal }}> {
+export class {{ ServiceName }} extends BaseTypeOrmCrudService<{{ Pascal }}> {
   @InjectEntityModel({{ Pascal }})
   repo: Repository<{{ Pascal }}>;
 }