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

pageheader2 根据路由判断当前是否菜单路径

This commit is contained in:
wkj 2024-01-29 14:21:40 +08:00
parent 5e279e953c
commit 954f3916fd
17 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
es/components/actionTabPanel/index.js
View File

@ -1,9 +1,9 @@
export default OakComponent({
isList: false,
data: {
slideWidth: 0,
slideLeft: 0,
slideShow: false,
slideWidth: 0, //小程序使用
slideLeft: 0, //小程序使用
slideShow: false, //小程序使用
commonAction: [
'create',
'update',

2
es/components/detail/index.js
View File

@ -63,7 +63,7 @@ export default OakComponent({
let currentUrl = event.currentTarget.dataset.src;
let urlList = event.currentTarget.dataset.list;
wx.previewImage({
current: currentUrl,
current: currentUrl, // 当前显示图片的http链接
urls: urlList, // 需要预览的图片http链接列表
});
},

2
es/components/filter/index.js
View File

@ -90,7 +90,7 @@ export default OakComponent({
attribute: {},
options: [],
inputType: '',
timeStartStr: '',
timeStartStr: '', // 小程序选择时间显示
timeEndStr: '',
selectedLabel: '',
minDateMp: new Date(1980, 1, 1).getTime(),

12
es/components/pageHeader2/index.js
View File

@ -5,4 +5,16 @@ export default OakComponent({
this.navigateBack(delta);
},
},
formData({ features }) {
const menus = features.contextMenuFactory.menus;
const namespace = features.navigator.getNamespace();
const location = features.navigator.getLocation();
const currentPath = location.pathname; //当前路由path
const allowBack = !menus?.find((ele) => features.navigator
.getPathname(ele.url || '', namespace)
?.toLocaleLowerCase() === currentPath?.toLocaleLowerCase());
return {
allowBack,
};
}
});

1
es/components/pageHeader2/web.d.ts vendored
View File

@ -17,6 +17,7 @@ type PageHeaderProps = {
extra?: React.ReactNode;
children?: React.ReactNode;
content?: React.ReactNode;
allowBack: boolean;
};
type ED = EntityDict & BaseEntityDict;
export default function Render(props: WebComponentProps<ED, keyof ED, false, PageHeaderProps, {

15
es/components/pageHeader2/web.js
View File

@ -4,18 +4,23 @@ import { ArrowLeftOutlined } from '@ant-design/icons';
import classNames from 'classnames';
import './index.less';
export default function Render(props) {
const { style, className, showHeader = true, showBack = false, onBack, backIcon, delta, title, subTitle, extra, tags, children, content,
const { data, methods } = props;
const { style, className, showHeader = true, showBack = false, onBack, backIcon, delta, title, subTitle, extra, tags, children, content,
// contentStyle,
// contentClassName,
// bodyStyle,
// bodyClassName,
} = props.data;
const { t, goBack } = props.methods;
allowBack = true, //state取
} = data;
const { t, goBack } = methods;
const prefixCls = 'oak-new';
const back = data.hasOwnProperty('showBack')
? showBack
: allowBack;
return (<div style={style} className={classNames(`${prefixCls}-pageHeader`, className)}>
{showHeader && (title || showBack || subTitle || tags || extra) && (<div className={`${prefixCls}-pageHeader-header`}>
{showHeader && (title || back || subTitle || tags || extra) && (<div className={`${prefixCls}-pageHeader-header`}>
<div className={`${prefixCls}-pageHeader-header-left`}>
{showBack && (<Button type="text" className={`${prefixCls}-pageHeader-header-back`} onClick={() => {
{back && (<Button type="text" className={`${prefixCls}-pageHeader-header-back`} onClick={() => {
if (typeof onBack === 'function') {
onBack();
return;

2
es/components/refAttr/index.js
View File

@ -9,7 +9,7 @@ export default OakComponent({
multiple: false,
entityId: '',
entityIds: [],
pickerRender: {},
pickerRender: {}, // OakAbsRefAttrPickerRender
onChange: (() => undefined),
},
formData() {

2
es/components/upsert/index.js
View File

@ -5,7 +5,7 @@ export default OakComponent({
return this.props.entity;
},
properties: {
helps: {},
helps: {}, // Record<string, string>;
entity: '',
attributes: [],
layout: 'horizontal',

2
es/features/cache.js
View File

@ -322,7 +322,7 @@ export class Cache extends Feature {
opers.forEach((oper) => {
const { entity, operation } = oper;
this.cacheStore.operate(entity, operation, this.context, {
checkerTypes: ['logical'],
checkerTypes: ['logical'], // 这里不能检查data，不然在数据没填完前会有大量异常
dontCollect: true,
dontCreateOper: true,
dontCreateModi: true,

1
es/features/contextMenuFactory.d.ts vendored
View File

@ -11,6 +11,7 @@ interface IMenu<ED extends EntityDict & BaseEntityDict, T extends keyof ED> {
entity: T;
action: ED[T]['Action'] | ED[T]['Action'][];
paths: string[];
url?: string;
}
export declare class ContextMenuFactory<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>, AD extends CommonAspectDict<ED, Cxt> & Record<string, Aspect<ED, Cxt>>> extends Feature {
cache: Cache<ED, Cxt, FrontCxt, AD>;

2
es/platforms/web/responsive/context.js
View File

@ -1,7 +1,7 @@
import React from 'react';
export const keys = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'];
export const values = {
xs: 576,
xs: 576, //小于576
sm: 576,
md: 768,
lg: 992,

2
lib/features/cache.js
View File

@ -325,7 +325,7 @@ class Cache extends Feature_1.Feature {
opers.forEach((oper) => {
const { entity, operation } = oper;
this.cacheStore.operate(entity, operation, this.context, {
checkerTypes: ['logical'],
checkerTypes: ['logical'], // 这里不能检查data，不然在数据没填完前会有大量异常
dontCollect: true,
dontCreateOper: true,
dontCreateModi: true,

1
lib/features/contextMenuFactory.d.ts vendored
View File

@ -11,6 +11,7 @@ interface IMenu<ED extends EntityDict & BaseEntityDict, T extends keyof ED> {
entity: T;
action: ED[T]['Action'] | ED[T]['Action'][];
paths: string[];
url?: string;
}
export declare class ContextMenuFactory<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>, AD extends CommonAspectDict<ED, Cxt> & Record<string, Aspect<ED, Cxt>>> extends Feature {
cache: Cache<ED, Cxt, FrontCxt, AD>;

2
lib/platforms/web/responsive/context.js
View File

@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
const react_1 = tslib_1.__importDefault(require("react"));
exports.keys = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'];
exports.values = {
xs: 576,
xs: 576, //小于576
sm: 576,
md: 768,
lg: 992,

17
src/components/pageHeader2/index.ts
View File

@ -9,6 +9,23 @@ export default OakComponent({
this.navigateBack(delta);
},
},
formData({ features }) {
const menus = features.contextMenuFactory.menus;
const namespace = features.navigator.getNamespace();
const location = features.navigator.getLocation();
const currentPath = location.pathname; //当前路由path
const allowBack = !menus?.find(
(ele) =>
features.navigator
.getPathname(ele.url || '', namespace)
?.toLocaleLowerCase() === currentPath?.toLocaleLowerCase()
);
return {
allowBack,
};
}
}) as <ED2 extends EntityDict & BaseEntityDict, T2 extends keyof ED2>(
props: ReactComponentProps<
ED2,

15
src/components/pageHeader2/web.tsx
View File

@ -27,6 +27,8 @@ type PageHeaderProps = {
// contentClassName?: string;
// bodyStyle?: React.ReactNode;
// bodyClassName?: string;
allowBack: boolean;
};
type ED = EntityDict & BaseEntityDict;
@ -42,6 +44,7 @@ export default function Render(
}
>
) {
const { data, methods } = props;
const {
style,
className,
@ -61,19 +64,23 @@ export default function Render(
// contentClassName,
// bodyStyle,
// bodyClassName,
} = props.data;
const { t, goBack } = props.methods;
allowBack = true, //state取
} = data;
const { t, goBack } = methods;
const prefixCls = 'oak-new';
const back = data.hasOwnProperty('showBack')
? showBack
: allowBack;
return (
<div
style={style}
className={classNames(`${prefixCls}-pageHeader`, className)}
>
{showHeader && (title || showBack || subTitle || tags || extra) && (
{showHeader && (title || back || subTitle || tags || extra) && (
<div className={`${prefixCls}-pageHeader-header`}>
<div className={`${prefixCls}-pageHeader-header-left`}>
{showBack && (
{back && (
<Button
type="text"
className={`${prefixCls}-pageHeader-header-back`}

1
src/features/contextMenuFactory.ts
View File

@ -15,6 +15,7 @@ interface IMenu<ED extends EntityDict & BaseEntityDict, T extends keyof ED> {
entity: T;
action: ED[T]['Action'] | ED[T]['Action'][];
paths: string[];
url?: string
}
export class ContextMenuFactory<