@hw-component/form 1.9.1 → 1.9.3

package/es/Upload/hooks/propsMaker.js

@@ -8,16 +8,19 @@ import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import { useFormConfigContext } from '../../Form/Context/FormConfigProvider.js';
+import { baseConfig } from '../../config.js';
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useProps = function useProps(_ref) {
+  var _baseConfig$uploadPro;
   var request = _ref.request,
     exFiles = _ref.exFiles,
     maxSize = _ref.maxSize;
   var configUploadProps = useFormConfigContext("uploadProps");
+  var cuRequest = request === null ? (_baseConfig$uploadPro = baseConfig.uploadProps) === null || _baseConfig$uploadPro === void 0 ? void 0 : _baseConfig$uploadPro.request : request;
   var inputProps = {
-    request: request,
+    request: cuRequest,
     maxSize: maxSize
   };
   var keys = Object.keys(inputProps);

package/es/Upload/index.js

@@ -21,7 +21,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"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref, ref) {
@@ -40,6 +40,7 @@ var Index = function Index(_ref, ref) {
     maxSize = _ref.maxSize,
     addFormat = _ref.addFormat,
     thumbUrl = _ref.thumbUrl,
+    hideAddBtn = _ref.hideAddBtn,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = useProps({
     request: request,
@@ -131,7 +132,7 @@ var Index = function Index(_ref, ref) {
         return false;
       }
     }, props), {}, {
-      children: jsx(Btn, {
+      children: hideAddBtn ? null : jsx(Btn, {
         value: relVal,
         maxCount: maxCount,
         listType: listType

package/es/Upload/modal.d.ts

@@ -9,7 +9,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
         url: string;
-    }>;
+    }> | null;
     errorType?: "alert" | "show";
     onChange?: (fileList: UploadFile[]) => void;
     value?: UploadFile[];
@@ -17,6 +17,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     maxSize?: number;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     thumbUrl?: string;
+    hideAddBtn?: boolean;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/lib/Upload/hooks/propsMaker.js

@@ -9,16 +9,19 @@ require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
+var config = require('../../config.js');
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var useProps = function useProps(_ref) {
+  var _baseConfig$uploadPro;
   var request = _ref.request,
     exFiles = _ref.exFiles,
     maxSize = _ref.maxSize;
   var configUploadProps = FormConfigProvider.useFormConfigContext("uploadProps");
+  var cuRequest = request === null ? (_baseConfig$uploadPro = config.baseConfig.uploadProps) === null || _baseConfig$uploadPro === void 0 ? void 0 : _baseConfig$uploadPro.request : request;
   var inputProps = {
-    request: request,
+    request: cuRequest,
     maxSize: maxSize
   };
   var keys = Object.keys(inputProps);

package/lib/Upload/index.js

@@ -24,7 +24,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"];
+var _excluded = ["value", "onChange", "listType", "exFiles", "maxCount", "maxRowNum", "onPreview", "request", "maxSize", "addFormat", "thumbUrl", "hideAddBtn"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Index = function Index(_ref, ref) {
@@ -43,6 +43,7 @@ var Index = function Index(_ref, ref) {
     maxSize = _ref.maxSize,
     addFormat = _ref.addFormat,
     thumbUrl = _ref.thumbUrl,
+    hideAddBtn = _ref.hideAddBtn,
     props = _objectWithoutProperties(_ref, _excluded);
   var matchProps = propsMaker.useProps({
     request: request,
@@ -134,7 +135,7 @@ var Index = function Index(_ref, ref) {
         return false;
       }
     }, props), {}, {
-      children: jsxRuntime.jsx(Btn.default, {
+      children: hideAddBtn ? null : jsxRuntime.jsx(Btn.default, {
         value: relVal,
         maxCount: maxCount,
         listType: listType

package/lib/Upload/modal.d.ts

@@ -9,7 +9,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
         url: string;
-    }>;
+    }> | null;
     errorType?: "alert" | "show";
     onChange?: (fileList: UploadFile[]) => void;
     value?: UploadFile[];
@@ -17,6 +17,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
     maxSize?: number;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     thumbUrl?: string;
+    hideAddBtn?: boolean;
 }
 export interface IMediaTypeEleProps {
     file?: UploadFile;

package/package.json

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

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

@@ -1,10 +1,12 @@
 import { useFormConfigContext } from "../../Form/Context/FormConfigProvider";
 import type { IUpLoadProps } from "../modal";
+import {baseConfig} from "../../config";
 
 export const useProps = ({ request, exFiles, maxSize }: IUpLoadProps) => {
   const configUploadProps = useFormConfigContext("uploadProps");
+  const cuRequest=request===null?baseConfig.uploadProps?.request:request;
   const inputProps = {
-    request,
+    request:cuRequest,
     maxSize,
   };
   const keys = Object.keys(inputProps);

package/src/components/Upload/index.tsx

@@ -26,6 +26,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     maxSize,
     addFormat,
     thumbUrl,
+    hideAddBtn,
     ...props
   },
   ref
@@ -114,7 +115,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
         }}
         {...props}
       >
-        <Btn value={relVal} maxCount={maxCount} listType={listType} />
+        {hideAddBtn?null: <Btn value={relVal} maxCount={maxCount} listType={listType} />}
       </Upload>
       <Preview
         visible={visible}

package/src/components/Upload/modal.ts

@@ -10,7 +10,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
   exFiles?: string[] | null;
   request?: (
     file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
-  ) => Promise<{ url: string }>;
+  ) => Promise<{ url: string }>|null;
   errorType?: "alert" | "show";
   onChange?: (fileList: UploadFile[]) => void;
   value?: UploadFile[];
@@ -18,6 +18,7 @@ export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
   maxSize?: number;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
   thumbUrl?: string;
+  hideAddBtn?:boolean;
 }
 export interface IMediaTypeEleProps {
   file?: UploadFile;

package/src/pages/Upload/index.tsx

@@ -6,7 +6,6 @@ import { MediaTypeEnum } from "../../components/Upload/enums";
 export default () => {
   const [files, setFiles] = useState([]);
   const [files1, setFiles1] = useState([]);
-  console.log(files);
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HUpload
@@ -26,6 +25,7 @@ export default () => {
       />
       <HUpload
         value={files1}
+        hideAddBtn={false}
         mediaType={MediaTypeEnum.file}
         showUploadList={{
           showPreviewIcon: false,