@qn-pandora/pandora-component 4.0.12 → 4.0.13

package/CHANGELOG.json

@@ -1,6 +1,26 @@
 {
   "name": "@qn-pandora/pandora-component",
   "entries": [
+    {
+      "version": "4.0.13",
+      "tag": "@qn-pandora/pandora-component_v4.0.13",
+      "date": "Tue, 06 Jun 2023 07:33:10 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "2023.06.06发布"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@qn-pandora/pandora-component-icons\" from `^3.0.15` to `^3.0.16`"
+          },
+          {
+            "comment": "Updating dependency \"@qn-pandora/app-sdk\" from `^3.0.16` to `^3.0.17`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.0.12",
       "tag": "@qn-pandora/pandora-component_v4.0.12",

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log - @qn-pandora/pandora-component
 
-This log was last generated on Mon, 29 May 2023 10:29:42 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Jun 2023 07:33:10 GMT and should not be manually modified.
+
+## 4.0.13
+
+Tue, 06 Jun 2023 07:33:10 GMT
+
+### Patches
+
+- 2023.06.06 发布
 
 ## 4.0.12
 

package/es/components/Drawer/index.d.ts

@@ -51,15 +51,20 @@ export declare type IDrawerProps = Overwrite<DrawerProps, {
      */
     zIndex?: number;
     getContainer?: string | HTMLElement | getContainerFunc | false;
-    onClose?: (e: EventType) => void;
+    onClose?: (e: EventType | null) => void;
     afterVisibleChange?: (visible: boolean) => void;
     /**
      * 是否允许拖拽
      */
     canDrag?: boolean;
     closeIconPlacement?: 'left' | 'right';
+    /**
+     * 无遮罩时点击空白处中的哪些元素不关闭
+     */
+    nonCloseSelector?: string;
 }>;
 export declare class Drawer extends React.Component<React.PropsWithChildren<IDrawerProps>, any> {
+    drawerId: string;
     isResizing: boolean;
     realWidth: string | number | undefined;
     throttleMouseMove: import("lodash").DebouncedFunc<(e: any) => void>;
@@ -70,6 +75,7 @@ export declare class Drawer extends React.Component<React.PropsWithChildren<IDra
     onMouseDown(): void;
     onMouseUp(): void;
     onMouseMove(e: any): void;
+    onMouseClick(e: MouseEvent): void;
     componentDidMount(): void;
     UNSAFE_componentWillUpdate(nextProps: Readonly<React.PropsWithChildren<IDrawerProps>>): void;
     componentWillUnmount(): void;
@@ -122,17 +128,22 @@ declare const _default: (props: {
      */
     zIndex?: number | undefined;
     getContainer?: string | false | HTMLElement | getContainerFunc | undefined;
-    onClose?: ((e: EventType) => void) | undefined;
+    onClose?: ((e: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLDivElement | HTMLButtonElement, MouseEvent> | null) => void) | undefined;
     afterVisibleChange?: ((visible: boolean) => void) | undefined;
     /**
      * 是否允许拖拽
      */
     canDrag?: boolean | undefined;
     closeIconPlacement?: import("antd/es/collapse/Collapse").ExpandIconPosition;
+    /**
+     * 无遮罩时点击空白处中的哪些元素不关闭
+     */
+    nonCloseSelector?: string | undefined;
 } & Pick<DrawerProps, "style" | "autoFocus" | "size" | "prefixCls" | "footer" | "extra" | "bodyStyle" | "forceRender" | "keyboard" | "destroyOnClose" | "closeIcon" | "drawerStyle" | "headerStyle" | "contentWrapperStyle" | "push" | "handler" | "footerStyle" | "level" | "levelMove"> & {
     children?: React.ReactNode;
 } & {
     bodyStyle?: React.CSSProperties | undefined;
     children: React.ReactNode;
+    title?: React.ReactNode;
 }) => JSX.Element;
 export default _default;

package/es/components/Drawer/index.js

@@ -49,8 +49,9 @@ import { observer } from 'mobx-react';
 import { observable, action, computed } from 'mobx';
 import { Drawer as BaseDrawer } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
-import { SDK_PREFIX } from '../../constants/style';
-import popContainerWrapper from '../../hoc/popContainer';
+import { doesDOMMatchSelector } from '../../utils/dom';
+import { SDK_PREFIX, ANT_PREFIX } from '../../constants/style';
+import modalPopupContainerWrapper from '../../hoc/modalPopupContainer';
 import bind from '../../utils/bind';
 var MAX_WIDTH = 6000;
 var MIN_WIDTH = 300;
@@ -58,6 +59,7 @@ var Drawer = /** @class */ (function (_super) {
     __extends(Drawer, _super);
     function Drawer() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.drawerId = "drawer-id-" + Math.floor(Math.random() * 10000);
         _this.isResizing = false;
         _this.realWidth = _this.props.width;
         _this.throttleMouseMove = throttle(function (e) { return _this.onMouseMove(e); }, 100);
@@ -108,11 +110,36 @@ var Drawer = /** @class */ (function (_super) {
             }
         }
     };
+    Drawer.prototype.onMouseClick = function (e) {
+        var _a = this.props, mask = _a.mask, maskClosable = _a.maskClosable, nonCloseSelector = _a.nonCloseSelector, onClose = _a.onClose, visible = _a.visible;
+        if (mask === false && maskClosable && visible) {
+            var currentEl = e.target;
+            var shouldClose = true;
+            while (currentEl) {
+                if (nonCloseSelector) {
+                    if (doesDOMMatchSelector(nonCloseSelector, currentEl)) {
+                        shouldClose = false;
+                        break;
+                    }
+                }
+                if (doesDOMMatchSelector("." + this.drawerId, currentEl) ||
+                    doesDOMMatchSelector("." + ANT_PREFIX + "-modal-root, .ant-modal-root", currentEl)) {
+                    shouldClose = false;
+                    break;
+                }
+                currentEl = currentEl.parentElement;
+            }
+            if (shouldClose) {
+                onClose === null || onClose === void 0 ? void 0 : onClose(null);
+            }
+        }
+    };
     Drawer.prototype.componentDidMount = function () {
         if (this.props.canDrag) {
             document.addEventListener('mousemove', this.throttleMouseMove);
             document.addEventListener('mouseup', this.onMouseUp);
         }
+        document.body.addEventListener('click', this.onMouseClick);
     };
     Drawer.prototype.UNSAFE_componentWillUpdate = function (nextProps) {
         if (nextProps.canDrag && !this.props.canDrag) {
@@ -123,11 +150,12 @@ var Drawer = /** @class */ (function (_super) {
     Drawer.prototype.componentWillUnmount = function () {
         document.removeEventListener('mousemove', this.throttleMouseMove);
         document.removeEventListener('mouseup', this.onMouseUp);
+        document.body.removeEventListener('click', this.onMouseClick);
     };
     Drawer.prototype.render = function () {
         var _a;
         var _b = this.props, width = _b.width, className = _b.className, children = _b.children, canDrag = _b.canDrag, visible = _b.visible, closable = _b.closable, extra = _b.extra, other = __rest(_b, ["width", "className", "children", "canDrag", "visible", "closable", "extra"]);
-        return (React.createElement(BaseDrawer, __assign({ className: classnames(SDK_PREFIX + "-drawer", className, (_a = {},
+        return (React.createElement(BaseDrawer, __assign({ className: classnames(this.drawerId, SDK_PREFIX + "-drawer", className, (_a = {},
                 _a[SDK_PREFIX + "-drawer-no-mask"] = this.props.mask === false,
                 _a)), width: this.realWidth || 'auto', zIndex: 1200, visible: visible, closable: this.closable, extra: this.extra }, other),
             canDrag && (React.createElement("div", { className: SDK_PREFIX + "-scroll-handler", onMouseDown: this.onMouseDown })),
@@ -183,10 +211,16 @@ var Drawer = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], Drawer.prototype, "onMouseMove", null);
+    __decorate([
+        bind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [MouseEvent]),
+        __metadata("design:returntype", void 0)
+    ], Drawer.prototype, "onMouseClick", null);
     Drawer = __decorate([
         observer
     ], Drawer);
     return Drawer;
 }(React.Component));
 export { Drawer };
-export default popContainerWrapper(Drawer);
+export default modalPopupContainerWrapper(Drawer);

package/es/components/Table/index.d.ts

@@ -29,6 +29,7 @@ export interface ITableProps<T> extends TableProps<T> {
     selectedRows?: T[];
     /** 如果支持多选，则batchOptions为多选时的一些批量操作，如删除、添加等 */
     batchOptions?: IOptionItem[];
+    emptyText?: React.ReactNode;
 }
 /**
  * pandora2.0风格的表格
@@ -48,6 +49,7 @@ declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
     get rowSelection(): TableRowSelection<T> | undefined;
     get undisabledData(): readonly T[];
     get keysOfCurrentPage(): any[];
+    get emptyTextComp(): {};
     getRowKey(row: any, index: number): any;
     setIndeterminate(indeterminate: boolean): void;
     setCheckAll(checkAll: boolean): void;

package/es/components/Table/index.js

@@ -154,6 +154,26 @@ var Table = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    Object.defineProperty(Table.prototype, "emptyTextComp", {
+        get: function () {
+            var emptyText = this.props.emptyText;
+            if (!emptyText) {
+                return (React.createElement("div", { className: SDK_PREFIX + "-table-empty" },
+                    React.createElement("div", { className: SDK_PREFIX + "-table-empty-icon" },
+                        React.createElement(EmptyIcon, null)),
+                    React.createElement("div", { className: SDK_PREFIX + "-table-empty-text" }, formatString(TableLocale.empty, this.context.locale))));
+            }
+            if (typeof emptyText === 'string' || typeof emptyText === 'number') {
+                return (React.createElement("div", { className: SDK_PREFIX + "-table-empty" },
+                    React.createElement("div", { className: SDK_PREFIX + "-table-empty-icon" },
+                        React.createElement(EmptyIcon, null)),
+                    React.createElement("div", { className: SDK_PREFIX + "-table-empty-text" }, emptyText)));
+            }
+            return emptyText;
+        },
+        enumerable: true,
+        configurable: true
+    });
     Table.prototype.getRowKey = function (row, index) {
         var rowKey = this.props.rowKey;
         if (typeof rowKey === 'function') {
@@ -238,12 +258,9 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.render = function () {
         var _a, _b;
         var _this = this;
-        var _c = this.props, className = _c.className, batchOptions = _c.batchOptions, scroll = _c.scroll, locale = _c.locale, restProps = __rest(_c, ["className", "batchOptions", "scroll", "locale"]);
+        var _c = this.props, className = _c.className, batchOptions = _c.batchOptions, scroll = _c.scroll, locale = _c.locale, emptyText = _c.emptyText, restProps = __rest(_c, ["className", "batchOptions", "scroll", "locale", "emptyText"]);
         return (React.createElement("div", null,
-            React.createElement(AntTable, __assign({ scroll: scroll, locale: __assign({ emptyText: (React.createElement("div", { className: SDK_PREFIX + "-table-empty" },
-                        React.createElement("div", { className: SDK_PREFIX + "-table-empty-icon" },
-                            React.createElement(EmptyIcon, null)),
-                        React.createElement("div", { className: SDK_PREFIX + "-table-empty-text" }, formatString(TableLocale.empty, this.context.locale)))) }, locale) }, restProps, { className: classnames(SDK_PREFIX + "-table-wrapper", (_a = {}, _a[SDK_PREFIX + "-table-scrollX"] = get(scroll, 'x'), _a), (_b = {}, _b[SDK_PREFIX + "-table-scrollY"] = get(scroll, 'y'), _b), className), 
+            React.createElement(AntTable, __assign({ scroll: scroll, locale: __assign({ emptyText: this.emptyTextComp }, locale) }, restProps, { className: classnames(SDK_PREFIX + "-table-wrapper", (_a = {}, _a[SDK_PREFIX + "-table-scrollX"] = get(scroll, 'x'), _a), (_b = {}, _b[SDK_PREFIX + "-table-scrollY"] = get(scroll, 'y'), _b), className), 
                 // 涉及到权限
                 // getCheckboxProps只能放到tableBatchWrapper里，因为selectedRowKeys在那个组件计算
                 rowSelection: batchOptions && this.props.rowSelection
@@ -297,6 +314,11 @@ var Table = /** @class */ (function (_super) {
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Table.prototype, "keysOfCurrentPage", null);
+    __decorate([
+        computed,
+        __metadata("design:type", Object),
+        __metadata("design:paramtypes", [])
+    ], Table.prototype, "emptyTextComp", null);
     __decorate([
         bind,
         __metadata("design:type", Function),

package/es/components/Tabs/index.d.ts

@@ -21,6 +21,10 @@ export interface IOption {
      * 当用户点击刷新的回调函数，此项不存在时表示不显示刷新 Icon
      */
     onRefresh?: () => void;
+    /**
+     * tab对应内容
+     */
+    children?: React.ReactNode;
 }
 export interface ITabsProps extends TabsProps {
     /**

package/es/components/Tabs/index.js

@@ -32,7 +32,7 @@ export function Tabs(props) {
     var className = props.className, active = props.active, options = props.options, onChange = props.onChange, refreshText = props.refreshText, onRefresh = props.onRefresh, restProps = __rest(props, ["className", "active", "options", "onChange", "refreshText", "onRefresh"]);
     var panes = options.map(function (_a) {
         var _b;
-        var key = _a.key, text = _a.text, hidden = _a.hidden, refreshTextCur = _a.refreshText, onRefreshCur = _a.onRefresh;
+        var key = _a.key, text = _a.text, children = _a.children, hidden = _a.hidden, refreshTextCur = _a.refreshText, onRefreshCur = _a.onRefresh;
         if (hidden) {
             return null;
         }
@@ -44,7 +44,7 @@ export function Tabs(props) {
                 _b)) },
             text,
             refresh));
-        return React.createElement(BaseTabs.TabPane, { key: key, tab: tab });
+        return (React.createElement(BaseTabs.TabPane, { key: key, tab: tab }, children));
     });
     return (React.createElement(BaseTabs, __assign({ className: classnames(SDK_PREFIX + "-tabs", className), tabBarGutter: 16, activeKey: active, onChange: onChange }, restProps), panes));
 }

package/es/constants/style.d.ts

@@ -1 +1,2 @@
 export declare const SDK_PREFIX = "pandora-sdk";
+export declare const ANT_PREFIX = "pandora-antd";

package/es/constants/style.js

@@ -1 +1,2 @@
 export var SDK_PREFIX = 'pandora-sdk';
+export var ANT_PREFIX = 'pandora-antd';

package/es/hoc/modalPopupContainer.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export default function modalPopupContainerWrapper<T>(Comp: React.ComponentType<T>): (props: T & {
+    bodyStyle?: React.CSSProperties | undefined;
+    children: React.ReactNode;
+    title?: React.ReactNode;
+}) => JSX.Element;

package/es/hoc/{popContainer.js → modalPopupContainer.js}

@@ -23,14 +23,19 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { useRef, useCallback } from 'react';
 import ConfigProvider, { ConfigConsumer } from 'antd/es/config-provider';
 import { SDK_PREFIX } from '../constants/style';
-export default function popContainerWrapper(Comp) {
+export default function modalPopupContainerWrapper(Comp) {
     return function (props) {
         var containerRef = useRef(null);
-        var _a = props.bodyStyle, bodyStyle = _a === void 0 ? {} : _a, children = props.children, rest = __rest(props, ["bodyStyle", "children"]);
+        var titleRef = useRef(null);
+        var _a = props.bodyStyle, bodyStyle = _a === void 0 ? {} : _a, children = props.children, title = props.title, rest = __rest(props, ["bodyStyle", "children", "title"]);
         var childrenGetPopupContainer = useCallback(function () {
             return (containerRef === null || containerRef === void 0 ? void 0 : containerRef.current) || document.body;
         }, []);
-        return (React.createElement(Comp, __assign({}, rest),
+        var titleGetPopupContainer = useCallback(function () {
+            return (containerRef === null || containerRef === void 0 ? void 0 : containerRef.current) || document.body;
+        }, []);
+        return (React.createElement(Comp, __assign({}, rest, { title: React.createElement("div", { ref: titleRef },
+                React.createElement(ConfigConsumer, null, function (config) { return (React.createElement(ConfigProvider, __assign({}, config, { getPopupContainer: titleGetPopupContainer }), title)); })) }),
             React.createElement("div", { className: SDK_PREFIX + "-drawer-container", ref: containerRef, style: bodyStyle },
                 React.createElement(ConfigConsumer, null, function (config) { return (React.createElement(ConfigProvider, __assign({}, config, { getPopupContainer: childrenGetPopupContainer }), children)); }))));
     };