tntd 2.0.11 → 2.0.13

package/lib/utils/index.js

@@ -1,95 +1,132 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  isGroupMenu: true,
+  getSelectedMenuInfo: true,
+  hasLevel3: true,
+  isNewTabMenu: true,
+  openInNewTab: true,
+  traverseTree: true,
+  safeParseJSON: true
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeParseJSON = exports.traverseTree = exports.openInNewTab = exports.isNewTabMenu = exports.hasLevel3 = exports.getSelectedMenuInfo = exports.isGroupMenu = void 0;
-__exportStar(require("./checkAuth"), exports);
-__exportStar(require("./findMenuInfoByPath"), exports);
-const isGroupMenu = (menu) => (menu === null || menu === void 0 ? void 0 : menu.children) && !(menu === null || menu === void 0 ? void 0 : menu.path);
-exports.isGroupMenu = isGroupMenu;
-const getSelectedMenuInfo = (selectedKey, menus = []) => {
-    let subMenu;
-    let menu;
-    let parentMenus = [];
-    if (selectedKey) {
-        (0, exports.traverseTree)(menus, (node, pnode, pnodes) => {
-            if (!(0, exports.isGroupMenu)(node) && node.code === selectedKey) {
-                subMenu = node;
-                menu = pnode;
-                parentMenus = pnodes;
-                return false;
-            }
-        });
+exports.traverseTree = exports.safeParseJSON = exports.openInNewTab = exports.isNewTabMenu = exports.isGroupMenu = exports.hasLevel3 = exports.getSelectedMenuInfo = void 0;
+var _checkAuth = require("./checkAuth");
+Object.keys(_checkAuth).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _checkAuth[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _checkAuth[key];
     }
-    else {
-        // 默认找到第一个菜单项
-        (0, exports.traverseTree)(menus, (node, pnode, pnodes) => {
-            if (!(0, exports.isGroupMenu)(node)) {
-                subMenu = node;
-                menu = pnode;
-                parentMenus = pnodes;
-                return false;
-            }
-        });
+  });
+});
+var _findMenuInfoByPath = require("./findMenuInfoByPath");
+Object.keys(_findMenuInfoByPath).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _findMenuInfoByPath[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _findMenuInfoByPath[key];
     }
-    return {
-        subMenu,
-        menu,
-        parentMenus,
-    };
+  });
+});
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+var isGroupMenu = function isGroupMenu(menu) {
+  return (menu === null || menu === void 0 ? void 0 : menu.children) && !(menu === null || menu === void 0 ? 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;
-const hasLevel3 = (menus) => {
-    return menus === null || menus === void 0 ? void 0 : menus.some((menu) => { var _a; return (_a = menu === null || menu === void 0 ? void 0 : menu.children) === null || _a === void 0 ? void 0 : _a.some((item) => { var _a; return (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length; }); });
+var hasLevel3 = function hasLevel3(menus) {
+  return menus === null || menus === void 0 ? void 0 : menus.some(function (menu) {
+    var _a;
+    return (_a = menu === null || menu === void 0 ? void 0 : menu.children) === null || _a === void 0 ? void 0 : _a.some(function (item) {
+      var _a;
+      return (_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length;
+    });
+  });
 };
 exports.hasLevel3 = hasLevel3;
-const isNewTabMenu = (menu) => {
-    const { target, path } = menu || {};
-    return target === '_blank' || (/^http/i.test(path) && /blankType=newTarget/.test(path));
+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);
 };
 exports.isNewTabMenu = isNewTabMenu;
-const openInNewTab = (path) => {
-    window.open(path, '_blank');
+var openInNewTab = function openInNewTab(path) {
+  window.open(path, '_blank');
 };
 exports.openInNewTab = openInNewTab;
-const traverseTree = (treeData, callback, pnode, pnodes = []) => {
-    ;
-    (treeData || []).every((node, index) => {
-        let result;
-        if (callback) {
-            result = callback(node, pnode, (pnodes === null || pnodes === void 0 ? void 0 : pnodes.length) ? pnodes : [pnode].filter((item) => !!item), index);
-        }
-        // 回调函数返回false则终止遍历
-        if (result !== false) {
-            node && (0, exports.traverseTree)(node.children || [], callback, node, [node, ...pnodes]);
-        }
-        return result !== false;
-    });
-    return treeData;
-};
-exports.traverseTree = traverseTree;
-const safeParseJSON = (str, defaultObj) => {
-    let result;
-    try {
-        result = JSON.parse(str);
+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 || pnodes === void 0 ? void 0 : pnodes.length) ? pnodes : [pnode].filter(function (item) {
+        return !!item;
+      }), index);
     }
-    catch (err) {
-        console.warn('json parse error:', err);
-        result = typeof defaultObj === 'undefined' ? str : defaultObj;
+    // 回调函数返回false则终止遍历
+    if (result !== false) {
+      node && traverseTree(node.children || [], callback, node, [node].concat(_toConsumableArray(pnodes)));
     }
-    return result || defaultObj;
+    return result !== false;
+  });
+  return treeData;
+};
+exports.traverseTree = traverseTree;
+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;
 };
-exports.safeParseJSON = safeParseJSON;
-//# sourceMappingURL=index.js.map
+exports.safeParseJSON = safeParseJSON;

package/lib/version/index.d.ts

@@ -1,5 +1,5 @@
-import Version from 'antd/es/version';
-import 'antd/es/version/style';
-export * from 'antd/es/version';
+import Version from 'antd/lib/version';
+import 'antd/lib/version/style';
+export * from 'antd/lib/version';
 export default Version;
 //# sourceMappingURL=index.d.ts.map

package/lib/version/index.js

@@ -1,24 +1,25 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+exports["default"] = void 0;
+var _version = _interopRequireWildcard(require("antd/lib/version"));
+Object.keys(_version).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _version[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _version[key];
     }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const version_1 = __importDefault(require("antd/es/version"));
-require("antd/es/version/style");
-__exportStar(require("antd/es/version"), exports);
-exports.default = version_1.default;
-//# sourceMappingURL=index.js.map
+  });
+});
+require("antd/lib/version/style");
+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; }
+var _default = _version["default"];
+exports["default"] = _default;

package/lib/version/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/version/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,8DAAqC;AAErC,iCAA8B;AAE9B,kDAA+B;AAE/B,kBAAe,iBAAO,CAAA","sourcesContent":["import Version from 'antd/es/version'\n\nimport 'antd/es/version/style'\n\nexport * from 'antd/es/version'\n\nexport default Version\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/version/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,8DAAqC;AAErC,iCAA8B;AAE9B,kDAA+B;AAE/B,kBAAe,iBAAO,CAAA","sourcesContent":["import Version from 'antd/lib/version'\n\nimport 'antd/lib/version/style'\n\nexport * from 'antd/lib/version'\n\nexport default Version\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tntd",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "license": "MIT",
   "dependencies": {
     "@icon-park/react": "^1.3.5",
@@ -41,7 +41,10 @@
     "typescript": "~4.6.2",
     "@types/lodash-es": "~4.17.6",
     "@types/lodash": "~4.14.191",
-    "babel-plugin-lodash": "~3.3.4"
+    "babel-plugin-lodash": "~3.3.4",
+    "@babel/cli": "~7.21.0",
+    "@babel/core": "~7.21.0",
+    "@babel/preset-env": "~7.20.2"
   },
   "peerDependencies": {
     "antd": ">= 3.0.0",
@@ -69,9 +72,9 @@
   "typings": "lib/index.d.ts",
   "scripts": {
     "start": "heft start --storybook",
-    "build": "heft build --clean && yarn build:es && yarn build:cjs && yarn post:build",
-    "build:es": "ES_MODULE=true npx babel es --out-dir es",
-    "build:cjs": "npx babel es --presets @babel/preset-env --out-dir lib",
+    "build": "heft build --clean && npm run build:es && npm run build:cjs && npm run post:build",
+    "build:es": "ES_MODULE=true babel es --out-dir es",
+    "build:cjs": "babel es --presets @babel/preset-env --out-dir lib",
     "post:build": "node ./scripts/postbuild.js",
     "build:watch": "heft build --clean --watch",
     "watch": "rush build:watch --changed-projects-only --to-except tntd",

package/themes/default/colors.less

@@ -14,12 +14,6 @@
 @lime-6: #a0d911;
 @gold-6: #FF9845;
 
-// 字体颜色
-@txt-normal: #17233d;
-@txt-second: fade(@txt-normal, 80%);
-@txt-third: fade(@txt-normal, 50%);
-@txt-disabled: fade(@txt-normal, 30%);
-
 // 线条显色
 @grey-d: #c9d2dd;
 @grey-split: #e1e6ee; // 分割线 常用于表格、collapse

package/themes/default/variables.less

@@ -45,12 +45,12 @@
   'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji',
   'Segoe UI Emoji', 'Segoe UI Symbol';
 @code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-@text-color: @txt-normal; //fade(@black, 65%);
-@text-color-secondary: @txt-second; //fade(@black, 45%);
+@text-color: #17233d;; //fade(@black, 65%);
+@text-color-secondary: fade(@text-color, 80%);; //fade(@black, 45%);
 @text-color-inverse: @white;
 @icon-color: inherit;
 @icon-color-hover: fade(@black, 75%);
-@heading-color: @txt-normal; //fade(#000, 85%);
+@heading-color: @text-color; //fade(#000, 85%);
 @heading-color-dark: fade(@white, 100%);
 @text-color-dark: fade(@white, 85%);
 @text-color-secondary-dark: fade(@white, 65%);
@@ -125,7 +125,7 @@
 @background-color-base: @bg-grey-default; //hsv(0, 0, 96%); // Default grey background color
 
 // Disabled states
-@disabled-color: @txt-disabled; //fade(#000, 25%);
+@disabled-color: fade(@text-color, 30%); //fade(#000, 25%);
 @disabled-bg: @bg-disabled; //@background-color-base;
 @disabled-color-dark: fade(#fff, 35%);
 
@@ -392,7 +392,7 @@
 // Table
 // ---
 @table-header-bg: @background-color-light;
-@table-header-color: @txt-normal; //@heading-color;
+@table-header-color: @text-color; //@heading-color;
 @table-header-sort-bg: @background-color-base;
 @table-body-sort-bg: rgba(0, 0, 0, 0.01);
 @table-row-hover-bg: @bg-grey-second; //@primary-1;