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

修改了subscribeMessage的最后一个参数

This commit is contained in:
Xu Chang 2023-03-14 10:49:58 +08:00
parent c226fd32fe
commit ea3d5f1dd8
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/page.mp.d.ts vendored
View File

@ -15,5 +15,5 @@ import { GAD, GFD, OakComponentOption } from './types/Page';
* @param messageProps
* @returns
*/
export declare function subscribeMpMessage<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD>, AD extends GAD<ED, Cxt>, FD extends GFD<ED, Cxt, FrontCxt, AD>, FormedData extends Record<string, any>, IsList extends boolean, TData extends Record<string, any> = {}, TProperty extends PropertyOption = {}, TMethod extends Record<string, Function> = {}>(this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod>, messageTypes: string[], haveToAccept?: boolean, showTip?: boolean): Promise<boolean>;
export declare function subscribeMpMessage<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD>, AD extends GAD<ED, Cxt>, FD extends GFD<ED, Cxt, FrontCxt, AD>, FormedData extends Record<string, any>, IsList extends boolean, TData extends Record<string, any> = {}, TProperty extends PropertyOption = {}, TMethod extends Record<string, Function> = {}>(this: ComponentPublicThisType<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod>, messageTypes: string[], haveToAccept?: boolean, tip?: string): Promise<boolean>;
export declare function createComponent<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD>, AD extends GAD<ED, Cxt>, FD extends GFD<ED, Cxt, FrontCxt, AD>, FormedData extends Record<string, any>, IsList extends boolean, TData extends Record<string, any> = {}, TProperty extends PropertyOption = {}, TMethod extends Record<string, Function> = {}>(option: OakComponentOption<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod>, features: BasicFeatures<ED, Cxt, FrontCxt, AD & CommonAspectDict<ED, Cxt>> & FD): string;

10
lib/page.mp.js
View File

@ -13,7 +13,7 @@ var Exception_1 = require("./types/Exception");
* @param messageProps
* @returns
*/
function subscribeMpMessage(messageTypes, haveToAccept, showTip) {
function subscribeMpMessage(messageTypes, haveToAccept, tip) {
return tslib_1.__awaiter(this, void 0, void 0, function () {
var mttIds, tmplIds, result_1, rejected;
var _this = this;
@ -51,10 +51,10 @@ function subscribeMpMessage(messageTypes, haveToAccept, showTip) {
}
});
if (rejected.length > 0 && haveToAccept) {
if (showTip) {
if (tip) {
this.setMessage({
type: 'warning',
content: '请接受订阅消息，以便及时收取系统通知',
content: tip,
});
return [2 /*return*/, false];
}
@ -71,11 +71,11 @@ function createComponent(option, features) {
var wechatMp = option.wechatMp, methods = option.methods, lifetimes = option.lifetimes, rest = tslib_1.__rest(option, ["wechatMp", "methods", "lifetimes"]);
var relatedMessageTypes = (wechatMp || {}).relatedMessageTypes;
var _a = lifetimes || {}, ready = _a.ready, attached = _a.attached, restLifeTimes = tslib_1.__rest(_a, ["ready", "attached"]);
return (0, page_mp_1.createComponent)(tslib_1.__assign({ methods: tslib_1.__assign({ subscribeMpMessage: function (messageTypes, haveToAccept, showTip) {
return (0, page_mp_1.createComponent)(tslib_1.__assign({ methods: tslib_1.__assign({ subscribeMpMessage: function (messageTypes, haveToAccept, tip) {
return tslib_1.__awaiter(this, void 0, void 0, function () {
return tslib_1.__generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, subscribeMpMessage.call(this, messageTypes, haveToAccept, showTip)];
case 0: return [4 /*yield*/, subscribeMpMessage.call(this, messageTypes, haveToAccept, tip)];
case 1: return [2 /*return*/, _a.sent()];
}
});

2
lib/types/Page.d.ts vendored
View File

@ -11,7 +11,7 @@ import { AspectDict as GeneralAspectDict } from '../aspects/AspectDict';
import { BackendRuntimeContext } from '../context/BackendRuntimeContext';
import { FrontendRuntimeContext } from '../context/FrontendRuntimeContext';
export declare type OakComponentOption<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends BackendRuntimeContext<ED>, FrontCxt extends FrontendRuntimeContext<ED, Cxt, AD & GAD<ED, Cxt>>, AD extends Record<string, Aspect<ED, Cxt>>, FD extends Record<string, Feature>, FormedData extends Record<string, any>, IsList extends boolean, TData extends Record<string, any>, TProperty extends PropertyOption, TMethod extends Record<string, Function>> = BaseOakComponentOption<ED, T, Cxt, FrontCxt, AD & GAD<ED, Cxt>, FD & GFD<ED, Cxt, FrontCxt, AD & GAD<ED, Cxt>>, FormedData, IsList, TData, TProperty, TMethod, {
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, showTip?: boolean) => Promise<boolean>;
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, tip?: string) => Promise<boolean>;
}> & Partial<{
wechatMp: {
relatedMessageTypes?: string[];

12
src/page.mp.ts
View File

@ -42,7 +42,7 @@ export async function subscribeMpMessage<
TData,
TProperty,
TMethod
>, messageTypes: string[], haveToAccept?: boolean, showTip?: boolean) {
>, messageTypes: string[], haveToAccept?: boolean, tip?: string) {
const mttIds = this.features.cache.get('messageTypeTemplateId', {
data: {
id: 1,
@ -76,10 +76,10 @@ export async function subscribeMpMessage<
}
);
if (rejected.length > 0 && haveToAccept) {
if (showTip) {
if (tip) {
this.setMessage({
type: 'warning',
content: '请接受订阅消息，以便及时收取系统通知',
content: tip,
});
return false;
}
@ -122,11 +122,11 @@ export function createComponent<
const { ready, attached, ...restLifeTimes } = lifetimes || {};
return createBaseComponent<ED, T, Cxt, FrontCxt, AD, FD, FormedData, IsList, TData, TProperty, TMethod & {
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean) => Promise<boolean>;
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, tip?: string) => Promise<boolean>;
}>({
methods: {
async subscribeMpMessage(messageTypes: string[], haveToAccept?: boolean, showTip?: boolean) {
return await subscribeMpMessage.call(this as any, messageTypes, haveToAccept, showTip);
async subscribeMpMessage(messageTypes: string[], haveToAccept?: boolean, tip?: string) {
return await subscribeMpMessage.call(this as any, messageTypes, haveToAccept, tip);
},
...(methods as TMethod),
},

2
src/types/Page.ts
View File

@ -23,7 +23,7 @@ export type OakComponentOption<
TProperty extends PropertyOption,
TMethod extends Record<string, Function>,
> = BaseOakComponentOption<ED, T, Cxt, FrontCxt, AD & GAD<ED, Cxt>, FD & GFD<ED, Cxt, FrontCxt, AD & GAD<ED, Cxt>>, FormedData, IsList, TData, TProperty, TMethod, {
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, showTip?: boolean) => Promise<boolean>;
subscribeMpMessage: (messageTypes: string[], haveToAccept?: boolean, tip?: string) => Promise<boolean>;
}> & Partial<{
wechatMp: {
relatedMessageTypes?: string[];