tntd 1.4.10 → 1.4.11

package/es/Layout/AppList.js

@@ -66,7 +66,7 @@ import styled, { withTheme } from 'styled-components';
 import { get } from 'lodash';
 import Icon from '../Icon';
 import { getCurrentAppStore, setCurrentAppStore } from './storage';
-import { traverseTree } from './utils';
+import { traverseTree } from '../utils';
 var Option = _Select.Option;
 var MenuList = styled(_Menu)(_templateObject()); // 新版UI
 

package/es/Layout/GlobalNavigation/NavigationPopup.js

@@ -82,7 +82,7 @@ import { useState, useEffect } from 'react';
 import cn from 'classnames';
 import styled from 'styled-components';
 import { debounce } from 'lodash';
-import { traverseTree, hasLevel3 } from '../utils';
+import { traverseTree, hasLevel3 } from '../../utils';
 import Icon from '../Iconfont';
 import { getText } from '../../locale';
 var SearchArea = styled.div(_templateObject(), function (props) {

package/es/Layout/GlobalNavigation/index.js

@@ -42,7 +42,7 @@ import cn from 'classnames';
 import styled, { createGlobalStyle, withTheme } from 'styled-components';
 import { uniq } from 'lodash';
 import ActionsContext from '../ActionsContext';
-import { hasLevel3 } from '../utils';
+import { hasLevel3 } from '../../utils';
 import Icon from '../Iconfont';
 import NavigationPopup from './NavigationPopup';
 var Navigation = styled.li(_templateObject(), function (_ref) {

package/es/Layout/OrgAppList.js

@@ -1,7 +1,7 @@
-import "antd/lib/select/style";
-import _Select from "antd/lib/select";
 import "antd/lib/tree-select/style";
 import _TreeSelect from "antd/lib/tree-select";
+import "antd/lib/select/style";
+import _Select from "antd/lib/select";
 import "antd/lib/input/style";
 import _Input from "antd/lib/input";
 
@@ -57,9 +57,8 @@ import { useState, useEffect } from 'react';
 import styled, { withTheme, createGlobalStyle } from 'styled-components';
 import { get } from 'lodash';
 import { getCurrentAppStore, setCurrentAppStore, getCurrentOrgStore, setCurrentOrgStore, getCurrentOrgTreeStore, setCurrentOrgTreeStore } from './storage';
-import { traverseTree } from './utils';
+import { traverseTree } from '../utils';
 var InputGroup = _Input.Group;
-var TreeNode = _TreeSelect.TreeNode;
 var Option = _Select.Option; // 机构+应用UI
 
 var OrgAppsInputGroup = styled(InputGroup)(_templateObject(), function (props) {

package/es/Layout/SideMenu.js

@@ -47,7 +47,7 @@ import { useState, useEffect, useContext } from 'react';
 import styled, { withTheme } from 'styled-components';
 import { get } from 'lodash';
 import ActionsContext from './ActionsContext';
-import { getSelectedMenuInfo, isGroupMenu, isNewTabMenu, openInNewTab, traverseTree } from './utils';
+import { getSelectedMenuInfo, isGroupMenu, isNewTabMenu, openInNewTab, traverseTree } from '../utils';
 import { setSideMenuStore } from './storage';
 import Iconfont from './Iconfont';
 var color = 'rgba(255,255,255,.85)';

package/es/Layout/index.js

@@ -10,9 +10,8 @@ import EnterpriseLayout from './EnterpriseLayout';
 import PaasLayout from './paaslayout';
 import HeaderNavs from './HeaderNavs';
 import HeaderTabs from './HeaderTabs';
-import getCheckAuth from './checkAuth';
 import AuthContext from '../AuthContext';
-import { safeParseJSON, findMenuInfoByPath } from './utils';
+import { safeParseJSON, findMenuInfoByPath, getCheckAuth } from '../utils';
 import ActionsContext from './ActionsContext';
 import createActions from './createActions';
 import { getLanguageStore } from './storage';
@@ -24,7 +23,9 @@ export * from './HeaderNavs';
 var TNTLayout = function TNTLayout(_ref) {
   var type = _ref.type,
       config = _ref.config,
-      props = _objectWithoutProperties(_ref, ["type", "config"]);
+      _ref$showMenuInIframe = _ref.showMenuInIframe,
+      showMenuInIframe = _ref$showMenuInIframe === void 0 ? false : _ref$showMenuInIframe,
+      props = _objectWithoutProperties(_ref, ["type", "config", "showMenuInIframe"]);
 
   var headerHeight = props.size === 'large' ? 60 : 50;
   var theme = {
@@ -47,7 +48,7 @@ var TNTLayout = function TNTLayout(_ref) {
     blueBgColor: '#1D4295' // 默认的蓝色主题
 
   };
-  var isInIframe = self !== top; // 前期拼写错误，导致需要兼容处理
+  var isInIframe = showMenuInIframe ? false : self !== top && !window.navigator.userAgent.includes('mo-fang-app'); // 前期拼写错误，导致需要兼容处理
 
   var extraHeaderActions = props.extraHeaderActions || props.extralHeaderActions;
   var extendMap = typeof props.extendMap === 'string' ? safeParseJSON(props.extendMap, {}) : props.extendMap;

package/es/Layout/paaslayout/CompactSideMenu.js

@@ -31,7 +31,7 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 import { useState, useEffect, Component } from 'react';
 import styled from 'styled-components';
 import cn from 'classnames';
-import { isNewTabMenu, openInNewTab } from '../utils';
+import { isNewTabMenu, openInNewTab } from '../../utils';
 import Iconfont from '../Iconfont';
 var SideMenu = styled.ul(_templateObject());
 var SubMenu = styled.ul(_templateObject2());

package/es/Layout/paaslayout/index.js

@@ -31,7 +31,7 @@ import { useState, useEffect } from 'react';
 import styled, { withTheme } from 'styled-components';
 import cn from 'classnames';
 import { get, reduce, isUndefined } from 'lodash';
-import { getSelectedMenuInfo } from '../utils';
+import { getSelectedMenuInfo } from '../../utils';
 import HeaderNavs from '../HeaderNavs';
 import Header from './Header';
 import SideMenu from './SideMenu';

package/es/Layout/storage.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import { safeParseJSON } from './utils';
+import { safeParseJSON } from '../utils';
 export var getSideMenuStore = function getSideMenuStore() {
   return safeParseJSON(localStorage.getItem('sideMenu'), {});
 };

package/es/index.js

@@ -16,4 +16,5 @@ export { default as Select } from './Select';
 export { default as Img } from './Img';
 export { default as Title } from './Title';
 export { default as Ellipsis } from './Ellipsis';
-export { default as ArrayInput } from './ArrayInput';
+export { default as ArrayInput } from './ArrayInput';
+export * from './utils';

package/es/utils/checkAuth.js

@@ -0,0 +1,30 @@
+import { get } from 'lodash';
+export var getCheckAuth = function getCheckAuth(menus) {
+  var getAuthMap = function getAuthMap() {
+    var menus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var authMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    return menus.reduce(function (acc, _ref) {
+      var code = _ref.code,
+          groupName = _ref.groupName,
+          functionList = _ref.functionList,
+          children = _ref.children;
+
+      if (groupName) {
+        return getAuthMap(children, acc);
+      } else {
+        acc[code] = acc[code] || {};
+        acc[code] = (functionList || []).reduce(function (acc, curFunc) {
+          acc[curFunc.code] = curFunc.hasPermission;
+          return acc;
+        }, acc[code]);
+        return acc;
+      }
+    }, authMap);
+  };
+
+  var authMap = getAuthMap(menus);
+  return function (menuCode, funCode) {
+    return !!get(authMap, "".concat(menuCode).concat(funCode ? ".".concat(funCode) : ''));
+  };
+};
+export default getCheckAuth;

package/es/utils/findMenuInfoByPath.js

@@ -0,0 +1,41 @@
+import { traverseTree, isGroupMenu } from '.';
+export 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;
+        }
+
+        if (!matchedSubMenu && matchFunc && matchFunc(menu)) {
+          matchedSubMenu = menu;
+          menu = pnode;
+          parentMenus = pnodes;
+        }
+      }
+    });
+    return {
+      subMenu: subMenu,
+      matchedSubMenu: matchedSubMenu,
+      menu: menu,
+      parentMenus: parentMenus
+    };
+  }
+
+  return {
+    subMenu: subMenu,
+    menu: menu,
+    parentMenus: parentMenus
+  };
+};
+export default findMenuInfoByPath;

package/es/utils/index.js

@@ -0,0 +1,99 @@
+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; } }
+
+export * from './checkAuth';
+export * from './findMenuInfoByPath';
+export var isGroupMenu = function isGroupMenu(menu) {
+  return (menu == null ? void 0 : menu.children) && !(menu == null ? void 0 : menu.path);
+};
+export 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
+  };
+};
+export 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;
+
+      return item == null ? void 0 : (_item$children = item.children) == null ? void 0 : _item$children.length;
+    });
+  });
+};
+export 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 var openInNewTab = function openInNewTab(path) {
+  window.open(path, '_blank');
+};
+export var traverseTree = function traverseTree(treeData, callback, pnode) {
+  var pnodes = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  (treeData || []).every(function (node, index) {
+    var result;
+
+    if (callback) {
+      result = callback(node, pnode, (pnodes == null ? void 0 : pnodes.length) ? pnodes : [pnode].filter(function (item) {
+        return !!item;
+      }), index);
+    } // 回调函数返回false则终止遍历
+
+
+    if (result !== false) {
+      node && traverseTree(node.children || [], callback, node, [node].concat(_toConsumableArray(pnodes)));
+    }
+
+    return result !== false;
+  });
+  return treeData;
+};
+export var safeParseJSON = function safeParseJSON(str, defaultObj) {
+  var result;
+
+  try {
+    result = JSON.parse(str);
+  } catch (err) {
+    console.warn('json parse error:', err);
+    result = typeof defaultObj === 'undefined' ? str : defaultObj;
+  }
+
+  return result || defaultObj;
+};

package/lib/Layout/AppList.js

@@ -37,7 +37,7 @@ var _Icon = _interopRequireDefault(require("../Icon"));
 
 var _storage = require("./storage");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 var _this = void 0;
 

package/lib/Layout/GlobalNavigation/NavigationPopup.js

@@ -13,7 +13,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _lodash = require("lodash");
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 

package/lib/Layout/GlobalNavigation/index.js

@@ -19,7 +19,7 @@ var _lodash = require("lodash");
 
 var _ActionsContext = _interopRequireDefault(require("../ActionsContext"));
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 

package/lib/Layout/OrgAppList.js

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/select/style");
-
-var _select = _interopRequireDefault(require("antd/lib/select"));
-
 require("antd/lib/tree-select/style");
 
 var _treeSelect = _interopRequireDefault(require("antd/lib/tree-select"));
 
+require("antd/lib/select/style");
+
+var _select = _interopRequireDefault(require("antd/lib/select"));
+
 require("antd/lib/input/style");
 
 var _input = _interopRequireDefault(require("antd/lib/input"));
@@ -27,7 +27,7 @@ var _lodash = require("lodash");
 
 var _storage = require("./storage");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
@@ -84,7 +84,6 @@ function _templateObject() {
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
 var InputGroup = _input["default"].Group;
-var TreeNode = _treeSelect["default"].TreeNode;
 var Option = _select["default"].Option; // 机构+应用UI
 
 var OrgAppsInputGroup = (0, _styledComponents["default"])(InputGroup)(_templateObject(), function (props) {

package/lib/Layout/SideMenu.js

@@ -19,7 +19,7 @@ var _lodash = require("lodash");
 
 var _ActionsContext = _interopRequireDefault(require("./ActionsContext"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 var _storage = require("./storage");
 

package/lib/Layout/index.js

@@ -33,11 +33,9 @@ Object.keys(_HeaderNavs).forEach(function (key) {
 
 var _HeaderTabs = _interopRequireDefault(require("./HeaderTabs"));
 
-var _checkAuth = _interopRequireDefault(require("./checkAuth"));
-
 var _AuthContext = _interopRequireDefault(require("../AuthContext"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 var _ActionsContext = _interopRequireDefault(require("./ActionsContext"));
 
@@ -66,7 +64,9 @@ exports.HeaderActionItem = HeaderActionItem;
 var TNTLayout = function TNTLayout(_ref) {
   var type = _ref.type,
       config = _ref.config,
-      props = _objectWithoutProperties(_ref, ["type", "config"]);
+      _ref$showMenuInIframe = _ref.showMenuInIframe,
+      showMenuInIframe = _ref$showMenuInIframe === void 0 ? false : _ref$showMenuInIframe,
+      props = _objectWithoutProperties(_ref, ["type", "config", "showMenuInIframe"]);
 
   var headerHeight = props.size === 'large' ? 60 : 50;
   var theme = {
@@ -89,7 +89,7 @@ var TNTLayout = function TNTLayout(_ref) {
     blueBgColor: '#1D4295' // 默认的蓝色主题
 
   };
-  var isInIframe = self !== top; // 前期拼写错误，导致需要兼容处理
+  var isInIframe = showMenuInIframe ? false : self !== top && !window.navigator.userAgent.includes('mo-fang-app'); // 前期拼写错误，导致需要兼容处理
 
   var extraHeaderActions = props.extraHeaderActions || props.extralHeaderActions;
   var extendMap = typeof props.extendMap === 'string' ? (0, _utils.safeParseJSON)(props.extendMap, {}) : props.extendMap;
@@ -126,7 +126,7 @@ var TNTLayout = function TNTLayout(_ref) {
   return React.createElement(_styledComponents.ThemeProvider, {
     theme: theme
   }, React.createElement(_AuthContext["default"].Provider, {
-    value: (0, _checkAuth["default"])(props.menus)
+    value: (0, _utils.getCheckAuth)(props.menus)
   }, React.createElement(_ActionsContext["default"].Provider, {
     value: actionsContextValue
   }, type === 'paas' && React.createElement(_paaslayout["default"], _extends({

package/lib/Layout/paaslayout/CompactSideMenu.js

@@ -11,7 +11,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 

package/lib/Layout/paaslayout/index.js

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _lodash = require("lodash");
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _HeaderNavs = _interopRequireDefault(require("../HeaderNavs"));
 

package/lib/Layout/storage.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getThemeStore = exports.setThemeStore = exports.getLanguageStore = exports.setLanguageStore = exports.getCurrentOrgTreeStore = exports.setCurrentOrgTreeStore = exports.getCurrentOrgStore = exports.setCurrentOrgStore = exports.getCurrentAppStore = exports.setCurrentAppStore = exports.setSideMenuStore = exports.getSideMenuStore = void 0;
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 

package/lib/index.js

@@ -3,6 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  Layout: true,
+  AuthContext: true,
+  QueryForm: true,
+  Table: true,
+  ResizableTable: true,
+  QueryListScene: true,
+  Icon: true,
+  iconList: true,
+  Modal: true,
+  Columns: true,
+  DevelopmentLogin: true,
+  LoadingButton: true,
+  Handle: true,
+  Page: true,
+  Select: true,
+  Img: true,
+  Title: true,
+  Ellipsis: true,
+  ArrayInput: true
+};
 Object.defineProperty(exports, "Layout", {
   enumerable: true,
   get: function get() {
@@ -156,4 +177,17 @@ var _Ellipsis = _interopRequireDefault(require("./Ellipsis"));
 
 var _ArrayInput = _interopRequireDefault(require("./ArrayInput"));
 
+var _utils = require("./utils");
+
+Object.keys(_utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _utils[key];
+    }
+  });
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/utils/checkAuth.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.getCheckAuth = void 0;
+
+var _lodash = require("lodash");
+
+var getCheckAuth = function getCheckAuth(menus) {
+  var getAuthMap = function getAuthMap() {
+    var menus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var authMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    return menus.reduce(function (acc, _ref) {
+      var code = _ref.code,
+          groupName = _ref.groupName,
+          functionList = _ref.functionList,
+          children = _ref.children;
+
+      if (groupName) {
+        return getAuthMap(children, acc);
+      } else {
+        acc[code] = acc[code] || {};
+        acc[code] = (functionList || []).reduce(function (acc, curFunc) {
+          acc[curFunc.code] = curFunc.hasPermission;
+          return acc;
+        }, acc[code]);
+        return acc;
+      }
+    }, authMap);
+  };
+
+  var authMap = getAuthMap(menus);
+  return function (menuCode, funCode) {
+    return !!(0, _lodash.get)(authMap, "".concat(menuCode).concat(funCode ? ".".concat(funCode) : ''));
+  };
+};
+
+exports.getCheckAuth = getCheckAuth;
+var _default = getCheckAuth;
+exports["default"] = _default;

package/lib/utils/findMenuInfoByPath.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.findMenuInfoByPath = void 0;
+
+var _ = require(".");
+
+var findMenuInfoByPath = function findMenuInfoByPath(menuTree, path, matchFunc) {
+  var menu;
+  var subMenu;
+  var matchedSubMenu;
+  var parentMenus;
+
+  if (path) {
+    (0, _.traverseTree)(menuTree, function (menu, pnode, pnodes) {
+      if (!(0, _.isGroupMenu)(menu)) {
+        var _menu;
+
+        if (((_menu = menu) == null ? void 0 : _menu.path) === path) {
+          subMenu = menu;
+          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
+    };
+  }
+
+  return {
+    subMenu: subMenu,
+    menu: menu,
+    parentMenus: parentMenus
+  };
+};
+
+exports.findMenuInfoByPath = findMenuInfoByPath;
+var _default = findMenuInfoByPath;
+exports["default"] = _default;