@hw-component/form 1.9.2 → 1.9.4

package/es/Form/hooks/useHForm.js

@@ -6,11 +6,11 @@ import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/es.promise.js';
 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 'core-js/modules/es.reflect.delete-property.js';
+import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.function.name.js';
 import 'core-js/modules/es.array.concat.js';
@@ -46,6 +46,27 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var formatValuesFn = function formatValuesFn() {
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
+      var valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      var newValue = _objectSpread({}, value);
+      var keys = Object.keys(formatSourceData);
+      keys.forEach(function (key) {
+        var _formatSourceData$key;
+        var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
+        if (!format) {
+          return;
+        }
+        var resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
+      });
+      return newValue;
+    };
     return _objectSpread(_objectSpread({
       reload: function reload(params) {
         return Promise.resolve(params);
@@ -53,7 +74,7 @@ var useHForm = (function () {
       initValues: function initValues() {
         var newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -83,23 +104,7 @@ var useHForm = (function () {
       formatValues: function formatValues() {
         var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
-        var valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        var newValue = _objectSpread({}, value);
-        var keys = Object.keys(formatSourceData);
-        keys.forEach(function (key) {
-          var _formatSourceData$key;
-          var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
-          if (!format) {
-            return;
-          }
-          var resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
-        });
-        return newValue;
+        return formatValuesFn(value, formatKey);
       },
       dispatch: function dispatch() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -174,7 +179,7 @@ var useHForm = (function () {
       },
       outputValues: function outputValues(value) {
         var val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
@@ -182,14 +187,13 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
-        var newValue = this.formatValues(values);
+        var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {
-        var _this = this;
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {
-            var result = _this.formatValues(value, "outputValue");
+            var result = formatValuesFn(value, "outputValue");
             return resolve(result);
           }).catch(function (e) {
             reject(e);

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/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[];

package/lib/Form/hooks/useHForm.js

@@ -9,11 +9,11 @@ require('core-js/modules/es.object.get-own-property-descriptors.js');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-require('core-js/modules/es.object.to-string.js');
-require('core-js/modules/es.promise.js');
 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');
 require('core-js/modules/es.reflect.delete-property.js');
+require('core-js/modules/es.promise.js');
 require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.array.concat.js');
@@ -49,6 +49,27 @@ var useHForm = (function () {
         defaultFn: []
       };
     };
+    var formatValuesFn = function formatValuesFn() {
+      var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
+      var valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      var newValue = _objectSpread({}, value);
+      var keys = Object.keys(formatSourceData);
+      keys.forEach(function (key) {
+        var _formatSourceData$key;
+        var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
+        if (!format) {
+          return;
+        }
+        var resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
+      });
+      return newValue;
+    };
     return _objectSpread(_objectSpread({
       reload: function reload(params) {
         return Promise.resolve(params);
@@ -56,7 +77,7 @@ var useHForm = (function () {
       initValues: function initValues() {
         var newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -86,23 +107,7 @@ var useHForm = (function () {
       formatValues: function formatValues() {
         var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var formatKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "inputValue";
-        var valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        var newValue = _objectSpread({}, value);
-        var keys = Object.keys(formatSourceData);
-        keys.forEach(function (key) {
-          var _formatSourceData$key;
-          var format = (_formatSourceData$key = formatSourceData[key]) === null || _formatSourceData$key === void 0 ? void 0 : _formatSourceData$key[formatKey];
-          if (!format) {
-            return;
-          }
-          var resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
-        });
-        return newValue;
+        return formatValuesFn(value, formatKey);
       },
       dispatch: function dispatch() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -177,7 +182,7 @@ var useHForm = (function () {
       },
       outputValues: function outputValues(value) {
         var val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       }
     }, form), {}, {
       setFieldsValue: function setFieldsValue(values) {
@@ -185,14 +190,13 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
-        var newValue = this.formatValues(values);
+        var newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields: function validateFields(nameList) {
-        var _this = this;
         return new Promise(function (resolve, reject) {
           form.validateFields(nameList).then(function (value) {
-            var result = _this.formatValues(value, "outputValue");
+            var result = formatValuesFn(value, "outputValue");
             return resolve(result);
           }).catch(function (e) {
             reject(e);

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/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[];

package/package.json

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

package/src/components/Form/hooks/useHForm.ts

@@ -34,6 +34,27 @@ export default () => {
         defaultFn: [],
       };
     };
+    const formatValuesFn=(value = {}, formatKey = "inputValue")=>{
+      const valKeys = Object.keys(value).length;
+      if (!valKeys) {
+        return {};
+      }
+      let newValue = { ...value };
+      const keys = Object.keys(formatSourceData);
+      keys.forEach((key) => {
+        const format = formatSourceData[key]?.[formatKey];
+        if (!format) {
+          return;
+        }
+        const resultValue = format(value);
+        Reflect.deleteProperty(newValue, key);
+        newValue = {
+          ...newValue,
+          ...resultValue,
+        };
+      });
+      return newValue;
+    }
     return {
       reload: (params) => {
         return Promise.resolve(params);
@@ -41,7 +62,7 @@ export default () => {
       initValues() {
         let newValue = {};
         if (cacheValues) {
-          newValue = this.formatValues(cacheValues);
+          newValue = formatValuesFn(cacheValues);
           initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
@@ -65,25 +86,7 @@ export default () => {
         Reflect.deleteProperty(formatSourceData, name);
       },
       formatValues(value = {}, formatKey = "inputValue") {
-        const valKeys = Object.keys(value).length;
-        if (!valKeys) {
-          return {};
-        }
-        let newValue = { ...value };
-        const keys = Object.keys(formatSourceData);
-        keys.forEach((key) => {
-          const format = formatSourceData[key]?.[formatKey];
-          if (!format) {
-            return;
-          }
-          const resultValue = format(value);
-          Reflect.deleteProperty(newValue, key);
-          newValue = {
-            ...newValue,
-            ...resultValue,
-          };
-        });
-        return newValue;
+       return formatValuesFn(value,formatKey);
       }, //转化方法
       dispatch(...args) {
         const [action, ...dispatchArgs] = args;
@@ -146,7 +149,7 @@ export default () => {
       },
       outputValues(value) {
         const val = value || form.getFieldsValue();
-        return this.formatValues(val, "outputValue");
+        return formatValuesFn(val, "outputValue");
       },
       ...form,
       setFieldsValue(values) {
@@ -154,7 +157,7 @@ export default () => {
           cacheValues = values;
           return;
         }
-        const newValue = this.formatValues(values);
+        const newValue = formatValuesFn(values);
         form.setFieldsValue(newValue);
       },
       validateFields(nameList) {
@@ -162,7 +165,7 @@ export default () => {
           form
             .validateFields(nameList)
             .then((value) => {
-              const result = this.formatValues(value, "outputValue");
+              const result = formatValuesFn(value, "outputValue");
               return resolve(result);
             })
             .catch((e) => {

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/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[];

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