@zat-design/sisyphus-react 3.11.13 → 3.11.14-beta.10

package/es/ProDrawerForm/index.d.ts

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

package/es/ProDrawerForm/propsType.d.ts

@@ -1,17 +1,26 @@
 import React, { ReactNode } from 'react';
 import type { ModalProps, DrawerProps, FormInstance } from 'antd';
-import { ProFormProps } from '../ProForm/propsType';
+import { ProFormType } from '../ProForm/propsType';
+/**
+ * 抽屉尺寸类型定义
+ */
 export type DrawerSizePropsType = 'small' | 'middle' | 'large';
+export type DrawerSizeType = DrawerSizePropsType;
+/**
+ * 显示类型定义
+ */
 export type ShowTypePropsType = 'Modal' | 'Drawer';
-export interface ProDrawerFormRef {
-    form: FormInstance<any>;
-}
+export type ShowType = ShowTypePropsType;
+/**
+ * 为了保持向后兼容，保留原有接口名称
+ * @deprecated ProDrawerFormType
+ */
 export interface ProDrawerFormPropsType {
-    /** @name 内部form */
+    /** @name 内部form实例 */
     form?: FormInstance<any>;
     /** @name 自定义className */
     className?: string;
-    /** @name 控制显示隐藏 */
+    /** @name 控制显示隐藏（兼容旧版API） */
     visible?: ModalProps['open'] | DrawerProps['open'];
     /** @name 控制显示隐藏 */
     open: ModalProps['open'] | DrawerProps['open'];
@@ -25,30 +34,22 @@ export interface ProDrawerFormPropsType {
     isView?: boolean | undefined;
     /** @name 宽度 */
     width?: ModalProps['width'] | DrawerProps['width'];
-    /**
-     * @name 取消按钮文字
-     */
+    /** @name 取消按钮文字 */
     cancelText?: ModalProps['cancelText'];
-    /**
-     * @name 确认按钮文字
-     */
+    /** @name 确认按钮文字 */
     okText?: ModalProps['okText'];
-    /**
-     * @name 确认按钮loading
-     */
+    /** @name 确认按钮loading状态 */
     okLoading?: boolean;
-    /**
-     * @name 确认按钮disabled
-     */
+    /** @name 确认按钮禁用状态 */
     okDisabled?: boolean;
     /** @name 显示方式 (废弃) */
-    showType?: ShowTypePropsType;
+    showType?: ShowType;
     /** @name 显示方式 */
-    mode?: ShowTypePropsType;
+    mode?: ShowType;
     /** @name 尺寸 */
-    size?: DrawerSizePropsType;
+    size?: DrawerSizeType;
     /**
-     * @name自动选中第一项
+     * @name 自动选中第一项
      * @description 只对有input的类型有效
      */
     autoFocusFirstInput?: boolean;
@@ -64,10 +65,14 @@ export interface ProDrawerFormPropsType {
     isConfirmCloseModalProps?: ModalProps;
     /**
      * @name 底部默认取消按钮事件
+     * @returns 返回Promise或布尔值可控制弹窗关闭行为
      */
     onCancel?: () => Promise<boolean | void | unknown> | boolean | void | unknown;
     /**
      * @name 底部默认确定按钮事件
+     * @param values 表单值
+     * @param form 表单实例
+     * @returns 返回Promise或布尔值可控制弹窗关闭行为
      */
     onOk?: (values?: any, form?: FormInstance) => Promise<boolean | void | unknown> | boolean | void | unknown;
     /**
@@ -79,24 +84,30 @@ export interface ProDrawerFormPropsType {
      */
     extraLeft?: ReactNode;
     /**
-     * @name proForm的属性 配置后children不展示
+     * @name proForm的属性
+     * @description 配置后children不展示
      */
-    proFormProps?: Omit<ProFormProps, 'form'>;
+    proFormProps?: Omit<ProFormType, 'form'>;
     /**
-     * 不支持 'visible'，请使用全局的 visible
      * @name 弹框的属性
+     * @description 不支持'visible'，请使用全局的visible/open
      */
     modalProps?: Omit<ModalProps, 'visible'>;
     /**
-     * 不支持 'visible'，请使用全局的 visible
      * @name 抽屉的属性
+     * @description 不支持'visible'，请使用全局的visible/open
      */
     drawerProps?: Omit<DrawerProps, 'visible'>;
     /**
-     * 不支持 'visible'，请使用全局的 visible
      * @name 关闭时弹框或者抽屉是否清空formValues
      */
     onCloseClean?: boolean;
+    /** @name 子组件 */
     children?: React.ReactNode;
+    /** @name z轴层级 */
     zIndex?: number;
 }
+/**
+ * 抽屉表单属性类型定义
+ */
+export type ProDrawerFormType = ProDrawerFormPropsType;

package/es/ProDrawerForm/utils/index.d.ts

@@ -1,6 +1,6 @@
-import { DrawerSizePropsType } from '../propsType';
+import { DrawerSizeType } from '../propsType';
 /**
  * 将枚举值转成数值px，暴露枚举，隐藏真实数值，暂时不让用户自定义
  * @param size 设计规范的三个尺寸  460 960 1200 对应 'small' | 'middle' | 'large'
  */
-export declare const transformBySize: (size: DrawerSizePropsType) => number;
+export declare const transformBySize: (size: DrawerSizeType) => number;

package/es/ProEditLabel/components/RenderProForm.d.ts

@@ -1,4 +1,4 @@
 import { FC } from 'react';
-import type { PopupProps } from '../propsType';
-declare const RenderProForm: FC<PopupProps>;
+import type { PopupType } from '../propsType';
+declare const RenderProForm: FC<PopupType>;
 export default RenderProForm;

package/es/ProEditLabel/index.d.ts

@@ -1,4 +1,4 @@
 import { FC } from 'react';
-import { ContainerProps, LabelProps, PopupConfirmProps } from './propsType';
-declare const ProEditLabel: FC<LabelProps & PopupConfirmProps & ContainerProps>;
+import type { ContainerType, LabelType, ProEditLabelType } from './propsType';
+declare const ProEditLabel: FC<LabelType & ProEditLabelType & ContainerType>;
 export default ProEditLabel;

package/es/ProEditLabel/propsType.d.ts

@@ -2,45 +2,172 @@ import { InputProps } from 'antd/es/input';
 import { PopconfirmProps } from 'antd/es/popconfirm';
 import { FormInstance } from 'antd/es/form';
 import React from 'react';
-import { ProColumnProps } from '../index';
-export interface ContainerProps {
+import { ProColumnType } from '../index';
+export interface ContainerType {
+    /**
+     * @description 触发方式
+     * @default "click"
+     */
     trigger?: 'click' | 'hover';
+    /**
+     * @description 尺寸
+     * @default "middle"
+     */
     size?: 'small' | 'middle' | 'large';
+    /**
+     * @description 显示模式
+     * @default "popup"
+     */
     mode?: 'popup' | 'current';
+    /**
+     * @description 类型
+     * @default "input"
+     */
     type?: 'input' | 'select';
 }
-export interface StateProps {
+export interface StateType {
+    /**
+     * @description 弹出值
+     * @default ""
+     */
     popValue?: string;
+    /**
+     * @description 确认值
+     * @default ""
+     */
     confirmValue?: string;
 }
-export interface PopupProps {
+export interface PopupType {
+    /**
+     * @description 类型
+     * @default -
+     */
     type?: string;
+    /**
+     * @description 标签
+     * @default -
+     */
     label?: string | React.ReactNode;
+    /**
+     * @description 标题
+     * @default -
+     */
     title?: string | React.ReactNode;
+    /**
+     * @description 提示
+     * @default -
+     */
     tip?: string | React.ReactNode;
+    /**
+     * @description 是否去除空格
+     * @default false
+     */
     trim?: boolean;
+    /**
+     * @description 标签宽度
+     * @default -
+     */
     labelWidth?: string | number;
+    /**
+     * @description 字段属性
+     * @default -
+     */
     fieldProps?: any;
-    columns?: ProColumnProps;
+    /**
+     * @description 列配置
+     * @default -
+     */
+    columns?: ProColumnType;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
-export interface LabelProps extends InputProps {
+export interface LabelType extends InputProps {
+    /**
+     * @description 是否可见
+     * @default false
+     */
     visible?: boolean;
+    /**
+     * @description 是否打开
+     * @default false
+     */
     open?: boolean;
+    /**
+     * @description 可见性变化回调
+     * @default -
+     */
     onVisibleChange?: (open: boolean) => void;
+    /**
+     * @description 值变化回调
+     * @default -
+     */
     onChange?: (value: React.ChangeEvent<HTMLInputElement>) => void;
+    /**
+     * @description 是否可编辑
+     * @default false
+     */
     editable?: boolean;
+    /**
+     * @description 编辑回调
+     * @default -
+     */
     onEdit?: () => void;
 }
-export interface PopupConfirmProps extends Partial<PopconfirmProps> {
-    popupProps?: PopupProps;
+export interface ProEditLabelType extends Partial<PopconfirmProps> {
+    /**
+     * @description 弹出属性
+     * @default -
+     */
+    popupProps?: PopupType;
+    /**
+     * @description 空值显示
+     * @default "-"
+     */
     viewEmpty?: '-';
+    /**
+     * @description 确认回调
+     * @default -
+     */
     onConfirm?: (e?: any) => void;
+    /**
+     * @description 完成回调
+     * @default -
+     */
     onFinish?: (e?: any) => void;
+    /**
+     * @description 打开状态变化回调
+     * @default -
+     */
     onOpenChange?: (e?: any) => void;
+    /**
+     * @description 触发方式
+     * @default "click"
+     */
     trigger?: 'click' | 'hover';
+    /**
+     * @description 值
+     * @default -
+     */
     value?: any;
+    /**
+     * @description 表单实例
+     * @default -
+     */
     form?: FormInstance;
+    /**
+     * @description 是否禁用
+     * @default false
+     */
     disabled?: boolean;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
+export type ContainerProps = ContainerType;
+export type StateProps = StateType;
+export type PopupProps = PopupType;
+export type LabelProps = LabelType;
+export type PopupConfirmProps = ProEditLabelType;

package/es/ProEditLabel/style/index.less

@@ -11,8 +11,8 @@
   }
 
   .pro-form-view-container {
+    display: inline-block;
     word-break: break-all;
-    display   : inline-block;
   }
 
   &.trigger-hover {
@@ -25,20 +25,19 @@
         display: block;
       }
     }
-
   }
 
   .anticon-edit {
-    color  : #D8D8D8;
-    cursor : pointer;
     padding: var(--zaui-space-size-xs, 4px);
+    color: #d8d8d8;
+    cursor: pointer;
 
     &:hover {
-      color: var(--zaui-brand, #006AFF);
+      color: var(--zaui-brand, #006aff);
     }
 
     &:active {
-      background   : #E3E8F0;
+      background: #e3e8f0;
       border-radius: var(--zaui-border-radius-card, 4px);
     }
   }
@@ -54,25 +53,27 @@
   &.pro-edit-label-large {
     height: 40px;
   }
-
 }
 
 .@{ant-prefix}-popover {
   .@{ant-prefix}-btn-sm {
-    font-size  : var(--zaui-font-size-sm, 12px);
-    min-width  : 56px;
+    min-width: 56px;
+    font-size: var(--zaui-font-size-sm, 12px);
     line-height: 1;
 
     span {
       letter-spacing: -1px;
     }
-
   }
 }
 
 .pro-edit-label-popconfirm {
   z-index: 1001 !important;
 
+  .@{ant-prefix}-popover-inner-content {
+    width: 100%;
+  }
+
   .@{ant-prefix}-popover-message {
     display: block;
   }
@@ -82,26 +83,26 @@
   }
 
   .@{ant-prefix}-popover-content {
-    width    : 360px;
+    width: 360px;
     max-width: 400px;
   }
 
   .pro-edit-label-title {
-    font-size    : var(--zaui-font-size-lg, 16px);
-    font-weight  : 500;
-    color        : var(--zaui-text, #343434);
     margin-bottom: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size; 1));
+    color: var(--zaui-text, #343434);
+    font-weight: 500;
+    font-size: var(--zaui-font-size-lg, 16px);
   }
 
   .pro-edit-label-tip {
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-    color        : #666;
+    color: #666;
 
     .anticon-info-circle {
-      font-size   : var(--zaui-font-size-lg, 16px);
+      margin-top: var(--zaui-space-size-xs, 4px);
       margin-right: var(--zaui-space-size-sm, 8px);
-      color       : var(--zaui-warning, #EC9131);
-      margin-top  : var(--zaui-space-size-xs, 4px);
+      color: var(--zaui-warning, #ec9131);
+      font-size: var(--zaui-font-size-lg, 16px);
     }
   }
 
@@ -119,18 +120,16 @@
     }
 
     .@{ant-prefix}-col-10 {
-      flex         : 0 0 var(--zaui-form-label-width, 130px);
-      white-space  : pre-wrap;
-      line-height  : 1;
-      overflow     : initial;
-      box-sizing   : border-box;
+      flex: 0 0 var(--zaui-form-label-width, 130px);
+      box-sizing: border-box;
       padding-right: var(--zaui-space-size-md, 16px);
+      overflow: initial;
+      line-height: 1;
+      white-space: pre-wrap;
     }
-
   }
 
   .@{ant-prefix}-select {
     width: 100%;
   }
-
 }

package/es/ProEditTable/components/ActionButton/index.js

@@ -64,7 +64,7 @@ var ActionButton = function ActionButton(_ref) {
     mulDelete: mulDeletePoConfirmMsg
   };
   // 判断当前行是否正在编辑
-  var isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
+  var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
   // 单行删除、多行删除按钮Props
   var delBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
@@ -98,7 +98,7 @@ var ActionButton = function ActionButton(_ref) {
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
-  return isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
+  return _isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? _jsx(_Fragment, {
       children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(_Popconfirm, {
         placement: "topRight",

package/es/ProEditTable/components/RenderField/index.js

@@ -64,7 +64,7 @@ var RenderField = function RenderField(_ref) {
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
-    isEditing = config.isEditing,
+    _isEditing = config._isEditing,
     form = config.form,
     setState = config.setState,
     name = config.name,
@@ -139,7 +139,7 @@ var RenderField = function RenderField(_ref) {
     // }, 100);
   }
   // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || getDisabled({
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
     formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
     column: column,
@@ -157,7 +157,7 @@ var RenderField = function RenderField(_ref) {
     label: label,
     labelRequired: labelRequired,
     required: !isView && _required,
-    rules: isEditing ? _rules : [],
+    rules: _isEditing ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type: type
@@ -242,7 +242,7 @@ var RenderField = function RenderField(_ref) {
     var _componentMap$type;
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : _jsx(_Fragment, {});
   }
-  if (isEditable && isEditing) {
+  if (isEditable && _isEditing) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }

package/es/ProEditTable/components/Summary/index.d.ts

@@ -1,8 +1,8 @@
-import { SummaryColumnProps } from '../../propsType';
+import { SummaryColumnType } from '../../propsType';
 interface SummaryProps<T = any> {
     data: T[];
     summary: {
-        columns: SummaryColumnProps[];
+        columns: SummaryColumnType[];
         total?: boolean;
         fixed?: boolean | 'top' | 'bottom';
     };

package/es/ProEditTable/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ProEditTableProps, ProEditTableRefProps } from './propsType';
-declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableProps<any>, "ref"> & React.RefAttributes<ProEditTableRefProps>>;
+import { ProEditTableType } from './propsType';
+declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableType<any>, "ref"> & React.RefAttributes<import("./propsType").ProEditTableRefProps>>;
 export default ForwardProEditTable;

package/es/ProEditTable/index.js

@@ -189,14 +189,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
               recursive: true
             });
           case 7:
-            if (current !== page.pageNum) {
-              setState({
-                page: {
-                  pageNum: current,
-                  pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
-                }
-              });
-            }
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+              }
+            });
           case 8:
             _context.next = 13;
             break;