日期字段增加主键选项

This commit is contained in:
2024-11-25 09:43:02 +08:00
parent 2ccd5af611
commit fdabf685e8
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@yizhi/postgres", "name": "@yizhi/postgres",
"version": "1.0.10", "version": "1.0.11",
"main": "dist/index.js", "main": "dist/index.js",
"types": "typing/index.d.ts", "types": "typing/index.d.ts",
"scripts": {}, "scripts": {},

View File

@ -226,8 +226,8 @@ export function BooleanColumn(name?: any, option?: any) {
* @param name 字段名称 * @param name 字段名称
* @param option 字段选项 * @param option 字段选项
*/ */
export function DateColumn(option?: { virtual?: boolean }): Decorators.PropDecorator<BasicEntity> export function DateColumn(option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator<BasicEntity>
export function DateColumn(name: string, option?: { virtual?: boolean }): Decorators.PropDecorator<BasicEntity> export function DateColumn(name: string, option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator<BasicEntity>
export function DateColumn(name?: any, option?: any) { export function DateColumn(name?: any, option?: any) {
if (typeof name != "string") { if (typeof name != "string") {
option = name option = name
@ -242,15 +242,15 @@ export function DateColumn(name?: any, option?: any) {
}, v => { }, v => {
if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD"); if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD");
return null; return null;
}, false, option?.virtual ?? false); }, option?.primary ?? false, option?.virtual ?? false);
} }
/** /**
* 定义日期时间字段 * 定义日期时间字段
* @param name 字段名称 * @param name 字段名称
*/ */
export function DateTimeColumn(option?: { virtual?: boolean }): Decorators.PropDecorator<BasicEntity> export function DateTimeColumn(option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator<BasicEntity>
export function DateTimeColumn(name: string, option?: { virtual?: boolean }): Decorators.PropDecorator<BasicEntity> export function DateTimeColumn(name: string, option?: { primary?: boolean, virtual?: boolean }): Decorators.PropDecorator<BasicEntity>
export function DateTimeColumn(name?: any, option?: any) { export function DateTimeColumn(name?: any, option?: any) {
if (typeof name != "string") { if (typeof name != "string") {
option = name option = name
@ -265,7 +265,7 @@ export function DateTimeColumn(name?: any, option?: any) {
}, v => { }, v => {
if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD HH:mm:ss"); if (typeof v == "string" || (v instanceof global.Date)) return moment(v).format("YYYY-MM-DD HH:mm:ss");
return null; return null;
}, false, option?.virtual ?? false); }, option?.primary ?? false, option?.virtual ?? false);
} }