wargerm 0.5.24 → 0.5.27
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.
- package/dist/components/Upload/example/demo2.d.ts +3 -0
- package/dist/index.esm.js +148 -52
- package/dist/index.js +150 -53
- package/package.json +2 -1
package/dist/index.esm.js
CHANGED
@@ -11,10 +11,11 @@ import 'antd/es/input/style';
|
|
11
11
|
import _Input from 'antd/es/input';
|
12
12
|
import 'antd/es/modal/style';
|
13
13
|
import _Modal from 'antd/es/modal';
|
14
|
-
import 'antd/es/upload/style';
|
15
|
-
import _Upload from 'antd/es/upload';
|
16
14
|
import 'antd/es/message/style';
|
17
15
|
import _message from 'antd/es/message';
|
16
|
+
import 'antd/es/upload/style';
|
17
|
+
import _Upload from 'antd/es/upload';
|
18
|
+
import FileViewer from 'react-file-viewer';
|
18
19
|
import 'antd/es/input-number/style';
|
19
20
|
import _InputNumber from 'antd/es/input-number';
|
20
21
|
import 'antd/es/pagination/style';
|
@@ -584,7 +585,8 @@ var Index = WInput;
|
|
584
585
|
Index.TextArea = _Input.TextArea;
|
585
586
|
WInput.defaultProps = {};
|
586
587
|
|
587
|
-
var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
|
588
|
+
var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
|
589
|
+
var Dragger = _Upload.Dragger;
|
588
590
|
|
589
591
|
function Index$1(_ref, ref) {
|
590
592
|
var value = _ref.value,
|
@@ -597,6 +599,7 @@ function Index$1(_ref, ref) {
|
|
597
599
|
splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
|
598
600
|
fetchMethod = _ref.fetchMethod,
|
599
601
|
getFileList = _ref.getFileList,
|
602
|
+
type = _ref.type,
|
600
603
|
props = _objectWithoutProperties(_ref, _excluded$1);
|
601
604
|
|
602
605
|
var _useState = useState([]),
|
@@ -604,36 +607,42 @@ function Index$1(_ref, ref) {
|
|
604
607
|
fileList = _useState2[0],
|
605
608
|
setFileList = _useState2[1];
|
606
609
|
|
610
|
+
var _useState3 = useState(0),
|
611
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
612
|
+
progress = _useState4[0],
|
613
|
+
setProgress = _useState4[1];
|
614
|
+
|
607
615
|
useEffect(function () {
|
608
616
|
setFileList(value ? value.split(splitStr).map(function (url) {
|
609
617
|
return {
|
610
618
|
uid: Math.random().toString(36).slice(2, 36),
|
611
|
-
name:
|
619
|
+
name: url,
|
612
620
|
status: 'done',
|
613
621
|
url: url
|
614
622
|
};
|
615
623
|
}) : []);
|
616
624
|
}, [value]);
|
617
625
|
useEffect(function () {
|
626
|
+
console.log(fileList);
|
618
627
|
getFileList && getFileList(fileList.map(function (file) {
|
619
628
|
return file.url;
|
620
629
|
}), fileList);
|
621
630
|
}, [fileList]);
|
622
631
|
|
623
|
-
var
|
624
|
-
_useState4 = _slicedToArray(_useState3, 2),
|
625
|
-
previewVisible = _useState4[0],
|
626
|
-
setPreviewVisible = _useState4[1];
|
627
|
-
|
628
|
-
var _useState5 = useState(''),
|
632
|
+
var _useState5 = useState(false),
|
629
633
|
_useState6 = _slicedToArray(_useState5, 2),
|
630
|
-
|
631
|
-
|
634
|
+
previewVisible = _useState6[0],
|
635
|
+
setPreviewVisible = _useState6[1];
|
632
636
|
|
633
637
|
var _useState7 = useState(''),
|
634
638
|
_useState8 = _slicedToArray(_useState7, 2),
|
635
|
-
|
636
|
-
|
639
|
+
previewImage = _useState8[0],
|
640
|
+
setPreviewImage = _useState8[1];
|
641
|
+
|
642
|
+
var _useState9 = useState(''),
|
643
|
+
_useState10 = _slicedToArray(_useState9, 2),
|
644
|
+
previewTitle = _useState10[0],
|
645
|
+
setPreviewTitle = _useState10[1];
|
637
646
|
|
638
647
|
var getBase64 = function getBase64(file) {
|
639
648
|
return new Promise(function (resolve, reject) {
|
@@ -672,36 +681,23 @@ function Index$1(_ref, ref) {
|
|
672
681
|
|
673
682
|
var handleChange = /*#__PURE__*/function () {
|
674
683
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) {
|
675
|
-
var file, newFileList,
|
684
|
+
var file, newFileList, urls;
|
676
685
|
return regeneratorRuntime.wrap(function _callee$(_context) {
|
677
686
|
while (1) {
|
678
687
|
switch (_context.prev = _context.next) {
|
679
688
|
case 0:
|
680
689
|
file = _ref2.file, newFileList = _ref2.fileList;
|
681
690
|
|
682
|
-
if (
|
683
|
-
|
684
|
-
|
685
|
-
|
691
|
+
if (file.status === 'done' || file.status === 'removed') {
|
692
|
+
file.url = file.response;
|
693
|
+
urls = newFileList.map(function (file) {
|
694
|
+
return file.url;
|
695
|
+
}).join(splitStr);
|
696
|
+
onChange && onChange(urls);
|
697
|
+
} // setFileList(newFileList)
|
686
698
|
|
687
|
-
_context.next = 4;
|
688
|
-
return fetchMethod ? fetchMethod(file.originFileObj) : file.originFileObj ? getBase64(file.originFileObj) : Promise.resolve(file.url);
|
689
699
|
|
690
|
-
case
|
691
|
-
url = _context.sent;
|
692
|
-
|
693
|
-
if (!file.url) {
|
694
|
-
file.url = url;
|
695
|
-
}
|
696
|
-
|
697
|
-
case 6:
|
698
|
-
urls = newFileList.map(function (file) {
|
699
|
-
return file.url;
|
700
|
-
}).join(splitStr);
|
701
|
-
onChange && onChange(urls);
|
702
|
-
setFileList(newFileList);
|
703
|
-
|
704
|
-
case 9:
|
700
|
+
case 2:
|
705
701
|
case "end":
|
706
702
|
return _context.stop();
|
707
703
|
}
|
@@ -714,31 +710,92 @@ function Index$1(_ref, ref) {
|
|
714
710
|
};
|
715
711
|
}();
|
716
712
|
|
713
|
+
var request = /*#__PURE__*/function () {
|
714
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
|
715
|
+
var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
|
716
|
+
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
717
|
+
while (1) {
|
718
|
+
switch (_context2.prev = _context2.next) {
|
719
|
+
case 0:
|
720
|
+
onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
|
721
|
+
_context2.prev = 1;
|
722
|
+
_context2.next = 4;
|
723
|
+
return fetchMethod ? fetchMethod(file) : getBase64(file);
|
724
|
+
|
725
|
+
case 4:
|
726
|
+
url = _context2.sent;
|
727
|
+
|
728
|
+
if (url) {
|
729
|
+
fileObj = {
|
730
|
+
uid: options.file.uid,
|
731
|
+
name: file.name,
|
732
|
+
status: 'done',
|
733
|
+
response: url,
|
734
|
+
thumbUrl: url,
|
735
|
+
originFileObj: file,
|
736
|
+
xhr: onProgress
|
737
|
+
};
|
738
|
+
newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
|
739
|
+
setFileList(newFileList);
|
740
|
+
onSuccess(url, file);
|
741
|
+
}
|
742
|
+
|
743
|
+
_context2.next = 12;
|
744
|
+
break;
|
745
|
+
|
746
|
+
case 8:
|
747
|
+
_context2.prev = 8;
|
748
|
+
_context2.t0 = _context2["catch"](1);
|
749
|
+
console.log("Eroor: ", _context2.t0);
|
750
|
+
onError({
|
751
|
+
err: _context2.t0
|
752
|
+
});
|
753
|
+
|
754
|
+
case 12:
|
755
|
+
case "end":
|
756
|
+
return _context2.stop();
|
757
|
+
}
|
758
|
+
}
|
759
|
+
}, _callee2, null, [[1, 8]]);
|
760
|
+
}));
|
761
|
+
|
762
|
+
return function request(_x2) {
|
763
|
+
return _ref4.apply(this, arguments);
|
764
|
+
};
|
765
|
+
}();
|
766
|
+
|
717
767
|
var handleronRemove = function handleronRemove(file) {
|
718
768
|
var index = fileList.indexOf(file);
|
719
|
-
|
769
|
+
|
770
|
+
if (onRemove) {
|
771
|
+
onRemove && onRemove(file, function () {
|
772
|
+
var newFileList = fileList.slice();
|
773
|
+
newFileList.splice(index, 1);
|
774
|
+
setFileList(newFileList);
|
775
|
+
});
|
776
|
+
} else {
|
720
777
|
var newFileList = fileList.slice();
|
721
778
|
newFileList.splice(index, 1);
|
722
779
|
setFileList(newFileList);
|
723
|
-
}
|
780
|
+
}
|
724
781
|
};
|
725
782
|
|
726
783
|
var handlePreview = /*#__PURE__*/function () {
|
727
|
-
var
|
728
|
-
return regeneratorRuntime.wrap(function
|
784
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file) {
|
785
|
+
return regeneratorRuntime.wrap(function _callee3$(_context3) {
|
729
786
|
while (1) {
|
730
|
-
switch (
|
787
|
+
switch (_context3.prev = _context3.next) {
|
731
788
|
case 0:
|
732
789
|
if (!(!file.url && !file.preview)) {
|
733
|
-
|
790
|
+
_context3.next = 4;
|
734
791
|
break;
|
735
792
|
}
|
736
793
|
|
737
|
-
|
794
|
+
_context3.next = 3;
|
738
795
|
return getBase64(file.originFileObj);
|
739
796
|
|
740
797
|
case 3:
|
741
|
-
file.preview =
|
798
|
+
file.preview = _context3.sent;
|
742
799
|
|
743
800
|
case 4:
|
744
801
|
setPreviewImage(file.url || file.preview);
|
@@ -747,14 +804,14 @@ function Index$1(_ref, ref) {
|
|
747
804
|
|
748
805
|
case 7:
|
749
806
|
case "end":
|
750
|
-
return
|
807
|
+
return _context3.stop();
|
751
808
|
}
|
752
809
|
}
|
753
|
-
},
|
810
|
+
}, _callee3);
|
754
811
|
}));
|
755
812
|
|
756
|
-
return function handlePreview(
|
757
|
-
return
|
813
|
+
return function handlePreview(_x3) {
|
814
|
+
return _ref5.apply(this, arguments);
|
758
815
|
};
|
759
816
|
}();
|
760
817
|
|
@@ -768,19 +825,58 @@ function Index$1(_ref, ref) {
|
|
768
825
|
fileList: fileList
|
769
826
|
};
|
770
827
|
});
|
771
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(
|
828
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, type == 'dragger' ? /*#__PURE__*/React.createElement(Dragger, _objectSpread2({
|
829
|
+
fileList: fileList,
|
830
|
+
onPreview: handlePreview,
|
831
|
+
onChange: handleChange,
|
832
|
+
onRemove: handleronRemove,
|
833
|
+
customRequest: request,
|
834
|
+
onProgress: function onProgress(_ref6) {
|
835
|
+
var percent = _ref6.percent;
|
836
|
+
console.log("progre...", percent);
|
837
|
+
|
838
|
+
if (percent === 100) {
|
839
|
+
setTimeout(function () {
|
840
|
+
return setProgress(0);
|
841
|
+
}, 1000);
|
842
|
+
}
|
843
|
+
|
844
|
+
return setProgress(Math.floor(percent));
|
845
|
+
}
|
846
|
+
}, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React.createElement(_Upload, _objectSpread2({
|
847
|
+
accept: "image/*",
|
772
848
|
fileList: fileList,
|
773
849
|
listType: "picture-card",
|
774
850
|
beforeUpload: beforeUploadIn,
|
775
851
|
onPreview: handlePreview,
|
776
852
|
onChange: handleChange,
|
777
|
-
onRemove: handleronRemove
|
853
|
+
onRemove: handleronRemove,
|
854
|
+
customRequest: request,
|
855
|
+
onProgress: function onProgress(_ref7) {
|
856
|
+
var percent = _ref7.percent;
|
857
|
+
console.log("progre...", percent);
|
858
|
+
|
859
|
+
if (percent === 100) {
|
860
|
+
setTimeout(function () {
|
861
|
+
return setProgress(0);
|
862
|
+
}, 1000);
|
863
|
+
}
|
864
|
+
|
865
|
+
return setProgress(Math.floor(percent));
|
866
|
+
}
|
778
867
|
}, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(_Modal, {
|
779
868
|
visible: previewVisible,
|
780
869
|
title: previewTitle,
|
781
870
|
footer: null,
|
782
871
|
onCancel: handleCancel
|
783
|
-
}, /*#__PURE__*/React.createElement(
|
872
|
+
}, type == 'dragger' ? /*#__PURE__*/React.createElement(FileViewer, {
|
873
|
+
fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
|
874
|
+
filePath: previewImage,
|
875
|
+
errorComponent: /*#__PURE__*/React.createElement(React.Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
|
876
|
+
onError: function onError(err) {
|
877
|
+
console.log(err);
|
878
|
+
}
|
879
|
+
}) : /*#__PURE__*/React.createElement("img", {
|
784
880
|
alt: "example",
|
785
881
|
style: {
|
786
882
|
width: '100%'
|
@@ -7797,7 +7893,7 @@ var WForm = function WForm(props, ref) {
|
|
7797
7893
|
|
7798
7894
|
filterFormColumns.forEach(function (c) {
|
7799
7895
|
if (c.search && c.search.transformSetForm) {
|
7800
|
-
var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
|
7896
|
+
var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex], setFieldsValues);
|
7801
7897
|
setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
|
7802
7898
|
|
7803
7899
|
if (!transformObj[c.dataIndex]) {
|
package/dist/index.js
CHANGED
@@ -15,10 +15,11 @@ require('antd/es/input/style');
|
|
15
15
|
var _Input = require('antd/es/input');
|
16
16
|
require('antd/es/modal/style');
|
17
17
|
var _Modal = require('antd/es/modal');
|
18
|
-
require('antd/es/upload/style');
|
19
|
-
var _Upload = require('antd/es/upload');
|
20
18
|
require('antd/es/message/style');
|
21
19
|
var _message = require('antd/es/message');
|
20
|
+
require('antd/es/upload/style');
|
21
|
+
var _Upload = require('antd/es/upload');
|
22
|
+
var FileViewer = require('react-file-viewer');
|
22
23
|
require('antd/es/input-number/style');
|
23
24
|
var _InputNumber = require('antd/es/input-number');
|
24
25
|
require('antd/es/pagination/style');
|
@@ -93,8 +94,9 @@ var _Dropdown__default = /*#__PURE__*/_interopDefaultLegacy(_Dropdown);
|
|
93
94
|
var _Menu__default = /*#__PURE__*/_interopDefaultLegacy(_Menu);
|
94
95
|
var _Input__default = /*#__PURE__*/_interopDefaultLegacy(_Input);
|
95
96
|
var _Modal__default = /*#__PURE__*/_interopDefaultLegacy(_Modal);
|
96
|
-
var _Upload__default = /*#__PURE__*/_interopDefaultLegacy(_Upload);
|
97
97
|
var _message__default = /*#__PURE__*/_interopDefaultLegacy(_message);
|
98
|
+
var _Upload__default = /*#__PURE__*/_interopDefaultLegacy(_Upload);
|
99
|
+
var FileViewer__default = /*#__PURE__*/_interopDefaultLegacy(FileViewer);
|
98
100
|
var _InputNumber__default = /*#__PURE__*/_interopDefaultLegacy(_InputNumber);
|
99
101
|
var _Pagination__default = /*#__PURE__*/_interopDefaultLegacy(_Pagination);
|
100
102
|
var _Spin__default = /*#__PURE__*/_interopDefaultLegacy(_Spin);
|
@@ -644,7 +646,8 @@ var Index = WInput;
|
|
644
646
|
Index.TextArea = _Input__default['default'].TextArea;
|
645
647
|
WInput.defaultProps = {};
|
646
648
|
|
647
|
-
var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
|
649
|
+
var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
|
650
|
+
var Dragger = _Upload__default['default'].Dragger;
|
648
651
|
|
649
652
|
function Index$1(_ref, ref) {
|
650
653
|
var value = _ref.value,
|
@@ -657,6 +660,7 @@ function Index$1(_ref, ref) {
|
|
657
660
|
splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
|
658
661
|
fetchMethod = _ref.fetchMethod,
|
659
662
|
getFileList = _ref.getFileList,
|
663
|
+
type = _ref.type,
|
660
664
|
props = _objectWithoutProperties(_ref, _excluded$1);
|
661
665
|
|
662
666
|
var _useState = React.useState([]),
|
@@ -664,36 +668,42 @@ function Index$1(_ref, ref) {
|
|
664
668
|
fileList = _useState2[0],
|
665
669
|
setFileList = _useState2[1];
|
666
670
|
|
671
|
+
var _useState3 = React.useState(0),
|
672
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
673
|
+
progress = _useState4[0],
|
674
|
+
setProgress = _useState4[1];
|
675
|
+
|
667
676
|
React.useEffect(function () {
|
668
677
|
setFileList(value ? value.split(splitStr).map(function (url) {
|
669
678
|
return {
|
670
679
|
uid: Math.random().toString(36).slice(2, 36),
|
671
|
-
name:
|
680
|
+
name: url,
|
672
681
|
status: 'done',
|
673
682
|
url: url
|
674
683
|
};
|
675
684
|
}) : []);
|
676
685
|
}, [value]);
|
677
686
|
React.useEffect(function () {
|
687
|
+
console.log(fileList);
|
678
688
|
getFileList && getFileList(fileList.map(function (file) {
|
679
689
|
return file.url;
|
680
690
|
}), fileList);
|
681
691
|
}, [fileList]);
|
682
692
|
|
683
|
-
var
|
684
|
-
_useState4 = _slicedToArray(_useState3, 2),
|
685
|
-
previewVisible = _useState4[0],
|
686
|
-
setPreviewVisible = _useState4[1];
|
687
|
-
|
688
|
-
var _useState5 = React.useState(''),
|
693
|
+
var _useState5 = React.useState(false),
|
689
694
|
_useState6 = _slicedToArray(_useState5, 2),
|
690
|
-
|
691
|
-
|
695
|
+
previewVisible = _useState6[0],
|
696
|
+
setPreviewVisible = _useState6[1];
|
692
697
|
|
693
698
|
var _useState7 = React.useState(''),
|
694
699
|
_useState8 = _slicedToArray(_useState7, 2),
|
695
|
-
|
696
|
-
|
700
|
+
previewImage = _useState8[0],
|
701
|
+
setPreviewImage = _useState8[1];
|
702
|
+
|
703
|
+
var _useState9 = React.useState(''),
|
704
|
+
_useState10 = _slicedToArray(_useState9, 2),
|
705
|
+
previewTitle = _useState10[0],
|
706
|
+
setPreviewTitle = _useState10[1];
|
697
707
|
|
698
708
|
var getBase64 = function getBase64(file) {
|
699
709
|
return new Promise(function (resolve, reject) {
|
@@ -732,36 +742,23 @@ function Index$1(_ref, ref) {
|
|
732
742
|
|
733
743
|
var handleChange = /*#__PURE__*/function () {
|
734
744
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) {
|
735
|
-
var file, newFileList,
|
745
|
+
var file, newFileList, urls;
|
736
746
|
return regeneratorRuntime.wrap(function _callee$(_context) {
|
737
747
|
while (1) {
|
738
748
|
switch (_context.prev = _context.next) {
|
739
749
|
case 0:
|
740
750
|
file = _ref2.file, newFileList = _ref2.fileList;
|
741
751
|
|
742
|
-
if (
|
743
|
-
|
744
|
-
|
745
|
-
|
746
|
-
|
747
|
-
|
748
|
-
|
752
|
+
if (file.status === 'done' || file.status === 'removed') {
|
753
|
+
file.url = file.response;
|
754
|
+
urls = newFileList.map(function (file) {
|
755
|
+
return file.url;
|
756
|
+
}).join(splitStr);
|
757
|
+
onChange && onChange(urls);
|
758
|
+
} // setFileList(newFileList)
|
749
759
|
|
750
|
-
case 4:
|
751
|
-
url = _context.sent;
|
752
|
-
|
753
|
-
if (!file.url) {
|
754
|
-
file.url = url;
|
755
|
-
}
|
756
760
|
|
757
|
-
case
|
758
|
-
urls = newFileList.map(function (file) {
|
759
|
-
return file.url;
|
760
|
-
}).join(splitStr);
|
761
|
-
onChange && onChange(urls);
|
762
|
-
setFileList(newFileList);
|
763
|
-
|
764
|
-
case 9:
|
761
|
+
case 2:
|
765
762
|
case "end":
|
766
763
|
return _context.stop();
|
767
764
|
}
|
@@ -774,31 +771,92 @@ function Index$1(_ref, ref) {
|
|
774
771
|
};
|
775
772
|
}();
|
776
773
|
|
774
|
+
var request = /*#__PURE__*/function () {
|
775
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
|
776
|
+
var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
|
777
|
+
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
778
|
+
while (1) {
|
779
|
+
switch (_context2.prev = _context2.next) {
|
780
|
+
case 0:
|
781
|
+
onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
|
782
|
+
_context2.prev = 1;
|
783
|
+
_context2.next = 4;
|
784
|
+
return fetchMethod ? fetchMethod(file) : getBase64(file);
|
785
|
+
|
786
|
+
case 4:
|
787
|
+
url = _context2.sent;
|
788
|
+
|
789
|
+
if (url) {
|
790
|
+
fileObj = {
|
791
|
+
uid: options.file.uid,
|
792
|
+
name: file.name,
|
793
|
+
status: 'done',
|
794
|
+
response: url,
|
795
|
+
thumbUrl: url,
|
796
|
+
originFileObj: file,
|
797
|
+
xhr: onProgress
|
798
|
+
};
|
799
|
+
newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
|
800
|
+
setFileList(newFileList);
|
801
|
+
onSuccess(url, file);
|
802
|
+
}
|
803
|
+
|
804
|
+
_context2.next = 12;
|
805
|
+
break;
|
806
|
+
|
807
|
+
case 8:
|
808
|
+
_context2.prev = 8;
|
809
|
+
_context2.t0 = _context2["catch"](1);
|
810
|
+
console.log("Eroor: ", _context2.t0);
|
811
|
+
onError({
|
812
|
+
err: _context2.t0
|
813
|
+
});
|
814
|
+
|
815
|
+
case 12:
|
816
|
+
case "end":
|
817
|
+
return _context2.stop();
|
818
|
+
}
|
819
|
+
}
|
820
|
+
}, _callee2, null, [[1, 8]]);
|
821
|
+
}));
|
822
|
+
|
823
|
+
return function request(_x2) {
|
824
|
+
return _ref4.apply(this, arguments);
|
825
|
+
};
|
826
|
+
}();
|
827
|
+
|
777
828
|
var handleronRemove = function handleronRemove(file) {
|
778
829
|
var index = fileList.indexOf(file);
|
779
|
-
|
830
|
+
|
831
|
+
if (onRemove) {
|
832
|
+
onRemove && onRemove(file, function () {
|
833
|
+
var newFileList = fileList.slice();
|
834
|
+
newFileList.splice(index, 1);
|
835
|
+
setFileList(newFileList);
|
836
|
+
});
|
837
|
+
} else {
|
780
838
|
var newFileList = fileList.slice();
|
781
839
|
newFileList.splice(index, 1);
|
782
840
|
setFileList(newFileList);
|
783
|
-
}
|
841
|
+
}
|
784
842
|
};
|
785
843
|
|
786
844
|
var handlePreview = /*#__PURE__*/function () {
|
787
|
-
var
|
788
|
-
return regeneratorRuntime.wrap(function
|
845
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file) {
|
846
|
+
return regeneratorRuntime.wrap(function _callee3$(_context3) {
|
789
847
|
while (1) {
|
790
|
-
switch (
|
848
|
+
switch (_context3.prev = _context3.next) {
|
791
849
|
case 0:
|
792
850
|
if (!(!file.url && !file.preview)) {
|
793
|
-
|
851
|
+
_context3.next = 4;
|
794
852
|
break;
|
795
853
|
}
|
796
854
|
|
797
|
-
|
855
|
+
_context3.next = 3;
|
798
856
|
return getBase64(file.originFileObj);
|
799
857
|
|
800
858
|
case 3:
|
801
|
-
file.preview =
|
859
|
+
file.preview = _context3.sent;
|
802
860
|
|
803
861
|
case 4:
|
804
862
|
setPreviewImage(file.url || file.preview);
|
@@ -807,14 +865,14 @@ function Index$1(_ref, ref) {
|
|
807
865
|
|
808
866
|
case 7:
|
809
867
|
case "end":
|
810
|
-
return
|
868
|
+
return _context3.stop();
|
811
869
|
}
|
812
870
|
}
|
813
|
-
},
|
871
|
+
}, _callee3);
|
814
872
|
}));
|
815
873
|
|
816
|
-
return function handlePreview(
|
817
|
-
return
|
874
|
+
return function handlePreview(_x3) {
|
875
|
+
return _ref5.apply(this, arguments);
|
818
876
|
};
|
819
877
|
}();
|
820
878
|
|
@@ -828,19 +886,58 @@ function Index$1(_ref, ref) {
|
|
828
886
|
fileList: fileList
|
829
887
|
};
|
830
888
|
});
|
831
|
-
return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(
|
889
|
+
return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type == 'dragger' ? /*#__PURE__*/React__default['default'].createElement(Dragger, _objectSpread2({
|
890
|
+
fileList: fileList,
|
891
|
+
onPreview: handlePreview,
|
892
|
+
onChange: handleChange,
|
893
|
+
onRemove: handleronRemove,
|
894
|
+
customRequest: request,
|
895
|
+
onProgress: function onProgress(_ref6) {
|
896
|
+
var percent = _ref6.percent;
|
897
|
+
console.log("progre...", percent);
|
898
|
+
|
899
|
+
if (percent === 100) {
|
900
|
+
setTimeout(function () {
|
901
|
+
return setProgress(0);
|
902
|
+
}, 1000);
|
903
|
+
}
|
904
|
+
|
905
|
+
return setProgress(Math.floor(percent));
|
906
|
+
}
|
907
|
+
}, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React__default['default'].createElement(_Upload__default['default'], _objectSpread2({
|
908
|
+
accept: "image/*",
|
832
909
|
fileList: fileList,
|
833
910
|
listType: "picture-card",
|
834
911
|
beforeUpload: beforeUploadIn,
|
835
912
|
onPreview: handlePreview,
|
836
913
|
onChange: handleChange,
|
837
|
-
onRemove: handleronRemove
|
914
|
+
onRemove: handleronRemove,
|
915
|
+
customRequest: request,
|
916
|
+
onProgress: function onProgress(_ref7) {
|
917
|
+
var percent = _ref7.percent;
|
918
|
+
console.log("progre...", percent);
|
919
|
+
|
920
|
+
if (percent === 100) {
|
921
|
+
setTimeout(function () {
|
922
|
+
return setProgress(0);
|
923
|
+
}, 1000);
|
924
|
+
}
|
925
|
+
|
926
|
+
return setProgress(Math.floor(percent));
|
927
|
+
}
|
838
928
|
}, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], {
|
839
929
|
visible: previewVisible,
|
840
930
|
title: previewTitle,
|
841
931
|
footer: null,
|
842
932
|
onCancel: handleCancel
|
843
|
-
}, /*#__PURE__*/React__default['default'].createElement(
|
933
|
+
}, type == 'dragger' ? /*#__PURE__*/React__default['default'].createElement(FileViewer__default['default'], {
|
934
|
+
fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
|
935
|
+
filePath: previewImage,
|
936
|
+
errorComponent: /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
|
937
|
+
onError: function onError(err) {
|
938
|
+
console.log(err);
|
939
|
+
}
|
940
|
+
}) : /*#__PURE__*/React__default['default'].createElement("img", {
|
844
941
|
alt: "example",
|
845
942
|
style: {
|
846
943
|
width: '100%'
|
@@ -7857,7 +7954,7 @@ var WForm = function WForm(props, ref) {
|
|
7857
7954
|
|
7858
7955
|
filterFormColumns.forEach(function (c) {
|
7859
7956
|
if (c.search && c.search.transformSetForm) {
|
7860
|
-
var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
|
7957
|
+
var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex], setFieldsValues);
|
7861
7958
|
setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
|
7862
7959
|
|
7863
7960
|
if (!transformObj[c.dataIndex]) {
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"private": false,
|
3
3
|
"name": "wargerm",
|
4
|
-
"version": "0.5.
|
4
|
+
"version": "0.5.27",
|
5
5
|
"scripts": {
|
6
6
|
"dev": "dumi dev",
|
7
7
|
"docs:build": "dumi build",
|
@@ -52,6 +52,7 @@
|
|
52
52
|
"echarts-for-react": "^3.0.2",
|
53
53
|
"react-countup": "^6.0.0",
|
54
54
|
"react-dom": "^17.0.2",
|
55
|
+
"react-file-viewer": "^1.2.1",
|
55
56
|
"swiper": "^6.7.0",
|
56
57
|
"xgplayer": "^2.31.6",
|
57
58
|
"xgplayer-flv": "^2.5.1",
|