Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

list的相关方法在非list的页面上也应该存在

This commit is contained in:
Xu Chang 2022-07-28 12:08:35 +08:00
parent 6ac73278df
commit 7a087bcde6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/page.mp.js
View File

@ -261,7 +261,7 @@ function createPage(options, features, exceptionRouterDict, context) {
var formData = options.formData, isList = options.isList;
var hiddenMethods = (0, page_common_1.makeHiddenComponentMethods)();
var commonMethods = makeCommonComponentMethods(features, exceptionRouterDict, formData);
var listMethods = isList ? (0, page_common_1.makeListComponentMethods)(features) : {};
var listMethods = (0, page_common_1.makeListComponentMethods)(features);
var _a = makePageMethods(features, options, context), onLoad = _a.onLoad, onPullDownRefresh = _a.onPullDownRefresh, onReachBottom = _a.onReachBottom, restPageMethods = __rest(_a, ["onLoad", "onPullDownRefresh", "onReachBottom"]);
var methods = options.methods, lifetimes = options.lifetimes, pageLifetimes = options.pageLifetimes;
return Component({
@ -403,7 +403,7 @@ function createComponent(options, features, exceptionRouterDict, context) {
var formData = options.formData, isList = options.isList, entity = options.entity, methods = options.methods, lifetimes = options.lifetimes, pageLifetimes = options.pageLifetimes, data = options.data, properties = options.properties, actions = options.actions, observers = options.observers, restOptions = __rest(options, ["formData", "isList", "entity", "methods", "lifetimes", "pageLifetimes", "data", "properties", "actions", "observers"]);
var hiddenMethods = (0, page_common_1.makeHiddenComponentMethods)();
var commonMethods = makeCommonComponentMethods(features, exceptionRouterDict, formData);
var listMethods = isList ? (0, page_common_1.makeListComponentMethods)(features) : {};
var listMethods = (0, page_common_1.makeListComponentMethods)(features);
return Component(__assign({ data: Object.assign({}, data, {
oakEntity: '',
oakFullpath: '',

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

@ -74,7 +74,7 @@ export declare type OakPageOption<ED extends EntityDict, T extends keyof ED, Cxt
state: TData & FormedData & OakPageData<ED, T>;
props: WechatMiniprogram.Component.PropertyOptionToData<OakPageProperties & TProperty>;
setState: (data: Partial<TData & OakPageData<ED, T>>, callback?: () => void) => Promise<void>;
} & Omit<MiniprogramStyleMethods, 'triggerEvent'> & TMethod & WechatMiniprogram.Page.ILifetime & OakCommonComponentMethods<ED, T> & (IsList extends true ? OakListComponentMethods<ED, T> : {}) & OakPageMethods & OakPageInstanceProperties<ED, Cxt, AD, FD>>;
} & Omit<MiniprogramStyleMethods, 'triggerEvent'> & TMethod & WechatMiniprogram.Page.ILifetime & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T> & OakPageMethods & OakPageInstanceProperties<ED, Cxt, AD, FD>>;
export declare type OakComponentOption<ED extends EntityDict, T extends keyof ED, Cxt extends Context<ED>, AD extends Record<string, Aspect<ED, Cxt>>, FD extends Record<string, Feature<ED, Cxt, AD & CommonAspectDict<ED, Cxt>>>, FormedData extends WechatMiniprogram.Component.DataOption, IsList extends boolean, TData extends WechatMiniprogram.Component.DataOption, TProperty extends WechatMiniprogram.Component.PropertyOption, TMethod extends WechatMiniprogram.Component.MethodOption> = ComponentOption<ED, T, Cxt, AD, FD, FormedData, IsList, TProperty> & Partial<WechatMiniprogram.Component.Data<TData>> & Partial<WechatMiniprogram.Component.Property<TProperty>> & Partial<WechatMiniprogram.Component.Method<TMethod, false>> & Partial<{
lifetimes: WechatMiniprogram.Component.Lifetimes['lifetimes'];
observers: Record<string, (...args: any[]) => any>;
@ -86,7 +86,7 @@ export declare type OakComponentOption<ED extends EntityDict, T extends keyof ED
state: TData & FormedData & OakComponentData<ED, T>;
props: WechatMiniprogram.Component.PropertyOptionToData<OakComponentProperties & TProperty>;
setState: (data: Partial<TData>, callback?: () => void) => Promise<void>;
} & MiniprogramStyleMethods & TMethod & OakCommonComponentMethods<ED, T> & (IsList extends true ? OakListComponentMethods<ED, T> : {})>;
} & MiniprogramStyleMethods & TMethod & OakCommonComponentMethods<ED, T> & OakListComponentMethods<ED, T>>;
export declare type OakComponentProperties = {
oakEntity: StringConstructor;
oakPath: StringConstructor;

4
src/page.mp.ts
View File

@ -330,7 +330,7 @@ export function createPage<
exceptionRouterDict,
formData
);
const listMethods = isList ? makeListComponentMethods(features) : {};
const listMethods = makeListComponentMethods(features);
const { onLoad, onPullDownRefresh, onReachBottom, ...restPageMethods } =
makePageMethods(features, options, context);
@ -502,7 +502,7 @@ export function createComponent<
exceptionRouterDict,
formData
);
const listMethods = isList ? makeListComponentMethods(features) : {};
const listMethods = makeListComponentMethods(features);
return Component({
data: Object.assign({}, data, {

4
src/types/Page.ts
View File

@ -139,7 +139,7 @@ export type OakPageOption<
TMethod &
WechatMiniprogram.Page.ILifetime &
OakCommonComponentMethods<ED, T> &
(IsList extends true ? OakListComponentMethods<ED, T> : {}) &
OakListComponentMethods<ED, T> &
OakPageMethods &
OakPageInstanceProperties<ED, Cxt, AD, FD>
>;
@ -177,7 +177,7 @@ export type OakComponentOption<
} & MiniprogramStyleMethods &
TMethod &
OakCommonComponentMethods<ED, T> &
(IsList extends true ? OakListComponentMethods<ED, T> : {})
OakListComponentMethods<ED, T>
>;