diff --git a/lib/components/common/empty/empty.d.ts b/lib/components/common/empty/empty.d.ts index a67bcf109..5ad33b8bc 100644 --- a/lib/components/common/empty/empty.d.ts +++ b/lib/components/common/empty/empty.d.ts @@ -1,4 +1,3 @@ -/// import './index.less'; declare const Empty: () => JSX.Element; export default Empty; diff --git a/lib/components/common/empty/simple.d.ts b/lib/components/common/empty/simple.d.ts index a67bcf109..5ad33b8bc 100644 --- a/lib/components/common/empty/simple.d.ts +++ b/lib/components/common/empty/simple.d.ts @@ -1,4 +1,3 @@ -/// import './index.less'; declare const Empty: () => JSX.Element; export default Empty; diff --git a/lib/components/common/weChatLoginQrCode/index.d.ts b/lib/components/common/weChatLoginQrCode/index.d.ts index 54e2e93ee..261b368ef 100644 --- a/lib/components/common/weChatLoginQrCode/index.d.ts +++ b/lib/components/common/weChatLoginQrCode/index.d.ts @@ -1,4 +1,3 @@ -/// import './index.less'; interface QrCodeProps { id?: string; diff --git a/lib/components/config/application/web.pc.d.ts b/lib/components/config/application/web.pc.d.ts index 0dd74c034..289c251d1 100644 --- a/lib/components/config/application/web.pc.d.ts +++ b/lib/components/config/application/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/components/config/application/web/index.d.ts b/lib/components/config/application/web/index.d.ts index 90b02d1c5..b7f7da3d0 100644 --- a/lib/components/config/application/web/index.d.ts +++ b/lib/components/config/application/web/index.d.ts @@ -1,4 +1,3 @@ -/// import { WebConfig } from '../../../../general-app-domain/Application/Schema'; export default function Web(props: { config: WebConfig; diff --git a/lib/components/config/application/wechatMp/index.d.ts b/lib/components/config/application/wechatMp/index.d.ts index e70206643..cad38df4f 100644 --- a/lib/components/config/application/wechatMp/index.d.ts +++ b/lib/components/config/application/wechatMp/index.d.ts @@ -1,4 +1,3 @@ -/// import { WechatMpConfig } from '../../../../general-app-domain/Application/Schema'; export default function WechatMp(props: { config: WechatMpConfig; diff --git a/lib/components/config/application/wechatPublic/index.d.ts b/lib/components/config/application/wechatPublic/index.d.ts index c9c21655c..51cd047a7 100644 --- a/lib/components/config/application/wechatPublic/index.d.ts +++ b/lib/components/config/application/wechatPublic/index.d.ts @@ -1,4 +1,3 @@ -/// import { WechatPublicConfig } from '../../../../general-app-domain/Application/Schema'; export default function WechatPublic(props: { config: WechatPublicConfig; diff --git a/lib/components/config/upsert/account/index.d.ts b/lib/components/config/upsert/account/index.d.ts index ed8ae19c5..d12966ca5 100644 --- a/lib/components/config/upsert/account/index.d.ts +++ b/lib/components/config/upsert/account/index.d.ts @@ -1,4 +1,3 @@ -/// import { Config } from '../../../../types/Config'; export default function Account(props: { account: Required['Account']; diff --git a/lib/components/config/upsert/cos/index.d.ts b/lib/components/config/upsert/cos/index.d.ts index 1be008bf7..e597fb133 100644 --- a/lib/components/config/upsert/cos/index.d.ts +++ b/lib/components/config/upsert/cos/index.d.ts @@ -1,4 +1,3 @@ -/// import { Config } from '../../../../types/Config'; export default function Cos(props: { cos: Required['Cos']; diff --git a/lib/components/config/upsert/live/index.d.ts b/lib/components/config/upsert/live/index.d.ts index 35e0ce993..e6e06424f 100644 --- a/lib/components/config/upsert/live/index.d.ts +++ b/lib/components/config/upsert/live/index.d.ts @@ -1,4 +1,3 @@ -/// import { Config } from '../../../../types/Config'; export default function Cos(props: { live: Required['Live']; diff --git a/lib/components/config/upsert/map/index.d.ts b/lib/components/config/upsert/map/index.d.ts index 7b865bc39..84db02c1b 100644 --- a/lib/components/config/upsert/map/index.d.ts +++ b/lib/components/config/upsert/map/index.d.ts @@ -1,4 +1,3 @@ -/// import { Config } from '../../../../types/Config'; export default function Cos(props: { map: Required['Map']; diff --git a/lib/components/config/upsert/web.pc.d.ts b/lib/components/config/upsert/web.pc.d.ts index 55df3262a..529956e31 100644 --- a/lib/components/config/upsert/web.pc.d.ts +++ b/lib/components/config/upsert/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { Config } from '../../../types/Config'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/components/extraFile/display/web.d.ts b/lib/components/extraFile/display/web.d.ts index 5eaeadcc2..cfaabf286 100644 --- a/lib/components/extraFile/display/web.d.ts +++ b/lib/components/extraFile/display/web.d.ts @@ -1,2 +1 @@ -/// export default function render(): JSX.Element; diff --git a/lib/components/extraFile/gallery/web.d.ts b/lib/components/extraFile/gallery/web.d.ts index e0125b1e0..99a59a462 100644 --- a/lib/components/extraFile/gallery/web.d.ts +++ b/lib/components/extraFile/gallery/web.d.ts @@ -1,4 +1,3 @@ -/// import { UploadFile } from 'antd'; import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; diff --git a/lib/components/func/actionPanel/web.d.ts b/lib/components/func/actionPanel/web.d.ts index bdf44b412..2ae338d31 100644 --- a/lib/components/func/actionPanel/web.d.ts +++ b/lib/components/func/actionPanel/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from "oak-frontend-base"; import { EntityDict } from "../../../general-app-domain"; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../general-app-domain'; import './web.less'; diff --git a/lib/components/message/web.d.ts b/lib/components/message/web.d.ts index ee53e17bd..2ee2d0046 100644 --- a/lib/components/message/web.d.ts +++ b/lib/components/message/web.d.ts @@ -1,4 +1,3 @@ -/// import { MessageProps } from 'oak-frontend-base/lib/types/Message'; export default function render(props: { data: { diff --git a/lib/components/my/avatar/web.d.ts b/lib/components/my/avatar/web.d.ts index b6d4120e5..14968938d 100644 --- a/lib/components/my/avatar/web.d.ts +++ b/lib/components/my/avatar/web.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; import { AvatarSize } from 'antd/es/avatar/SizeContext'; diff --git a/lib/components/my/info/web.d.ts b/lib/components/my/info/web.d.ts index 7a0240a16..b5bc0e9c6 100644 --- a/lib/components/my/info/web.d.ts +++ b/lib/components/my/info/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { AppType, WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/application/detail/web.d.ts b/lib/pages/application/detail/web.d.ts index 466f965ed..abf9578b3 100644 --- a/lib/pages/application/detail/web.d.ts +++ b/lib/pages/application/detail/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebConfig, WechatPublicConfig, WechatMpConfig } from '../../../general-app-domain/Application/Schema'; import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/application/list/web.pc.d.ts b/lib/pages/application/list/web.pc.d.ts index 7d9c794d6..f83736a11 100644 --- a/lib/pages/application/list/web.pc.d.ts +++ b/lib/pages/application/list/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from './../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import '@wangeditor/editor/dist/css/style.css'; import { EntityDict } from './../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/domain/detail/web.d.ts b/lib/pages/domain/detail/web.d.ts index 54de6e3ae..0fde0e02e 100644 --- a/lib/pages/domain/detail/web.d.ts +++ b/lib/pages/domain/detail/web.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../general-app-domain'; export default function render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/mobile/me/web.d.ts b/lib/pages/mobile/me/web.d.ts index bcd7e916b..90d439ce1 100644 --- a/lib/pages/mobile/me/web.d.ts +++ b/lib/pages/mobile/me/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps export default function Render(): JSX.Element; diff --git a/lib/pages/personal/web.pc.d.ts b/lib/pages/personal/web.pc.d.ts index aa9c8f0b9..baca2f3aa 100644 --- a/lib/pages/personal/web.pc.d.ts +++ b/lib/pages/personal/web.pc.d.ts @@ -1,2 +1 @@ -/// export default function Render(): JSX.Element; diff --git a/lib/pages/pickers/area/web.d.ts b/lib/pages/pickers/area/web.d.ts index 402dea2d5..96962c2b8 100644 --- a/lib/pages/pickers/area/web.d.ts +++ b/lib/pages/pickers/area/web.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { Config } from '../../../../types/Config'; import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/platform/detail/web.d.ts b/lib/pages/platform/detail/web.d.ts index 5cf6f9d31..e934cc279 100644 --- a/lib/pages/platform/detail/web.d.ts +++ b/lib/pages/platform/detail/web.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { Config } from '../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/platform/list/web.pc.d.ts b/lib/pages/platform/list/web.pc.d.ts index 938411724..34feac623 100644 --- a/lib/pages/platform/list/web.pc.d.ts +++ b/lib/pages/platform/list/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../../general-app-domain'; import { Config } from '../../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/system/detail/web.d.ts b/lib/pages/system/detail/web.d.ts index b5371919f..cce76388c 100644 --- a/lib/pages/system/detail/web.d.ts +++ b/lib/pages/system/detail/web.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { Config } from '../../../types/Config'; import { WebComponentProps } from 'oak-frontend-base'; diff --git a/lib/pages/system/list/web.pc.d.ts b/lib/pages/system/list/web.pc.d.ts index 843a9d166..3f7e8af66 100644 --- a/lib/pages/system/list/web.pc.d.ts +++ b/lib/pages/system/list/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function render(props: WebComponentProps import { EntityDict } from '../../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/user/search/web.d.ts b/lib/pages/user/search/web.d.ts index 5eaeadcc2..cfaabf286 100644 --- a/lib/pages/user/search/web.d.ts +++ b/lib/pages/user/search/web.d.ts @@ -1,2 +1 @@ -/// export default function render(): JSX.Element; diff --git a/lib/pages/userEntityGrant/confirm/web.d.ts b/lib/pages/userEntityGrant/confirm/web.d.ts index 1674e7f9a..c567cdf19 100644 --- a/lib/pages/userEntityGrant/confirm/web.d.ts +++ b/lib/pages/userEntityGrant/confirm/web.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function render(props: WebComponentProps export default function Render(props: any): JSX.Element; diff --git a/lib/pages/userEntityGrant/detail/web.pc.d.ts b/lib/pages/userEntityGrant/detail/web.pc.d.ts index b88b8c10f..17acc3779 100644 --- a/lib/pages/userEntityGrant/detail/web.pc.d.ts +++ b/lib/pages/userEntityGrant/detail/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/onEntity/web.d.ts b/lib/pages/userRelation/onEntity/web.d.ts index ad0b8f2aa..11df1296a 100644 --- a/lib/pages/userRelation/onEntity/web.d.ts +++ b/lib/pages/userRelation/onEntity/web.d.ts @@ -1,2 +1 @@ -/// export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/onUser/web.d.ts b/lib/pages/userRelation/onUser/web.d.ts index ad0b8f2aa..11df1296a 100644 --- a/lib/pages/userRelation/onUser/web.d.ts +++ b/lib/pages/userRelation/onUser/web.d.ts @@ -1,2 +1 @@ -/// export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts b/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts index ef231e514..8c8945357 100644 --- a/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/byMobile/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts b/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts index d4ffe02e7..7de5e2f13 100644 --- a/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function render(props: WebComponentProps import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/onUser/web.pc.d.ts b/lib/pages/userRelation/upsert/onUser/web.pc.d.ts index e17464587..dc6832f7c 100644 --- a/lib/pages/userRelation/upsert/onUser/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/onUser/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../../general-app-domain'; export default function Render(props: WebComponentProps export default function render(this: any): JSX.Element; diff --git a/lib/pages/userRelation/upsert/web.pc.d.ts b/lib/pages/userRelation/upsert/web.pc.d.ts index 9779d29cb..fbdc2b78b 100644 --- a/lib/pages/userRelation/upsert/web.pc.d.ts +++ b/lib/pages/userRelation/upsert/web.pc.d.ts @@ -1,4 +1,3 @@ -/// import { WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../general-app-domain'; export default function Render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps import { EntityDict } from '../../../general-app-domain'; import { WebComponentProps } from 'oak-frontend-base'; export default function render(props: WebComponentProps): any; + success(options: Record): any; + warning(options: Record): any; + error(options: Record): any; + confirm(options: Record): any; + hide(context: any): void; +}; +export default Message; diff --git a/lib/utils/dialog/index.mp.js b/lib/utils/dialog/index.mp.js index 251130122..495d81ee7 100644 --- a/lib/utils/dialog/index.mp.js +++ b/lib/utils/dialog/index.mp.js @@ -1,6 +1,54 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var tslib_1 = require("tslib"); -// @ts-ignore -var index_1 = tslib_1.__importDefault(require("../../miniprogram_npm/tdesign/dialog/index")); -exports.default = index_1.default; +var DialogType = { + info: 'info', + success: 'success', + warning: 'warning', + error: 'error', + confirm: 'confirm', +}; +function getInstance(context, selector) { + if (selector === void 0) { selector = '#oak-dialog'; } + var instance = context.selectComponent(selector); + if (!instance) { + return Promise.reject(new Error('未找到Dialog组件, 请检查selector是否正确')); + } + return instance; +} +function showDialog(options, type) { + if (type === void 0) { type = DialogType.info; } + var options2 = tslib_1.__assign({}, options); + var context = options2.context; + delete options.context; + var instance = getInstance(context); + instance.resetData(function () { + instance.setData(Object.assign({ type: type }, options), instance.show); + }); + return instance; +} +var Message = { + info: function (options) { + return showDialog(options, DialogType.info); + }, + success: function (options) { + return showDialog(options, DialogType.success); + }, + warning: function (options) { + return showDialog(options, DialogType.warning); + }, + error: function (options) { + return showDialog(options, DialogType.error); + }, + confirm: function (options) { + return showDialog(options, DialogType.confirm); + }, + hide: function (context) { + var instance = getInstance(context); + if (!instance) { + return; + } + instance.linHide(); + }, +}; +exports.default = Message; diff --git a/lib/utils/message/index.mp.js b/lib/utils/message/index.mp.js index 306544bc0..5cba043fa 100644 --- a/lib/utils/message/index.mp.js +++ b/lib/utils/message/index.mp.js @@ -8,7 +8,7 @@ var MessageType = { error: 'error', }; function getInstance(context, selector) { - if (selector === void 0) { selector = '#t-message'; } + if (selector === void 0) { selector = '#oak-message'; } var instance = context.selectComponent(selector); if (!instance) { return Promise.reject(new Error('未找到Message组件, 请检查selector是否正确')); diff --git a/src/components/message/index.xml b/src/components/message/index.xml index e523fe35b..f0536c57d 100644 --- a/src/components/message/index.xml +++ b/src/components/message/index.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/utils/dialog/index.mp.ts b/src/utils/dialog/index.mp.ts index 962cc50a3..84306f1c5 100644 --- a/src/utils/dialog/index.mp.ts +++ b/src/utils/dialog/index.mp.ts @@ -1,4 +1,54 @@ -// @ts-ignore -import Dialog from '../../miniprogram_npm/tdesign/dialog/index'; +const DialogType = { + info: 'info', + success: 'success', + warning: 'warning', + error: 'error', + confirm: 'confirm', +}; -export default Dialog; +function getInstance(context: any, selector = '#oak-dialog') { + const instance = context.selectComponent(selector); + if (!instance) { + return Promise.reject( + new Error('未找到Dialog组件, 请检查selector是否正确') + ); + } + return instance; +} +function showDialog(options: Record, type = DialogType.info) { + const options2 = { ...options }; + const { context } = options2; + delete options.context; + const instance = getInstance(context); + instance.resetData(() => { + instance.setData(Object.assign({ type }, options), instance.show); + }); + return instance; +} + +const Message = { + info(options: Record) { + return showDialog(options, DialogType.info); + }, + success(options: Record) { + return showDialog(options, DialogType.success); + }, + warning(options: Record) { + return showDialog(options, DialogType.warning); + }, + error(options: Record) { + return showDialog(options, DialogType.error); + }, + confirm(options: Record) { + return showDialog(options, DialogType.confirm); + }, + hide(context: any) { + const instance = getInstance(context); + if (!instance) { + return; + } + instance.linHide(); + }, +}; + +export default Message; diff --git a/src/utils/message/index.mp.ts b/src/utils/message/index.mp.ts index 2fa258a1a..5b093b5e0 100644 --- a/src/utils/message/index.mp.ts +++ b/src/utils/message/index.mp.ts @@ -5,7 +5,7 @@ const MessageType = { error: 'error', }; -function getInstance(context: any, selector = '#t-message') { +function getInstance(context: any, selector = '#oak-message') { const instance = context.selectComponent(selector); if (!instance) { return Promise.reject(