@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/lib/ProDownload/index.js

@@ -6,14 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _utils = require("./utils");
@@ -136,7 +135,7 @@ var ProDownload = props => {
   var cls = (0, _classnames.default)(className, {
     'pro-download': true
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: cls,
     onClick: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var res;

package/lib/ProDownload/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-download {
 

package/lib/ProDownload/utils.js

@@ -8,10 +8,9 @@ exports.BlobMakeFile = BlobMakeFile;
 exports.convertBase64ToBlob = exports.DownloadRequest = void 0;
 exports.getFilenameFromContentDisposition = getFilenameFromContentDisposition;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _locale = _interopRequireDefault(require("../locale"));
 /* eslint-disable no-empty */
@@ -128,7 +127,7 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
                       _context.next = 7;
                       break;
                     }
-                    _message2.default.error(`${_locale.default.ProDownload.errorMessage}`);
+                    _antd.message.error(`${_locale.default.ProDownload.errorMessage}`);
                     return _context.abrupt("return", Promise.reject(`${_locale.default.ProDownload.errorMessage}`));
                   case 7:
                     if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
@@ -136,7 +135,7 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
-                    errorMsg && _message2.default.error(errorMsg);
+                    errorMsg && _antd.message.error(errorMsg);
                     onError && onError(_data);
                     return _context.abrupt("return", Promise.reject(errorMsg));
                   case 12:

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -6,18 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/drawer/style");
-var _drawer = _interopRequireDefault(require("antd/es/drawer"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
 var _close = _interopRequireDefault(require("../../../assets/close.svg"));
@@ -30,7 +26,7 @@ var _jsxRuntime = require("react/jsx-runtime");
     title = _ref.title,
     width = _ref.width,
     footer = _ref.footer,
-    visible = _ref.visible,
+    open = _ref.open,
     isView = _ref.isView,
     maskClosable = _ref.maskClosable,
     isConfirmClose = _ref.isConfirmClose,
@@ -59,9 +55,9 @@ var _jsxRuntime = require("react/jsx-runtime");
     setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
 
-  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   (0, _react.useEffect)(() => {
-    if (visible) {
+    if (open) {
       // 延迟到下一个事件循环，确保 Drawer 已经渲染
       var timeoutId = setTimeout(() => {
         if (ref.current) {
@@ -72,7 +68,7 @@ var _jsxRuntime = require("react/jsx-runtime");
       return () => clearTimeout(timeoutId); // 清理定时器
     }
     setInitialSnapshot('');
-  }, [visible]); // 当 visible 变化时执行
+  }, [open]); // 当 open 变化时执行
 
   // 快照对比
   var compareSnapshots = () => {
@@ -88,7 +84,7 @@ var _jsxRuntime = require("react/jsx-runtime");
           if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
-            modalRef.current = _modal.default.confirm((0, _objectSpread2.default)({
+            modalRef.current = _antd.Modal.confirm((0, _objectSpread2.default)({
               className: 'width430',
               title: _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
               okText: _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm2 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
@@ -114,7 +110,7 @@ var _jsxRuntime = require("react/jsx-runtime");
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context2.next = 24;
             break;
           }
@@ -196,13 +192,13 @@ var _jsxRuntime = require("react/jsx-runtime");
    */
   var defaultFooter = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "pro-drawer-footer",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       type: "primary",
       onClick: handleFinish,
       loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
       disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
       children: okText
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       onClick: onCancel,
       children: cancelText
     })]
@@ -230,12 +226,12 @@ var _jsxRuntime = require("react/jsx-runtime");
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_drawer.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Drawer, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     placement: "right",
-    className: `pro-drawer ${className !== null && className !== void 0 ? className : ''}`,
+    rootClassName: (0, _classnames.default)(className, 'pro-drawer'),
     closable: false,
     onClose: onCancel,
     zIndex: zIndex

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -7,21 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _reactSvg = require("react-svg");
-var _close = _interopRequireDefault(require("../../../assets/close.svg"));
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 弹窗组件
@@ -31,7 +24,7 @@ var ProModal = _ref => {
   var form = _ref.form,
     title = _ref.title,
     width = _ref.width,
-    visible = _ref.visible,
+    open = _ref.open,
     footer = _ref.footer,
     isView = _ref.isView,
     maskClosable = _ref.maskClosable,
@@ -67,7 +60,7 @@ var ProModal = _ref => {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context.next = 24;
             break;
           }
@@ -148,12 +141,15 @@ var ProModal = _ref => {
    *
    */
   var defaultFooter = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: extraLeft ? 'pro-modal-footer' : undefined,
-    children: [extraLeft, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+    className: (0, _classnames.default)({
+      'pro-modal-footer': extraLeft,
+      'pro-modal-footer-123': true
+    }),
+    children: [extraLeft, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         onClick: onCancel,
         children: cancelText
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         type: "primary",
         onClick: handleFinish,
         loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
@@ -185,20 +181,16 @@ var ProModal = _ref => {
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_modal.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Modal, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: _className,
     title: title,
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     onCancel: onCancel,
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    closeIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-      className: "close-icon",
-      src: _close.default
-    }),
     zIndex: zIndex
   }, modalProps), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/ProDrawerForm/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+import { ProDrawerFormType } from './propsType';
 export declare const useProDrawerFormContext: () => any;
-declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
+declare const ProDrawerForm: React.ForwardRefExoticComponent<ProDrawerFormType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/lib/ProDrawerForm/index.js

@@ -8,36 +8,44 @@ Object.defineProperty(exports, "__esModule", {
 exports.useProDrawerFormContext = exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _components = require("./components");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _locale$ProDrawerForm3;
+var _excluded = ["open", "mode", "size", "disabled", "isView", "form", "proFormProps", "onCancel", "onCloseClean", "children", "okText", "isConfirmClose", "maskClosable", "cancelText"];
 var ProDrawerFormContext = /*#__PURE__*/(0, _react.createContext)(null);
 var useProDrawerFormContext = () => (0, _react.useContext)(ProDrawerFormContext);
 exports.useProDrawerFormContext = useProDrawerFormContext;
 var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
-  var visible = props.visible,
-    showType = props.showType,
-    okText = props.okText,
-    isView = props.isView;
+  var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3;
   var open = props.open,
-    mode = props.mode,
-    size = props.size,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'Drawer' : _props$mode,
+    _props$size = props.size,
+    size = _props$size === void 0 ? 'middle' : _props$size,
     disabled = props.disabled,
+    isView = props.isView,
     originalForm = props.form,
-    proFormProps = props.proFormProps,
+    _props$proFormProps = props.proFormProps,
+    proFormProps = _props$proFormProps === void 0 ? {} : _props$proFormProps,
     onCancel = props.onCancel,
-    onCloseClean = props.onCloseClean,
-    children = props.children;
-  showType = mode || showType;
-  isView = isView || disabled;
-  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.save : _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm2 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm;
-  visible = open !== null && open !== void 0 ? open : visible;
-  var width = props.width;
+    _props$onCloseClean = props.onCloseClean,
+    onCloseClean = _props$onCloseClean === void 0 ? true : _props$onCloseClean,
+    children = props.children,
+    okText = props.okText,
+    _props$isConfirmClose = props.isConfirmClose,
+    isConfirmClose = _props$isConfirmClose === void 0 ? true : _props$isConfirmClose,
+    _props$maskClosable = props.maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.cancel : _props$cancelText,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var nextIsView = isView || disabled;
+  var nextOkText = okText !== null && okText !== void 0 ? okText : mode === 'Drawer' ? _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm2 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.save : _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm3 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.confirm;
+  var width = restProps.width;
   if (!width && size) {
     width = (0, _utils.transformBySize)(size);
   }
@@ -56,38 +64,32 @@ var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
 
   // 暴露form实例给用户
   (0, _react.useImperativeHandle)(ref, () => form);
-  var Com = (0, _react.useMemo)(() => {
+  var DrawerModal = (0, _react.useMemo)(() => {
     return {
       Drawer: _components.ProDrawer,
       Modal: _components.ProModal
-    }[showType];
-  }, [showType]);
+    }[mode];
+  }, [mode]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(ProDrawerFormContext.Provider, {
     value: {
       source: 'ProDrawerForm'
     },
-    children: visible ? /*#__PURE__*/(0, _jsxRuntime.jsx)(Com, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-      isView: isView,
-      visible: visible,
+    children: open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(DrawerModal, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+      isView: nextIsView,
+      open: open,
       form: form,
       width: width,
-      okText: okText,
+      okText: nextOkText,
       onCancel: handleCancel,
+      isConfirmClose: isConfirmClose,
+      maskClosable: maskClosable,
+      cancelText: cancelText,
       children: children || /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProForm.default, (0, _objectSpread2.default)({
         form: form,
-        disabled: isView,
+        disabled: nextIsView,
         footer: false
       }, proFormProps))
     })) : null
   });
 });
-ProDrawerForm.defaultProps = {
-  showType: 'Drawer',
-  size: 'middle',
-  isConfirmClose: true,
-  onCloseClean: true,
-  maskClosable: false,
-  cancelText: _locale.default === null || _locale.default === void 0 || (_locale$ProDrawerForm3 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
-  proFormProps: {}
-};
 var _default = exports.default = ProDrawerForm;

package/lib/ProDrawerForm/propsType.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import type { ModalProps, DrawerProps, FormInstance } from 'antd';
+import type { ModalProps, DrawerProps, FormInstance, ModalFuncProps } from 'antd';
 import type { ProFormType } from '../ProForm/propsType';
 /**
  * 抽屉尺寸类型定义
@@ -11,17 +11,11 @@ export type DrawerSizeType = DrawerSizePropsType;
  */
 export type ShowTypePropsType = 'Modal' | 'Drawer';
 export type ShowType = ShowTypePropsType;
-/**
- * 为了保持向后兼容，保留原有接口名称
- * @deprecated ProDrawerFormType
- */
-export interface ProDrawerFormPropsType {
+export interface ProDrawerFormType {
     /** @name 内部form实例 */
     form?: FormInstance<any>;
     /** @name 自定义className */
     className?: string;
-    /** @name 控制显示隐藏（兼容旧版API） */
-    visible?: ModalProps['open'] | DrawerProps['open'];
     /** @name 控制显示隐藏 */
     open: ModalProps['open'] | DrawerProps['open'];
     /** @name 标题 */
@@ -33,7 +27,7 @@ export interface ProDrawerFormPropsType {
     /** @name 是否查看模式 */
     isView?: boolean | undefined;
     /** @name 宽度 */
-    width?: ModalProps['width'] | DrawerProps['width'];
+    width?: string | number;
     /** @name 取消按钮文字 */
     cancelText?: ModalProps['cancelText'];
     /** @name 确认按钮文字 */
@@ -62,7 +56,7 @@ export interface ProDrawerFormPropsType {
      * @name 关闭时二次确认弹框的属性
      * @description 只对Drawer的类型有效
      */
-    isConfirmCloseModalProps?: ModalProps;
+    isConfirmCloseModalProps?: Omit<ModalFuncProps, 'content' | 'onOk' | 'onCancel'>;
     /**
      * @name 底部默认取消按钮事件
      * @returns 返回Promise或布尔值可控制弹窗关闭行为
@@ -90,14 +84,12 @@ export interface ProDrawerFormPropsType {
     proFormProps?: Omit<ProFormType, 'form'>;
     /**
      * @name 弹框的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    modalProps?: Omit<ModalProps, 'visible'>;
+    modalProps?: ModalProps;
     /**
      * @name 抽屉的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    drawerProps?: Omit<DrawerProps, 'visible'>;
+    drawerProps?: DrawerProps;
     /**
      * @name 关闭时弹框或者抽屉是否清空formValues
      */
@@ -107,7 +99,4 @@ export interface ProDrawerFormPropsType {
     /** @name z轴层级 */
     zIndex?: number;
 }
-/**
- * 抽屉表单属性类型定义
- */
-export type ProDrawerFormType = ProDrawerFormPropsType;
+export type ProDrawerFormPropsType = ProDrawerFormType;

package/lib/ProDrawerForm/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-drawer {
   .original-value-tooltip {
@@ -112,18 +110,13 @@
 .pro-modal {
   .@{ant-prefix}-modal-close {
     .@{ant-prefix}-modal-close-x {
-      .close-icon {
-        fill: var(--zaui-aide-text, #909090);
-
-        &:hover {
-          fill: var(--zaui-brand, #006aff);
-        }
-      }
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 
   .@{ant-prefix}-modal-header {
-    padding: var(--zaui-space-size-md, 16px);
     border-bottom: none;
 
     .@{ant-prefix}-modal-title {
@@ -132,11 +125,11 @@
   }
 
   .@{ant-prefix}-modal-footer {
-    padding: var(--zaui-space-size-md, 16px);
     border-top: none;
 
     .pro-modal-footer {
       display: flex;
+      align-items: center;
       justify-content: space-between;
     }
   }
@@ -144,9 +137,9 @@
   .@{ant-prefix}-modal-content {
     .@{ant-prefix}-modal-body {
       max-height: 450px;
-      padding: 0 var(--zaui-space-size-md, 16px);
       padding-top: 0;
-      overflow: auto;
+      overflow-x: hidden;
+      overflow-y: auto;
     }
   }
 }
@@ -173,6 +166,5 @@
   .@{ant-prefix}-modal-footer {
     position: relative;
     z-index: 1;
-    box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 }

package/lib/ProEditLabel/components/RenderProForm.js

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
 var _lodash = require("lodash");
 var _icons = require("@ant-design/icons");
+var _antd = require("antd");
 var _index = require("../../index");
 var _utils = require("../utils");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -63,7 +62,7 @@ var RenderProForm = props => {
       children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
     }), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) !== null && _props7 !== void 0 && _props7.isView) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-label-tip",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
       })

package/lib/ProEditLabel/index.js

@@ -6,20 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
@@ -62,10 +55,10 @@ var ProEditLabel = _ref => {
     _useToggle2 = (0, _slicedToArray2.default)(_useToggle, 2),
     status = _useToggle2[0],
     toggleStatus = _useToggle2[1].toggle;
-  var _Form$useForm = _form.default.useForm(OriginForm),
+  var _Form$useForm = _antd.Form.useForm(OriginForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _Form$useForm3 = _form.default.useForm(),
+  var _Form$useForm3 = _antd.Form.useForm(),
     _Form$useForm4 = (0, _slicedToArray2.default)(_Form$useForm3, 1),
     viewForm = _Form$useForm4[0];
   var inputRef = (0, _react.useRef)(null);
@@ -228,7 +221,7 @@ var ProEditLabel = _ref => {
     var TextNode = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: cls,
       style: style,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
         children: [mode === 'current' ? props.value : /*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderProForm.default, (0, _objectSpread2.default)({
           value: confirmValue,
@@ -251,7 +244,7 @@ var ProEditLabel = _ref => {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           ref: inputRef,
           size: size,
           onBlur: e => {
@@ -277,10 +270,12 @@ var ProEditLabel = _ref => {
         }
         return TextNode;
       };
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        overlayClassName: "pro-edit-label-popconfirm",
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        classNames: {
+          root: 'pro-edit-label-popconfirm'
+        },
         icon: null,
-        destroyTooltipOnHide: true,
+        destroyOnHidden: true,
         title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderProForm.default, (0, _objectSpread2.default)({
           form: form,
           value: confirmValue,

package/lib/ProEditLabel/propsType.d.ts

@@ -84,11 +84,6 @@ export interface PopupType {
     [key: string]: any;
 }
 export interface LabelType extends InputProps {
-    /**
-     * @description 是否可见
-     * @default false
-     */
-    visible?: boolean;
     /**
      * @description 是否打开
      * @default false
@@ -98,7 +93,7 @@ export interface LabelType extends InputProps {
      * @description 可见性变化回调
      * @default -
      */
-    onVisibleChange?: (open: boolean) => void;
+    onOpenChange?: (open: boolean) => void;
     /**
      * @description 值变化回调
      * @default -

package/lib/ProEditLabel/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-label {
   display: inline-block;
@@ -69,12 +67,13 @@
 
 .pro-edit-label-popconfirm {
   z-index: 1001 !important;
+  
 
   .@{ant-prefix}-popover-inner-content {
     width: 100%;
   }
 
-  .@{ant-prefix}-popover-message {
+  .@{ant-prefix}-popconfirm-message {
     display: block;
   }