beer-assembly-biz 1.1.1-alpha.10 → 1.1.1-alpha.12

package/BackPageContainer.d.ts

@@ -0,0 +1,7 @@
+import React, { FC } from 'react';
+export declare type BackPageContainerProps = {
+    title?: string | undefined;
+    children?: React.ReactNode | undefined;
+};
+export declare const Component: FC<BackPageContainerProps>;
+export default Component;

package/BackPageContainer.js

@@ -0,0 +1,33 @@
+import React from 'react';
+import { css } from '@emotion/css';
+import { PageContainer } from '@ant-design/pro-components';
+import { useNavigate } from 'react-router-dom';
+export const Component = (props) => {
+    const navigate = useNavigate();
+    return React.createElement(React.Fragment, null,
+        React.createElement(PageContainer, { onBack: () => {
+                navigate(-1);
+            }, className: css `
+          .ant-page-header-heading {
+              padding-block-start: 0 !important;
+          }
+
+          .ant-page-header-heading-title {
+              font-size: 15px;
+              line-height: 1.5;
+              color: #333;
+          }
+      `, header: {
+                style: {
+                    background: '#fff',
+                    padding: '10px 24px 10px 24px',
+                    borderBottom: '1px solid rgba(0, 0, 0, 0.06)'
+                }
+            }, title: props.title, ghost: true, childrenContentStyle: {
+                padding: '0'
+            } },
+            React.createElement("div", { className: css `
+          padding: 12px 16px;
+      ` }, props.children)));
+};
+export default Component;

package/InlineContainer.d.ts

@@ -0,0 +1,6 @@
+import React, { FC } from 'react';
+export declare type InlineContainer = {
+    children?: React.ReactNode;
+};
+export declare const Component: FC<InlineContainer>;
+export default Component;

package/InlineContainer.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { App, ConfigProvider } from 'antd';
+export const Component = (props) => {
+    return React.createElement(App, null,
+        React.createElement(ConfigProvider, { theme: {
+                token: {
+                    fontSize: 12,
+                    controlHeight: 26,
+                    fontWeightStrong: 500
+                },
+                components: {
+                    Table: {
+                        motion: false,
+                        headerColor: '#333',
+                        rowHoverBg: '#f5f6f7',
+                        rowSelectedBg: '#f4f5f6',
+                        rowSelectedHoverBg: '#e6e7e8',
+                        headerBg: '#fafafa',
+                        cellPaddingInlineSM: 6,
+                        cellPaddingBlockSM: 7
+                    },
+                    Switch: {
+                        fontSize: 10
+                    }
+                }
+            } }, props?.children));
+};
+export default Component;

package/MyPageContainer.d.ts

@@ -0,0 +1,16 @@
+import React, { FC } from 'react';
+import { TabPaneProps } from 'antd';
+export interface Tab extends Omit<TabPaneProps, 'tab'> {
+    key: string;
+    label: React.ReactNode;
+}
+export declare type MyPageContainerProps = {
+    title?: string | undefined;
+    children?: React.ReactNode | undefined;
+    tabList?: Tab[];
+    onTabChange?: (e: string) => void;
+    onRefresh?: () => void;
+    banner?: React.ReactNode;
+};
+export declare const Component: FC<MyPageContainerProps>;
+export default Component;

package/MyPageContainer.js

@@ -0,0 +1,71 @@
+import React, { useEffect, useState } from 'react';
+import { css } from '@emotion/css';
+import { PageContainer } from '@ant-design/pro-components';
+import { message, Modal, Tabs } from 'antd';
+import { Outlet, useLocation } from 'react-router-dom';
+import ParentContext from './content/ParentContext';
+const pathPartition = (sessionStorage.getItem('DETAIL_PARTITION') || '') === ''
+    ? ['CREATE', 'EDIT', 'AUDIT', 'PREVIEW', 'DETAIL', 'READ', 'IN', 'INPUT', 'OUTPUT']
+    : JSON.parse(sessionStorage.getItem('DETAIL_PARTITION') || '[]');
+export const Component = (props) => {
+    const location = useLocation();
+    const [messageApi, contextHolder] = message.useMessage();
+    const [modal, contextModalHolder] = Modal.useModal();
+    const [isSubpage, setIsSubpage] = useState(false);
+    useEffect(() => {
+        const partition = pathPartition.find(path => {
+            return location.pathname.toUpperCase()
+                .indexOf(`/${path}/`) > -1;
+        });
+        if (partition !== undefined) {
+            setIsSubpage(true);
+        }
+        else {
+            setIsSubpage(false);
+        }
+    }, [location]);
+    return React.createElement(React.Fragment, null,
+        React.createElement(ParentContext.Provider, { value: {
+                messageApi,
+                modal,
+                active: () => {
+                    props?.onRefresh?.();
+                }
+            } },
+            contextHolder,
+            contextModalHolder,
+            React.createElement(PageContainer, { style: { display: isSubpage ? 'none' : 'block' }, className: css `
+            .ant-page-header-heading {
+                padding-block-start: 0 !important;
+            }
+
+            .ant-page-header-heading-title {
+                font-size: 15px;
+                line-height: 1.5;
+                color: #333;
+            }
+        `, header: {
+                    style: {
+                        background: '#fff',
+                        padding: (props?.tabList?.length || 0) <= 0 ? '10px 24px 10px 24px' : '10px 24px 2px 24px',
+                        borderBottom: (props?.tabList?.length || 0) <= 0 ? '1px solid rgba(0, 0, 0, 0.06)' : undefined
+                    }
+                }, title: props.title, ghost: true, childrenContentStyle: {
+                    padding: '0'
+                } },
+                (props?.tabList?.length || 0) > 0 ? React.createElement(React.Fragment, null,
+                    React.createElement(Tabs, { size: "small", items: props?.tabList, className: css `
+                background: #fff;
+                border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+
+                .ant-tabs-nav::before {
+                    display: none;
+                }
+            `, tabBarStyle: { margin: '0 24px' }, onChange: (e) => props?.onTabChange?.(e) })) : undefined,
+                props?.banner,
+                React.createElement("div", { className: css `
+            padding: 12px 16px;
+        ` }, props.children)),
+            React.createElement(Outlet, null)));
+};
+export default Component;

package/Permission.d.ts

@@ -0,0 +1,8 @@
+import React, { FC } from 'react';
+export declare type PermissionProps = {
+    domain: string;
+    permission: string;
+    children?: React.ReactNode | undefined;
+};
+export declare const Component: FC<PermissionProps>;
+export default Component;

package/Permission.js

@@ -0,0 +1,7 @@
+import React, { useContext } from 'react';
+import PermissionContext from './content/PermissionContext';
+export const Component = (props) => {
+    const { isPermission } = useContext(PermissionContext);
+    return React.createElement(React.Fragment, null, isPermission(props.domain, props.permission) ? props?.children : undefined);
+};
+export default Component;

package/Upgrade.d.ts

@@ -0,0 +1,7 @@
+import { FC } from 'react';
+export declare type UpgradeComponentProps = {
+    localVersion: string;
+    request?: () => Promise<string> | undefined;
+};
+declare const App: FC<UpgradeComponentProps>;
+export default App;

package/Upgrade.js

@@ -0,0 +1,46 @@
+import React, { useEffect } from 'react';
+import { Modal } from 'antd';
+const TIME_KEY = 'VERSION_TIME';
+const App = (props) => {
+    useEffect(() => {
+        // 每5分钟执行一次
+        setTimeout(async () => {
+            // 读取缓存的上次弹出更新时间
+            const lastTime = Number(localStorage.getItem(TIME_KEY) || 0);
+            if (Number.isNaN(lastTime)) {
+                localStorage.removeItem(TIME_KEY);
+                return;
+            }
+            // 30分钟执行一次
+            if (new Date().getTime() <= lastTime + 1800000) {
+                return;
+            }
+            // 更新刷新时间
+            localStorage.setItem(TIME_KEY, new Date().getTime()
+                .toString());
+            const newVersion = await props.request?.();
+            if (newVersion === undefined || newVersion === '') {
+                return;
+            }
+            if (newVersion === props.localVersion) {
+                return;
+            }
+            // 弹出提示框
+            Modal.confirm({
+                title: '版本更新提示',
+                content: React.createElement(React.Fragment, null,
+                    React.createElement("p", { style: {
+                            fontSize: '15px',
+                            lineHeight: '26px'
+                        } }, "\u60A8\u5DF2\u7ECF\u957F\u65F6\u95F4\u672A\u4F7F\u7528\u6B64\u9875\u9762\uFF0C\u5728\u6B64\u671F\u95F4\u5E73\u53F0\u6709\u8FC7\u66F4\u65B0\uFF0C\u5982\u60A8\u6B64\u65F6\u5728\u9875\u9762\u4E2D\u6CA1\u6709\u586B\u5199\u76F8\u5173\u4FE1\u606F\u7B49\u64CD\u4F5C\uFF0C\u8BF7\u70B9\u51FB\u5237\u65B0\u9875\u9762\u4F7F\u7528\u6700\u65B0\u7248\u672C\uFF01")),
+                okText: '确定',
+                cancelText: '取消',
+                onOk: () => {
+                    window.location.reload();
+                }
+            });
+        }, 5000);
+    }, []);
+    return React.createElement(React.Fragment, null);
+};
+export default App;

package/auth/AuthPassword.js

@@ -33,12 +33,16 @@ const App = (props) => {
     };
     const onConfirmLogin = async (code, slider) => {
         const params = form.getFieldsValue();
-        const result = (await props?.requestLogin?.(code, slider, params)) || true;
-        // 如果处理成功, 关闭Loading
-        if (result) {
-            setIsLoading(false);
+        const func = props?.requestLogin;
+        if (func !== undefined) {
+            const result = await func(code, slider, params);
+            if (!result) {
+                return false;
+            }
         }
-        return result;
+        // 如果处理成功, 关闭Loading
+        setIsLoading(false);
+        return true;
     };
     return React.createElement(Form, { form: form },
         React.createElement(Form.Item, { name: "username", style: { marginBottom: 12 } },

package/content/ParentContext.d.ts

@@ -0,0 +1,8 @@
+import type { MessageInstance } from 'antd/es/message/interface';
+import type { HookAPI } from 'antd/es/modal/useModal';
+declare const ParentContext: import("react").Context<{
+    messageApi: MessageInstance | undefined;
+    modal: HookAPI | undefined;
+    active: () => void;
+}>;
+export default ParentContext;

package/content/ParentContext.js

@@ -0,0 +1,9 @@
+import { createContext } from 'react';
+const ParentContext = createContext({
+    messageApi: undefined,
+    modal: undefined,
+    active: () => {
+        console.log('parent context');
+    }
+});
+export default ParentContext;

package/content/PermissionContext.d.ts

@@ -0,0 +1,4 @@
+declare const PermissionContext: import("react").Context<{
+    isPermission: (domain: string, permission: string) => boolean;
+}>;
+export default PermissionContext;

package/content/PermissionContext.js

@@ -0,0 +1,12 @@
+import { createContext } from 'react';
+const PermissionContext = createContext({
+    isPermission: (domain, permission) => {
+        console.log('parent context' + domain);
+        console.log('parent context' + permission);
+        if (!permission) {
+            return false;
+        }
+        return true;
+    }
+});
+export default PermissionContext;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beer-assembly-biz",
   "private": false,
-  "version": "1.1.1-alpha.10",
+  "version": "1.1.1-alpha.12",
   "scripts": {
     "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
     "pub-m": "tsc && cp -a src/icon ./dist && cp -a src/fonts ./dist && cp -a src/images ./dist && cp package.json ./dist/package.json && npm publish ./dist"
@@ -12,7 +12,7 @@
     "@emotion/css": "^11.11.2",
     "antd": "^5.10.0",
     "beer-network": "^1.1.1-alpha.14",
-    "beer-assembly": "^1.1.1-alpha.57",
+    "beer-assembly": "^1.1.1-alpha.70",
     "dayjs": "^1.11.13",
     "history": "^5.3.0",
     "lodash": "^4.17.21",