Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

extrafile extension可为空

This commit is contained in:
Wang Kejun 2023-08-24 17:21:39 +08:00
parent f170482891
commit 785e0bb305
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/entities/ExtraFile.d.ts vendored
View File

@ -12,7 +12,7 @@ export interface Schema extends EntityShape {
entity: String<32>;
entityId: String<64>;
extra1?: Text;
extension: String<16>;
extension?: String<16>;
size?: Int<4>;
sort?: Float<22, 10>;
fileType?: String<128>;

8
lib/oak-app-domain/ExtraFile/Schema.d.ts vendored
View File

@ -17,10 +17,10 @@ export declare type OpSchema = EntityShape & {
tag2?: String<32> | null;
filename: String<256>;
md5?: Text | null;
entity: "article" | "articleMenu" | "user" | string;
entity: 'article' | 'articleMenu' | 'user' | string;
entityId: String<64>;
extra1?: Text | null;
extension: String<16>;
extension?: String<16> | null;
size?: Int<4> | null;
sort?: Float<22, 10> | null;
fileType?: String<128> | null;
@ -36,10 +36,10 @@ export declare type Schema = EntityShape & {
tag2?: String<32> | null;
filename: String<256>;
md5?: Text | null;
entity: "article" | "articleMenu" | "user" | string;
entity: 'article' | 'articleMenu' | 'user' | string;
entityId: String<64>;
extra1?: Text | null;
extension: String<16>;
extension?: String<16> | null;
size?: Int<4> | null;
sort?: Float<22, 10> | null;
fileType?: String<128> | null;

1
lib/oak-app-domain/ExtraFile/Storage.js
View File

@ -69,7 +69,6 @@ exports.desc = {
type: "text"
},
extension: {
notNull: true,
type: "varchar",
params: {
length: 16

2
src/entities/ExtraFile.ts
View File

@ -14,7 +14,7 @@ export interface Schema extends EntityShape {
entity: String<32>;
entityId: String<64>;
extra1?: Text;
extension: String<16>;
extension?: String<16>;
size?: Int<4>;
sort?: Float<22,10>;
fileType?: String<128>;

2
src/features/extraFile.ts
View File

@ -44,7 +44,7 @@ export class ExtraFile<
const { origin, extra1, filename, objectId, extension, entity } =
extraFile;
// 构造文件上传所需的key
const key = `${entity ? entity + '/' : ''}${objectId}.${extension}`;
const key = `${entity ? entity + '/' : ''}${objectId}${extension ? '.' + extension : ''}`;
assert(origin && origin !== 'unknown');
const { result: uploadInfo } = await this.getUploadInfo(origin, key);

4
src/oak-app-domain/ExtraFile/Schema.ts
View File

@ -21,7 +21,7 @@ export type OpSchema = EntityShape & {
entity: "article" | "articleMenu" | "user" | string;
entityId: String<64>;
extra1?: Text | null;
extension: String<16>;
extension?: String<16> | null;
size?: Int<4> | null;
sort?: Float<22, 10> | null;
fileType?: String<128> | null;
@ -40,7 +40,7 @@ export type Schema = EntityShape & {
entity: "article" | "articleMenu" | "user" | string;
entityId: String<64>;
extra1?: Text | null;
extension: String<16>;
extension?: String<16> | null;
size?: Int<4> | null;
sort?: Float<22, 10> | null;
fileType?: String<128> | null;

1
src/oak-app-domain/ExtraFile/Storage.ts
View File

@ -68,7 +68,6 @@ export const desc: StorageDesc<OpSchema> = {
type: "text"
},
extension: {
notNull: true,
type: "varchar",
params: {
length: 16