@hw-component/form 0.0.6-beta-v3 → 0.0.6-beta-v5

package/es/DialogForm/hooks.js

@@ -66,7 +66,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
-        changeInitialValues = showParams.initialValues,
+        _showParams$initialVa = showParams.initialValues,
+        changeInitialValues = _showParams$initialVa === void 0 ? {} : _showParams$initialVa,
         _showParams$params = showParams.params,
         changeParams = _showParams$params === void 0 ? {} : _showParams$params,
         changeTitle = showParams.title;

package/es/Form/hooks/index.js

@@ -72,23 +72,24 @@ var useInfoReq = function useInfoReq(_ref) {
           setValue = initialValues;
           reqData.params = reqParams;
           if (!(!initialValues && !infoRequest)) {
-            _context2.next = 5;
+            _context2.next = 6;
             break;
           }
+          form === null || form === void 0 || form.setFieldsValue({});
           return _context2.abrupt("return", {});
-        case 5:
+        case 6:
           if (!infoRequest) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
-          _context2.next = 8;
+          _context2.next = 9;
           return infoRequest(reqParams);
-        case 8:
-          setValue = _context2.sent;
         case 9:
+          setValue = _context2.sent;
+        case 10:
           form === null || form === void 0 || form.setFieldsValue(setValue);
           return _context2.abrupt("return", setValue || {});
-        case 11:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/es/Form/hooks/useHForm.js

@@ -184,6 +184,10 @@ var useHForm = (function () {
             return resolve(result);
           });
         });
+      },
+      resetFields: function resetFields() {
+        form.resetFields();
+        isLoading = false;
       }
     });
   }, []);

package/es/Upload/UrlUpload/index.js

@@ -3,6 +3,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.regexp.to-string.js';
 import 'core-js/modules/es.string.trim.js';
@@ -10,6 +11,7 @@ import 'core-js/modules/es.array.map.js';
 import 'core-js/modules/es.array.from.js';
 import 'core-js/modules/es.string.iterator.js';
 import 'core-js/modules/es.function.name.js';
+import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/es.symbol.js';
 import 'core-js/modules/es.array.filter.js';
@@ -26,6 +28,14 @@ import { useState, useRef } from 'react';
 var _excluded = ["placeholder", "value", "onChange", "mediaType"];
 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 mkSubFileList = function mkSubFileList(fileList) {
+  var maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var len = fileList.length;
+  if (len > maxCount) {
+    return fileList.slice(len - maxCount);
+  }
+  return fileList;
+};
 var Index = function Index(_ref) {
   var _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
@@ -34,6 +44,7 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     mediaType = _ref.mediaType,
     props = _objectWithoutProperties(_ref, _excluded);
+  var maxCount = props.maxCount;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     url = _useState2[0],
@@ -55,7 +66,7 @@ var Index = function Index(_ref) {
         url: url
       }
     });
-    onChange === null || onChange === void 0 || onChange(newFileList);
+    onChange === null || onChange === void 0 || onChange(mkSubFileList(newFileList, maxCount));
     setUrl("");
     setLoad(false);
   };
@@ -91,7 +102,7 @@ var Index = function Index(_ref) {
       };
     });
     (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.change({
-      fileList: newFileList,
+      fileList: mkSubFileList([].concat(_toConsumableArray(value), _toConsumableArray(newFileList)), maxCount),
       file: newFileList[0]
     });
     setUrl("");

package/lib/DialogForm/hooks.js

@@ -67,7 +67,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var changeConfigData = showParams.configData,
-        changeInitialValues = showParams.initialValues,
+        _showParams$initialVa = showParams.initialValues,
+        changeInitialValues = _showParams$initialVa === void 0 ? {} : _showParams$initialVa,
         _showParams$params = showParams.params,
         changeParams = _showParams$params === void 0 ? {} : _showParams$params,
         changeTitle = showParams.title;

package/lib/Form/hooks/index.js

@@ -73,23 +73,24 @@ var useInfoReq = function useInfoReq(_ref) {
           setValue = initialValues;
           reqData.params = reqParams;
           if (!(!initialValues && !infoRequest)) {
-            _context2.next = 5;
+            _context2.next = 6;
             break;
           }
+          form === null || form === void 0 || form.setFieldsValue({});
           return _context2.abrupt("return", {});
-        case 5:
+        case 6:
           if (!infoRequest) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
-          _context2.next = 8;
+          _context2.next = 9;
           return infoRequest(reqParams);
-        case 8:
-          setValue = _context2.sent;
         case 9:
+          setValue = _context2.sent;
+        case 10:
           form === null || form === void 0 || form.setFieldsValue(setValue);
           return _context2.abrupt("return", setValue || {});
-        case 11:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/lib/Form/hooks/useHForm.js

@@ -187,6 +187,10 @@ var useHForm = (function () {
             return resolve(result);
           });
         });
+      },
+      resetFields: function resetFields() {
+        form.resetFields();
+        isLoading = false;
       }
     });
   }, []);

package/lib/Upload/UrlUpload/index.js

@@ -6,6 +6,7 @@ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.regexp.to-string.js');
 require('core-js/modules/es.string.trim.js');
@@ -13,6 +14,7 @@ require('core-js/modules/es.array.map.js');
 require('core-js/modules/es.array.from.js');
 require('core-js/modules/es.string.iterator.js');
 require('core-js/modules/es.function.name.js');
+require('core-js/modules/es.array.concat.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.array.filter.js');
@@ -29,6 +31,14 @@ var React = require('react');
 var _excluded = ["placeholder", "value", "onChange", "mediaType"];
 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 mkSubFileList = function mkSubFileList(fileList) {
+  var maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var len = fileList.length;
+  if (len > maxCount) {
+    return fileList.slice(len - maxCount);
+  }
+  return fileList;
+};
 var Index = function Index(_ref) {
   var _ref$placeholder = _ref.placeholder,
     placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
@@ -37,6 +47,7 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     mediaType = _ref.mediaType,
     props = _objectWithoutProperties(_ref, _excluded);
+  var maxCount = props.maxCount;
   var _useState = React.useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     url = _useState2[0],
@@ -58,7 +69,7 @@ var Index = function Index(_ref) {
         url: url
       }
     });
-    onChange === null || onChange === void 0 || onChange(newFileList);
+    onChange === null || onChange === void 0 || onChange(mkSubFileList(newFileList, maxCount));
     setUrl("");
     setLoad(false);
   };
@@ -94,7 +105,7 @@ var Index = function Index(_ref) {
       };
     });
     (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.change({
-      fileList: newFileList,
+      fileList: mkSubFileList([].concat(_toConsumableArray(value), _toConsumableArray(newFileList)), maxCount),
       file: newFileList[0]
     });
     setUrl("");

package/package.json

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

package/src/components/DialogForm/hooks.ts

@@ -45,7 +45,7 @@ export const useModifyProps = ({
     dialogForm.show = (showParams = {}) => {
       const {
         configData: changeConfigData,
-        initialValues: changeInitialValues,
+        initialValues: changeInitialValues={},
         params: changeParams={},
         title: changeTitle,
       } = showParams;

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

@@ -47,6 +47,7 @@ export const useInfoReq = ({
     let setValue = initialValues;
     reqData.params = reqParams;
     if (!initialValues && !infoRequest) {
+      form?.setFieldsValue({});
       return {};
     }
     if (infoRequest) {

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

@@ -159,6 +159,10 @@ export default () => {
           });
         });
       },
+      resetFields:()=>{
+        form.resetFields();
+        isLoading=false;
+      }
     };
   }, []);
 };

package/src/components/Upload/UrlUpload/index.tsx

@@ -5,6 +5,15 @@ import type { IUploadRefModal, IUrlUploadProps } from "../modal";
 import TypeEle from "../MediaTypeEle/TypeEle";
 import { useRef, useState } from "react";
 import type { RcFile, UploadFile } from "antd/es/upload/interface";
+
+const mkSubFileList=(fileList: UploadFile[],maxCount=1)=>{
+  const len=fileList.length;
+  if (len>maxCount){
+   return fileList.slice(len-maxCount);
+  }
+  return  fileList;
+}
+
 const Index = ({
   placeholder = "请输入文件地址",
   value = [],
@@ -12,11 +21,12 @@ const Index = ({
   mediaType,
   ...props
 }: IUrlUploadProps) => {
+  const {maxCount}=props;
   const [url, setUrl] = useState("");
   const [load, setLoad] = useState<boolean>(false);
   const ref = useRef<IUploadRefModal | null>(null);
   const onReady = () => {
-    const newFileList = [...value];
+    let newFileList = [...value];
     newFileList.push({
       url,
       uid: new Date().valueOf().toString(),
@@ -27,7 +37,7 @@ const Index = ({
         url,
       },
     });
-    onChange?.(newFileList);
+    onChange?.(mkSubFileList(newFileList,maxCount));
     setUrl("");
     setLoad(false);
   };
@@ -59,7 +69,7 @@ const Index = ({
         type,
       };
     });
-    ref.current?.change({ fileList: newFileList, file: newFileList[0] });
+    ref.current?.change({ fileList:mkSubFileList([...value,...newFileList],maxCount), file: newFileList[0] });
     setUrl("");
     setLoad(false);
   };
@@ -74,7 +84,11 @@ const Index = ({
           setUrl(e.target.value);
         }}
       />
-      <Upload {...props} ref={ref} value={value} onChange={onChange} />
+      <Upload {...props}
+              ref={ref}
+              value={value}
+              onChange={onChange}
+      />
       {load && (
         <div style={{ display: "none" }}>
           <TypeEle

package/src/pages/DrawerForm/index.tsx

@@ -114,12 +114,20 @@ export default () => {
           });
         }}
       >
-        打开
+        显示
+      </Button>
+      <Button
+          onClick={() => {
+            modalForm.show();
+          }}
+      >
+         打开
       </Button>
       <HDrawerForm
+
         configData={data}
         labelWidth={88}
-        modalForm={modalForm}
+        dialogForm={modalForm}
         title="测试"
       />
     </>

package/src/pages/Form/index.tsx

@@ -114,6 +114,9 @@ const formData = (options) => {
       label: "地址文件",
       name: "urlUpload",
       type: "urlUpload",
+      itemProps: {
+        maxCount:3
+      },
       rules: [{ required: true }],
     },
     {
@@ -150,7 +153,9 @@ export default () => {
           configData={formData(options)}
           labelWidth={200}
           form={form}
-          initialValues={{}}
+          initialValues={{
+            name:'fff'
+          }}
           onFinish={(value) => {
             console.log(value);
           }}
@@ -182,22 +187,18 @@ export default () => {
       </HFormConfigProvider>
       <div
         onClick={() => {
-          form.dispatch(
-            {
-              name: "select",
-              key: "reload",
-            },
-            {
-              params: {
-                label: "更新",
-                value: 2,
-              },
-            }
-          );
+          form.setFieldsValue({name:"123"})
         }}
       >
         点我
       </div>
+      <div
+          onClick={() => {
+            form.resetFields();
+          }}
+      >
+        重置
+      </div>
     </div>
   );
 };

package/src/pages/ModalForm/index.tsx

@@ -107,7 +107,6 @@ const data = [
     },
     itemProps: {
       request: (params = {}, values) => {
-        console.log(values, "paramsparamsparams");
         const { label = "123", value = 1 } = params;
         return Promise.resolve([{ label, value }]);
       },
@@ -133,6 +132,20 @@ export default () => {
       >
         打开
       </Button>
+      <Button
+          onClick={() => {
+            modalForm.show({
+              params: {
+                name: num,
+              },
+              initialValues:{
+                name:"name"
+              }
+            });
+          }}
+      >
+        宣誓
+      </Button>
       <HModalForm
         configData={data}
         labelWidth={88}