@hsu-react/ui 0.0.25 → 2.0.0

package/es/components/Copy/index.js

@@ -1,19 +1,33 @@
+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); }
+var _excluded = ["id", "isMessage", "md", "text", "copyIcon", "copyedIcon", "hideIcon", "className", "onClick"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-import React, { useState } from "react";
+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; }
+import React, { forwardRef, useState } from "react";
 import Icon from "../Icon";
 import TurndownService from "turndown";
 import classNames from "classnames";
-import { message } from "antd";
+import { message } from "../../feedback";
 import styles from "./index.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-var Copy = function Copy(props) {
+/**
+ * Wrapped in `forwardRef` because antd v6's Trigger (Tooltip / Popover / Dropdown) hands its child
+ * a ref instead of falling back to `findDOMNode` the way v5 did — a plain function component makes
+ * it warn and lose the trigger. The remaining props are spread onto the rendered node for the same
+ * reason: Trigger injects its event handlers by cloning the child.
+ */
+var Copy = /*#__PURE__*/forwardRef(function (props, ref) {
   var id = props.id,
     _props$isMessage = props.isMessage,
     isMessage = _props$isMessage === void 0 ? true : _props$isMessage,
@@ -23,7 +37,10 @@ var Copy = function Copy(props) {
     copyIcon = props.copyIcon,
     copyedIcon = props.copyedIcon,
     _props$hideIcon = props.hideIcon,
-    hideIcon = _props$hideIcon === void 0 ? false : _props$hideIcon;
+    hideIcon = _props$hideIcon === void 0 ? false : _props$hideIcon,
+    className = props.className,
+    _onClick = props.onClick,
+    rest = _objectWithoutProperties(props, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     copyed = _useState2[0],
@@ -96,21 +113,27 @@ var Copy = function Copy(props) {
       }
     }
   };
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: copyed ? /*#__PURE__*/_jsxs("div", {
-      className: classNames(styles.Copyed),
-      children: [!hideIcon && (copyedIcon !== null && copyedIcon !== void 0 ? copyedIcon : /*#__PURE__*/_jsx(Icon, {
-        icon: "ci:check",
-        className: classNames(styles.icon)
-      })), "\u5DF2\u590D\u5236\uFF01"]
-    }) : /*#__PURE__*/_jsxs("div", {
-      className: classNames(styles.Copy),
-      onClick: onCopy,
-      children: [!hideIcon && (copyIcon !== null && copyIcon !== void 0 ? copyIcon : /*#__PURE__*/_jsx(Icon, {
-        icon: "ci:copy",
-        className: classNames(styles.icon)
-      })), text !== null && text !== void 0 ? text : "复制"]
-    })
-  });
-};
+  return copyed ? /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({
+    ref: ref
+  }, rest), {}, {
+    className: classNames(styles.Copyed, className),
+    children: [!hideIcon && (copyedIcon !== null && copyedIcon !== void 0 ? copyedIcon : /*#__PURE__*/_jsx(Icon, {
+      icon: "ci:check",
+      className: classNames(styles.icon)
+    })), "\u5DF2\u590D\u5236\uFF01"]
+  })) : /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({
+    ref: ref
+  }, rest), {}, {
+    className: classNames(styles.Copy, className),
+    onClick: function onClick(e) {
+      onCopy();
+      _onClick === null || _onClick === void 0 || _onClick(e);
+    },
+    children: [!hideIcon && (copyIcon !== null && copyIcon !== void 0 ? copyIcon : /*#__PURE__*/_jsx(Icon, {
+      icon: "ci:copy",
+      className: classNames(styles.icon)
+    })), text !== null && text !== void 0 ? text : "复制"]
+  }));
+});
+Copy.displayName = "Copy";
 export default Copy;

package/es/components/Copy/index.module.scss

@@ -8,18 +8,18 @@
 
   font-size: 14px;
   line-height: 18px;
-  color: var(--cf-text-2);
+  color: var(--vita-muted-foreground);
 
   cursor: pointer;
 
   transition: color 0.3s, background-color 0.3s;
 
   &:hover {
-    color: var(--cf-text);
+    color: var(--vita-foreground);
 
-    background-color: var(--cf-row-hover);
+    background-color: var(--vita-hover);
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
   }
 
   .icon {
@@ -34,7 +34,7 @@
 
   font-size: 14px;
   line-height: 18px;
-  color: var(--cf-text);
+  color: var(--vita-foreground);
 
   cursor: default;
 

package/es/components/DatePicker/RangePicker/index.js

@@ -141,7 +141,11 @@ var RangePicker = function RangePicker(props) {
       showSearch: false
     })), /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread(_objectSpread({}, rangePickerConfig), {}, {
       ref: ref,
-      popupClassName: classNames(styles.rangePickerPopup, popupClassName),
+      classNames: {
+        popup: {
+          root: classNames(styles.rangePickerPopup, popupClassName)
+        }
+      },
       getPopupContainer: getPopupContainer !== null && getPopupContainer !== void 0 ? getPopupContainer : defaultModalPickerGetPopupContainer,
       className: styles.RangePicker,
       picker: picker,

package/es/components/DatePicker/RangePicker/index.module.scss

@@ -13,11 +13,13 @@
 }
 
 .RangePicker {
+  // 同 Input.Number：父级无确定高度时避免被内容撑成 33/35。
+  min-height: var(--vita-control-height);
   width: 0;
   flex: 1;
   height: 100%;
 
-  border-radius: 6px;
+  border-radius: var(--vita-radius);
 
   font-family: inherit;
   font-size: inherit;
@@ -38,6 +40,13 @@
       font-weight: inherit;
       color: inherit;
       text-align: inherit;
+
+      // 字号是 inherit 的（刻意的，控件跟随容器排版）。但 antd 的行高是 1.57 倍字号，
+      // 容器字号一变大，行高 + 上下 padding + 边框就把整个控件顶高：在 16px 的页面里
+      // 实测 25.14 + 8 + 2 = 35，比其他控件高 3px。
+      // DatePicker 有外层 wrapper 兜底，RangePicker 的类直接落在 .ant-picker 上没人拦，
+      // 所以这里固定行高，让外层的 min-height 说了算。
+      line-height: normal;
     }
   }
 }

package/es/components/DatePicker/StepPicker/index.module.scss

@@ -1,3 +1,5 @@
+// 内部这几个按钮此前是 4px 圆角（2.0 之前就写死的 4px，改造时只是原样收进了 radius-xs）。
+// 全库按钮统一到 8px 之后，只有步进选择器这几个还是小圆角，并排时很明显。
 .StepPicker {
   display: flex;
   align-items: center;
@@ -7,10 +9,10 @@
   .icon {
     &:global(.ant-btn-icon-only) {
       width: 32px;
-      height: 32px;
+      height: var(--vita-control-height);
     }
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius);
 
     font-size: 16px;
   }
@@ -18,10 +20,10 @@
   .time {
     width: 32px;
     min-width: max-content;
-    height: 32px;
+    height: var(--vita-control-height);
     padding: 0px 4px;
 
     font-size: 16px;
-    border-radius: 4px;
+    border-radius: var(--vita-radius);
   }
 }

package/es/components/DatePicker/index.js

@@ -155,8 +155,15 @@ var DatePicker = function DatePicker(props) {
       allowClear: false,
       showSearch: false
     })), /*#__PURE__*/_jsx(AntdDatePicker, _objectSpread(_objectSpread({}, datePickerProps), {}, {
-      ref: ref,
-      popupClassName: classNames(styles.datePickerPopup, popupClassName),
+      ref: ref
+      // v6 replaced `popupClassName` with the `popup.root` semantic slot; this component's own
+      // `popupClassName` prop is kept as-is for consumers.
+      ,
+      classNames: {
+        popup: {
+          root: classNames(styles.datePickerPopup, popupClassName)
+        }
+      },
       getPopupContainer: getPopupContainer !== null && getPopupContainer !== void 0 ? getPopupContainer : defaultModalPickerGetPopupContainer,
       value: value ? dayjs(value.toString()) : undefined,
       defaultValue: defaultValue ? dayjs(defaultValue.toString()) : undefined,
@@ -168,8 +175,12 @@ var DatePicker = function DatePicker(props) {
         width: 0
       },
       showTime: showTime,
-      onChange: function onChange(v) {
+      onChange: function onChange(value) {
         var date = "";
+
+        // v6 widened the picker's onChange value to `Dayjs | Dayjs[]`; a non-range picker only
+        // ever hands back a single value.
+        var v = Array.isArray(value) ? value[0] : value;
         if (v) {
           if (picker === "date") {
             date = dayjs(v).format("YYYY-MM-DD");

package/es/components/DatePicker/index.module.scss

@@ -5,10 +5,10 @@
 
   width: 100%;
   height: 100%;
-  min-height: 32px;
+  min-height: var(--vita-control-height);
   max-height: max-content;
 
-  border-radius: 6px;
+  border-radius: var(--vita-radius);
 
   font-family: inherit;
   font-size: inherit;

package/es/components/Descriptions/index.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from "react";
-import { DescriptionsProps as AntdDescriptionsProps } from "antd";
+import { Descriptions as AntdDescriptions, DescriptionsProps as AntdDescriptionsProps } from "antd";
 export interface ColumnsType {
     title: string;
     dataIndex: string;
@@ -12,5 +12,9 @@ interface DescriptionsProps extends AntdDescriptionsProps {
     columns?: ColumnsType[];
     dataSource?: Record<string, unknown>;
 }
-declare const Descriptions: React.FC<DescriptionsProps>;
+interface DescriptionsFC extends React.FC<DescriptionsProps> {
+    /** antd 的 `Descriptions.Item`，供 JSX 写法（本库更推荐用 `items` / `columns`） */
+    Item: typeof AntdDescriptions.Item;
+}
+declare const Descriptions: DescriptionsFC;
 export default Descriptions;

package/es/components/Descriptions/index.js

@@ -7,6 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
+import { mergeSemantic } from "../../utils/semantic";
 import React, { useMemo } from "react";
 import { Descriptions as AntdDescriptions } from "antd";
 import { get_string_size } from "hsu-utils";
@@ -110,18 +111,24 @@ var Descriptions = function Descriptions(props) {
   }, [_items, labelWidths, column, layout, bordered]);
   return /*#__PURE__*/_jsx(AntdDescriptions, _objectSpread({
     items: finalItems,
-    classNames: _objectSpread({
-      root: "".concat(styles.Descriptions, " ").concat((classNames === null || classNames === void 0 ? void 0 : classNames.root) || ""),
-      label: "".concat(styles.label, " ").concat(layout === "horizontal" ? styles.horizontal : "", " ").concat((classNames === null || classNames === void 0 ? void 0 : classNames.label) || ""),
-      content: "".concat(styles.content, " ").concat((classNames === null || classNames === void 0 ? void 0 : classNames.content) || "")
-    }, classNames),
-    styles: _objectSpread(_objectSpread({}, _styles), {}, {
-      label: _objectSpread({}, _styles === null || _styles === void 0 ? void 0 : _styles.label)
-    }),
+    classNames: mergeSemantic(classNames, function (outer) {
+      return _objectSpread(_objectSpread({}, outer), {}, {
+        // `...classNames` used to be spread *after* these lines, so a caller-supplied slot
+        // silently dropped this component's own class. Merge the two instead.
+        root: "".concat(styles.Descriptions, " ").concat(outer.root || ""),
+        label: "".concat(styles.label, " ").concat(layout === "horizontal" ? styles.horizontal : "", " ").concat(outer.label || ""),
+        content: "".concat(styles.content, " ").concat(outer.content || "")
+      });
+    })
+    // Was `{ ..._styles, label: { ...(_styles?.label) } }` — a no-op that only re-copied `label`
+    // onto itself, and which no longer type-checks now that `styles` may also be a function.
+    ,
+    styles: _styles,
     colon: colon,
     layout: layout,
     bordered: bordered,
     column: column
   }, escriptionsConfig));
 };
+Descriptions.Item = AntdDescriptions.Item;
 export default Descriptions;

package/es/components/Editor/index.module.scss

@@ -7,14 +7,14 @@
 
   overflow: hidden;
 
-  border: 1px solid var(--cf-border);
-  border-radius: 6px;
+  border: 1px solid var(--vita-border);
+  border-radius: var(--vita-radius);
 
   .toolbar {
-    border-bottom: 1px solid var(--cf-border);
+    border-bottom: 1px solid var(--vita-border);
 
     .w-e-bar-item {
-      color: var(--cf-text-3);
+      color: var(--vita-subtle-foreground);
     }
   }
 
@@ -28,14 +28,14 @@
 
   &.disabled {
     .editor {
-      border-color: var(--cf-border);
+      border-color: var(--vita-border);
 
       cursor: not-allowed;
 
       .w-e-text-container {
-        background-color: var(--cf-subtle);
+        background-color: var(--vita-muted);
 
-        color: var(--cf-text-3);
+        color: var(--vita-subtle-foreground);
       }
     }
   }

package/es/components/FileCol/index.js

@@ -36,10 +36,10 @@ var FileCol = function FileCol(props) {
           className: styles.fileItem,
           children: [!hideNm && /*#__PURE__*/_jsx(Tooltip, {
             title: file.name,
-            color: "var(--cf-subtle)",
+            color: "var(--vita-muted)",
             styles: {
-              body: {
-                color: "var(--cf-text)",
+              container: {
+                color: "var(--vita-foreground)",
                 padding: "6px 16px"
               }
             },

package/es/components/FilePreview/_components/BasePreview/index.module.scss

@@ -61,9 +61,9 @@
     max-height: fit-content;
     padding: 20px;
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
 
-    background-color: var(--cf-surface);
+    background-color: var(--vita-surface);
 
     overflow: auto;
 
@@ -73,7 +73,7 @@
     }
 
     &::-webkit-scrollbar-track {
-      background-color: var(--cf-surface);
+      background-color: var(--vita-surface);
     }
   }
 }

package/es/components/FilePreview/_components/PdfPreview/index.js

@@ -10,6 +10,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useRef, useState } from "react";
 import { Spin, notification } from "antd";
+// 这里用的是 notification 的 hook 版本（useNotification + contextHolder），本来就在 React
+// 树里、能读到主题，不需要换成 ../../../../feedback 那层代理 —— 那层解决的是**静态方法**
+// 读不到 context 的问题。
+
 import Icon from "../../../Icon";
 import { RenderPDF } from "hsu-utils";
 import classNames from "classnames";
@@ -208,8 +212,11 @@ var PdfPreview = function PdfPreview(props) {
           children: /*#__PURE__*/_jsx("li", {
             className: classNames(styles.toolItemItem, _defineProperty({}, styles.disabled, loading || !fileUrl || full)),
             onClick: function onClick() {
-              if (fileUrl && !full) {
-                window.open(fileUrl, "_blank");
+              // 只放行可导航的协议。fileUrl 通常来自后端，但 FilePreview 展示的本就是
+              // 用户上传的文件，若这个值一路从用户数据流下来，javascript: 会在
+              // 本站源里执行。noopener 同时切断被打开页对 window.opener 的访问。
+              if (fileUrl && !full && /^(https?:|blob:|\/)/i.test(fileUrl)) {
+                window.open(fileUrl, "_blank", "noopener,noreferrer");
               }
             },
             children: /*#__PURE__*/_jsx(Icon, {

package/es/components/FilePreview/_components/PdfPreview/index.module.scss

@@ -82,7 +82,7 @@
 
     margin-top: -3%;
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
 
     overflow: auto;
 
@@ -133,11 +133,11 @@
 
     padding: 5px 10px;
 
-    background-color: var(--cf-surface);
+    background-color: var(--vita-surface);
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
 
-    box-shadow: var(--cf-shadow-3);
+    box-shadow: var(--vita-shadow-3);
 
     .toolItem {
       display: flex;
@@ -150,18 +150,18 @@
         justify-content: center;
 
         width: 32px;
-        height: 32px;
+        height: var(--vita-control-height);
 
         font-size: 24px;
 
-        border-radius: 4px;
+        border-radius: var(--vita-radius-xs);
 
         transition: background-color 0.3s, color 0.3s;
 
         cursor: pointer;
 
         &:hover {
-          background-color: var(--cf-row-hover);
+          background-color: var(--vita-hover);
         }
 
         &.disabled {

package/es/components/FilePreview/index.module.scss

@@ -56,7 +56,7 @@
     height: 90%;
     max-height: fit-content;
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
     overflow: hidden;
   }
 
@@ -71,9 +71,9 @@
     max-height: fit-content;
     padding: 20px;
 
-    border-radius: 4px;
+    border-radius: var(--vita-radius-xs);
 
-    background-color: var(--cf-surface);
+    background-color: var(--vita-surface);
 
     overflow: auto;
 
@@ -83,7 +83,7 @@
     }
 
     &::-webkit-scrollbar-track {
-      background-color: var(--cf-surface);
+      background-color: var(--vita-surface);
     }
   }
 }

package/es/components/Form/DrawerForm/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["formItems", "extraFormItems", "externalForm", "className", "value", "open", "hasPermi", "buttonGroup", "onClose", "reset", "title"];
+var _excluded = ["formItems", "extraFormItems", "externalForm", "className", "value", "open", "hasPermi", "buttonGroup", "onClose", "reset", "title", "classNames"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -22,11 +22,11 @@ import classNames from "classnames";
 import styles from "./index.module.scss";
 import useLabelWidth from "../../../hooks/useLabelWidth";
 import usePermissions from "../../../hooks/usePermissions";
+import { mergeSemantic } from "../../../utils/semantic";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var DrawerForm = function DrawerForm(props) {
-  var _drawerConfig$classNa;
   var formItems = props.formItems,
     extraFormItems = props.extraFormItems,
     externalForm = props.externalForm,
@@ -40,14 +40,8 @@ var DrawerForm = function DrawerForm(props) {
     _props$reset = props.reset,
     reset = _props$reset === void 0 ? true : _props$reset,
     title = props.title,
+    drawerClassNames = props.classNames,
     drawerConfig = _objectWithoutProperties(props, _excluded);
-  var _ref = (_drawerConfig$classNa = drawerConfig.classNames) !== null && _drawerConfig$classNa !== void 0 ? _drawerConfig$classNa : {},
-    header = _ref.header,
-    body = _ref.body,
-    footer = _ref.footer,
-    mask = _ref.mask,
-    content = _ref.content,
-    wrapper = _ref.wrapper;
   var _Form$useForm = Form.useForm(externalForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -72,15 +66,13 @@ var DrawerForm = function DrawerForm(props) {
   return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
     open: open,
     className: classNames(styles.DrawerForm, className),
-    classNames: {
-      header: "".concat(header !== null && header !== void 0 ? header : ""),
-      body: "".concat(styles.body, " ").concat(body !== null && body !== void 0 ? body : ""),
-      footer: "".concat(footer !== null && footer !== void 0 ? footer : ""),
-      mask: "".concat(mask !== null && mask !== void 0 ? mask : ""),
-      content: "".concat(content !== null && content !== void 0 ? content : ""),
-      wrapper: "".concat(wrapper !== null && wrapper !== void 0 ? wrapper : "")
-    },
-    width: 500,
+    classNames: mergeSemantic(drawerClassNames, function (outer) {
+      var _outer$body;
+      return _objectSpread(_objectSpread({}, outer), {}, {
+        body: "".concat(styles.body, " ").concat((_outer$body = outer.body) !== null && _outer$body !== void 0 ? _outer$body : "")
+      });
+    }),
+    size: 500,
     closable: false,
     title: /*#__PURE__*/_jsxs(_Fragment, {
       children: [title, /*#__PURE__*/_jsxs("span", {

package/es/components/Form/ImportForm/index.js

@@ -13,7 +13,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-import { Form, notification } from "antd";
+import { Form } from "antd";
+import { notification } from "../../../feedback";
+import { modalWidth } from "../../../styles/tokens";
 import FormItem, { PlaceholderDict, PlaceholderDictEn } from "../../FormItem";
 import React from "react";
 import { downloadFile } from "hsu-utils";
@@ -23,6 +25,7 @@ import styles from "./index.module.scss";
 import useLabelWidth from "../../../hooks/useLabelWidth";
 import usePermissions from "../../../hooks/usePermissions";
 import Modal from "../../Modal";
+import { mergeSemantic } from "../../../utils/semantic";
 import { jsx as _jsx } from "react/jsx-runtime";
 var ImportForm = observer(function (props) {
   var open = props.open,
@@ -38,12 +41,6 @@ var ImportForm = observer(function (props) {
     hasPermi = props.hasPermi,
     uploadProps = props.uploadProps,
     modalConfig = _objectWithoutProperties(props, _excluded);
-  var header = classNames.header,
-    body = classNames.body,
-    footer = classNames.footer,
-    mask = classNames.mask,
-    content = classNames.content,
-    wrapper = classNames.wrapper;
   var _usePermissions = usePermissions(hasPermi),
     permitted = _usePermissions.permitted;
   var onExport = function onExport() {
@@ -88,16 +85,18 @@ var ImportForm = observer(function (props) {
     open: open,
     centered: true,
     className: "".concat(styles.ImportForm, " ").concat(className !== null && className !== void 0 ? className : ""),
-    width: 600,
-    classNames: {
-      header: "".concat(header !== null && header !== void 0 ? header : ""),
-      body: "".concat(styles.body, " ").concat(body !== null && body !== void 0 ? body : ""),
-      footer: "".concat(footer !== null && footer !== void 0 ? footer : ""),
-      mask: "".concat(mask !== null && mask !== void 0 ? mask : ""),
-      content: "".concat(content !== null && content !== void 0 ? content : ""),
-      wrapper: "".concat(wrapper !== null && wrapper !== void 0 ? wrapper : "")
+    width: modalWidth.sm,
+    classNames: mergeSemantic(classNames, function (outer) {
+      var _outer$body;
+      return _objectSpread(_objectSpread({}, outer), {}, {
+        body: "".concat(styles.body, " ").concat((_outer$body = outer.body) !== null && _outer$body !== void 0 ? _outer$body : "")
+      });
+    })
+    // v6 folded `maskClosable` into the `mask` config object
+    ,
+    mask: {
+      closable: false
     },
-    maskClosable: false,
     footer: false
   }, modalConfig), {}, {
     children: /*#__PURE__*/_jsx(Form, {

package/es/components/Form/ModalForm/index.d.ts

@@ -3,7 +3,7 @@ import { ModalProps } from "../../Modal";
 import { FormItemProps } from "../../FormItem";
 import React from "react";
 import { ItemContainerProps } from "../../FormItem/ItemContainer";
-import { FormRef } from "rc-field-form";
+import type { FormRef } from "../../../types/antd";
 export type ExtraFormItem = React.ReactElement<ItemContainerProps>;
 export interface ModalFormProps extends Omit<ModalProps, "onCancel" | "onOk"> {
     formItems?: FormItemProps[] | Record<string, FormItemProps[]>;