@hw-component/form 1.9.77 → 1.9.78

package/es/Upload/Btn.d.ts

@@ -1,3 +1,3 @@
 import type { IUpLoadProps } from "./modal";
-declare const _default: ({ value, maxCount, listType }: IUpLoadProps) => JSX.Element;
+declare const _default: ({ value, maxCount, listType, children }: IUpLoadProps) => JSX.Element;
 export default _default;

package/es/Upload/Btn.js

@@ -1,14 +1,15 @@
 // welcome to hoo hoo hoo
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { PlusOutlined, UploadOutlined } from '@ant-design/icons';
-import { useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { Button } from 'antd';
 
 var Btn = (function (_ref) {
   var value = _ref.value,
     _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 1 : _ref$maxCount,
-    listType = _ref.listType;
+    listType = _ref.listType,
+    children = _ref.children;
   var len = (value === null || value === void 0 ? void 0 : value.length) || 0;
   var text = useMemo(function () {
     if (len === maxCount) {
@@ -26,8 +27,20 @@ var Btn = (function (_ref) {
       })]
     });
   }
+  var loading = useMemo(function () {
+    return value === null || value === void 0 ? void 0 : value.some(function (_ref2) {
+      var status = _ref2.status;
+      return status === "uploading";
+    });
+  }, [value]);
+  if (children) {
+    return /*#__PURE__*/React.cloneElement(children, {
+      loading: loading
+    });
+  }
   return jsx(Button, {
     icon: jsx(UploadOutlined, {}),
+    loading: loading,
     children: text
   });
 });

package/es/Upload/index.js

@@ -11,7 +11,7 @@ import { Upload } from 'antd';
 import Btn from './Btn.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn", "children"];
 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; }
 var Index = function Index(_ref, ref) {
@@ -31,6 +31,7 @@ var Index = function Index(_ref, ref) {
     addFormat = _ref.addFormat,
     thumbUrl = _ref.thumbUrl,
     hideAddBtn = _ref.hideAddBtn,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = useProps({
     request: request,
@@ -62,6 +63,9 @@ var Index = function Index(_ref, ref) {
     };
   }, [maxRowNum, listType]);
   var preview = function preview(file) {
+    if (onPreview === null) {
+      return;
+    }
     if (onPreview) {
       onPreview(file);
       return;
@@ -110,10 +114,11 @@ var Index = function Index(_ref, ref) {
     }
   });
   var relVal = Array.isArray(value) ? value : [];
+  var upListType = listType === null ? undefined : listType;
   return jsxs("div", {
     style: contentStyle,
     children: [jsx(Upload, _objectSpread(_objectSpread({
-      listType: listType,
+      listType: upListType,
       maxCount: maxNum,
       fileList: relVal,
       onPreview: preview,
@@ -125,7 +130,8 @@ var Index = function Index(_ref, ref) {
       children: hideAddBtn ? null : jsx(Btn, {
         value: relVal,
         maxCount: maxCount,
-        listType: listType
+        listType: upListType,
+        children: children
       })
     })), jsx(Preview, {
       visible: visible,

package/es/Upload/modal.d.ts

@@ -5,7 +5,8 @@ import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
-export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
+import { UploadListType } from "antd/lib/upload/interface";
+export interface IUpLoadProps extends Omit<UploadProps, "onChange" | "listType" | "onPreview"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
         url: string;
@@ -19,6 +20,8 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     thumbUrl?: string;
     hideAddBtn?: boolean;
+    listType?: UploadListType | null;
+    onPreview?: UploadProps["onPreview"] | null;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/lib/Upload/Btn.d.ts

@@ -1,3 +1,3 @@
 import type { IUpLoadProps } from "./modal";
-declare const _default: ({ value, maxCount, listType }: IUpLoadProps) => JSX.Element;
+declare const _default: ({ value, maxCount, listType, children }: IUpLoadProps) => JSX.Element;
 export default _default;

package/lib/Upload/Btn.js

@@ -11,7 +11,8 @@ var Btn = (function (_ref) {
   var value = _ref.value,
     _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 1 : _ref$maxCount,
-    listType = _ref.listType;
+    listType = _ref.listType,
+    children = _ref.children;
   var len = (value === null || value === void 0 ? void 0 : value.length) || 0;
   var text = React.useMemo(function () {
     if (len === maxCount) {
@@ -29,8 +30,20 @@ var Btn = (function (_ref) {
       })]
     });
   }
+  var loading = React.useMemo(function () {
+    return value === null || value === void 0 ? void 0 : value.some(function (_ref2) {
+      var status = _ref2.status;
+      return status === "uploading";
+    });
+  }, [value]);
+  if (children) {
+    return /*#__PURE__*/React.cloneElement(children, {
+      loading: loading
+    });
+  }
   return jsxRuntime.jsx(antd.Button, {
     icon: jsxRuntime.jsx(icons.UploadOutlined, {}),
+    loading: loading,
     children: text
   });
 });

package/lib/Upload/index.js

@@ -14,7 +14,7 @@ var antd = require('antd');
 var Btn = require('./Btn.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn", "children"];
 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; }
 var Index = function Index(_ref, ref) {
@@ -34,6 +34,7 @@ var Index = function Index(_ref, ref) {
     addFormat = _ref.addFormat,
     thumbUrl = _ref.thumbUrl,
     hideAddBtn = _ref.hideAddBtn,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = propsMaker.useProps({
     request: request,
@@ -65,6 +66,9 @@ var Index = function Index(_ref, ref) {
     };
   }, [maxRowNum, listType]);
   var preview = function preview(file) {
+    if (onPreview === null) {
+      return;
+    }
     if (onPreview) {
       onPreview(file);
       return;
@@ -113,10 +117,11 @@ var Index = function Index(_ref, ref) {
     }
   });
   var relVal = Array.isArray(value) ? value : [];
+  var upListType = listType === null ? undefined : listType;
   return jsxRuntime.jsxs("div", {
     style: contentStyle,
     children: [jsxRuntime.jsx(antd.Upload, _objectSpread(_objectSpread({
-      listType: listType,
+      listType: upListType,
       maxCount: maxNum,
       fileList: relVal,
       onPreview: preview,
@@ -128,7 +133,8 @@ var Index = function Index(_ref, ref) {
       children: hideAddBtn ? null : jsxRuntime.jsx(Btn.default, {
         value: relVal,
         maxCount: maxCount,
-        listType: listType
+        listType: upListType,
+        children: children
       })
     })), jsxRuntime.jsx(index.default, {
       visible: visible,

package/lib/Upload/modal.d.ts

@@ -5,7 +5,8 @@ import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
-export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
+import { UploadListType } from "antd/lib/upload/interface";
+export interface IUpLoadProps extends Omit<UploadProps, "onChange" | "listType" | "onPreview"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
         url: string;
@@ -19,6 +20,8 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     thumbUrl?: string;
     hideAddBtn?: boolean;
+    listType?: UploadListType | null;
+    onPreview?: UploadProps["onPreview"] | null;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.77",
+  "version": "1.9.78",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Upload/Btn.tsx

@@ -1,9 +1,9 @@
 import { PlusOutlined, UploadOutlined } from "@ant-design/icons";
 import type { IUpLoadProps } from "./modal";
-import { useMemo } from "react";
+import React, { useMemo } from "react";
 import { Button } from "antd";
 
-export default ({ value, maxCount = 1, listType }: IUpLoadProps) => {
+export default ({ value, maxCount = 1, listType ,children}: IUpLoadProps) => {
   const len = value?.length || 0;
   const text = useMemo(() => {
     if (len === maxCount) {
@@ -11,7 +11,6 @@ export default ({ value, maxCount = 1, listType }: IUpLoadProps) => {
     }
     return "上传";
   }, [len, maxCount]);
-
   if (listType === "picture-card") {
     return (
       <div>
@@ -20,5 +19,13 @@ export default ({ value, maxCount = 1, listType }: IUpLoadProps) => {
       </div>
     );
   }
-  return <Button icon={<UploadOutlined />}>{text}</Button>;
+  const loading=useMemo(()=>{
+     return value?.some(({status})=>{
+        return status==="uploading";
+     })
+  },[value]);
+  if (children){
+    return  React.cloneElement<any>((children as any),{loading});
+  }
+  return <Button icon={<UploadOutlined />} loading={loading}>{text}</Button>;
 };

package/src/components/Upload/hooks/customRequest.ts

@@ -4,6 +4,7 @@ import type { RcFile } from "antd/lib/upload";
 import { useEffect, useMemo } from "react";
 import type { UploadFileStatus } from "antd/es/upload/interface";
 import { message } from "antd";
+import {useRequest} from "ahooks";
 
 interface SubReqParamsModal {
   request?: IUpLoadProps["request"];
@@ -73,7 +74,6 @@ export const useCustomRequest = ({
   useEffect(() => {
     valObj.value = value;
   }, [value]); //强制同步避免闭包问题
-
   const sendFile = async (file: RcFile) => {
     const { uid } = file;
     const result = await subReq({ request, file });

package/src/components/Upload/index.tsx

@@ -22,6 +22,8 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     addFormat,
     thumbUrl,
     hideAddBtn,
+      children,
+
     ...props
   },
   ref
@@ -48,6 +50,9 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
   }, [maxRowNum, listType]);
 
   const preview = (file) => {
+      if (onPreview===null){
+          return;
+      }
     if (onPreview) {
       onPreview(file);
       return;
@@ -97,10 +102,11 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     },
   });
   const relVal = Array.isArray(value) ? value : [];
+  const upListType=listType===null?undefined:listType;
   return (
     <div style={contentStyle}>
       <Upload
-        listType={listType}
+        listType={upListType}
         maxCount={maxNum}
         fileList={relVal}
         onPreview={preview}
@@ -111,7 +117,9 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
         {...props}
       >
         {hideAddBtn ? null : (
-          <Btn value={relVal} maxCount={maxCount} listType={listType} />
+            <Btn value={relVal} maxCount={maxCount} listType={upListType} >
+                {children}
+            </Btn>
         )}
       </Upload>
       <Preview

package/src/components/Upload/modal.ts

@@ -5,8 +5,9 @@ import type { UploadChangeParam } from "antd/lib/upload/interface";
 import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
+import {UploadListType} from "antd/lib/upload/interface";
 
-export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
+export interface IUpLoadProps extends Omit<UploadProps, "onChange"|"listType"|"onPreview"> {
   exFiles?: string[] | null;
   request?: (
     file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
@@ -19,6 +20,8 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
   thumbUrl?: string;
   hideAddBtn?: boolean;
+  listType?:UploadListType|null;
+  onPreview?:UploadProps["onPreview"]|null
 }
 export interface IMediaTypeEleProps {
   file?: UploadFile;

package/src/pages/ModalForm/index.tsx

@@ -1,4 +1,4 @@
-import { Button } from "antd";
+import {Button, Input} from "antd";
 import {
   HModalForm,
   useHDialogForm,
@@ -11,18 +11,20 @@ import { ShowParamsModal } from "@/components/DialogForm/modal";
 const Test = (props) => {
   return <HUrlUpload {...props} />;
 };
+const ITest=()=>{
+    return <Input onPressEnter={(e)=>{
+        e.preventDefault();
+        console.log("ITest")
+    }}/>
+}
 const data = [
   {
     label: "输入框",
     name: "name",
     hideLabel: true,
-    rules: [
-      () => {
-        return {
-          required: true,
-        };
-      },
-    ],
+    render:()=>{
+        return <ITest/>
+    },
   },
   // {
   //   label: "数字",
@@ -203,6 +205,7 @@ export default () => {
             marginBottom: 100,
           }}
           onOk={() => {
+              console.log("fff")
             return false;
           }}
           infoRequest={() => {

package/src/pages/Upload/index.tsx

@@ -1,4 +1,4 @@
-import { Space } from "antd";
+import {Button, Space} from "antd";
 import { HUpload, HUrlUpload } from "../../components";
 import React, { useState } from "react";
 import { MediaTypeEnum } from "../../components/Upload/enums";
@@ -26,11 +26,15 @@ export default () => {
         value={files1}
         hideAddBtn={false}
         mediaType={MediaTypeEnum.file}
+        listType={null}
+        onPreview={false}
         showUploadList={{
           showPreviewIcon: false,
         }}
         onChange={setFiles1}
-      />
+      >
+          <Button>按钮</Button>
+      </HUpload>
       <HUrlUpload
         inputHelper="测试"
         mediaType={MediaTypeEnum.video}