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

package/lib/ProTreeModal/propsType.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode, CSSProperties } from 'react';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../ProForm/propsType';
+import { ProFormOtherType } from '../ProForm/propsType';
 export interface TreeDataProps {
     label: string;
     value: string;
@@ -74,7 +74,7 @@ export interface ProTreeModalProps {
     style?: CSSProperties;
     /** tags 集合 */
     tags?: string[];
-    otherProps?: ProFormOtherProps;
+    otherProps?: ProFormOtherType;
     /** 远程请求接口 */
     useRequest?: {
         service?: Service<any, any>;

package/lib/ProUpload/components/ButtonRender.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { UploadFile } from 'antd';
-import { ProUploadProps } from '../propsType';
-interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled' | 'maxCount' | 'extraTipText' | 'buttonText'> {
+import type { ProUploadType } from '../propsType';
+interface DragRenderProps extends Pick<ProUploadType, 'buttonProps' | 'disabled' | 'maxCount' | 'extraTipText' | 'buttonText'> {
     isView?: boolean;
     headerRender: () => ReactNode;
     footerRender: () => ReactNode;

package/lib/ProUpload/components/DraggableUploadListItem.d.ts

@@ -1,2 +1,2 @@
-import { DraggableUploadListItemProps } from '../propsType';
-export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => import("react/jsx-runtime").JSX.Element;
+import type { DraggableUploadListItemType } from '../propsType';
+export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemType) => import("react/jsx-runtime").JSX.Element;

package/lib/ProUpload/components/Example.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
-import { ExampleModalProps } from '../propsType';
+import type { ExampleModalType } from '../propsType';
 interface ExampleProps {
     exampleContent?: React.ReactNode;
     className?: string;
     exampleTitle?: string | React.ReactNode;
-    exampleModalProps?: ExampleModalProps;
+    exampleModalProps?: ExampleModalType;
 }
 export declare const Example: React.FC<ExampleProps>;
 export {};

package/lib/ProUpload/components/ImageRender.d.ts

@@ -1,7 +1,7 @@
 import { FC, ReactNode } from 'react';
 import { UploadFile } from 'antd/es/upload/interface';
-import { ProUploadProps } from '../propsType';
-interface DragRenderProps extends Pick<ProUploadProps, 'buttonProps' | 'disabled' | 'maxCount' | 'extraTipText' | 'showExampleContent' | 'exampleTitle' | 'exampleContent' | 'exampleModalProps'> {
+import type { ProUploadType } from '../propsType';
+interface DragRenderProps extends Pick<ProUploadType, 'buttonProps' | 'disabled' | 'maxCount' | 'extraTipText' | 'showExampleContent' | 'exampleTitle' | 'exampleContent' | 'exampleModalProps'> {
     isView?: boolean;
     headerRender: () => ReactNode;
     footerRender: () => ReactNode;

package/lib/ProUpload/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ProUploadProps } from './propsType';
-declare const ProUpload: React.FC<ProUploadProps>;
+import type { ProUploadType } from './propsType';
+declare const ProUpload: React.FC<ProUploadType>;
 export default ProUpload;

package/lib/ProUpload/index.js

@@ -29,6 +29,9 @@ var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerR
  * @LastEditors: wangshengqiang
  * @Description: 上传控件
  */
+var defaultCustomRequest = function defaultCustomRequest(option) {
+  return option.onSuccess();
+};
 var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _locale$ProUpload;
   var _useState = (0, _react.useState)([]),
@@ -212,13 +215,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     return headerRender;
   };
-  // 自定义顶部
-  // const _centerRender = () => {
-  //   if (isFunction(centerRender)) {
-  //     return centerRender();
-  //   }
-  //   return centerRender;
-  // };
   // 自定义底部
   var _footerRender = function _footerRender() {
     if ((0, _lodash.isFunction)(footerRender)) {
@@ -249,7 +245,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     };
   }, [_fileList]);
   // 通用props
-  var baseUploadProps = (0, _objectSpread2.default)({
+  var baseUploadProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     action: action,
     beforeUpload: handleBeforeUpload,
     onRemove: handleRemove,
@@ -260,7 +256,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     accept: accept,
     data: (0, _objectSpread2.default)({}, dataParams),
     name: name
-  }, residueProps);
+  }, residueProps), {}, {
+    customRequest: !action && !residueProps.customRequest ? defaultCustomRequest : residueProps.customRequest
+  });
   var baseProps = {
     isView: isView,
     headerRender: _headerRender,

package/lib/ProUpload/propsType.d.ts

@@ -1,22 +1,57 @@
 import React from 'react';
 import { UploadFile } from 'antd/es/upload/interface';
+import { UploadRequestOption } from 'rc-upload/lib/interface';
 export type UploadType = 'drag' | 'button' | 'image';
-export interface UploadFileRes {
+export interface UploadFileResType {
+    /**
+     * @description 上传文件返回的URL
+     * @default -
+     */
     url: string;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
-export interface ExampleModalProps {
+export interface ExampleModalType {
+    /**
+     * @description 弹窗宽度
+     * @default -
+     */
     width?: string | number;
+    /**
+     * @description 弹窗外层容器类名
+     * @default -
+     */
     wrapClassName?: string;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
-export interface fieldNamesProps {
+export interface FieldNamesType {
+    /**
+     * @description 文件唯一标识字段
+     * @default -
+     */
     uid?: number;
+    /**
+     * @description 文件名称字段
+     * @default -
+     */
     name?: string;
+    /**
+     * @description 文件URL字段
+     * @default -
+     */
     url?: string;
+    /**
+     * @description 文件状态字段
+     * @default -
+     */
     status?: 'done' | 'uploading' | 'error';
 }
-export interface ProUploadProps {
+export interface ProUploadType {
     /**
      * @description       顶部的内容(button类型的上传不适用)
      * @default           -
@@ -51,7 +86,7 @@ export interface ProUploadProps {
      * @description       示例弹窗的属性配置继承与antd 的Modal对话框
      * @default           -
      */
-    exampleModalProps?: ExampleModalProps;
+    exampleModalProps?: ExampleModalType;
     /**
      * @description       接受上传的文件类型, '.png,.jpeg,.jpg,.xlsx,.xls,.json,.doc,.docx' 详见 input accept Attribute
      * @default           -
@@ -168,7 +203,7 @@ export interface ProUploadProps {
      * @description 上传接口处理方法 返回一个数组 UploadFile【】
      * @default    -
      */
-    transformResponse?: (res: any) => UploadFileRes;
+    transformResponse?: (res: any) => UploadFileResType;
     /**
      * @description 可以调用组件的内部方法，例如：uploadStart方式
      * @default    -
@@ -188,20 +223,42 @@ export interface ProUploadProps {
      * @description 文件对象的字段映射
      * @default    true
      */
-    fieldNames?: fieldNamesProps;
+    fieldNames?: FieldNamesType;
     /**
      * @description 删除已经上传的文件时是否二次提示
      * @default    false
      */
     isConfirmDelete?: boolean;
+    /**
+     * @description 组件ID
+     * @default    -
+     */
     id?: string;
     /**
      * @description 查看模式
      * @default    false
      */
     isView?: boolean;
+    /**
+     * @description 自定义上传实现
+     * @default    false
+     */
+    customRequest?: (option: UploadRequestOption) => void;
 }
-export interface DraggableUploadListItemProps {
+export interface DraggableUploadListItemType {
+    /**
+     * @description 文件对象
+     * @default -
+     */
     file: UploadFile<any>;
+    /**
+     * @description 子元素
+     * @default -
+     */
     children: React.ReactNode;
 }
+export type UploadFileRes = UploadFileResType;
+export type ExampleModalProps = ExampleModalType;
+export type fieldNamesProps = FieldNamesType;
+export type ProUploadProps = ProUploadType;
+export type DraggableUploadListItemProps = DraggableUploadListItemType;

package/lib/ProWaterMark/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ProWaterMarkProps } from './propsType';
-declare const ProWaterMark: React.FC<ProWaterMarkProps>;
+import type { ProWaterMarkType } from './propsType';
+declare const ProWaterMark: React.FC<ProWaterMarkType>;
 export default ProWaterMark;

package/lib/ProWaterMark/propsType.d.ts

@@ -1,4 +1,4 @@
-export interface ProWaterMarkProps {
+export interface ProWaterMarkType {
     /**
      * @description       水印是否显示
      * @default           true
@@ -80,3 +80,4 @@ export interface ProWaterMarkProps {
      */
     mode?: 'repeat' | 'interval';
 }
+export type ProWaterMarkProps = ProWaterMarkType;

package/lib/index.d.ts

@@ -31,4 +31,5 @@ export * from './ProTable/propsType';
 export * from './ProEditTable/propsType';
 export * from './ProUpload/propsType';
 export * from './ProTabs/propType';
+export * from './ProLayout/components/ProHeader/PropTypes';
 export * from './tokens';

package/lib/index.js

@@ -297,6 +297,18 @@ Object.keys(_propType).forEach(function (key) {
     }
   });
 });
+var _PropTypes = require("./ProLayout/components/ProHeader/PropTypes");
+Object.keys(_PropTypes).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _PropTypes[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _PropTypes[key];
+    }
+  });
+});
 var _tokens = require("./tokens");
 Object.keys(_tokens).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.13",
+  "version": "3.11.14-beta.10",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",