tntd 3.0.0-beta.1 → 3.0.0-beta.2

package/lib/utils/simple-template.js

@@ -1,6 +1,9 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleTemplate = void 0;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.simpleTemplate = simpleTemplate;
 /**
  * 简单的模板替换
  *
@@ -8,8 +11,9 @@ exports.simpleTemplate = void 0;
  * @param data
  * @returns
  */
-function simpleTemplate(template, data = {}) {
-    return template === null || template === void 0 ? void 0 : template.replace(/\${(.*?)}/g, (match, key) => data[key.trim()].toString());
-}
-exports.simpleTemplate = simpleTemplate;
-//# sourceMappingURL=simple-template.js.map
+function simpleTemplate(template) {
+  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return template === null || template === void 0 ? void 0 : template.replace(/\${(.*?)}/g, function (match, key) {
+    return data[key.trim()].toString();
+  });
+}

package/lib/version/index.d.ts

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

package/lib/version/index.js

@@ -1,24 +1,24 @@
 "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(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];
     }
-    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");
-__exportStar(require("antd/es/version"), exports);
-exports.default = version_1.default;
-//# sourceMappingURL=index.js.map
+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"];

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/es/version'\n\nimport './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,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"]}

package/lib/version/style/index.js

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

package/lib/water-mark/index.js

@@ -1,129 +1,140 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+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 __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"));
+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; }
 /**
  * 返回当前显示设备的物理像素分辨率与CSS像素分辨率之比
  *
  * @param context
  * @see api 有些废弃了，其实类型 CanvasRenderingContext2D
  */
-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 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 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());
-            }
-        }
-        else {
-            // eslint-disable-next-line no-console
-            console.error('当前环境不支持Canvas');
+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);
         }
-    }, [
-        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) })));
+        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)
+  }));
 };
-exports.Watermark = Watermark;
-exports.default = exports.Watermark;
-//# sourceMappingURL=index.js.map
+var _default = exports["default"] = Watermark;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.0-beta.1",
+    "version": "3.0.0-beta.2",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",
@@ -15,7 +15,6 @@
         "test:watch": "heft test --watch --clean"
     },
     "dependencies": {
-        "@icon-park/react": "^1.3.5",
         "@stellaris/hooks": "~0.4.6",
         "classnames": "~2.3.1",
         "@tntx/logo-icon": "~1.0.4",

package/themes/common/css2.x.css

@@ -142,7 +142,6 @@
   --text-color-secondary: #454f64;
   --text-color-tint-50: #8b919e;
   --text-color-tertiary: #babdc5;
-  --fill-color-tertiary: #f1f2f5;
   --fill-color-quaternary: #f8f9fb;
   --border-color: #c9d2dd;
   --border-color-secondary: #e1e6ee;
@@ -151,4 +150,39 @@
   --bg-color-spotilight-tint-50: var(--text-color-tint-50);
   --size-step-base: 4;
   --size-step-unit: 4;
+
+  --heading-1-size: calc(var(--font-size-base) * 2.71);
+  --heading-2-size: calc(var(--font-size-base) * 2.14);
+  --heading-3-size: calc(var(--font-size-base) * 1.71);
+  --heading-4-size: calc(var(--font-size-base) * 1.42);
+  --line-height-base: 1.5;
+  --line-height-sm: 1.6666666;
+  --line-height-lg: 1.5;
+  --line-height-xl: 28 / 20;
+  --heading-1-line-height: 40 / 32;
+  --heading-2-line-height: 32 / 24;
+  --heading-3-line-height: 26 / 18;
+  --heading-4-line-height: 24 / 16;
+  --border-radius-base: 2px;
+  --border-radius-sm: 2px;
+  --border-radius-xs: 4px;
+  --border-radius-lg: 20px;
+  --padding-xxs: 4px;
+  --padding-base: 16px;
+  --padding-xxl: 48px;
+  --padding-xl: 32px;
+  --padding-lg: 20px;
+  --padding-md: 12px;
+  --padding-sm: 10px;
+  --padding-xs: 8px;
+  --margin-xxs: 4px;
+  --margin-xs: 8px;
+  --margin-sm: 12px;
+  --margin-base: 16px;
+  --margin-md: 20px;
+  --margin-lg: 24px;
+  --margin-xl: 32px;
+  --margin-xxl: 48px;
+  --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
+  --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
 }

package/themes/common/css3.x.css

@@ -142,7 +142,6 @@
   --text-color-secondary: #454f64;
   --text-color-tint-50: #8b919e;
   --text-color-tertiary: #babdc5;
-  --fill-color-tertiary: #f1f2f5;
   --fill-color-quaternary: #f8f9fb;
   --border-color: #c9d2dd;
   --border-color-secondary: #e1e6ee;
@@ -151,4 +150,39 @@
   --bg-color-spotilight-tint-50: var(--text-color-tint-50);
   --size-step-base: 4;
   --size-step-unit: 4;
+
+  --heading-1-size: 32px;
+  --heading-2-size: 24px;
+  --heading-3-size: 18px;
+  --heading-4-size: 16px;
+  --line-height-base: 22 / 14;
+  --line-height-sm: 20 / 12;
+  --line-height-lg: 24 / 16;
+  --line-height-xl: 28 / 20;
+  --heading-1-line-height: 40 / 32;
+  --heading-2-line-height: 32 / 24;
+  --heading-3-line-height: 26 / 18;
+  --heading-4-line-height: 24 / 16;
+  --border-radius-base: 8px;
+  --border-radius-sm: 4px;
+  --border-radius-xs: 2px;
+  --border-radius-lg: 16px;
+  --padding-xxs: 4px;
+  --padding-base: 16px;
+  --padding-xxl: 48px;
+  --padding-xl: 32px;
+  --padding-lg: 24px;
+  --padding-md: 20px;
+  --padding-sm: 12px;
+  --padding-xs: 8px;
+  --margin-xxs: 4px;
+  --margin-xs: 8px;
+  --margin-sm: 12px;
+  --margin-base: 16px;
+  --margin-md: 20px;
+  --margin-lg: 24px;
+  --margin-xl: 32px;
+  --margin-xxl: 48px;
+  --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
+  --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
 }

package/themes/default/colorsVar.less

@@ -19,7 +19,7 @@
 @grey-split: #e1e6ee; // 分割线 常用于表格、collapse
 
 // 背景色
-@bg-disabled: var(--fill-color-tertiary);
+@bg-disabled: #f1f2f5;
 @bg-grey-default: #f1f2f5;
 @bg-grey-first: #f8f9fb;
 @bg-grey-second: #f3f4f6;

package/themes/default/lessToCssVar.less

@@ -125,3 +125,42 @@
 @gold-10: var(--gold-10);
 @white: var(--white);
 @text-color: var(--text-color);
+
+/** 非颜色变量(这些变量暂时不用，直接用lessVars3.x.less) */
+// @font-size-base: var(--font-size-base);
+// @heading-1-size: var(--heading-1-size);
+// @heading-2-size: var(--heading-2-size);
+// @heading-3-size: var(--heading-3-size);
+// @heading-4-size: var(--heading-4-size);
+// @line-height-sm: var(--line-height-sm);
+// @line-height-lg: var(--line-height-lg);
+// @line-height-xl: var(--line-height-xl);
+// @heading-1-line-height: var(--heading-1-line-height);
+// @heading-2-line-height: var(--heading-2-line-height);
+// @heading-3-line-height: var(--heading-3-line-height);
+// @heading-4-line-height: var(--heading-4-line-height);
+@border-radius-base: var(--border-radius-base);
+@border-radius-sm: var(--border-radius-sm);
+@border-radius-xs: var(--border-radius-xs);
+@border-radius-lg: var(--border-radius-lg);
+// @padding-xxs: var(--padding-xxs);
+// @padding-base: var(--padding-base);
+// @padding-xxl: var(--padding-xxl);
+// @padding-xl: var(--padding-xl);
+// @padding-lg: var(--padding-lg);
+// @padding-md: var(--padding-md);
+// @margin-xxs: var(--margin-xxs);
+// @margin-xs: var(--margin-xs);
+// @margin-sm: var(--margin-sm);
+// @margin-base: var(--margin-base);
+// @margin-md: var(--margin-md);
+// @margin-lg: var(--margin-lg);
+// @margin-xl: var(--margin-xl);
+// @margin-xxl: var(--margin-xxl);
+// @box-shadow-md: var(--box-shadow-md);
+// @box-shadow-lg: var(--box-shadow-lg);
+
+/** 这几个变量涉及到计算，所以不能变成css变量  */
+@padding-sm: 12px;
+@padding-xs: 8px;
+@line-height-base: 22 / 14;

package/themes/default/lessVars2.x.less

@@ -10,10 +10,10 @@
 @heading-2-line-height: 32 / 24;
 @heading-3-line-height: 26 / 18;
 @heading-4-line-height: 24 / 16;
-@border-radius-base: 8px;
-@border-radius-sm: 2px;
-@border-radius-xs: 4px;
-@border-radius-lg: 20px;
+// @border-radius-base: 2px;
+// @border-radius-sm: 2px;
+// @border-radius-xs: 4px;
+// @border-radius-lg: 20px;
 @padding-xxs: 4px;
 @padding-base: 16px;
 @padding-xxl: 48px;

package/themes/default/lessVars3.x.less

@@ -10,10 +10,10 @@
 @heading-2-line-height: 32 / 24;
 @heading-3-line-height: 26 / 18;
 @heading-4-line-height: 24 / 16;
-@border-radius-base: 8px;
-@border-radius-sm: 4px;
-@border-radius-xs: 2px;
-@border-radius-lg: 16px;
+// @border-radius-base: 8px;
+// @border-radius-sm: 4px;
+// @border-radius-xs: 2px;
+// @border-radius-lg: 16px;
 @padding-xxs: 4px;
 @padding-base: 16px;
 @padding-xxl: 48px;

package/themes/default/variables.less

@@ -412,7 +412,7 @@
 @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: @primary-1;
+@table-row-hover-bg: #fff;
 @table-selected-row-color: inherit;
 @table-selected-row-bg: @primary-1;
 @table-expanded-row-bg: #fbfbfb;

package/themes/default/variablesVar.less

@@ -1,7 +1,7 @@
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
 @import './colorsVar.less';
-@import './lessToCssVar.less';
 @import './lessVars3.x.less';
+@import './lessToCssVar.less';
 
 // The prefix to use on all css classes from ant.
 @ant-prefix: ant;
@@ -48,7 +48,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;
 @text-color-inverse: @white;
 @icon-color: inherit;
 @icon-color-hover: fade(@black, 75%);
@@ -413,7 +413,7 @@
 @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: @primary-1;
+@table-row-hover-bg: #fff;
 @table-selected-row-color: inherit;
 @table-selected-row-bg: @primary-1;
 @table-expanded-row-bg: #fbfbfb;
@@ -692,7 +692,7 @@
 @fill-color-tertiary: var(--fill-color-tertiary);
 @fill-color-quaternary: var(--fill-color-quaternary);
 @bg-color-quaternary: var(--bg-color-quaternary);
-@bg-color-spotilight: var(--bg-color-spotilight);
-@bg-color-spotilight-tint-50: var(--bg-color-spotilight-tint-50);
+@bg-color-spotilight: #17233d;
+@bg-color-spotilight-tint-50: #8b919e;
 @size-step-base: var(--size-step-base);
 @size-step-unit: var(--size-step-unit);