diff --git a/lib/components/common/tabBar/index.d.ts b/lib/components/common/tabBar/index.d.ts index 42765aac1..4c4fea97f 100644 --- a/lib/components/common/tabBar/index.d.ts +++ b/lib/components/common/tabBar/index.d.ts @@ -1,3 +1,28 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/config/application/index.d.ts b/lib/components/config/application/index.d.ts index 42765aac1..981d5468d 100644 --- a/lib/components/config/application/index.d.ts +++ b/lib/components/config/application/index.d.ts @@ -1,3 +1,10 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/config/application/index.js b/lib/components/config/application/index.js index 695fd49ec..5ace4fb44 100644 --- a/lib/components/config/application/index.js +++ b/lib/components/config/application/index.js @@ -10,6 +10,7 @@ exports.default = OakComponent({ name: String, entityId: String, type: String, + isService: Boolean, }, data: { initialConfig: {}, diff --git a/lib/components/config/upsert/index.d.ts b/lib/components/config/upsert/index.d.ts index 42765aac1..456cde6d8 100644 --- a/lib/components/config/upsert/index.d.ts +++ b/lib/components/config/upsert/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/editor/index.d.ts b/lib/components/editor/index.d.ts index a064469ab..56653b752 100644 --- a/lib/components/editor/index.d.ts +++ b/lib/components/editor/index.d.ts @@ -1,3 +1,36 @@ import React from 'react'; -declare const _default: React.ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => React.ReactElement>; export default _default; diff --git a/lib/components/extraFile/avatar/index.d.ts b/lib/components/extraFile/avatar/index.d.ts index 42765aac1..a54f0f821 100644 --- a/lib/components/extraFile/avatar/index.d.ts +++ b/lib/components/extraFile/avatar/index.d.ts @@ -1,3 +1,10 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/extraFile/display/index.d.ts b/lib/components/extraFile/display/index.d.ts index 42765aac1..b48183ff8 100644 --- a/lib/components/extraFile/display/index.d.ts +++ b/lib/components/extraFile/display/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/extraFile/gallery/index.d.ts b/lib/components/extraFile/gallery/index.d.ts index 42765aac1..117137cc7 100644 --- a/lib/components/extraFile/gallery/index.d.ts +++ b/lib/components/extraFile/gallery/index.d.ts @@ -1,3 +1,74 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/actionBtnPanel/index.d.ts b/lib/components/func/actionBtnPanel/index.d.ts index 42765aac1..9df5efbca 100644 --- a/lib/components/func/actionBtnPanel/index.d.ts +++ b/lib/components/func/actionBtnPanel/index.d.ts @@ -1,3 +1,21 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/actionPanel/index.d.ts b/lib/components/func/actionPanel/index.d.ts index 42765aac1..6ff879b12 100644 --- a/lib/components/func/actionPanel/index.d.ts +++ b/lib/components/func/actionPanel/index.d.ts @@ -1,3 +1,12 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/actionPanel/index.js b/lib/components/func/actionPanel/index.js index 4ad0531a1..82e4f2752 100644 --- a/lib/components/func/actionPanel/index.js +++ b/lib/components/func/actionPanel/index.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = OakComponent({ isList: false, properties: { + onActionClick: Function, actions: Array, actionDescriptions: Object, iconSize: String, diff --git a/lib/components/func/actionTabPanel/index.d.ts b/lib/components/func/actionTabPanel/index.d.ts index 42765aac1..18adacb50 100644 --- a/lib/components/func/actionTabPanel/index.d.ts +++ b/lib/components/func/actionTabPanel/index.d.ts @@ -1,3 +1,25 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/debugPanel/index.d.ts b/lib/components/func/debugPanel/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/components/func/debugPanel/index.d.ts +++ b/lib/components/func/debugPanel/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/entityPicker/index.d.ts b/lib/components/func/entityPicker/index.d.ts index 42765aac1..aacae7ac0 100644 --- a/lib/components/func/entityPicker/index.d.ts +++ b/lib/components/func/entityPicker/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/entityPicker/index.js b/lib/components/func/entityPicker/index.js index 7febf689f..8a73e5382 100644 --- a/lib/components/func/entityPicker/index.js +++ b/lib/components/func/entityPicker/index.js @@ -22,6 +22,8 @@ exports.default = OakComponent({ properties: { entity: String, projection: Object, + multiple: Boolean, + onSelect: Function, }, methods: {}, }); diff --git a/lib/components/func/foreignKeyFilter/index.d.ts b/lib/components/func/foreignKeyFilter/index.d.ts index 42765aac1..e722dfe38 100644 --- a/lib/components/func/foreignKeyFilter/index.d.ts +++ b/lib/components/func/foreignKeyFilter/index.d.ts @@ -1,3 +1,7 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/foreignKeyFilter/index.js b/lib/components/func/foreignKeyFilter/index.js index 3f7e42712..844bf64f3 100644 --- a/lib/components/func/foreignKeyFilter/index.js +++ b/lib/components/func/foreignKeyFilter/index.js @@ -14,6 +14,7 @@ exports.default = OakComponent({ properties: { entity: String, column: Object, + formItem: Boolean, }, methods: { getNamedFilter: function (name) { diff --git a/lib/components/func/query/index.d.ts b/lib/components/func/query/index.d.ts index 42765aac1..33101c3a2 100644 --- a/lib/components/func/query/index.d.ts +++ b/lib/components/func/query/index.d.ts @@ -1,3 +1,6 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/func/queryFilter/index.d.ts b/lib/components/func/queryFilter/index.d.ts index 42765aac1..cb83c0cb9 100644 --- a/lib/components/func/queryFilter/index.d.ts +++ b/lib/components/func/queryFilter/index.d.ts @@ -1,3 +1,6 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/icon-font-awesome/index.d.ts b/lib/components/icon-font-awesome/index.d.ts index 42765aac1..4dcb5b29b 100644 --- a/lib/components/icon-font-awesome/index.d.ts +++ b/lib/components/icon-font-awesome/index.d.ts @@ -1,3 +1,25 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/icon/index.d.ts b/lib/components/icon/index.d.ts index 42765aac1..beee9bd0c 100644 --- a/lib/components/icon/index.d.ts +++ b/lib/components/icon/index.d.ts @@ -1,3 +1,13 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/message/cell/index.d.ts b/lib/components/message/cell/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/components/message/cell/index.d.ts +++ b/lib/components/message/cell/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/message/cellButton/index.d.ts b/lib/components/message/cellButton/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/components/message/cellButton/index.d.ts +++ b/lib/components/message/cellButton/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/message/index.d.ts b/lib/components/message/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/components/message/index.d.ts +++ b/lib/components/message/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/messageTypeTemplateId/list/index.d.ts b/lib/components/messageTypeTemplateId/list/index.d.ts index 42765aac1..90d2d6ba5 100644 --- a/lib/components/messageTypeTemplateId/list/index.d.ts +++ b/lib/components/messageTypeTemplateId/list/index.d.ts @@ -1,3 +1,5 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/mobile/manageList/index.d.ts b/lib/components/mobile/manageList/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/components/mobile/manageList/index.d.ts +++ b/lib/components/mobile/manageList/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/my/avatar/index.d.ts b/lib/components/my/avatar/index.d.ts index 42765aac1..b6aacb906 100644 --- a/lib/components/my/avatar/index.d.ts +++ b/lib/components/my/avatar/index.d.ts @@ -1,3 +1,20 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/my/avatar/index.js b/lib/components/my/avatar/index.js index 35bb17fa8..60687791e 100644 --- a/lib/components/my/avatar/index.js +++ b/lib/components/my/avatar/index.js @@ -11,10 +11,6 @@ exports.default = OakComponent({ type: Number, optionalTypes: [Number, String], }, - iconType: { - type: String, - value: 'fas', - }, iconColor: { type: String, value: 'primary', diff --git a/lib/components/my/avatar/web.d.ts b/lib/components/my/avatar/web.d.ts index 14968938d..0cfed41f3 100644 --- a/lib/components/my/avatar/web.d.ts +++ b/lib/components/my/avatar/web.d.ts @@ -5,7 +5,6 @@ export default function Render(props: WebComponentProps -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/my/message/index.d.ts b/lib/components/my/message/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/components/my/message/index.d.ts +++ b/lib/components/my/message/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/components/userEntityGrant/cellButton/index.d.ts b/lib/components/userEntityGrant/cellButton/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/components/userEntityGrant/cellButton/index.d.ts +++ b/lib/components/userEntityGrant/cellButton/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/general-app-domain/Address/locales/zh_CN.json b/lib/general-app-domain/Address/locales/zh_CN.json index 418338fdd..6235a672c 100644 --- a/lib/general-app-domain/Address/locales/zh_CN.json +++ b/lib/general-app-domain/Address/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "detail": "详细地址", "area": "所在地区", "phone": "联系电话", "name": "姓名", "default": "是否默认", "remark": "备注" } } +{ "name": "地址", "attr": { "detail": "详细地址", "area": "所在地区", "phone": "联系电话", "name": "姓名", "default": "是否默认", "remark": "备注" } } diff --git a/lib/general-app-domain/Application/locales/zh_CN.json b/lib/general-app-domain/Application/locales/zh_CN.json index 3b4385ab8..fd1aa6060 100644 --- a/lib/general-app-domain/Application/locales/zh_CN.json +++ b/lib/general-app-domain/Application/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "description": "描述", "type": "类型", "system": "系统", "name": "名称", "config": "设置", "style": "样式" }, "v": { "type": { "web": "网站", "wechatPublic": "微信公众号", "wechatMp": "微信小程序" } } } +{ "name": "应用", "attr": { "description": "描述", "type": "类型", "system": "系统", "name": "名称", "config": "设置", "style": "样式" }, "v": { "type": { "web": "网站", "wechatPublic": "微信公众号", "wechatMp": "微信小程序" } } } diff --git a/lib/general-app-domain/Area/locales/zh_CN.json b/lib/general-app-domain/Area/locales/zh_CN.json index 683c08bb0..8e0c9f7e0 100644 --- a/lib/general-app-domain/Area/locales/zh_CN.json +++ b/lib/general-app-domain/Area/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "level": "层级", "depth": "深度", "parent": "上级地区", "name": "名称", "code": "地区编码", "center": "中心坐标" }, "v": { "level": { "country": "国家", "province": "省", "city": "市", "district": "区", "street": "街道" } } } +{ "name": "地区", "attr": { "level": "层级", "depth": "深度", "parent": "上级地区", "name": "名称", "code": "地区编码", "center": "中心坐标" }, "v": { "level": { "country": "国家", "province": "省", "city": "市", "district": "区", "street": "街道" } } } diff --git a/lib/general-app-domain/Article/locales/zh_CN.json b/lib/general-app-domain/Article/locales/zh_CN.json index 55e0aca25..da1506ed0 100644 --- a/lib/general-app-domain/Article/locales/zh_CN.json +++ b/lib/general-app-domain/Article/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "title": "标题", "author": "作者", "abstract": "简介", "content": "正文", "files": "封面图", "iState": "状态", "url": "外部链接", "entity": "关联对象", "entityId": "关联对象id", "sign": "唯一标志" }, "action": { "online": "上架", "offline": "下架", "disabled": "禁用" }, "v": { "iState": { "online": "已上架", "offline": "已下架", "disabled": "已禁用" } } } +{ "name": "文章", "attr": { "title": "标题", "author": "作者", "abstract": "简介", "content": "正文", "files": "封面图", "iState": "状态", "url": "外部链接", "entity": "关联对象", "entityId": "关联对象id", "sign": "唯一标志" }, "action": { "online": "上架", "offline": "下架", "disabled": "禁用" }, "v": { "iState": { "online": "已上架", "offline": "已下架", "disabled": "已禁用" } } } diff --git a/lib/general-app-domain/Captcha/locales/zh_CN.json b/lib/general-app-domain/Captcha/locales/zh_CN.json index 3d2315cb1..c221a56f1 100644 --- a/lib/general-app-domain/Captcha/locales/zh_CN.json +++ b/lib/general-app-domain/Captcha/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "mobile": "手机号", "code": "验证码", "visitorId": "用户标识", "reason": "失败原因", "env": "用户环境", "expired": "是否过期", "expiresAt": "过期时间", "iState": "状态" }, "action": { "send": "发送", "fail": "失败", "success": "成功" }, "v": { "iState": { "unsent": "未发送", "sending": "发送中", "sent": "已发送", "failure": "已失败" } } } +{ "name": "验证码", "attr": { "mobile": "手机号", "code": "验证码", "visitorId": "用户标识", "reason": "失败原因", "env": "用户环境", "expired": "是否过期", "expiresAt": "过期时间", "iState": "状态" }, "action": { "send": "发送", "fail": "失败", "success": "成功" }, "v": { "iState": { "unsent": "未发送", "sending": "发送中", "sent": "已发送", "failure": "已失败" } } } diff --git a/lib/general-app-domain/Domain/locales/zh_CN.json b/lib/general-app-domain/Domain/locales/zh_CN.json index 587c330b5..f366b6ffb 100644 --- a/lib/general-app-domain/Domain/locales/zh_CN.json +++ b/lib/general-app-domain/Domain/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "url": "域名", "apiPath": "api路径", "protocol": "协议", "port": "端口", "system": "系统" }, "v": { "protocol": { "http": "http", "https": "https" } } } +{ "name": "域名", "attr": { "url": "域名", "apiPath": "api路径", "protocol": "协议", "port": "端口", "system": "系统" }, "v": { "protocol": { "http": "http", "https": "https" } } } diff --git a/lib/general-app-domain/Email/locales/zh_CN.json b/lib/general-app-domain/Email/locales/zh_CN.json index 5eaefac7e..c30aad5ec 100644 --- a/lib/general-app-domain/Email/locales/zh_CN.json +++ b/lib/general-app-domain/Email/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "ableState": "是否可用", "email": "邮箱", "user": "关联用户", "tokens": "相关令牌" }, "action": { "enable": "启用", "disable": "禁用" }, "v": { "ableState": { "enabled": "可用的", "disabled": "禁用的" } } } +{ "name": "邮箱", "attr": { "ableState": "是否可用", "email": "邮箱", "user": "关联用户", "tokens": "相关令牌" }, "action": { "enable": "启用", "disable": "禁用" }, "v": { "ableState": { "enabled": "可用的", "disabled": "禁用的" } } } diff --git a/lib/general-app-domain/ExtraFile/locales/zh_CN.json b/lib/general-app-domain/ExtraFile/locales/zh_CN.json index 016b43a3d..d8c90213a 100644 --- a/lib/general-app-domain/ExtraFile/locales/zh_CN.json +++ b/lib/general-app-domain/ExtraFile/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型" }, "v": { "origin": { "qiniu": "七牛云", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" } } } +{ "name": "文件", "attr": { "origin": "源", "type": "类型", "bucket": "桶", "objectId": "对象编号", "tag1": "标签一", "tag2": "标签二", "filename": "文件名", "md5": "md5", "entity": "关联对象", "entityId": "关联对象id", "extra1": "额外信息", "extension": "后缀名", "size": "文件大小", "sort": "排序", "fileType": "文件类型" }, "v": { "origin": { "qiniu": "七牛云", "unknown": "未知" }, "type": { "image": "图像", "video": "视频", "audio": "音频", "file": "文件" } } } diff --git a/lib/general-app-domain/Livestream/locales/zh_CN.json b/lib/general-app-domain/Livestream/locales/zh_CN.json index d06f08027..61f123b89 100644 --- a/lib/general-app-domain/Livestream/locales/zh_CN.json +++ b/lib/general-app-domain/Livestream/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "title": "名称", "streamTitle": "直播流名称", "liveonly": "活跃状态", "hub": "直播空间名称", "entity": "所属实体", "entityId": "所属实体id", "rtmpPushUrl": "推流地址", "rtmpPlayUrl": "播放地址", "expireAt": "推流过期时间", "pcPushUrl": "OBS推流地址", "streamKey": "OBS串流密钥" }, "v": { "liveonly": { "online": "在线", "offline": "下线" } } } +{ "name": "直播流", "attr": { "title": "名称", "streamTitle": "直播流名称", "liveonly": "活跃状态", "hub": "直播空间名称", "entity": "所属实体", "entityId": "所属实体id", "rtmpPushUrl": "推流地址", "rtmpPlayUrl": "播放地址", "expireAt": "推流过期时间", "pcPushUrl": "OBS推流地址", "streamKey": "OBS串流密钥" }, "v": { "liveonly": { "online": "在线", "offline": "下线" } } } diff --git a/lib/general-app-domain/Message/locales/zh_CN.json b/lib/general-app-domain/Message/locales/zh_CN.json index 1250df0f1..85355a696 100644 --- a/lib/general-app-domain/Message/locales/zh_CN.json +++ b/lib/general-app-domain/Message/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "entity": "关联对象", "entityId": "关联对象ID", "restriction": "限制", "title": "标题", "content": "内容", "user": "关联用户", "type": "消息类型", "weight": "优先级", "iState": "发送状态", "visitState": "访问状态", "router": "目标路由", "data": "透传数据" }, "action": { "succeed": "成功", "fail": "失败", "visit": "阅读" }, "v": { "iState": { "sending": "发送中", "success": "发送成功", "failure": "发送失败" }, "visitState": { "unvisited": "未读", "visited": "已读" }, "weight": { "high": "高", "medium": "中", "low": "低" } } } +{ "name": "信息", "attr": { "entity": "关联对象", "entityId": "关联对象ID", "restriction": "限制", "title": "标题", "content": "内容", "user": "关联用户", "type": "消息类型", "weight": "优先级", "iState": "发送状态", "visitState": "访问状态", "router": "目标路由", "data": "透传数据" }, "action": { "succeed": "成功", "fail": "失败", "visit": "阅读" }, "v": { "iState": { "sending": "发送中", "success": "发送成功", "failure": "发送失败" }, "visitState": { "unvisited": "未读", "visited": "已读" }, "weight": { "high": "高", "medium": "中", "low": "低" } } } diff --git a/lib/general-app-domain/MessageSystem/locales/zh_CN.json b/lib/general-app-domain/MessageSystem/locales/zh_CN.json index c36a37c82..1aa2f5c59 100644 --- a/lib/general-app-domain/MessageSystem/locales/zh_CN.json +++ b/lib/general-app-domain/MessageSystem/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "message": "消息", "system": "系统" } } +{ "name": "信息系统连接", "attr": { "message": "消息", "system": "系统" } } diff --git a/lib/general-app-domain/MessageType/locales/zh_CN.json b/lib/general-app-domain/MessageType/locales/zh_CN.json index dce58b5b6..d8d1b8576 100644 --- a/lib/general-app-domain/MessageType/locales/zh_CN.json +++ b/lib/general-app-domain/MessageType/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "type": "类型" } } +{ "name": "消息类型", "attr": { "type": "类型" } } diff --git a/lib/general-app-domain/MessageTypeTemplateId/locales/zh_CN.json b/lib/general-app-domain/MessageTypeTemplateId/locales/zh_CN.json index 255d573df..c23ef30b2 100644 --- a/lib/general-app-domain/MessageTypeTemplateId/locales/zh_CN.json +++ b/lib/general-app-domain/MessageTypeTemplateId/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "type": "消息类型", "templateId": "模板编号", "application": "关联应用" } } +{ "name": "消息类型模板", "attr": { "type": "消息类型", "templateId": "模板编号", "application": "关联应用" } } diff --git a/lib/general-app-domain/Mobile/locales/zh_CN.json b/lib/general-app-domain/Mobile/locales/zh_CN.json index 9fba59eb5..e04e73286 100644 --- a/lib/general-app-domain/Mobile/locales/zh_CN.json +++ b/lib/general-app-domain/Mobile/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "ableState": "是否可用", "mobile": "手机号", "user": "关联用户", "tokens": "相关令牌" }, "action": { "enable": "启用", "disable": "禁用" }, "v": { "ableState": { "enabled": "可用的", "disabled": "禁用的" } } } +{ "name": "手机", "attr": { "ableState": "是否可用", "mobile": "手机号", "user": "关联用户", "tokens": "相关令牌" }, "action": { "enable": "启用", "disable": "禁用" }, "v": { "ableState": { "enabled": "可用的", "disabled": "禁用的" } } } diff --git a/lib/general-app-domain/Modi/locales/zh_CN.json b/lib/general-app-domain/Modi/locales/zh_CN.json index 1e6afdf75..603c92a66 100644 --- a/lib/general-app-domain/Modi/locales/zh_CN.json +++ b/lib/general-app-domain/Modi/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "targetEntity": "目标对象", "entity": "关联对象", "entityId": "关联对象Id", "action": "动作", "data": "数据", "filter": "条件", "extra": "其它", "iState": "状态" }, "action": { "abandon": "放弃", "apply": "应用" }, "v": { "iState": { "active": "活跃的", "abandoned": "放弃的", "applied": "应用的" } } } +{ "name": "更新", "attr": { "targetEntity": "目标对象", "entity": "关联对象", "entityId": "关联对象Id", "action": "动作", "data": "数据", "filter": "条件", "extra": "其它", "iState": "状态" }, "action": { "abandon": "放弃", "apply": "应用" }, "v": { "iState": { "active": "活跃的", "abandoned": "放弃的", "applied": "应用的" } } } diff --git a/lib/general-app-domain/ModiEntity/locales/zh_CN.json b/lib/general-app-domain/ModiEntity/locales/zh_CN.json index 4e87195a5..1c0c55d42 100644 --- a/lib/general-app-domain/ModiEntity/locales/zh_CN.json +++ b/lib/general-app-domain/ModiEntity/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "modi": "更新", "entity": "关联对象", "entityId": "关联对象id" } } +{ "name": "更新对象连接", "attr": { "modi": "更新", "entity": "关联对象", "entityId": "关联对象id" } } diff --git a/lib/general-app-domain/Notification/locales/zh_CN.json b/lib/general-app-domain/Notification/locales/zh_CN.json index ca04c1ee8..9a4a2280b 100644 --- a/lib/general-app-domain/Notification/locales/zh_CN.json +++ b/lib/general-app-domain/Notification/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "channel": "消息渠道", "data": "消息数据", "messageSystem": "消息系统连接", "data1": "数据1", "data2": "数据2", "iState": "状态", "application": "关联应用", "templateId": "模板id" }, "action": { "succeed": "成功", "fail": "失败" }, "v": { "iState": { "sending": "发送中", "success": "发送成功", "failure": "发送失败" }, "channel": { "wechatPublic": "公众号", "jPush": "极光推送", "jim": "极光消息", "wechatMp": "小程序", "sms": "短信" } } } +{ "name": "通知", "attr": { "channel": "消息渠道", "data": "消息数据", "messageSystem": "消息系统连接", "data1": "数据1", "data2": "数据2", "iState": "状态", "application": "关联应用", "templateId": "模板id" }, "action": { "succeed": "成功", "fail": "失败" }, "v": { "iState": { "sending": "发送中", "success": "发送成功", "failure": "发送失败" }, "channel": { "wechatPublic": "公众号", "jPush": "极光推送", "jim": "极光消息", "wechatMp": "小程序", "sms": "短信" } } } diff --git a/lib/general-app-domain/Oper/locales/zh_CN.json b/lib/general-app-domain/Oper/locales/zh_CN.json index 33472c763..b0179cce6 100644 --- a/lib/general-app-domain/Oper/locales/zh_CN.json +++ b/lib/general-app-domain/Oper/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "action": "动作", "data": "数据", "filter": "选择条件", "extra": "其它", "operator": "操作者" } } +{ "name": "操作", "attr": { "action": "动作", "data": "数据", "filter": "选择条件", "extra": "其它", "operator": "操作者" } } diff --git a/lib/general-app-domain/OperEntity/locales/zh_CN.json b/lib/general-app-domain/OperEntity/locales/zh_CN.json index 362452110..435a0ca25 100644 --- a/lib/general-app-domain/OperEntity/locales/zh_CN.json +++ b/lib/general-app-domain/OperEntity/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "oper": "操作", "entity": "关联对象", "entityId": "关联对象id" } } +{ "name": "操作对象连接", "attr": { "oper": "操作", "entity": "关联对象", "entityId": "关联对象id" } } diff --git a/lib/general-app-domain/Platform/locales/zh_CN.json b/lib/general-app-domain/Platform/locales/zh_CN.json index 02ac190dd..e2a70edfd 100644 --- a/lib/general-app-domain/Platform/locales/zh_CN.json +++ b/lib/general-app-domain/Platform/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "name": "名称", "description": "描述", "config": "设置", "style": "样式", "entity": "关联对象", "entityId": "关联对象id" } } +{ "name": "平台", "attr": { "name": "名称", "description": "描述", "config": "设置", "style": "样式", "entity": "关联对象", "entityId": "关联对象id" } } diff --git a/lib/general-app-domain/Role/locales/zh_CN.json b/lib/general-app-domain/Role/locales/zh_CN.json index be9310ed1..f85926f72 100644 --- a/lib/general-app-domain/Role/locales/zh_CN.json +++ b/lib/general-app-domain/Role/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "name": "名称" }, "r": { "owner": "所有者" } } +{ "name": "角色", "attr": { "name": "名称" }, "r": { "owner": "所有者" } } diff --git a/lib/general-app-domain/Subscription/locales/zh_CN.json b/lib/general-app-domain/Subscription/locales/zh_CN.json index 482ffbc33..ecdf70736 100644 --- a/lib/general-app-domain/Subscription/locales/zh_CN.json +++ b/lib/general-app-domain/Subscription/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "name": "名称", "entity": "对象名称", "entityId": "对象Id", "description": "描述", "config": "配置", "offset": "已同步素材位置" } } +{ "name": "订阅号", "attr": { "name": "名称", "entity": "对象名称", "entityId": "对象Id", "description": "描述", "config": "配置", "offset": "已同步素材位置" } } diff --git a/lib/general-app-domain/System/locales/zh_CN.json b/lib/general-app-domain/System/locales/zh_CN.json index 23325e10c..33f9e85c3 100644 --- a/lib/general-app-domain/System/locales/zh_CN.json +++ b/lib/general-app-domain/System/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "name": "名称", "description": "描述", "config": "设置", "platform": "平台", "super": "超级系统", "folder": "代码目录名", "style": "样式", "entity": "关联对象", "entityId": "关联对象id" } } +{ "name": "系统", "attr": { "name": "名称", "description": "描述", "config": "设置", "platform": "平台", "super": "超级系统", "folder": "代码目录名", "style": "样式", "entity": "关联对象", "entityId": "关联对象id" } } diff --git a/lib/general-app-domain/Token/locales/zh_CN.json b/lib/general-app-domain/Token/locales/zh_CN.json index bcae0ce36..2564e744b 100644 --- a/lib/general-app-domain/Token/locales/zh_CN.json +++ b/lib/general-app-domain/Token/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "application": "应用", "entity": "关联对象", "entityId": "关联对象id", "user": "用户", "player": "扮演者", "env": "环境", "ableState": "状态" }, "action": { "enable": "激活", "disable": "禁用" }, "v": { "ableState": { "enabled": "使用中", "disabled": "已禁用" } } } +{ "name": "令牌", "attr": { "application": "应用", "entity": "关联对象", "entityId": "关联对象id", "user": "用户", "player": "扮演者", "env": "环境", "ableState": "状态" }, "action": { "enable": "激活", "disable": "禁用" }, "v": { "ableState": { "enabled": "使用中", "disabled": "已禁用" } } } diff --git a/lib/general-app-domain/User/locales/zh_CN.json b/lib/general-app-domain/User/locales/zh_CN.json index d2963d8a7..caa2b9920 100644 --- a/lib/general-app-domain/User/locales/zh_CN.json +++ b/lib/general-app-domain/User/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } } +{ "name": "用户", "attr": { "name": "姓名", "nickname": "昵称", "birth": "生日", "password": "密码", "passwordSha1": "sha1加密密码", "gender": "性别", "idCardType": "证件类型", "idNumber": "证件号码", "ref": "指向用户", "files": "相关文件", "userState": "用户状态", "idState": "身份验证状态", "codes": "微信分享二维码" }, "action": { "activate": "激活", "accept": "同意", "verify": "验证", "reject": "拒绝", "enable": "启用", "disable": "禁用", "mergeTo": "合并", "mergeFrom": "使合并" }, "v": { "userState": { "shadow": "未激活", "normal": "正常", "disabled": "禁用", "merged": "已被合并" }, "idState": { "unverified": "未验证", "verifying": "验证中", "verified": "已验证" }, "gender": { "male": "男", "female": "女" }, "idCardType": { "ID-Card": "身份证", "passport": "护照", "Mainland-passport": "港澳台通行证" } } } diff --git a/lib/general-app-domain/UserEntityGrant/locales/zh_CN.json b/lib/general-app-domain/UserEntityGrant/locales/zh_CN.json index 07ac2d2a6..ccbd29fb8 100644 --- a/lib/general-app-domain/UserEntityGrant/locales/zh_CN.json +++ b/lib/general-app-domain/UserEntityGrant/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "relation": "关系", "entity": "关联对象", "entityId": "关联对象id", "type": "类型", "number": "次数", "confirmed": "已确认人数", "remark": "备注", "grantee": "领取人", "granter": "授权人", "codes": "微信码", "expired": "是否过期", "expiresAt": "过期时间", "redirectTo": "重定向页面", "qrCodeType": "二维码类型" }, "action": { "confirm": "确认" }, "v": { "type": { "grant": "授予", "transfer": "转交" }, "qrCodeType": { "webForWechatPublic": "网站引流到公众号", "wechatMpDomainUrl": "小程序url码", "wechatMpWxaCode": "小程序码", "wechatPublic": "公众号关注码", "wechatPublicForMp": "公众号回复小程序码" } } } +{ "name": "用户授权", "attr": { "relation": "关系", "entity": "关联对象", "entityId": "关联对象id", "type": "类型", "number": "次数", "confirmed": "已确认人数", "remark": "备注", "grantee": "领取人", "granter": "授权人", "codes": "微信码", "expired": "是否过期", "expiresAt": "过期时间", "redirectTo": "重定向页面", "qrCodeType": "二维码类型" }, "action": { "confirm": "确认" }, "v": { "type": { "grant": "授予", "transfer": "转交" }, "qrCodeType": { "webForWechatPublic": "网站引流到公众号", "wechatMpDomainUrl": "小程序url码", "wechatMpWxaCode": "小程序码", "wechatPublic": "公众号关注码", "wechatPublicForMp": "公众号回复小程序码" } } } diff --git a/lib/general-app-domain/UserSystem/locales/zh_CN.json b/lib/general-app-domain/UserSystem/locales/zh_CN.json index 335da9e3c..80ee1b233 100644 --- a/lib/general-app-domain/UserSystem/locales/zh_CN.json +++ b/lib/general-app-domain/UserSystem/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "user": "用户", "system": "系统" } } +{ "name": "用户系统", "attr": { "user": "用户", "system": "系统" } } diff --git a/lib/general-app-domain/UserWechatPublicTag/locales/zh_CN.json b/lib/general-app-domain/UserWechatPublicTag/locales/zh_CN.json index 7505bef45..a47b3cdd8 100644 --- a/lib/general-app-domain/UserWechatPublicTag/locales/zh_CN.json +++ b/lib/general-app-domain/UserWechatPublicTag/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "wechatPublicTag": "tag", "user": "用户", "sync": "同步状态", "syncAt": "同步时间" } } +{ "name": "用户公众号Tag", "attr": { "wechatPublicTag": "tag", "user": "用户", "sync": "同步状态", "syncAt": "同步时间" } } diff --git a/lib/general-app-domain/WechatPublicTag/locales/zh_CN.json b/lib/general-app-domain/WechatPublicTag/locales/zh_CN.json index 0f9b4c5f7..18badeb8f 100644 --- a/lib/general-app-domain/WechatPublicTag/locales/zh_CN.json +++ b/lib/general-app-domain/WechatPublicTag/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "text": "tag名", "application": "关联应用", "wechatId": "微信端id", "sync": "同步状态", "syncAt": "同步时间" } } +{ "name": "公众号标签", "attr": { "text": "tag名", "application": "关联应用", "wechatId": "微信端id", "sync": "同步状态", "syncAt": "同步时间" } } diff --git a/lib/general-app-domain/WechatQrCode/locales/zh_CN.json b/lib/general-app-domain/WechatQrCode/locales/zh_CN.json index b5569469c..3c21230c9 100644 --- a/lib/general-app-domain/WechatQrCode/locales/zh_CN.json +++ b/lib/general-app-domain/WechatQrCode/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "entity": "关联对象", "entityId": "关联对象id", "type": "类型", "allowShare": "允许分享", "tag": "tag", "ticket": "ticket", "url": "url", "permanent": "是否永久码", "buffer": "小程序码数据(动态)", "expired": "是否过期", "expiresAt": "过期时间", "application": "应用", "props": "属性" }, "v": { "type": { "webForWechatPublic": "网站引流到公众号", "wechatMpDomainUrl": "小程序url码", "wechatMpWxaCode": "小程序码", "wechatPublic": "公众号关注码", "wechatPublicForMp": "公众号回复小程序码" } } } +{ "name": "微信识别码", "attr": { "entity": "关联对象", "entityId": "关联对象id", "type": "类型", "allowShare": "允许分享", "tag": "tag", "ticket": "ticket", "url": "url", "permanent": "是否永久码", "buffer": "小程序码数据(动态)", "expired": "是否过期", "expiresAt": "过期时间", "application": "应用", "props": "属性" }, "v": { "type": { "webForWechatPublic": "网站引流到公众号", "wechatMpDomainUrl": "小程序url码", "wechatMpWxaCode": "小程序码", "wechatPublic": "公众号关注码", "wechatPublicForMp": "公众号回复小程序码" } } } diff --git a/lib/general-app-domain/WechatUser/locales/zh_CN.json b/lib/general-app-domain/WechatUser/locales/zh_CN.json index 95733b92a..0c1d0b3d7 100644 --- a/lib/general-app-domain/WechatUser/locales/zh_CN.json +++ b/lib/general-app-domain/WechatUser/locales/zh_CN.json @@ -1 +1 @@ -{ "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" } } } +{ "name": "微信用户", "attr": { "origin": "源", "openId": "openId", "unionId": "unionId", "sessionKey": "sessionKey", "accessToken": "accessToken", "refreshToken": "refreshToken", "atExpiredAt": "accessToken过期时间", "rtExpiredAt": "refreshToken过期时间", "scope": "accessToken域", "subscribed": "是否订阅", "subscribedAt": "订阅时间", "unsubscribedAt": "取关时间", "user": "用户", "tokens": "相关令牌", "application": "应用", "nickname": "昵称", "avatar": "头像" }, "v": { "origin": { "mp": "小程序", "public": "公众号", "web": "网站" } } } diff --git a/lib/pages/address/list/index.d.ts b/lib/pages/address/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/address/list/index.d.ts +++ b/lib/pages/address/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/address/upsert/index.d.ts b/lib/pages/address/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/address/upsert/index.d.ts +++ b/lib/pages/address/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/application/config/upsert/index.d.ts b/lib/pages/application/config/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/application/config/upsert/index.d.ts +++ b/lib/pages/application/config/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/application/detail/index.d.ts b/lib/pages/application/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/application/detail/index.d.ts +++ b/lib/pages/application/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/application/list/index.d.ts b/lib/pages/application/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/application/list/index.d.ts +++ b/lib/pages/application/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/application/upsert/index.d.ts b/lib/pages/application/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/application/upsert/index.d.ts +++ b/lib/pages/application/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/article/detail/index.d.ts b/lib/pages/article/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/article/detail/index.d.ts +++ b/lib/pages/article/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/article/list/index.d.ts b/lib/pages/article/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/article/list/index.d.ts +++ b/lib/pages/article/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/article/preview/index.d.ts b/lib/pages/article/preview/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/article/preview/index.d.ts +++ b/lib/pages/article/preview/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/article/upsert/index.d.ts b/lib/pages/article/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/article/upsert/index.d.ts +++ b/lib/pages/article/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/domain/detail/index.d.ts b/lib/pages/domain/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/domain/detail/index.d.ts +++ b/lib/pages/domain/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/domain/list/index.d.ts b/lib/pages/domain/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/domain/list/index.d.ts +++ b/lib/pages/domain/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/domain/upsert/index.d.ts b/lib/pages/domain/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/domain/upsert/index.d.ts +++ b/lib/pages/domain/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/icon/index.d.ts b/lib/pages/icon/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/icon/index.d.ts +++ b/lib/pages/icon/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/login/index.d.ts b/lib/pages/login/index.d.ts index 42765aac1..9ff8f4f3f 100644 --- a/lib/pages/login/index.d.ts +++ b/lib/pages/login/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/message/detail/index.d.ts b/lib/pages/message/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/message/detail/index.d.ts +++ b/lib/pages/message/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/message/drawerList/index.d.ts b/lib/pages/message/drawerList/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/message/drawerList/index.d.ts +++ b/lib/pages/message/drawerList/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/message/list/index.d.ts b/lib/pages/message/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/message/list/index.d.ts +++ b/lib/pages/message/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/mobile/login/index.d.ts b/lib/pages/mobile/login/index.d.ts index 42765aac1..6dea646d0 100644 --- a/lib/pages/mobile/login/index.d.ts +++ b/lib/pages/mobile/login/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/mobile/me/index.d.ts b/lib/pages/mobile/me/index.d.ts index 42765aac1..229a14f88 100644 --- a/lib/pages/mobile/me/index.d.ts +++ b/lib/pages/mobile/me/index.d.ts @@ -1,3 +1,5 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/personal/index.d.ts b/lib/pages/personal/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/personal/index.d.ts +++ b/lib/pages/personal/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/pickers/area/index.d.ts b/lib/pages/pickers/area/index.d.ts index 42765aac1..dbecf7237 100644 --- a/lib/pages/pickers/area/index.d.ts +++ b/lib/pages/pickers/area/index.d.ts @@ -1,3 +1,6 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/platform/config/upsert/index.d.ts b/lib/pages/platform/config/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/platform/config/upsert/index.d.ts +++ b/lib/pages/platform/config/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/platform/detail/index.d.ts b/lib/pages/platform/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/platform/detail/index.d.ts +++ b/lib/pages/platform/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/platform/list/index.d.ts b/lib/pages/platform/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/platform/list/index.d.ts +++ b/lib/pages/platform/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/platform/upsert/index.d.ts b/lib/pages/platform/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/platform/upsert/index.d.ts +++ b/lib/pages/platform/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/setting/index.d.ts b/lib/pages/setting/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/setting/index.d.ts +++ b/lib/pages/setting/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/subscription/config/upsert/index.d.ts b/lib/pages/subscription/config/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/subscription/config/upsert/index.d.ts +++ b/lib/pages/subscription/config/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/subscription/detail/index.d.ts b/lib/pages/subscription/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/subscription/detail/index.d.ts +++ b/lib/pages/subscription/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/subscription/list/index.d.ts b/lib/pages/subscription/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/subscription/list/index.d.ts +++ b/lib/pages/subscription/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/subscription/upsert/index.d.ts b/lib/pages/subscription/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/subscription/upsert/index.d.ts +++ b/lib/pages/subscription/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/system/config/upsert/index.d.ts b/lib/pages/system/config/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/system/config/upsert/index.d.ts +++ b/lib/pages/system/config/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/system/detail/index.d.ts b/lib/pages/system/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/system/detail/index.d.ts +++ b/lib/pages/system/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/system/list/index.d.ts b/lib/pages/system/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/system/list/index.d.ts +++ b/lib/pages/system/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/system/upsert/index.d.ts b/lib/pages/system/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/system/upsert/index.d.ts +++ b/lib/pages/system/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/token/me/index.d.ts b/lib/pages/token/me/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/token/me/index.d.ts +++ b/lib/pages/token/me/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/user/info/index.d.ts b/lib/pages/user/info/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/user/info/index.d.ts +++ b/lib/pages/user/info/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/user/manage/detail/index.d.ts b/lib/pages/user/manage/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/user/manage/detail/index.d.ts +++ b/lib/pages/user/manage/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/user/manage/index.d.ts b/lib/pages/user/manage/index.d.ts index 42765aac1..539ecab30 100644 --- a/lib/pages/user/manage/index.d.ts +++ b/lib/pages/user/manage/index.d.ts @@ -1,3 +1,5 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/user/manage/upsert/index.d.ts b/lib/pages/user/manage/upsert/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/user/manage/upsert/index.d.ts +++ b/lib/pages/user/manage/upsert/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/user/search/index.d.ts b/lib/pages/user/search/index.d.ts index 42765aac1..28a65c5a6 100644 --- a/lib/pages/user/search/index.d.ts +++ b/lib/pages/user/search/index.d.ts @@ -1,3 +1,5 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userEntityGrant/confirm/index.d.ts b/lib/pages/userEntityGrant/confirm/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/userEntityGrant/confirm/index.d.ts +++ b/lib/pages/userEntityGrant/confirm/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userEntityGrant/detail/index.d.ts b/lib/pages/userEntityGrant/detail/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/userEntityGrant/detail/index.d.ts +++ b/lib/pages/userEntityGrant/detail/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userEntityGrant/grant/index.d.ts b/lib/pages/userEntityGrant/grant/index.d.ts index 42765aac1..4e7acb2c8 100644 --- a/lib/pages/userEntityGrant/grant/index.d.ts +++ b/lib/pages/userEntityGrant/grant/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userEntityGrant/list/index.d.ts b/lib/pages/userEntityGrant/list/index.d.ts index 42765aac1..8c2febc85 100644 --- a/lib/pages/userEntityGrant/list/index.d.ts +++ b/lib/pages/userEntityGrant/list/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/list/index.d.ts b/lib/pages/userRelation/list/index.d.ts index 42765aac1..47f9f25e8 100644 --- a/lib/pages/userRelation/list/index.d.ts +++ b/lib/pages/userRelation/list/index.d.ts @@ -1,3 +1,10 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/list/index.js b/lib/pages/userRelation/list/index.js index fea228c39..4177b28d0 100644 --- a/lib/pages/userRelation/list/index.js +++ b/lib/pages/userRelation/list/index.js @@ -150,7 +150,7 @@ exports.default = OakComponent({ }, relations: function (prev, next) { if (this.state.oakFullpath && (prev.relations.length !== next.relations.length || (0, lodash_1.difference)(prev.relations, next.relations).length > 0)) { - this.caclRelations(); + this.calcRelations(); this.refresh(); } } diff --git a/lib/pages/userRelation/manage/index.d.ts b/lib/pages/userRelation/manage/index.d.ts index 42765aac1..ca1974742 100644 --- a/lib/pages/userRelation/manage/index.d.ts +++ b/lib/pages/userRelation/manage/index.d.ts @@ -1,3 +1,7 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/onEntity/index.d.ts b/lib/pages/userRelation/onEntity/index.d.ts index 42765aac1..76c71e20f 100644 --- a/lib/pages/userRelation/onEntity/index.d.ts +++ b/lib/pages/userRelation/onEntity/index.d.ts @@ -1,3 +1,8 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/byMobile/index.d.ts b/lib/pages/userRelation/upsert/byMobile/index.d.ts index 42765aac1..ac21317e1 100644 --- a/lib/pages/userRelation/upsert/byMobile/index.d.ts +++ b/lib/pages/userRelation/upsert/byMobile/index.d.ts @@ -1,3 +1,7 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/byUser/index.d.ts b/lib/pages/userRelation/upsert/byUser/index.d.ts index 42765aac1..ac21317e1 100644 --- a/lib/pages/userRelation/upsert/byUser/index.d.ts +++ b/lib/pages/userRelation/upsert/byUser/index.d.ts @@ -1,3 +1,7 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/byUserEntityGrant/index.d.ts b/lib/pages/userRelation/upsert/byUserEntityGrant/index.d.ts index 42765aac1..ab0bef79d 100644 --- a/lib/pages/userRelation/upsert/byUserEntityGrant/index.d.ts +++ b/lib/pages/userRelation/upsert/byUserEntityGrant/index.d.ts @@ -1,3 +1,10 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/index.d.ts b/lib/pages/userRelation/upsert/index.d.ts index 42765aac1..387da2dec 100644 --- a/lib/pages/userRelation/upsert/index.d.ts +++ b/lib/pages/userRelation/upsert/index.d.ts @@ -1,3 +1,9 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/onUser/index.d.ts b/lib/pages/userRelation/upsert/onUser/index.d.ts index 42765aac1..bc087f3f6 100644 --- a/lib/pages/userRelation/upsert/onUser/index.d.ts +++ b/lib/pages/userRelation/upsert/onUser/index.d.ts @@ -1,3 +1,12 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/onUser/userRelation/index.d.ts b/lib/pages/userRelation/upsert/onUser/userRelation/index.d.ts index 42765aac1..ca1974742 100644 --- a/lib/pages/userRelation/upsert/onUser/userRelation/index.d.ts +++ b/lib/pages/userRelation/upsert/onUser/userRelation/index.d.ts @@ -1,3 +1,7 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/userRelation/upsert/web.d.ts b/lib/pages/userRelation/upsert/web.d.ts index cd70dc7e6..c31732b01 100644 --- a/lib/pages/userRelation/upsert/web.d.ts +++ b/lib/pages/userRelation/upsert/web.d.ts @@ -6,7 +6,7 @@ export default function Render(props: WebComponentProps -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/wechatPublic/tag/upsert/index.d.ts b/lib/pages/wechatPublic/tag/upsert/index.d.ts index 42765aac1..294366a34 100644 --- a/lib/pages/wechatPublic/tag/upsert/index.d.ts +++ b/lib/pages/wechatPublic/tag/upsert/index.d.ts @@ -1,3 +1,6 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/wechatQrCode/scan/index.d.ts b/lib/pages/wechatQrCode/scan/index.d.ts index 42765aac1..16f20d449 100644 --- a/lib/pages/wechatQrCode/scan/index.d.ts +++ b/lib/pages/wechatQrCode/scan/index.d.ts @@ -1,3 +1,5 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/pages/wechatUser/login/index.d.ts b/lib/pages/wechatUser/login/index.d.ts index 42765aac1..13e27c663 100644 --- a/lib/pages/wechatUser/login/index.d.ts +++ b/lib/pages/wechatUser/login/index.d.ts @@ -1,3 +1,3 @@ /// -declare const _default: import("react").ComponentType; +declare const _default: (props: import("oak-frontend-base").ReactComponentProps) => import("react").ReactElement>; export default _default; diff --git a/lib/types/Page.d.ts b/lib/types/Page.d.ts index 9724f397c..415ad50c1 100644 --- a/lib/types/Page.d.ts +++ b/lib/types/Page.d.ts @@ -1,5 +1,5 @@ /// -import { OakComponentOption as BaseOakComponentOption, PropertyOption, DataOption, MethodOption } from 'oak-frontend-base/lib/types/Page'; +import { OakComponentOption as BaseOakComponentOption, PropertyOption, DataOption, MethodOption, ReactComponentProps } from 'oak-frontend-base/lib/types/Page'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; import { EntityDict } from '../general-app-domain'; import { Aspect } from 'oak-domain/lib/types/Aspect'; @@ -21,5 +21,5 @@ export declare type GAD, FrontCxt extends FrontendRuntimeContext, AD extends GAD> = BasicFeatures; declare type GF, FrontCxt extends FrontendRuntimeContext, AD extends GAD> = GeneralFeatures; export declare type GFD, FrontCxt extends FrontendRuntimeContext, AD extends GAD> = BF & GF; -export declare type MakeOakComponent, FrontCxt extends FrontendRuntimeContext>, AD extends Record>, FD extends Record> = (options: OakComponentOption) => React.ComponentType; +export declare type MakeOakComponent, FrontCxt extends FrontendRuntimeContext>, AD extends Record>, FD extends Record> = (options: OakComponentOption) => (props: ReactComponentProps) => React.ReactElement; export {}; diff --git a/src/components/common/tabBar/index.ts b/src/components/common/tabBar/index.ts index bfe2c8242..21e056793 100644 --- a/src/components/common/tabBar/index.ts +++ b/src/components/common/tabBar/index.ts @@ -48,8 +48,8 @@ export default OakComponent({ const currentPagePath = '/' + getCurrentPages()[0].route; let index; - for (let i = 0; i < list.length; i++) { - if (list[i].pagePath === currentPagePath) { + for (let i = 0; i < list!.length; i++) { + if (list![i].pagePath === currentPagePath) { index = i; break; } @@ -67,7 +67,7 @@ export default OakComponent({ }); // 触发事件 - const item = list[index]; + const item = list![index]; this.triggerEvent('linchange', { index, item }); }, @@ -77,9 +77,9 @@ export default OakComponent({ */ onTapItem(e: { currentTarget: { dataset: { index: any; }; }; }) { const index = e.currentTarget.dataset.index; - const url = this.props.list[index].pagePath; + const url = this.props.list![index].pagePath; - this.triggerEvent('lintap', { index, item: this.props.list[index] }); + this.triggerEvent('lintap', { index, item: this.props.list![index] }); if (!url) { return; diff --git a/src/components/config/application/index.ts b/src/components/config/application/index.ts index 5f04e6a4f..777581593 100644 --- a/src/components/config/application/index.ts +++ b/src/components/config/application/index.ts @@ -11,6 +11,7 @@ export default OakComponent({ name: String, entityId: String, type: String, + isService: Boolean, }, data: { initialConfig: {} as Config, @@ -82,7 +83,7 @@ export default OakComponent({ await this.features.config.updateApplicationConfig( entity as 'application', - entityId, + entityId!, currentConfig ); this.setMessage({ diff --git a/src/components/config/upsert/index.ts b/src/components/config/upsert/index.ts index 553be330f..9d98d4634 100644 --- a/src/components/config/upsert/index.ts +++ b/src/components/config/upsert/index.ts @@ -74,7 +74,7 @@ export default OakComponent({ await this.features.config.updateConfig( entity as 'system' | 'platform', - entityId, + entityId!, currentConfig ); this.setMessage({ diff --git a/src/components/extraFile/gallery/index.ts b/src/components/extraFile/gallery/index.ts index 29e9929c1..30c0bd4e6 100644 --- a/src/components/extraFile/gallery/index.ts +++ b/src/components/extraFile/gallery/index.ts @@ -35,7 +35,7 @@ export default OakComponent({ files, disableInsert: this.props.maxNumber === 0 || - files?.length >= this.props.maxNumber, + files?.length >= this.props.maxNumber!, }; }, data: { @@ -221,7 +221,7 @@ export default OakComponent({ const { selectCount, extension, fileType } = this.props; try { const { errMsg, tempFiles } = await wx.chooseMessageFile({ - count: selectCount, + count: selectCount!, type: 'all', ...(fileType === 'file' ? { extension } : {}), }); @@ -255,7 +255,7 @@ export default OakComponent({ }, onPickByMp() { const { theme } = this.props; - if (['image', 'image-flow'].includes(theme)) { + if (['image', 'image-flow'].includes(theme!)) { this.chooseMediaByMp(); } else { this.chooseFileByMp(); diff --git a/src/components/func/actionPanel/index.ts b/src/components/func/actionPanel/index.ts index dbba28863..73b2fbbf7 100644 --- a/src/components/func/actionPanel/index.ts +++ b/src/components/func/actionPanel/index.ts @@ -1,6 +1,7 @@ export default OakComponent({ isList: false, properties: { + onActionClick: Function, actions: Array, actionDescriptions: Object, iconSize: String, @@ -12,7 +13,7 @@ export default OakComponent({ methods: { onClickMp(e: WechatMiniprogram.TouchEvent) { const { index } = e.detail; - const action = this.props.actions[index]; + const action = this.props.actions![index]; this.triggerEvent('action', { action }); }, }, @@ -21,7 +22,7 @@ export default OakComponent({ if (prev.actions !== next.actions) { const { actionDescriptions } = this.props; const actionss = next.actions?.map((action: string) => - Object.assign({}, actionDescriptions[action], { + Object.assign({}, actionDescriptions![action], { action, }) ); @@ -36,7 +37,7 @@ export default OakComponent({ if (actions) { const actionss = actions.map((action: string) => - Object.assign({}, actionDescriptions[action], { action }) + Object.assign({}, actionDescriptions![action], { action }) ); this.setState({ actionss }); } diff --git a/src/components/func/entityPicker/index.ts b/src/components/func/entityPicker/index.ts index e4fa334ad..ecef691b2 100644 --- a/src/components/func/entityPicker/index.ts +++ b/src/components/func/entityPicker/index.ts @@ -22,6 +22,8 @@ export default OakComponent({ properties: { entity: String, projection: Object, + multiple: Boolean, + onSelect: Function, }, methods: {}, }); diff --git a/src/components/func/foreignKeyFilter/index.ts b/src/components/func/foreignKeyFilter/index.ts index 7b83edcd2..032e6573d 100644 --- a/src/components/func/foreignKeyFilter/index.ts +++ b/src/components/func/foreignKeyFilter/index.ts @@ -15,6 +15,7 @@ export default OakComponent({ properties: { entity: String, column: Object, + formItem: Boolean, }, methods: { getNamedFilter(name: string) { diff --git a/src/components/my/avatar/index.ts b/src/components/my/avatar/index.ts index e26dda81c..4a043db36 100644 --- a/src/components/my/avatar/index.ts +++ b/src/components/my/avatar/index.ts @@ -11,10 +11,6 @@ export default OakComponent({ type: Number, optionalTypes: [Number, String], }, - iconType: { - type: String, - value: 'fas', - }, iconColor: { type: String, value: 'primary', diff --git a/src/components/my/avatar/web.tsx b/src/components/my/avatar/web.tsx index c6cd4bf44..5903a6288 100644 --- a/src/components/my/avatar/web.tsx +++ b/src/components/my/avatar/web.tsx @@ -12,13 +12,12 @@ export default function Render(props: WebComponentProps void; }>) { - const { data: { avatarUrl, shape, size, iconType, iconColor, iconName, onClick } } = props; + const { data: { avatarUrl, shape, size, iconColor, iconName, onClick } } = props; return avatarUrl ? ( + } shape={shape} size={size} diff --git a/src/pages/user/manage/index.ts b/src/pages/user/manage/index.ts index 68e1b4528..c291e2a73 100644 --- a/src/pages/user/manage/index.ts +++ b/src/pages/user/manage/index.ts @@ -117,7 +117,7 @@ export default OakComponent({ }, lifetimes: { detached() { - this.unsubAll(this.props.event); + this.unsubAll(this.props.event!); }, }, }); \ No newline at end of file diff --git a/src/pages/user/search/index.ts b/src/pages/user/search/index.ts index 37da78349..6f90d0bd0 100644 --- a/src/pages/user/search/index.ts +++ b/src/pages/user/search/index.ts @@ -123,7 +123,7 @@ export default OakComponent( const { toUrl } = this.props; const userIds = data?.map((ele: any) => ele.id); this.navigateTo({ - url: toUrl, + url: toUrl!, userIds, }); this.setState({ @@ -175,7 +175,7 @@ export default OakComponent( this.save('user_searchList', JSON.stringify(searchArr)); this.setState({showList: false}) this.navigateTo({ - url: toUrl, + url: toUrl!, userIds: [userIds[index]], }) }, diff --git a/src/pages/userRelation/list/index.ts b/src/pages/userRelation/list/index.ts index b9bb85cd6..337662f01 100644 --- a/src/pages/userRelation/list/index.ts +++ b/src/pages/userRelation/list/index.ts @@ -147,7 +147,7 @@ export default OakComponent({ }, relations(prev, next) { if (this.state.oakFullpath && (prev.relations.length !== next.relations.length || difference(prev.relations, next.relations).length > 0)) { - this.caclRelations(); + this.calcRelations(); this.refresh(); } } @@ -177,7 +177,7 @@ export default OakComponent({ } else { const userId = this.features.token.getUserId(); - const legalRelations = this.features.relation.getChildrenRelations(entity as keyof EntityDict, userId!, entityId); + const legalRelations = this.features.relation.getChildrenRelations(entity as keyof EntityDict, userId!, entityId!); const relationss = legalRelations ? ( relations ? relations.filter( ele => legalRelations.includes(ele) diff --git a/src/pages/userRelation/upsert/onUser/index.ts b/src/pages/userRelation/upsert/onUser/index.ts index c46ed88c0..b09030af7 100644 --- a/src/pages/userRelation/upsert/onUser/index.ts +++ b/src/pages/userRelation/upsert/onUser/index.ts @@ -67,7 +67,7 @@ export default OakComponent({ } this.setState({ userRelationRelativePath: `user${firstLetterUpperCase( - entity + entity! )}$user`, }); }, diff --git a/src/pages/userRelation/upsert/onUser/userRelation/index.ts b/src/pages/userRelation/upsert/onUser/userRelation/index.ts index a5e028cfc..349114257 100644 --- a/src/pages/userRelation/upsert/onUser/userRelation/index.ts +++ b/src/pages/userRelation/upsert/onUser/userRelation/index.ts @@ -5,7 +5,7 @@ import { EntityDict } from "../../../../../general-app-domain"; export default OakComponent({ entity() { const { entity } = this.props; - return `user${firstLetterUpperCase(entity)}` as keyof EntityDict; + return `user${firstLetterUpperCase(entity!)}` as keyof EntityDict; }, projection() { const { entity } = this.props; @@ -34,7 +34,7 @@ export default OakComponent({ const { relations } = this.props; const relations2: Array<{ isChecked: boolean; relation: string; - }> = relations.map( + }> = relations!.map( (relation: string) => { const isChecked = !!(userRelations?.find( (ele: any) => ele.relation === relation && !ele.$$deleteAt$$ diff --git a/src/pages/userRelation/upsert/web.pc.tsx b/src/pages/userRelation/upsert/web.pc.tsx index 0058f7aae..f957f4a70 100644 --- a/src/pages/userRelation/upsert/web.pc.tsx +++ b/src/pages/userRelation/upsert/web.pc.tsx @@ -19,7 +19,7 @@ export default function Render( grantByEmail: boolean; grantByMobile: boolean; grantMethodCount: number; - redirectToAfterConfirm: string; + redirectToAfterConfirm: object; entity: string; entityId: string; relations: string[]; diff --git a/src/pages/userRelation/upsert/web.tsx b/src/pages/userRelation/upsert/web.tsx index e85d6e3a9..274dfd2d2 100644 --- a/src/pages/userRelation/upsert/web.tsx +++ b/src/pages/userRelation/upsert/web.tsx @@ -18,7 +18,7 @@ export default function Render( grantByEmail: boolean; grantByMobile: boolean; grantMethodCount: number; - redirectToAfterConfirm: string; + redirectToAfterConfirm: object; entity: string; entityId: string; relations: string[]; diff --git a/src/types/Page.ts b/src/types/Page.ts index 43e98d31b..96fec7420 100644 --- a/src/types/Page.ts +++ b/src/types/Page.ts @@ -1,4 +1,4 @@ -import { OakComponentOption as BaseOakComponentOption, PropertyOption, DataOption, MethodOption } from 'oak-frontend-base/lib/types/Page'; +import { OakComponentOption as BaseOakComponentOption, PropertyOption, DataOption, MethodOption, ReactComponentProps } from 'oak-frontend-base/lib/types/Page'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/types/Entity'; import { EntityDict } from '../general-app-domain'; import { Aspect } from 'oak-domain/lib/types/Aspect'; @@ -72,4 +72,4 @@ export type MakeOakComponent< TProperty, TMethod > -) => React.ComponentType; \ No newline at end of file +) => (props: ReactComponentProps) => React.ReactElement; \ No newline at end of file