From 954f3916fd8695b36f46094d86f652c4c802323b Mon Sep 17 00:00:00 2001
From: wkj <278599135@.com>
Date: Mon, 29 Jan 2024 14:21:40 +0800
Subject: [PATCH] =?UTF-8?q?pageheader2=20=E6=A0=B9=E6=8D=AE=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/actionTabPanel/index.js   |  6 +++---
 es/components/detail/index.js           |  2 +-
 es/components/filter/index.js           |  2 +-
 es/components/pageHeader2/index.js      | 12 ++++++++++++
 es/components/pageHeader2/web.d.ts      |  1 +
 es/components/pageHeader2/web.js        | 15 ++++++++++-----
 es/components/refAttr/index.js          |  2 +-
 es/components/upsert/index.js           |  2 +-
 es/features/cache.js                    |  2 +-
 es/features/contextMenuFactory.d.ts     |  1 +
 es/platforms/web/responsive/context.js  |  2 +-
 lib/features/cache.js                   |  2 +-
 lib/features/contextMenuFactory.d.ts    |  1 +
 lib/platforms/web/responsive/context.js |  2 +-
 src/components/pageHeader2/index.ts     | 17 +++++++++++++++++
 src/components/pageHeader2/web.tsx      | 15 +++++++++++----
 src/features/contextMenuFactory.ts      |  1 +
 17 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/es/components/actionTabPanel/index.js b/es/components/actionTabPanel/index.js
index 334680cc..1019b0e6 100644
--- a/es/components/actionTabPanel/index.js
+++ b/es/components/actionTabPanel/index.js
@@ -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',
diff --git a/es/components/detail/index.js b/es/components/detail/index.js
index de7b54df..ac642855 100644
--- a/es/components/detail/index.js
+++ b/es/components/detail/index.js
@@ -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链接列表
             });
         },
diff --git a/es/components/filter/index.js b/es/components/filter/index.js
index c9631b7c..edea5393 100644
--- a/es/components/filter/index.js
+++ b/es/components/filter/index.js
@@ -90,7 +90,7 @@ export default OakComponent({
         attribute: {},
         options: [],
         inputType: '',
-        timeStartStr: '',
+        timeStartStr: '', // 小程序选择时间显示
         timeEndStr: '',
         selectedLabel: '',
         minDateMp: new Date(1980, 1, 1).getTime(),
diff --git a/es/components/pageHeader2/index.js b/es/components/pageHeader2/index.js
index d99d9985..2e548570 100644
--- a/es/components/pageHeader2/index.js
+++ b/es/components/pageHeader2/index.js
@@ -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,
+        };
+    }
 });
diff --git a/es/components/pageHeader2/web.d.ts b/es/components/pageHeader2/web.d.ts
index b695949c..83163e50 100644
--- a/es/components/pageHeader2/web.d.ts
+++ b/es/components/pageHeader2/web.d.ts
@@ -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, {
diff --git a/es/components/pageHeader2/web.js b/es/components/pageHeader2/web.js
index 8be3f916..ba9f82b9 100644
--- a/es/components/pageHeader2/web.js
+++ b/es/components/pageHeader2/web.js
@@ -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;
diff --git a/es/components/refAttr/index.js b/es/components/refAttr/index.js
index a98ea981..6c92bb93 100644
--- a/es/components/refAttr/index.js
+++ b/es/components/refAttr/index.js
@@ -9,7 +9,7 @@ export default OakComponent({
         multiple: false,
         entityId: '',
         entityIds: [],
-        pickerRender: {},
+        pickerRender: {}, // OakAbsRefAttrPickerRender
         onChange: (() => undefined),
     },
     formData() {
diff --git a/es/components/upsert/index.js b/es/components/upsert/index.js
index d9561533..38d769fd 100644
--- a/es/components/upsert/index.js
+++ b/es/components/upsert/index.js
@@ -5,7 +5,7 @@ export default OakComponent({
         return this.props.entity;
     },
     properties: {
-        helps: {},
+        helps: {}, // Record<string, string>;
         entity: '',
         attributes: [],
         layout: 'horizontal',
diff --git a/es/features/cache.js b/es/features/cache.js
index 8a91d3fe..d58ff611 100644
--- a/es/features/cache.js
+++ b/es/features/cache.js
@@ -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,
diff --git a/es/features/contextMenuFactory.d.ts b/es/features/contextMenuFactory.d.ts
index 95021e27..21edc4df 100644
--- a/es/features/contextMenuFactory.d.ts
+++ b/es/features/contextMenuFactory.d.ts
@@ -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>;
diff --git a/es/platforms/web/responsive/context.js b/es/platforms/web/responsive/context.js
index 160db654..1f1c4d3f 100644
--- a/es/platforms/web/responsive/context.js
+++ b/es/platforms/web/responsive/context.js
@@ -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,
diff --git a/lib/features/cache.js b/lib/features/cache.js
index dc3d8401..e02750ac 100644
--- a/lib/features/cache.js
+++ b/lib/features/cache.js
@@ -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,
diff --git a/lib/features/contextMenuFactory.d.ts b/lib/features/contextMenuFactory.d.ts
index 95021e27..21edc4df 100644
--- a/lib/features/contextMenuFactory.d.ts
+++ b/lib/features/contextMenuFactory.d.ts
@@ -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>;
diff --git a/lib/platforms/web/responsive/context.js b/lib/platforms/web/responsive/context.js
index 55d0f20e..adacafce 100644
--- a/lib/platforms/web/responsive/context.js
+++ b/lib/platforms/web/responsive/context.js
@@ -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,
diff --git a/src/components/pageHeader2/index.ts b/src/components/pageHeader2/index.ts
index 0476eeb5..de506bf5 100644
--- a/src/components/pageHeader2/index.ts
+++ b/src/components/pageHeader2/index.ts
@@ -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,
diff --git a/src/components/pageHeader2/web.tsx b/src/components/pageHeader2/web.tsx
index 2a05c9e0..0cba2881 100644
--- a/src/components/pageHeader2/web.tsx
+++ b/src/components/pageHeader2/web.tsx
@@ -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`}
diff --git a/src/features/contextMenuFactory.ts b/src/features/contextMenuFactory.ts
index f76b38b4..70c1b375 100644
--- a/src/features/contextMenuFactory.ts
+++ b/src/features/contextMenuFactory.ts
@@ -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<