beer-assembly-biz 1.1.2-alpha.6 → 1.1.2-alpha.8

package/MediaModals.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { css } from '@emotion/css';
-import { Breadcrumb, Button, Dropdown, Input, message, Modal, Popconfirm, Space, Spin, Typography } from 'antd';
+import { Breadcrumb, Button, Dropdown, Input, message, Modal, Popconfirm, Space, Spin, theme, Typography } from 'antd';
 import ElementUtils from 'beer-network/elementUtils';
 import Flux from 'beer-assembly/Flux';
 import { CloudDownloadOutlined, CopyOutlined, DeleteOutlined, ExclamationCircleFilled, HighlightOutlined, RightCircleOutlined, ScissorOutlined } from '@ant-design/icons';
@@ -11,6 +11,7 @@ import IconMedia from './icon/media.png';
 export class MediaModals {
     static useMedia(request) {
         const [messageApi, contextHolder] = message.useMessage();
+        const { token } = theme.useToken();
         const [isOpenModal, setIsOpenModal] = useState(false);
         const [isOpenMoveModal, setIsOpenMoveModal] = useState(false);
         const [isOpenRenameModal, setIsOpenRenameModal] = useState(false);
@@ -336,7 +337,7 @@ export class MediaModals {
                             React.createElement(Space, null,
                                 React.createElement(Button, { type: "primary", onClick: () => onPutFile(), size: "small", style: {
                                         height: 24,
-                                        fontSize: 12
+                                        fontSize: token.fontSize - 1
                                     }, loading: isLoading }, "\u4E0A\u4F20\u6587\u4EF6"),
                                 React.createElement(Popconfirm, { title: "\u8BF7\u8F93\u5165\u76EE\u5F55\u540D\u79F0", description: React.createElement(Input, { value: selectName, onChange: (e) => setSelectName(e.currentTarget.value) }), onCancel: () => setSelectName(''), onConfirm: () => onCreateDirectory(selectName), okText: "\u786E\u5B9A", cancelText: "\u53D6\u6D88" },
                                     React.createElement(Button, { size: "small", style: {

package/SubMenusContainer.d.ts

@@ -1,7 +1,8 @@
 import React, { CSSProperties, FC } from 'react';
 import type { ComponentToken as MenuComponentToken } from 'antd/es/menu/style';
 export declare type MenusItem = {
-    key: string;
+    key?: string;
+    value?: string;
     label: string | React.ReactNode;
     children: MenusItem[];
 };
@@ -10,6 +11,7 @@ export declare type SubMenusProps = {
     token?: MenuComponentToken | undefined;
     gap?: number | undefined;
     height?: number | string | undefined;
+    width?: number | undefined;
     padding?: number | string | undefined;
     styles?: {
         menus?: CSSProperties | undefined;
@@ -17,7 +19,7 @@ export declare type SubMenusProps = {
     };
     header?: React.ReactNode | undefined;
     children?: React.ReactNode | undefined;
-    defaultValue?: string | undefined;
+    value?: string | undefined;
     onChange?: (key: string) => void;
 };
 export declare const Component: FC<SubMenusProps>;

package/SubMenusContainer.js

@@ -1,6 +1,13 @@
-import React from 'react';
-import { ConfigProvider, Menu, Space } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { ConfigProvider, Menu } from 'antd';
 export const Component = (props) => {
+    const [selectKeys, setSelectKeys] = useState([]);
+    useEffect(() => {
+        if (props?.value === undefined) {
+            return;
+        }
+        setSelectKeys([props.value]);
+    }, [props?.value]);
     return React.createElement(React.Fragment, null,
         React.createElement(ConfigProvider, { theme: {
                 components: {
@@ -19,11 +26,14 @@ export const Component = (props) => {
                     }
                 }
             } },
-            React.createElement(Space, { style: {
-                    alignItems: 'flex-start'
-                }, size: props?.gap },
+            React.createElement("div", { style: {
+                    display: 'flex',
+                    gap: `${props?.gap || 12}px`,
+                    alignItems: 'flex-start',
+                    width: '100%'
+                } },
                 React.createElement("div", { style: {
-                        width: 200,
+                        width: props?.width || 200,
                         backgroundColor: '#fff',
                         height: props?.height || '100vh',
                         userSelect: 'none',
@@ -39,8 +49,16 @@ export const Component = (props) => {
                     React.createElement(Menu, { style: {
                             height: '100%'
                         }, onClick: (e) => {
+                            setSelectKeys([e.key]);
                             props?.onChange?.(e.key);
-                        }, subMenuCloseDelay: 0, defaultSelectedKeys: props?.defaultValue === undefined ? undefined : [props?.defaultValue], mode: "inline", inlineIndent: 16, items: props?.items })),
-                React.createElement("div", { style: { padding: props?.padding, ...(props?.styles?.body || {}) } }, props?.children))));
+                        }, subMenuCloseDelay: 0, selectedKeys: selectKeys, mode: "inline", inlineIndent: 16, items: props?.items })),
+                React.createElement("div", { style: {
+                        width: `calc(100% - ${(props?.width || 200) + (props?.gap || 12) + (props?.gap || 12)}px)`,
+                        marginRight: (props?.gap || 12),
+                        height: '100%',
+                        padding: props?.padding || '12px 0',
+                        ...(props?.styles?.body || {}),
+                        overflow: 'auto'
+                    } }, props?.children))));
 };
 export default Component;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beer-assembly-biz",
   "private": false,
-  "version": "1.1.2-alpha.6",
+  "version": "1.1.2-alpha.8",
   "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"