diff --git a/es/checkers/index.d.ts b/es/checkers/index.d.ts index 1c141fe16..46b6c8266 100644 --- a/es/checkers/index.d.ts +++ b/es/checkers/index.d.ts @@ -1,2 +1,2 @@ -declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; +declare const checkers: (import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker | import("oak-domain").Checker)[]; export default checkers; diff --git a/es/components/config/style/platform/index.d.ts b/es/components/config/style/platform/index.d.ts index ac523880a..213a4c00f 100644 --- a/es/components/config/style/platform/index.d.ts +++ b/es/components/config/style/platform/index.d.ts @@ -2,7 +2,7 @@ import { Style } from '../../../../types/Style'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/config/upsert/index.d.ts b/es/components/config/upsert/index.d.ts index 0407ec4dc..230cb7fac 100644 --- a/es/components/config/upsert/index.d.ts +++ b/es/components/config/upsert/index.d.ts @@ -2,7 +2,7 @@ import { Config } from '../../../types/Config'; declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; diff --git a/es/components/extraFile/commit/index.d.ts b/es/components/extraFile/commit/index.d.ts index d7053cf27..4b0b94ca9 100644 --- a/es/components/extraFile/commit/index.d.ts +++ b/es/components/extraFile/commit/index.d.ts @@ -13,9 +13,9 @@ declare const _default: & import("react").ButtonHTMLAttributes, "id" | "onMouseDown" | "onMouseUp" | "onTouchStart" | "onTouchEnd"> & { + } & Pick & import("react").ButtonHTMLAttributes, "id" | "onMouseUp" | "onMouseDown" | "onTouchStart" | "onTouchEnd"> & { className?: string | undefined; style?: (import("react").CSSProperties & Partial>) | undefined; tabIndex?: number | undefined; diff --git a/es/entities/ExtraFile.d.ts b/es/entities/ExtraFile.d.ts index 92a62a540..de39fa4f6 100644 --- a/es/entities/ExtraFile.d.ts +++ b/es/entities/ExtraFile.d.ts @@ -2,7 +2,7 @@ import { String, Int, Text, Float, Boolean } from 'oak-domain/lib/types/DataType import { EntityShape } from 'oak-domain/lib/types/Entity'; import { Schema as Application } from './Application'; export interface Schema extends EntityShape { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32>; objectId?: String<64>; diff --git a/es/entities/ExtraFile.js b/es/entities/ExtraFile.js index b895a9477..3c086d032 100644 --- a/es/entities/ExtraFile.js +++ b/es/entities/ExtraFile.js @@ -28,6 +28,7 @@ const entityDesc = { v: { origin: { qiniu: '七牛云', + ctyun: '天翼云', wechat: '微信', unknown: '未知', }, diff --git a/es/oak-app-domain/ExtraFile/Schema.d.ts b/es/oak-app-domain/ExtraFile/Schema.d.ts index e0d5f5c42..fc3663b82 100644 --- a/es/oak-app-domain/ExtraFile/Schema.d.ts +++ b/es/oak-app-domain/ExtraFile/Schema.d.ts @@ -11,7 +11,7 @@ import * as ArticleMenu from "../ArticleMenu/Schema"; import * as SessionMessage from "../SessionMessage/Schema"; import * as User from "../User/Schema"; export type OpSchema = EntityShape & { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32> | null; objectId?: String<64> | null; @@ -34,7 +34,7 @@ export type OpSchema = EntityShape & { }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32> | null; objectId?: String<64> | null; @@ -67,7 +67,7 @@ type AttrFilter = { $$createAt$$: Q_DateValue; $$seq$$: Q_StringValue; $$updateAt$$: Q_DateValue; - origin: Q_EnumValue<'qiniu' | 'wechat' | 'unknown'>; + origin: Q_EnumValue<'qiniu' | 'wechat' | 'unknown' | 'ctyun'>; type: Q_EnumValue<'image' | 'video' | 'audio' | 'file'>; bucket: Q_StringValue; objectId: Q_StringValue; diff --git a/es/oak-app-domain/ExtraFile/Storage.js b/es/oak-app-domain/ExtraFile/Storage.js index d45f65e57..ec1831be5 100644 --- a/es/oak-app-domain/ExtraFile/Storage.js +++ b/es/oak-app-domain/ExtraFile/Storage.js @@ -4,7 +4,7 @@ export const desc = { origin: { notNull: true, type: "enum", - enumeration: ["qiniu", "wechat", "unknown"] + enumeration: ["qiniu", "wechat", "unknown", "ctyun"] }, type: { notNull: true, diff --git a/es/oak-app-domain/ExtraFile/locales/zh_CN.json b/es/oak-app-domain/ExtraFile/locales/zh_CN.json index 8e60d6675..26be86081 100644 --- a/es/oak-app-domain/ExtraFile/locales/zh_CN.json +++ b/es/oak-app-domain/ExtraFile/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extra2": "非结构化额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问", "uploadState": "上传状态", "uploadMeta": "上传需要的metadata", "application": "来源应用" }, "v": { "origin": { "qiniu": "七牛云", "wechat": "微信", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" }, "uploadState": { "success": "上传成功", "failed": "上传失败", "uploading": "上传中" } } } +{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extra2": "非结构化额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问", "uploadState": "上传状态", "uploadMeta": "上传需要的metadata", "application": "来源应用" }, "v": { "origin": { "qiniu": "七牛云", "ctyun": "天翼云", "wechat": "微信", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" }, "uploadState": { "success": "上传成功", "failed": "上传失败", "uploading": "上传中" } } } diff --git a/es/triggers/index.d.ts b/es/triggers/index.d.ts index bea53638e..c0354eb3f 100644 --- a/es/triggers/index.d.ts +++ b/es/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/lib/entities/ExtraFile.d.ts b/lib/entities/ExtraFile.d.ts index 92a62a540..de39fa4f6 100644 --- a/lib/entities/ExtraFile.d.ts +++ b/lib/entities/ExtraFile.d.ts @@ -2,7 +2,7 @@ import { String, Int, Text, Float, Boolean } from 'oak-domain/lib/types/DataType import { EntityShape } from 'oak-domain/lib/types/Entity'; import { Schema as Application } from './Application'; export interface Schema extends EntityShape { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32>; objectId?: String<64>; diff --git a/lib/entities/ExtraFile.js b/lib/entities/ExtraFile.js index 6d2f8c1dd..948ed7bb8 100644 --- a/lib/entities/ExtraFile.js +++ b/lib/entities/ExtraFile.js @@ -30,6 +30,7 @@ const entityDesc = { v: { origin: { qiniu: '七牛云', + ctyun: '天翼云', wechat: '微信', unknown: '未知', }, diff --git a/lib/oak-app-domain/ExtraFile/Schema.d.ts b/lib/oak-app-domain/ExtraFile/Schema.d.ts index e0d5f5c42..fc3663b82 100644 --- a/lib/oak-app-domain/ExtraFile/Schema.d.ts +++ b/lib/oak-app-domain/ExtraFile/Schema.d.ts @@ -11,7 +11,7 @@ import * as ArticleMenu from "../ArticleMenu/Schema"; import * as SessionMessage from "../SessionMessage/Schema"; import * as User from "../User/Schema"; export type OpSchema = EntityShape & { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32> | null; objectId?: String<64> | null; @@ -34,7 +34,7 @@ export type OpSchema = EntityShape & { }; export type OpAttr = keyof OpSchema; export type Schema = EntityShape & { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32> | null; objectId?: String<64> | null; @@ -67,7 +67,7 @@ type AttrFilter = { $$createAt$$: Q_DateValue; $$seq$$: Q_StringValue; $$updateAt$$: Q_DateValue; - origin: Q_EnumValue<'qiniu' | 'wechat' | 'unknown'>; + origin: Q_EnumValue<'qiniu' | 'wechat' | 'unknown' | 'ctyun'>; type: Q_EnumValue<'image' | 'video' | 'audio' | 'file'>; bucket: Q_StringValue; objectId: Q_StringValue; diff --git a/lib/oak-app-domain/ExtraFile/Storage.js b/lib/oak-app-domain/ExtraFile/Storage.js index d7ffde188..4ed2b924e 100644 --- a/lib/oak-app-domain/ExtraFile/Storage.js +++ b/lib/oak-app-domain/ExtraFile/Storage.js @@ -7,7 +7,7 @@ exports.desc = { origin: { notNull: true, type: "enum", - enumeration: ["qiniu", "wechat", "unknown"] + enumeration: ["qiniu", "wechat", "unknown", "ctyun"] }, type: { notNull: true, diff --git a/lib/oak-app-domain/ExtraFile/locales/zh_CN.json b/lib/oak-app-domain/ExtraFile/locales/zh_CN.json index 8e60d6675..26be86081 100644 --- a/lib/oak-app-domain/ExtraFile/locales/zh_CN.json +++ b/lib/oak-app-domain/ExtraFile/locales/zh_CN.json @@ -1 +1 @@ -{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extra2": "非结构化额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问", "uploadState": "上传状态", "uploadMeta": "上传需要的metadata", "application": "来源应用" }, "v": { "origin": { "qiniu": "七牛云", "wechat": "微信", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" }, "uploadState": { "success": "上传成功", "failed": "上传失败", "uploading": "上传中" } } } +{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extra2": "非结构化额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型", "isBridge": "是否桥接访问", "uploadState": "上传状态", "uploadMeta": "上传需要的metadata", "application": "来源应用" }, "v": { "origin": { "qiniu": "七牛云", "ctyun": "天翼云", "wechat": "微信", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" }, "uploadState": { "success": "上传成功", "failed": "上传失败", "uploading": "上传中" } } } diff --git a/lib/triggers/index.d.ts b/lib/triggers/index.d.ts index 2fb6b83f9..c0354eb3f 100644 --- a/lib/triggers/index.d.ts +++ b/lib/triggers/index.d.ts @@ -1,2 +1,2 @@ -declare const _default: (import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; +declare const _default: (import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger | import("oak-domain").Trigger | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger> | import("oak-domain").Trigger>)[]; export default _default; diff --git a/src/entities/ExtraFile.ts b/src/entities/ExtraFile.ts index 95aec5926..bc244308f 100644 --- a/src/entities/ExtraFile.ts +++ b/src/entities/ExtraFile.ts @@ -4,7 +4,7 @@ import { EntityDesc } from 'oak-domain/lib/types/EntityDesc'; import { Schema as Application } from './Application'; export interface Schema extends EntityShape { - origin: 'qiniu' | 'wechat' | 'unknown'; + origin: 'qiniu' | 'wechat' | 'unknown' | 'ctyun'; type: 'image' | 'video' | 'audio' | 'file'; bucket?: String<32>; // 七牛用,其它cos可忽略 objectId?: String<64>; // 七牛用,其它cos可忽略 @@ -59,6 +59,7 @@ const entityDesc: EntityDesc