@autobest-ui/components 2.4.0 → 2.5.0

package/esm/index.d.ts

@@ -38,8 +38,8 @@ export type { CheckboxProps } from './checkbox';
 export { default as Checkbox } from './checkbox';
 export type { ScriptAttributes, ScriptProps } from './script';
 export { default as Script } from './script';
-export type { MessageProps, MessageConfig } from './message';
-export { default as Message } from './message';
+export type { MessageProps, MessageConfig, MessageResult } from './message';
+export { default as message, Message } from './message';
 export type { TableProps, TableRowSelectionInfo } from './table';
 export type { TableColumnInfo, TableColumnOnRenderReturnObjectInfo } from './table/interface';
 export { default as Table } from './table';

package/esm/index.js

@@ -18,7 +18,7 @@ export { default as LazyImage } from './lazy-image';
 export { default as LinkList } from './link-list';
 export { default as Checkbox } from './checkbox';
 export { default as Script } from './script';
-export { default as Message } from './message';
+export { default as message, Message } from './message';
 export { default as Table } from './table';
 export { default as DatePicker } from './date-picker';
 export { default as Tabs } from './tabs';

package/esm/message/index.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { MessageItem } from './renderMessage';
 export interface MessageProps {
     /**
      * 提示文字
      */
-    content: React.ReactNode;
+    content: React.ReactChild;
     /**
      * 支持多种样式
      */
@@ -25,11 +26,36 @@ export interface MessageConfig {
      */
     maxCount?: number;
 }
-declare function Message(props: MessageProps): {
-    onCloseAll: () => void;
+export interface MessageResult {
     onClose: () => void;
+    onCloseAll: () => void;
+}
+declare type MessageItemWithTimer = MessageItem & {
+    timer?: ReturnType<typeof setTimeout>;
 };
-declare namespace Message {
-    var setConfig: (config: MessageConfig) => void;
+export declare class Message {
+    id: number;
+    prefixCls: string;
+    options: MessageItemWithTimer[];
+    config: MessageConfig;
+    constructor(config?: MessageConfig & {
+        prefixCls?: string;
+    });
+    private _render;
+    /**
+     * 关闭指定的一条message
+     * @param currentId
+     */
+    private _onClose;
+    /**
+     * 关闭所有message
+     */
+    private _onCloseAll;
+    setConfig: (config: MessageConfig) => void;
+    open: (props: MessageProps) => {
+        onCloseAll: () => void;
+        onClose: () => void;
+    };
 }
-export default Message;
+declare const message: Message;
+export default message;

package/esm/message/index.js

@@ -12,87 +12,100 @@ var __assign = this && this.__assign || function () {
 };
 import { canUseDOM, isEmptyArray } from '@autobest-ui/utils';
 import renderMessage from './renderMessage';
-var prefixCls = 'ab-message';
-var options = [];
-var id = 0;
-// 全局配置的默认值
-var currentConfig = {
-  expires: 3000,
-  maxCount: 3
-};
-export default function Message(props) {
-  if (!canUseDOM) {
-    throw new Error('Message use client!');
-  }
-  var cachedId = id++;
-  function render() {
-    renderMessage({
-      prefixCls: prefixCls,
-      className: currentConfig.className,
-      options: options
-    });
-  }
-  /**
-   * 关闭指定的一条message
-   * @param currentId
-   */
-  function _onClose(currentId) {
-    if (isEmptyArray(options)) {
-      return;
-    }
-    var index = options.findIndex(function (item) {
-      return item.id === currentId;
-    });
-    if (index >= 0) {
-      clearTimeout(options[index].timer);
-      options.splice(index, 1);
-      // 关闭需要再渲染一次
-      render();
+var Message = /** @class */function () {
+  function Message(config) {
+    if (config === void 0) {
+      config = {};
     }
+    var _this = this;
+    this.id = 0;
+    this.options = [];
+    this._render = function () {
+      renderMessage({
+        prefixCls: _this.prefixCls,
+        className: _this.config.className,
+        options: _this.options
+      });
+    };
+    /**
+     * 关闭指定的一条message
+     * @param currentId
+     */
+    this._onClose = function (currentId) {
+      if (isEmptyArray(_this.options)) {
+        return;
+      }
+      var index = _this.options.findIndex(function (item) {
+        return item.id === currentId;
+      });
+      if (index >= 0) {
+        clearTimeout(_this.options[index].timer);
+        _this.options.splice(index, 1);
+        // 关闭需要再渲染一次
+        _this._render();
+      }
+    };
+    /**
+     * 关闭所有message
+     */
+    this._onCloseAll = function () {
+      if (isEmptyArray(_this.options)) {
+        return;
+      }
+      _this.options.forEach(function (child) {
+        clearTimeout(child.timer);
+      });
+      _this.options = [];
+      _this._render();
+    };
+    this.setConfig = function (config) {
+      _this.config = __assign({
+        expires: 3000,
+        maxCount: 3
+      }, config);
+    };
+    this.open = function (props) {
+      if (!canUseDOM) {
+        throw new Error('Message use client!');
+      }
+      _this.id++;
+      var currentId = _this.id;
+      /**
+       * 超出条数，将删除最旧的那条message
+       */
+      if (_this.options.length >= _this.config.maxCount) {
+        _this._onClose(_this.options[0].id);
+      }
+      // 每条message对象
+      var item = {
+        content: props.content,
+        contentClassName: props.contentClassName,
+        id: currentId,
+        onDestroy: props.onDestroy,
+        onClose: _this._onClose,
+        timer: null
+      };
+      // push
+      _this.options.push(item);
+      // 开始渲染
+      _this._render();
+      // render后设置自动关闭功能，把定时器绑定到列表
+      item.timer = setTimeout(function () {
+        _this._onClose(currentId);
+      }, props.expires || _this.config.expires);
+      return {
+        onCloseAll: _this._onCloseAll,
+        onClose: function onClose() {
+          return _this._onClose(currentId);
+        }
+      };
+    };
+    this.prefixCls = config.prefixCls || 'ab-message';
+    delete config.prefixCls;
+    this.setConfig(__assign({}, config));
   }
-  /**
-   * 关闭所有message
-   */
-  function onCloseAll() {
-    if (isEmptyArray(options)) {
-      return;
-    }
-    options.forEach(function (child) {
-      clearTimeout(child.timer);
-    });
-    options = [];
-    render();
-  }
-  /**
-   * 超出条数，将删除最旧的那条message
-   */
-  if (options.length >= currentConfig.maxCount) {
-    _onClose(options[0].id);
-  }
-  // 每条message对象
-  var item = {
-    content: props.content,
-    contentClassName: props.contentClassName,
-    id: cachedId,
-    onDestroy: props.onDestroy,
-    onClose: _onClose,
-    timer: null
-  };
-  // push
-  options.push(item);
-  // 开始渲染
-  render();
-  // render后设置自动关闭功能，把定时器绑定到列表
-  item.timer = setTimeout(function () {
-    _onClose(cachedId);
-  }, props.expires || currentConfig.expires);
-  return {
-    onCloseAll: onCloseAll,
-    onClose: function onClose() {
-      return _onClose(cachedId);
-    }
-  };
-}
-Message.setConfig = function (config) {
-  currentConfig = __assign(__assign({}, currentConfig), config);
-};
+  return Message;
+}();
+export { Message };
+var message = new Message();
+export default message;

package/esm/message/renderMessage.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export interface MessageItem {
-    content: React.ReactNode;
+    content: React.ReactChild;
     contentClassName?: string;
     id: number;
     onClose?: (id: number) => void;

package/lib/index.d.ts

@@ -38,8 +38,8 @@ export type { CheckboxProps } from './checkbox';
 export { default as Checkbox } from './checkbox';
 export type { ScriptAttributes, ScriptProps } from './script';
 export { default as Script } from './script';
-export type { MessageProps, MessageConfig } from './message';
-export { default as Message } from './message';
+export type { MessageProps, MessageConfig, MessageResult } from './message';
+export { default as message, Message } from './message';
 export type { TableProps, TableRowSelectionInfo } from './table';
 export type { TableColumnInfo, TableColumnOnRenderReturnObjectInfo } from './table/interface';
 export { default as Table } from './table';

package/lib/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -109,7 +110,7 @@ Object.defineProperty(exports, "LoadingIcon", {
 Object.defineProperty(exports, "Message", {
   enumerable: true,
   get: function get() {
-    return _message.default;
+    return _message.Message;
   }
 });
 Object.defineProperty(exports, "Modal", {
@@ -172,6 +173,12 @@ Object.defineProperty(exports, "Tooltip", {
     return _tooltip.default;
   }
 });
+Object.defineProperty(exports, "message", {
+  enumerable: true,
+  get: function get() {
+    return _message.default;
+  }
+});
 var _accordion = _interopRequireDefault(require("./accordion"));
 var _ellipsis = _interopRequireDefault(require("./ellipsis"));
 var _affix = _interopRequireDefault(require("./affix"));
@@ -192,11 +199,13 @@ var _lazyImage = _interopRequireDefault(require("./lazy-image"));
 var _linkList = _interopRequireDefault(require("./link-list"));
 var _checkbox = _interopRequireDefault(require("./checkbox"));
 var _script = _interopRequireDefault(require("./script"));
-var _message = _interopRequireDefault(require("./message"));
+var _message = _interopRequireWildcard(require("./message"));
 var _table = _interopRequireDefault(require("./table"));
 var _datePicker = _interopRequireDefault(require("./date-picker"));
 var _tabs = _interopRequireDefault(require("./tabs"));
 var _loading = _interopRequireDefault(require("./loading"));
 var _loadingContainer = _interopRequireDefault(require("./loading-container"));
 var _loadingBar = _interopRequireDefault(require("./loading-bar"));
-var _loadingIcon = _interopRequireDefault(require("./loading-icon"));
+var _loadingIcon = _interopRequireDefault(require("./loading-icon"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/message/index.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { MessageItem } from './renderMessage';
 export interface MessageProps {
     /**
      * 提示文字
      */
-    content: React.ReactNode;
+    content: React.ReactChild;
     /**
      * 支持多种样式
      */
@@ -25,11 +26,36 @@ export interface MessageConfig {
      */
     maxCount?: number;
 }
-declare function Message(props: MessageProps): {
-    onCloseAll: () => void;
+export interface MessageResult {
     onClose: () => void;
+    onCloseAll: () => void;
+}
+declare type MessageItemWithTimer = MessageItem & {
+    timer?: ReturnType<typeof setTimeout>;
 };
-declare namespace Message {
-    var setConfig: (config: MessageConfig) => void;
+export declare class Message {
+    id: number;
+    prefixCls: string;
+    options: MessageItemWithTimer[];
+    config: MessageConfig;
+    constructor(config?: MessageConfig & {
+        prefixCls?: string;
+    });
+    private _render;
+    /**
+     * 关闭指定的一条message
+     * @param currentId
+     */
+    private _onClose;
+    /**
+     * 关闭所有message
+     */
+    private _onCloseAll;
+    setConfig: (config: MessageConfig) => void;
+    open: (props: MessageProps) => {
+        onCloseAll: () => void;
+        onClose: () => void;
+    };
 }
-export default Message;
+declare const message: Message;
+export default message;

package/lib/message/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = Message;
+exports.default = exports.Message = void 0;
 var _utils = require("@autobest-ui/utils");
 var _renderMessage = _interopRequireDefault(require("./renderMessage"));
 var __assign = void 0 && (void 0).__assign || function () {
@@ -19,87 +19,101 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-var prefixCls = 'ab-message';
-var options = [];
-var id = 0;
-// 全局配置的默认值
-var currentConfig = {
-  expires: 3000,
-  maxCount: 3
-};
-function Message(props) {
-  if (!_utils.canUseDOM) {
-    throw new Error('Message use client!');
-  }
-  var cachedId = id++;
-  function render() {
-    (0, _renderMessage.default)({
-      prefixCls: prefixCls,
-      className: currentConfig.className,
-      options: options
-    });
-  }
-  /**
-   * 关闭指定的一条message
-   * @param currentId
-   */
-  function _onClose(currentId) {
-    if ((0, _utils.isEmptyArray)(options)) {
-      return;
-    }
-    var index = options.findIndex(function (item) {
-      return item.id === currentId;
-    });
-    if (index >= 0) {
-      clearTimeout(options[index].timer);
-      options.splice(index, 1);
-      // 关闭需要再渲染一次
-      render();
+var Message = /** @class */function () {
+  function Message(config) {
+    if (config === void 0) {
+      config = {};
     }
+    var _this = this;
+    this.id = 0;
+    this.options = [];
+    this._render = function () {
+      (0, _renderMessage.default)({
+        prefixCls: _this.prefixCls,
+        className: _this.config.className,
+        options: _this.options
+      });
+    };
+    /**
+     * 关闭指定的一条message
+     * @param currentId
+     */
+    this._onClose = function (currentId) {
+      if ((0, _utils.isEmptyArray)(_this.options)) {
+        return;
+      }
+      var index = _this.options.findIndex(function (item) {
+        return item.id === currentId;
+      });
+      if (index >= 0) {
+        clearTimeout(_this.options[index].timer);
+        _this.options.splice(index, 1);
+        // 关闭需要再渲染一次
+        _this._render();
+      }
+    };
+    /**
+     * 关闭所有message
+     */
+    this._onCloseAll = function () {
+      if ((0, _utils.isEmptyArray)(_this.options)) {
+        return;
+      }
+      _this.options.forEach(function (child) {
+        clearTimeout(child.timer);
+      });
+      _this.options = [];
+      _this._render();
+    };
+    this.setConfig = function (config) {
+      _this.config = __assign({
+        expires: 3000,
+        maxCount: 3
+      }, config);
+    };
+    this.open = function (props) {
+      if (!_utils.canUseDOM) {
+        throw new Error('Message use client!');
+      }
+      _this.id++;
+      var currentId = _this.id;
+      /**
+       * 超出条数，将删除最旧的那条message
+       */
+      if (_this.options.length >= _this.config.maxCount) {
+        _this._onClose(_this.options[0].id);
+      }
+      // 每条message对象
+      var item = {
+        content: props.content,
+        contentClassName: props.contentClassName,
+        id: currentId,
+        onDestroy: props.onDestroy,
+        onClose: _this._onClose,
+        timer: null
+      };
+      // push
+      _this.options.push(item);
+      // 开始渲染
+      _this._render();
+      // render后设置自动关闭功能，把定时器绑定到列表
+      item.timer = setTimeout(function () {
+        _this._onClose(currentId);
+      }, props.expires || _this.config.expires);
+      return {
+        onCloseAll: _this._onCloseAll,
+        onClose: function onClose() {
+          return _this._onClose(currentId);
+        }
+      };
+    };
+    this.prefixCls = config.prefixCls || 'ab-message';
+    delete config.prefixCls;
+    this.setConfig(__assign({}, config));
   }
-  /**
-   * 关闭所有message
-   */
-  function onCloseAll() {
-    if ((0, _utils.isEmptyArray)(options)) {
-      return;
-    }
-    options.forEach(function (child) {
-      clearTimeout(child.timer);
-    });
-    options = [];
-    render();
-  }
-  /**
-   * 超出条数，将删除最旧的那条message
-   */
-  if (options.length >= currentConfig.maxCount) {
-    _onClose(options[0].id);
-  }
-  // 每条message对象
-  var item = {
-    content: props.content,
-    contentClassName: props.contentClassName,
-    id: cachedId,
-    onDestroy: props.onDestroy,
-    onClose: _onClose,
-    timer: null
-  };
-  // push
-  options.push(item);
-  // 开始渲染
-  render();
-  // render后设置自动关闭功能，把定时器绑定到列表
-  item.timer = setTimeout(function () {
-    _onClose(cachedId);
-  }, props.expires || currentConfig.expires);
-  return {
-    onCloseAll: onCloseAll,
-    onClose: function onClose() {
-      return _onClose(cachedId);
-    }
-  };
-}
-Message.setConfig = function (config) {
-  currentConfig = __assign(__assign({}, currentConfig), config);
-};
+  return Message;
+}();
+exports.Message = Message;
+var message = new Message();
+var _default = message;
+exports.default = _default;

package/lib/message/renderMessage.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export interface MessageItem {
-    content: React.ReactNode;
+    content: React.ReactChild;
     contentClassName?: string;
     id: number;
     onClose?: (id: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobest-ui/components",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "private": false,
   "description": "components common ui for React",
   "main": "lib/index.js",
@@ -52,5 +52,5 @@
   "dependencies": {
     "@autobest-ui/utils": "^2.1.0"
   },
-  "gitHead": "56e873adb2a68d99dcd56f83cb68f5d4b5d618d6"
+  "gitHead": "9b8f5b76f9bd726e24416b7992f2667a5d6b202d"
 }