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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/Upload/UrlUpload/index.js +13 -2
  2. package/lib/Upload/UrlUpload/index.js +13 -2
  3. package/package.json +1 -1
  4. package/src/components/Upload/UrlUpload/index.tsx +18 -4
  5. package/src/pages/Form/index.tsx +3 -0
package/es/Upload/UrlUpload/index.js CHANGED
@@ -3,6 +3,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
3
3
  import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
4
4
  import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
5
5
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
6
+ import 'core-js/modules/es.array.slice.js';
6
7
  import 'core-js/modules/es.object.to-string.js';
7
8
  import 'core-js/modules/es.regexp.to-string.js';
8
9
  import 'core-js/modules/es.string.trim.js';
@@ -10,6 +11,7 @@ import 'core-js/modules/es.array.map.js';
10
11
  import 'core-js/modules/es.array.from.js';
11
12
  import 'core-js/modules/es.string.iterator.js';
12
13
  import 'core-js/modules/es.function.name.js';
14
+ import 'core-js/modules/es.array.concat.js';
13
15
  import 'core-js/modules/es.object.keys.js';
14
16
  import 'core-js/modules/es.symbol.js';
15
17
  import 'core-js/modules/es.array.filter.js';
@@ -26,6 +28,14 @@ import { useState, useRef } from 'react';
26
28
  var _excluded = ["placeholder", "value", "onChange", "mediaType"];
27
29
  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; }
28
30
  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; }
31
+ var mkSubFileList = function mkSubFileList(fileList) {
32
+ var maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
33
+ var len = fileList.length;
34
+ if (len > maxCount) {
35
+ return fileList.slice(len - maxCount);
36
+ }
37
+ return fileList;
38
+ };
29
39
  var Index = function Index(_ref) {
30
40
  var _ref$placeholder = _ref.placeholder,
31
41
  placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
@@ -34,6 +44,7 @@ var Index = function Index(_ref) {
34
44
  onChange = _ref.onChange,
35
45
  mediaType = _ref.mediaType,
36
46
  props = _objectWithoutProperties(_ref, _excluded);
47
+ var maxCount = props.maxCount;
37
48
  var _useState = useState(""),
38
49
  _useState2 = _slicedToArray(_useState, 2),
39
50
  url = _useState2[0],
@@ -55,7 +66,7 @@ var Index = function Index(_ref) {
55
66
  url: url
56
67
  }
57
68
  });
58
- onChange === null || onChange === void 0 || onChange(newFileList);
69
+ onChange === null || onChange === void 0 || onChange(mkSubFileList(newFileList, maxCount));
59
70
  setUrl("");
60
71
  setLoad(false);
61
72
  };
@@ -91,7 +102,7 @@ var Index = function Index(_ref) {
91
102
  };
92
103
  });
93
104
  (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.change({
94
- fileList: newFileList,
105
+ fileList: mkSubFileList([].concat(_toConsumableArray(value), _toConsumableArray(newFileList)), maxCount),
95
106
  file: newFileList[0]
96
107
  });
97
108
  setUrl("");
package/lib/Upload/UrlUpload/index.js CHANGED
@@ -6,6 +6,7 @@ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
6
6
  var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
7
7
  var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
8
8
  var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
9
+ require('core-js/modules/es.array.slice.js');
9
10
  require('core-js/modules/es.object.to-string.js');
10
11
  require('core-js/modules/es.regexp.to-string.js');
11
12
  require('core-js/modules/es.string.trim.js');
@@ -13,6 +14,7 @@ require('core-js/modules/es.array.map.js');
13
14
  require('core-js/modules/es.array.from.js');
14
15
  require('core-js/modules/es.string.iterator.js');
15
16
  require('core-js/modules/es.function.name.js');
17
+ require('core-js/modules/es.array.concat.js');
16
18
  require('core-js/modules/es.object.keys.js');
17
19
  require('core-js/modules/es.symbol.js');
18
20
  require('core-js/modules/es.array.filter.js');
@@ -29,6 +31,14 @@ var React = require('react');
29
31
  var _excluded = ["placeholder", "value", "onChange", "mediaType"];
30
32
  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; }
31
33
  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; }
34
+ var mkSubFileList = function mkSubFileList(fileList) {
35
+ var maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
36
+ var len = fileList.length;
37
+ if (len > maxCount) {
38
+ return fileList.slice(len - maxCount);
39
+ }
40
+ return fileList;
41
+ };
32
42
  var Index = function Index(_ref) {
33
43
  var _ref$placeholder = _ref.placeholder,
34
44
  placeholder = _ref$placeholder === void 0 ? "请输入文件地址" : _ref$placeholder,
@@ -37,6 +47,7 @@ var Index = function Index(_ref) {
37
47
  onChange = _ref.onChange,
38
48
  mediaType = _ref.mediaType,
39
49
  props = _objectWithoutProperties(_ref, _excluded);
50
+ var maxCount = props.maxCount;
40
51
  var _useState = React.useState(""),
41
52
  _useState2 = _slicedToArray(_useState, 2),
42
53
  url = _useState2[0],
@@ -58,7 +69,7 @@ var Index = function Index(_ref) {
58
69
  url: url
59
70
  }
60
71
  });
61
- onChange === null || onChange === void 0 || onChange(newFileList);
72
+ onChange === null || onChange === void 0 || onChange(mkSubFileList(newFileList, maxCount));
62
73
  setUrl("");
63
74
  setLoad(false);
64
75
  };
@@ -94,7 +105,7 @@ var Index = function Index(_ref) {
94
105
  };
95
106
  });
96
107
  (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.change({
97
- fileList: newFileList,
108
+ fileList: mkSubFileList([].concat(_toConsumableArray(value), _toConsumableArray(newFileList)), maxCount),
98
109
  file: newFileList[0]
99
110
  });
100
111
  setUrl("");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "0.0.6-beta-v4",
3
+ "version": "0.0.6-beta-v5",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/Upload/UrlUpload/index.tsx CHANGED
@@ -5,6 +5,15 @@ import type { IUploadRefModal, IUrlUploadProps } from "../modal";
5
5
  import TypeEle from "../MediaTypeEle/TypeEle";
6
6
  import { useRef, useState } from "react";
7
7
  import type { RcFile, UploadFile } from "antd/es/upload/interface";
8
+
9
+ const mkSubFileList=(fileList: UploadFile[],maxCount=1)=>{
10
+ const len=fileList.length;
11
+ if (len>maxCount){
12
+ return fileList.slice(len-maxCount);
13
+ }
14
+ return fileList;
15
+ }
16
+
8
17
  const Index = ({
9
18
  placeholder = "请输入文件地址",
10
19
  value = [],
@@ -12,11 +21,12 @@ const Index = ({
12
21
  mediaType,
13
22
  ...props
14
23
  }: IUrlUploadProps) => {
24
+ const {maxCount}=props;
15
25
  const [url, setUrl] = useState("");
16
26
  const [load, setLoad] = useState<boolean>(false);
17
27
  const ref = useRef<IUploadRefModal | null>(null);
18
28
  const onReady = () => {
19
- const newFileList = [...value];
29
+ let newFileList = [...value];
20
30
  newFileList.push({
21
31
  url,
22
32
  uid: new Date().valueOf().toString(),
@@ -27,7 +37,7 @@ const Index = ({
27
37
  url,
28
38
  },
29
39
  });
30
- onChange?.(newFileList);
40
+ onChange?.(mkSubFileList(newFileList,maxCount));
31
41
  setUrl("");
32
42
  setLoad(false);
33
43
  };
@@ -59,7 +69,7 @@ const Index = ({
59
69
  type,
60
70
  };
61
71
  });
62
- ref.current?.change({ fileList: newFileList, file: newFileList[0] });
72
+ ref.current?.change({ fileList:mkSubFileList([...value,...newFileList],maxCount), file: newFileList[0] });
63
73
  setUrl("");
64
74
  setLoad(false);
65
75
  };
@@ -74,7 +84,11 @@ const Index = ({
74
84
  setUrl(e.target.value);
75
85
  }}
76
86
  />
77
- <Upload {...props} ref={ref} value={value} onChange={onChange} />
87
+ <Upload {...props}
88
+ ref={ref}
89
+ value={value}
90
+ onChange={onChange}
91
+ />
78
92
  {load && (
79
93
  <div style={{ display: "none" }}>
80
94
  <TypeEle
package/src/pages/Form/index.tsx CHANGED
@@ -114,6 +114,9 @@ const formData = (options) => {
114
114
  label: "地址文件",
115
115
  name: "urlUpload",
116
116
  type: "urlUpload",
117
+ itemProps: {
118
+ maxCount:3
119
+ },
117
120
  rules: [{ required: true }],
118
121
  },
119
122
  {