From fdabf685e8401d26d969e2ec9bc74c841c64c33e Mon Sep 17 00:00:00 2001 From: yizhi <946185759@qq.com> Date: Mon, 25 Nov 2024 09:43:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E9=94=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/entity.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 0598d3a..f9edd5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@yizhi/postgres", - "version": "1.0.10", + "version": "1.0.11", "main": "dist/index.js", "types": "typing/index.d.ts", "scripts": {}, diff --git a/src/entity.ts b/src/entity.ts index bbccdcd..0e725f4 100644 --- a/src/entity.ts +++ b/src/entity.ts @@ -226,8 +226,8 @@ export function BooleanColumn(name?: any, option?: any) { * @param name 字段名称 * @param option 字段选项 */ -export function DateColumn(option?: { virtual?: boolean }): Decorators.PropDecorator -export function DateColumn(name: string, option?: { virtual?: boolean }): Decorators.PropDecorator +export function DateColumn(option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator +export function DateColumn(name: string, option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator export function DateColumn(name?: any, option?: any) { if (typeof name != "string") { option = name @@ -242,15 +242,15 @@ export function DateColumn(name?: any, option?: any) { }, v => { if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD"); return null; - }, false, option?.virtual ?? false); + }, option?.primary ?? false, option?.virtual ?? false); } /** * 定义日期时间字段 * @param name 字段名称 */ -export function DateTimeColumn(option?: { virtual?: boolean }): Decorators.PropDecorator -export function DateTimeColumn(name: string, option?: { virtual?: boolean }): Decorators.PropDecorator +export function DateTimeColumn(option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator +export function DateTimeColumn(name: string, option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator export function DateTimeColumn(name?: any, option?: any) { if (typeof name != "string") { option = name @@ -265,7 +265,7 @@ export function DateTimeColumn(name?: any, option?: any) { }, v => { if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD HH:mm:ss"); return null; - }, false, option?.virtual ?? false); + }, option?.primary ?? false, option?.virtual ?? false); }