tntd 3.0.0-beta → 3.0.0-beta.1

package/lib/version/index.d.ts

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

package/lib/version/index.js

@@ -1,24 +1,24 @@
 "use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-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];
+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);
+};
+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("./style");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var _default = exports["default"] = _version["default"];
+__exportStar(require("antd/es/version"), exports);
+exports.default = version_1.default;
+//# sourceMappingURL=index.js.map

package/lib/version/index.js.map

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

package/lib/version/style/index.js

@@ -1,3 +1,5 @@
 "use strict";
-
-require("../../style/index.less");
+Object.defineProperty(exports, "__esModule", { value: true });
+// empty file prevent babel-plugin-import error
+require("../../style/index.less");
+//# sourceMappingURL=index.js.map

package/lib/water-mark/index.js

@@ -1,140 +1,129 @@
 "use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports["default"] = exports.Watermark = void 0;
-var _classnames = _interopRequireDefault(require("classnames"));
-var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Watermark = void 0;
+const classnames_1 = __importDefault(require("classnames"));
+const react_1 = __importStar(require("react"));
 /**
  * 返回当前显示设备的物理像素分辨率与CSS像素分辨率之比
  *
  * @param context
  * @see api 有些废弃了，其实类型 CanvasRenderingContext2D
  */
-var getPixelRatio = function getPixelRatio(context) {
-  if (!context) {
-    return 1;
-  }
-  var backingStore = context.backingStorePixelRatio || context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || 1;
-  return (window.devicePixelRatio || 1) / backingStore;
+const getPixelRatio = (context) => {
+    if (!context) {
+        return 1;
+    }
+    const backingStore = context.backingStorePixelRatio ||
+        context.webkitBackingStorePixelRatio ||
+        context.mozBackingStorePixelRatio ||
+        context.msBackingStorePixelRatio ||
+        context.oBackingStorePixelRatio ||
+        1;
+    return (window.devicePixelRatio || 1) / backingStore;
 };
-var Watermark = exports.Watermark = function Watermark(props) {
-  var children = props.children,
-    style = props.style,
-    className = props.className,
-    markStyle = props.markStyle,
-    markClassName = props.markClassName,
-    _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 9 : _props$zIndex,
-    _props$gapX = props.gapX,
-    gapX = _props$gapX === void 0 ? 212 : _props$gapX,
-    _props$gapY = props.gapY,
-    gapY = _props$gapY === void 0 ? 222 : _props$gapY,
-    _props$width = props.width,
-    width = _props$width === void 0 ? 120 : _props$width,
-    _props$height = props.height,
-    height = _props$height === void 0 ? 64 : _props$height,
-    _props$rotate = props.rotate,
-    rotate = _props$rotate === void 0 ? -22 : _props$rotate,
-    image = props.image,
-    content = props.content,
-    offsetLeft = props.offsetLeft,
-    offsetTop = props.offsetTop,
-    _props$fontStyle = props.fontStyle,
-    fontStyle = _props$fontStyle === void 0 ? 'normal' : _props$fontStyle,
-    _props$textAlign = props.textAlign,
-    textAlign = _props$textAlign === void 0 ? 'center' : _props$textAlign,
-    _props$fontWeight = props.fontWeight,
-    fontWeight = _props$fontWeight === void 0 ? 'normal' : _props$fontWeight,
-    _props$fontColor = props.fontColor,
-    fontColor = _props$fontColor === void 0 ? 'rgba(0,0,0,.15)' : _props$fontColor,
-    _props$fontSize = props.fontSize,
-    fontSize = _props$fontSize === void 0 ? 14 : _props$fontSize,
-    _props$fontFamily = props.fontFamily,
-    fontFamily = _props$fontFamily === void 0 ? 'sans-serif' : _props$fontFamily,
-    _props$prefixCls = props.prefixCls,
-    prefixCls = _props$prefixCls === void 0 ? 'tntd-watermark' : _props$prefixCls;
-  var wrapperCls = (0, _classnames["default"])(["".concat(prefixCls, "-wrapper"), className]);
-  var watermarkCls = (0, _classnames["default"])([prefixCls, markClassName]);
-  var _useState = (0, _react.useState)(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    base64Url = _useState2[0],
-    setBase64Url = _useState2[1];
-  (0, _react.useEffect)(function () {
-    var canvas = document.createElement('canvas');
-    var ctx = canvas.getContext('2d');
-    var ratio = getPixelRatio(ctx);
-    var canvasWidth = "".concat((gapX + width) * ratio, "px");
-    var canvasHeight = "".concat((gapY + height) * ratio, "px");
-    var canvasOffsetLeft = offsetLeft || gapX / 2;
-    var canvasOffsetTop = offsetTop || gapY / 2;
-    canvas.setAttribute('width', canvasWidth);
-    canvas.setAttribute('height', canvasHeight);
-    if (ctx) {
-      // 旋转字符 rotate
-      ctx.translate(canvasOffsetLeft * ratio, canvasOffsetTop * ratio);
-      ctx.rotate(Math.PI / 180 * Number(rotate));
-      var markWidth = width * ratio;
-      var markHeight = height * ratio;
-      if (image) {
-        var img = new Image();
-        img.crossOrigin = 'anonymous';
-        img.referrerPolicy = 'no-referrer';
-        img.src = image;
-        img.onload = function () {
-          ctx.drawImage(img, 0, 0, markWidth, markHeight);
-          setBase64Url(canvas.toDataURL());
-        };
-      } else if (content) {
-        var markSize = Number(fontSize) * ratio;
-        ctx.font = "".concat(fontStyle, " normal ").concat(fontWeight, " ").concat(markSize, "px/").concat(markHeight, "px ").concat(fontFamily);
-        ctx.fillStyle = fontColor;
-        ctx.textAlign = textAlign;
-        if (Array.isArray(content)) {
-          content === null || content === void 0 ? void 0 : content.forEach(function (item, index) {
-            return ctx.fillText(item, 0, index * markSize);
-          });
-        } else {
-          ctx.fillText(content, 0, 0);
+const Watermark = (props) => {
+    const { children, style, className, markStyle, markClassName, 
+    // antd 内容层 zIndex 基本上在 10 以下 https://github.com/ant-design/ant-design/blob/6192403b2ce517c017f9e58a32d58774921c10cd/components/style/themes/default.less#L335
+    zIndex = 9, gapX = 212, gapY = 222, width = 120, height = 64, rotate = -22, // 默认旋转 -22 度
+    image, content, offsetLeft, offsetTop, fontStyle = 'normal', textAlign = 'center', fontWeight = 'normal', fontColor = 'rgba(0,0,0,.15)', fontSize = 14, fontFamily = 'sans-serif', prefixCls = 'tntd-watermark', } = props;
+    const wrapperCls = (0, classnames_1.default)([`${prefixCls}-wrapper`, className]);
+    const watermarkCls = (0, classnames_1.default)([prefixCls, markClassName]);
+    const [base64Url, setBase64Url] = (0, react_1.useState)('');
+    (0, react_1.useEffect)(() => {
+        const canvas = document.createElement('canvas');
+        const ctx = canvas.getContext('2d');
+        const ratio = getPixelRatio(ctx);
+        const canvasWidth = `${(gapX + width) * ratio}px`;
+        const canvasHeight = `${(gapY + height) * ratio}px`;
+        const canvasOffsetLeft = offsetLeft || gapX / 2;
+        const canvasOffsetTop = offsetTop || gapY / 2;
+        canvas.setAttribute('width', canvasWidth);
+        canvas.setAttribute('height', canvasHeight);
+        if (ctx) {
+            // 旋转字符 rotate
+            ctx.translate(canvasOffsetLeft * ratio, canvasOffsetTop * ratio);
+            ctx.rotate((Math.PI / 180) * Number(rotate));
+            const markWidth = width * ratio;
+            const markHeight = height * ratio;
+            if (image) {
+                const img = new Image();
+                img.crossOrigin = 'anonymous';
+                img.referrerPolicy = 'no-referrer';
+                img.src = image;
+                img.onload = () => {
+                    ctx.drawImage(img, 0, 0, markWidth, markHeight);
+                    setBase64Url(canvas.toDataURL());
+                };
+            }
+            else if (content) {
+                const markSize = Number(fontSize) * ratio;
+                ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
+                ctx.fillStyle = fontColor;
+                ctx.textAlign = textAlign;
+                if (Array.isArray(content)) {
+                    content === null || content === void 0 ? void 0 : content.forEach((item, index) => ctx.fillText(item, 0, index * markSize));
+                }
+                else {
+                    ctx.fillText(content, 0, 0);
+                }
+                setBase64Url(canvas.toDataURL());
+            }
         }
-        setBase64Url(canvas.toDataURL());
-      }
-    } else {
-      // eslint-disable-next-line no-console
-      console.error('当前环境不支持Canvas');
-    }
-  }, [gapX, gapY, offsetLeft, offsetTop, rotate, fontStyle, textAlign, fontWeight, width, height, fontFamily, fontColor, image, content, fontSize]);
-  return _react["default"].createElement("div", {
-    style: Object.assign({
-      position: 'relative'
-    }, style),
-    className: wrapperCls
-  }, children, _react["default"].createElement("div", {
-    className: watermarkCls,
-    style: Object.assign(Object.assign({
-      zIndex: zIndex,
-      position: 'absolute',
-      left: 0,
-      top: 0,
-      width: '100%',
-      height: '100%',
-      backgroundSize: "".concat(gapX + width, "px"),
-      pointerEvents: 'none',
-      backgroundRepeat: 'repeat'
-    }, base64Url ? {
-      backgroundImage: "url('".concat(base64Url, "')")
-    } : {}), markStyle)
-  }));
+        else {
+            // eslint-disable-next-line no-console
+            console.error('当前环境不支持Canvas');
+        }
+    }, [
+        gapX,
+        gapY,
+        offsetLeft,
+        offsetTop,
+        rotate,
+        fontStyle,
+        textAlign,
+        fontWeight,
+        width,
+        height,
+        fontFamily,
+        fontColor,
+        image,
+        content,
+        fontSize,
+    ]);
+    return (react_1.default.createElement("div", { style: Object.assign({ position: 'relative' }, style), className: wrapperCls },
+        children,
+        react_1.default.createElement("div", { className: watermarkCls, style: Object.assign(Object.assign({ zIndex, position: 'absolute', left: 0, top: 0, width: '100%', height: '100%', backgroundSize: `${gapX + width}px`, pointerEvents: 'none', backgroundRepeat: 'repeat' }, (base64Url
+                ? {
+                    backgroundImage: `url('${base64Url}')`,
+                }
+                : {})), markStyle) })));
 };
-var _default = exports["default"] = Watermark;
+exports.Watermark = Watermark;
+exports.default = exports.Watermark;
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.0-beta",
+    "version": "3.0.0-beta.1",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",

package/themes/default/colors.less

@@ -1,18 +1,18 @@
 @import '../utils/colorPalette';
-@blue-6-hover: #005df4;
+@blue-6-hover: #3b8cff;
 @blue-6: #126bfb;
 @purple-6: #722ed1;
 @cyan-6: #13c2c2;
-@green-6: #56bb52;
+@green-6: #07c790;
 @magenta-6: #eb2f96;
 @pink-6: #eb2f96;
-@red-6: #d96156;
+@red-6: #ef4444;
 @orange-6: #fa8c16;
 @yellow-6: #fadb14;
 @volcano-6: #fa541c;
 @geekblue-6: #2f54eb;
 @lime-6: #a0d911;
-@gold-6: #ff9845;
+@gold-6: #f7b035;
 
 // 线条显色
 @grey-d: #c9d2dd;

package/themes/default/colorsVar.less

@@ -1,5 +1,5 @@
 @import '../utils/colorPalette';
-@blue-6-hover: #005df4;
+@blue-6-hover: var(--blue-5);
 @blue-6: var(--blue-6); // #126bfb;
 @purple-6: var(--purple-6); // #722ed1;
 @cyan-6: var(--cyan-6); //#13c2c2;
@@ -21,7 +21,7 @@
 // 背景色
 @bg-disabled: var(--fill-color-tertiary);
 @bg-grey-default: #f1f2f5;
-@bg-grey-first: #fafafa;
+@bg-grey-first: #f8f9fb;
 @bg-grey-second: #f3f4f6;
 
 // color palettes

package/themes/default/variables.less

@@ -1,6 +1,6 @@
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
-@import './colors';
-@import './lessVars2.x.less';
+@import './colors.less';
+@import './lessVars3.x.less';
 
 // The prefix to use on all css classes from ant.
 @ant-prefix: ant;
@@ -47,7 +47,7 @@
   'Segoe UI Emoji', 'Segoe UI Symbol';
 @code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
 @text-color: #17233d; //fade(@black, 65%);
-@text-color-secondary: var(--text-color-secondary); //fade(@black, 45%);
+@text-color-secondary: #454f64; //fade(@black, 45%);
 @text-color-inverse: @white;
 @icon-color: inherit;
 @icon-color-hover: fade(@black, 75%);
@@ -692,5 +692,6 @@
 @fill-color-quaternary: #f8f9fb;
 @bg-color-quaternary: #f8f9fb;
 @bg-color-spotilight: #17233d;
+@bg-color-spotilight-tint-50: #8b919e;
 @size-step-base: 4;
 @size-step-unit: 4;