tntd 1.4.6 → 1.4.7

package/lib/Layout/utils.js

@@ -1,166 +1,116 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.safeParseJSON = exports.traverseTree = exports.openInNewTab = exports.isNewTabMenu = exports.hasLevel3 = exports.findMenuInfoByPath = exports.getSelectedMenuInfo = exports.isGroupMenu = void 0;
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
-
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
-
-var isGroupMenu = function isGroupMenu(menu) {
-  return (menu == null ? void 0 : menu.children) && !(menu == null ? void 0 : menu.path);
-};
-
-exports.isGroupMenu = isGroupMenu;
-
-var getSelectedMenuInfo = function getSelectedMenuInfo(selectedKey) {
-  var menus = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var subMenu;
-  var menu;
-  var parentMenus = [];
-
-  if (selectedKey) {
-    traverseTree(menus, function (node, pnode, pnodes) {
-      if (!isGroupMenu(node) && node.code === selectedKey) {
-        subMenu = node;
-        menu = pnode;
-        parentMenus = pnodes;
-        return false;
-      }
-    });
-  } else {
-    // 默认找到第一个菜单项
-    traverseTree(menus, function (node, pnode, pnodes) {
-      if (!isGroupMenu(node)) {
-        subMenu = node;
-        menu = pnode;
-        parentMenus = pnodes;
-        return false;
-      }
-    });
-  }
-
-  return {
-    subMenu: subMenu,
-    menu: menu,
-    parentMenus: parentMenus
-  };
-};
-
-exports.getSelectedMenuInfo = getSelectedMenuInfo;
-
-var findMenuInfoByPath = function findMenuInfoByPath(menuTree, path, matchFunc) {
-  var menu;
-  var subMenu;
-  var matchedSubMenu;
-  var parentMenus;
-
-  if (path) {
-    traverseTree(menuTree, function (menu, pnode, pnodes) {
-      if (!isGroupMenu(menu)) {
-        var _menu;
-
-        if (((_menu = menu) == null ? void 0 : _menu.path) === path) {
-          subMenu = menu;
-          menu = pnode;
-          parentMenus = pnodes;
-          return false;
-        }
+export const isGroupMenu = menu => menu?.children && !menu?.path;
+
+export const getSelectedMenuInfo = (selectedKey, menus = []) => {
+    let subMenu;
+    let menu;
+    let parentMenus = [];
+
+    if (selectedKey) {
+        traverseTree(menus, (node, pnode, pnodes) => {
+            if (!isGroupMenu(node) && node.code === selectedKey) {
+                subMenu = node;
+                menu = pnode;
+                parentMenus = pnodes;
+                return false;
+            }
+        });
+    } else { // 默认找到第一个菜单项
+        traverseTree(menus, (node, pnode, pnodes) => {
+            if (!isGroupMenu(node)) {
+                subMenu = node;
+                menu = pnode;
+                parentMenus = pnodes;
+                return false;
+            }
+        });
+    }
 
-        if (!matchedSubMenu && matchFunc && matchFunc(menu)) {
-          matchedSubMenu = menu;
-          menu = pnode;
-          parentMenus = pnodes;
-        }
-      }
-    });
     return {
-      subMenu: subMenu,
-      matchedSubMenu: matchedSubMenu,
-      menu: menu,
-      parentMenus: parentMenus
+        subMenu,
+        menu,
+        parentMenus
     };
-  }
-
-  return {
-    subMenu: subMenu,
-    menu: menu,
-    parentMenus: parentMenus
-  };
 };
 
-exports.findMenuInfoByPath = findMenuInfoByPath;
-
-var hasLevel3 = function hasLevel3(menus) {
-  return menus == null ? void 0 : menus.some(function (menu) {
-    var _menu$children;
-
-    return menu == null ? void 0 : (_menu$children = menu.children) == null ? void 0 : _menu$children.some(function (item) {
-      var _item$children;
+export const findMenuInfoByPath = (menuTree, path, matchFunc) => {
+    let menu;
+    let subMenu;
+    let matchedSubMenu;
+    let parentMenus;
+
+    if (path) {
+        traverseTree(menuTree, (menu, pnode, pnodes) => {
+            if (!isGroupMenu(menu)) {
+                if (menu?.path === path) {
+                    subMenu = menu;
+                    menu = pnode;
+                    parentMenus = pnodes;
+                    return false;
+                }
+
+                if (!matchedSubMenu && matchFunc &&  matchFunc(menu)) {
+                    matchedSubMenu = menu;
+                    menu = pnode;
+                    parentMenus = pnodes; 
+                }
+            }
+        });
+
+        return {
+            subMenu,
+            matchedSubMenu,
+            menu,
+            parentMenus
+        };
+    }
 
-      return item == null ? void 0 : (_item$children = item.children) == null ? void 0 : _item$children.length;
-    });
-  });
+    return { subMenu, menu, parentMenus };
 };
 
-exports.hasLevel3 = hasLevel3;
-
-var isNewTabMenu = function isNewTabMenu(menu) {
-  var _ref = menu || {},
-      target = _ref.target,
-      path = _ref.path;
-
-  return target === '_blank' || /^http/i.test(path) && /blankType=newTarget/.test(path);
+export const hasLevel3 = menus => {
+    return menus?.some(
+        menu => menu?.children?.some(item => item?.children?.length)
+    );
 };
 
-exports.isNewTabMenu = isNewTabMenu;
+export const isNewTabMenu = menu => {
+    const { target, path } = menu || {};
 
-var openInNewTab = function openInNewTab(path) {
-  window.open(path, '_blank');
+    return target === '_blank' || (/^http/i.test(path) && /blankType=newTarget/.test(path));
 };
 
-exports.openInNewTab = openInNewTab;
+export const openInNewTab = path => {
+    window.open(path, '_blank');
+};
 
-var traverseTree = function traverseTree(treeData, callback, pnode) {
-  var pnodes = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  (treeData || []).every(function (node, index) {
-    var result;
+export const traverseTree = (treeData, callback, pnode, pnodes = []) => {
+    (treeData || []).every((node, index) => {
+        let result;
 
-    if (callback) {
-      result = callback(node, pnode, (pnodes == null ? void 0 : pnodes.length) ? pnodes : [pnode].filter(function (item) {
-        return !!item;
-      }), index);
-    } // 回调函数返回false则终止遍历
+        if (callback) {
+            result = callback(node, pnode, pnodes?.length ? pnodes : [pnode].filter(item => !!item), index);
+        }
 
+        // 回调函数返回false则终止遍历
+        if (result !== false) {
+            node && traverseTree(node.children || [], callback, node, [node, ...pnodes]);
+        }
 
-    if (result !== false) {
-      node && traverseTree(node.children || [], callback, node, [node].concat(_toConsumableArray(pnodes)));
-    }
+        return result !== false;
+    });
 
-    return result !== false;
-  });
-  return treeData;
+    return treeData;
 };
 
-exports.traverseTree = traverseTree;
-
-var safeParseJSON = function safeParseJSON(str, defaultObj) {
-  var result;
+export const safeParseJSON = (str, defaultObj) => {
+    let result;
 
-  try {
-    result = JSON.parse(str);
-  } catch (err) {
-    console.warn('json parse error:', err);
-    result = typeof defaultObj === 'undefined' ? str : defaultObj;
-  }
+    try {
+        result = JSON.parse(str);
+    } catch (err) {
+        console.warn('json parse error:', err);
+        result = typeof defaultObj === 'undefined' ? str : defaultObj;
+    }
 
-  return result || defaultObj;
+    return result || defaultObj;
 };
-
-exports.safeParseJSON = safeParseJSON;

package/lib/LoadingButton/index.js

@@ -1,58 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("antd/lib/button/style");
-
-var _button = _interopRequireDefault(require("antd/lib/button"));
-
-var _react = require("react");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var _default = function _default(props) {
-  var _useState = (0, _react.useState)(props.loading),
-      _useState2 = _slicedToArray(_useState, 2),
-      loading = _useState2[0],
-      setLoading = _useState2[1];
-
-  var onClick = function onClick(evt) {
-    if (!loading) {
-      setLoading(true);
-      var returnVal = props.onClick && props.onClick(evt, function () {
-        return setLoading(false);
-      });
-
-      if (returnVal instanceof Promise) {
-        returnVal.then(function () {
-          return setLoading(false);
-        })["catch"](function () {
-          return setLoading(false);
-        });
-      }
-    }
-  };
-
-  (0, _react.useEffect)(function () {
-    setLoading(props.loading);
-  }, [props.loading]);
-  return React.createElement(_button["default"], _extends({}, props, {
-    loading: loading,
-    onClick: onClick
-  }), loading ? props.loadingText || props.children : props.children);
+import { useState, useEffect } from "react";
+import { Button } from "antd";
+
+export default ({ loadingText, loading: pLoading, onClick, children, ...otherProps }) => {
+    const [loading, setLoading] = useState(pLoading);
+    const doClick = (evt) => {
+        if (!loading) {
+            setLoading(true);
+            const returnVal = onClick && onClick(evt, () => setLoading(false));
+
+            if (returnVal instanceof Promise) {
+                returnVal.then(() => setLoading(false)).catch(() => setLoading(false));
+            }
+        }
+    };
+
+    useEffect(() => {
+        setLoading(pLoading);
+    }, [pLoading]);
+
+    return (
+        <Button {...otherProps} loading={loading} onClick={doClick}>
+            {loading ? loadingText || children : children}
+        </Button>
+    );
 };
-
-exports["default"] = _default;

package/lib/Modal/index.js

@@ -1,111 +1,86 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("antd/lib/modal/style");
-
-var _modal = _interopRequireDefault(require("antd/lib/modal"));
-
-var _react = require("react");
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _Icon = _interopRequireDefault(require("../Icon"));
-
-require("./index.less");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-var Title = function Title(_ref) {
-  var title = _ref.title,
-      logo = _ref.logo,
-      fullscreen = _ref.fullscreen,
-      _ref$supportFullscree = _ref.supportFullscreen,
-      supportFullscreen = _ref$supportFullscree === void 0 ? true : _ref$supportFullscree,
-      onToggleFullscreen = _ref.onToggleFullscreen,
-      onClose = _ref.onClose;
-  return React.createElement(_react.Fragment, null, React.createElement("div", null, logo && React.createElement("img", {
-    src: logo
-  }), React.createElement("span", null, title)), React.createElement("div", {
-    className: "tnt-modal-header-actions"
-  }, supportFullscreen && React.createElement(_Icon["default"], {
-    className: "fullscreen",
-    type: fullscreen ? 'fullscreen-exit' : 'fullscreen',
-    onClick: onToggleFullscreen
-  }), React.createElement(_Icon["default"], {
-    className: "close",
-    type: "close",
-    onClick: onClose
-  })));
+import { useState, useEffect, Fragment } from 'react';
+import cn from 'classnames';
+import { Modal } from 'antd';
+import Icon from '../Icon';
+import './index.less';
+
+const Title = ({ title, logo, fullscreen, supportFullscreen = true, onToggleFullscreen, onClose }) => {
+    return (
+        <Fragment>
+            <div>
+                {
+                    logo && <img src={logo} />
+                }
+                <span>{title}</span>
+            </div>
+            <div className="tnt-modal-header-actions">
+                {
+                    supportFullscreen && (
+                        <Icon
+                            className="fullscreen"
+                            type={fullscreen ? 'fullscreen-exit' : 'fullscreen'}
+                            onClick={onToggleFullscreen}
+                        />
+                    )
+                }
+                <Icon
+                    className="close"
+                    type="close"
+                    onClick={onClose}
+                />
+            </div>
+        </Fragment>
+    );
 };
 
-var _default = function _default(props) {
-  var _cn;
-
-  var visible = props.visible,
-      children = props.children,
-      logo = props.logo,
-      title = props.title,
-      _props$height = props.height,
-      height = _props$height === void 0 ? '90vh' : _props$height,
-      _props$width = props.width,
-      width = _props$width === void 0 ? '85%' : _props$width,
-      className = props.className,
-      supportFullscreen = props.supportFullscreen,
-      _onToggleFullscreen = props.onToggleFullscreen,
-      onCancel = props.onCancel,
-      rest = _objectWithoutProperties(props, ["visible", "children", "logo", "title", "height", "width", "className", "supportFullscreen", "onToggleFullscreen", "onCancel"]);
-
-  var _useState = (0, _react.useState)(rest.fullscreen || false),
-      _useState2 = _slicedToArray(_useState, 2),
-      fullscreen = _useState2[0],
-      setFullscreen = _useState2[1];
-
-  (0, _react.useEffect)(function () {
-    setFullscreen(rest.fullscreen);
-  }, [rest.fullscreen, visible]);
-  return React.createElement(_modal["default"], _extends({
-    visible: visible,
-    title: React.createElement(Title, {
-      logo: logo,
-      title: title,
-      fullscreen: fullscreen,
-      supportFullscreen: supportFullscreen,
-      onClose: onCancel,
-      onToggleFullscreen: function onToggleFullscreen() {
-        setFullscreen(!fullscreen);
-        _onToggleFullscreen && _onToggleFullscreen(!fullscreen);
-      }
-    }),
-    onCancel: onCancel,
-    destroyOnClose: true,
-    centered: true,
-    footer: null,
-    width: fullscreen ? '100%' : width,
-    style: {
-      height: fullscreen ? '100vh' : height
-    },
-    className: (0, _classnames["default"])('tnt-modal', (_cn = {}, _defineProperty(_cn, className, className), _defineProperty(_cn, "fullscreen", fullscreen), _cn))
-  }, rest), children);
+export default props => {
+    const {
+        visible,
+        children,
+        logo,
+        title,
+        height = '90vh',
+        width = '85%',
+        className,
+        supportFullscreen,
+        onToggleFullscreen,
+        onCancel,
+        ...rest
+    } = props;
+    const [fullscreen, setFullscreen] = useState(rest.fullscreen || false);
+
+    useEffect(() => {
+        setFullscreen(rest.fullscreen);
+    }, [rest.fullscreen, visible]);
+
+    return (
+        <Modal
+            visible={visible}
+            title={
+                <Title 
+                    logo={logo}
+                    title={title}
+                    fullscreen={fullscreen}
+                    supportFullscreen={supportFullscreen}
+                    onClose={onCancel}
+                    onToggleFullscreen={() => {
+                        setFullscreen(!fullscreen);
+                        onToggleFullscreen && onToggleFullscreen(!fullscreen);
+                    }}
+                />
+            }
+            onCancel={onCancel}
+            destroyOnClose
+            centered
+            footer={null}
+            width={fullscreen ? '100%' : width}
+            style={{
+                height: fullscreen ? '100vh' : height
+            }}
+            className={cn('tnt-modal', { [className]: className, fullscreen })}
+            {...rest}
+        >
+            {children}
+        </Modal>
+    );
 };
-
-exports["default"] = _default;