fmui-base 2.2.49 → 2.2.50
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/README.md +1 -0
- package/lib/upload/upload.js +45 -3
- package/package.json +5 -5
package/README.md
CHANGED
package/lib/upload/upload.js
CHANGED
|
@@ -25,6 +25,10 @@ var _h5Imageviewer = require('h5-imageviewer');
|
|
|
25
25
|
|
|
26
26
|
var viewer = _interopRequireWildcard(_h5Imageviewer);
|
|
27
27
|
|
|
28
|
+
var _reactPhotoView = require('react-photo-view');
|
|
29
|
+
|
|
30
|
+
require('react-photo-view/dist/react-photo-view.css');
|
|
31
|
+
|
|
28
32
|
require('whatwg-fetch');
|
|
29
33
|
|
|
30
34
|
require('es6-promise');
|
|
@@ -98,6 +102,7 @@ var PageHome = function (_React$Component) {
|
|
|
98
102
|
};
|
|
99
103
|
|
|
100
104
|
_this.viewImageHandel = function (url) {
|
|
105
|
+
// 显示图片查看器
|
|
101
106
|
viewer.showViewer({
|
|
102
107
|
src: url
|
|
103
108
|
});
|
|
@@ -207,6 +212,8 @@ var PageHome = function (_React$Component) {
|
|
|
207
212
|
var businessExt = props.extensions ? props.extensions : "";
|
|
208
213
|
var context = document.getElementById("context").value;
|
|
209
214
|
var token = getLoginUserInfo().token;
|
|
215
|
+
// 判断是否为桌面端
|
|
216
|
+
var isDesktop = !('ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0);
|
|
210
217
|
_this.state = {
|
|
211
218
|
required: required,
|
|
212
219
|
canAdd: canAdd,
|
|
@@ -233,7 +240,8 @@ var PageHome = function (_React$Component) {
|
|
|
233
240
|
initList: initList,
|
|
234
241
|
returnOnce: returnOnce,
|
|
235
242
|
percent1: 0,
|
|
236
|
-
showProgress: true
|
|
243
|
+
showProgress: true,
|
|
244
|
+
isDesktop: isDesktop
|
|
237
245
|
};
|
|
238
246
|
return _this;
|
|
239
247
|
}
|
|
@@ -673,7 +681,15 @@ var PageHome = function (_React$Component) {
|
|
|
673
681
|
return t.state.uploadType == 'image' ? _react2.default.createElement(
|
|
674
682
|
'div',
|
|
675
683
|
{ className: 'upload-image-item', key: i },
|
|
676
|
-
|
|
684
|
+
t.state.isDesktop ? _react2.default.createElement(
|
|
685
|
+
_reactPhotoView.PhotoProvider,
|
|
686
|
+
null,
|
|
687
|
+
_react2.default.createElement(
|
|
688
|
+
_reactPhotoView.PhotoView,
|
|
689
|
+
{ src: t.state.urlPrev + item.id },
|
|
690
|
+
_react2.default.createElement('img', { width: '100', height: '98', src: t.state.urlPrev + item.id, alt: '' })
|
|
691
|
+
)
|
|
692
|
+
) : _react2.default.createElement('img', { width: '100', height: '98', onClick: _this3.viewImageHandel.bind(_this3, t.state.urlPrev + item.id), src: t.state.urlPrev + item.id }),
|
|
677
693
|
_react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus' : 't-DN', onClick: _this3.del.bind(_this3, i) })
|
|
678
694
|
) :
|
|
679
695
|
// <div className="t-FBH" key={i} >
|
|
@@ -700,7 +716,33 @@ var PageHome = function (_React$Component) {
|
|
|
700
716
|
_react2.default.createElement(
|
|
701
717
|
'div',
|
|
702
718
|
{ className: 'dd-t-border upload-list-item' },
|
|
703
|
-
_react2.default.createElement(
|
|
719
|
+
t.state.isDesktop && (item.fileExt == ".jpg" || item.fileExt == ".jpeg" || item.fileExt == ".gif" || item.fileExt == ".png") && _this3.state.viewType == 'view' ? _react2.default.createElement(
|
|
720
|
+
_reactPhotoView.PhotoProvider,
|
|
721
|
+
null,
|
|
722
|
+
_react2.default.createElement(
|
|
723
|
+
_reactPhotoView.PhotoView,
|
|
724
|
+
{ src: t.state.urlPrev + item.id },
|
|
725
|
+
_react2.default.createElement(
|
|
726
|
+
'div',
|
|
727
|
+
{ className: 'upload-list-item-content' },
|
|
728
|
+
_react2.default.createElement(
|
|
729
|
+
'div',
|
|
730
|
+
{ className: 'upload-name-icon' },
|
|
731
|
+
_react2.default.createElement('i', { className: _this3.getIcon(item.fileExt) }),
|
|
732
|
+
_react2.default.createElement(
|
|
733
|
+
'div',
|
|
734
|
+
{ className: 't-list-title t-omit t-LH1_4' },
|
|
735
|
+
typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
|
|
736
|
+
)
|
|
737
|
+
),
|
|
738
|
+
_react2.default.createElement(
|
|
739
|
+
'div',
|
|
740
|
+
{ className: 'dd-t-list-time t-FBAC' },
|
|
741
|
+
calculate(typeof item.fileSize == 'undefined' ? item.size : item.fileSize)
|
|
742
|
+
)
|
|
743
|
+
)
|
|
744
|
+
)
|
|
745
|
+
) : _react2.default.createElement(
|
|
704
746
|
'div',
|
|
705
747
|
{ className: 'upload-list-item-content', onClick: _this3.view.bind(_this3, item) },
|
|
706
748
|
_react2.default.createElement(
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fmui-base",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.50",
|
|
4
4
|
"title": "fmui-base",
|
|
5
5
|
"description": "fmui移动端组件",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -66,16 +66,16 @@
|
|
|
66
66
|
"collectCoverage": true
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
+
"classnames": "^2.2.6",
|
|
69
70
|
"copy-webpack-plugin": "^3.0.1",
|
|
70
71
|
"echarts": "5.5.0",
|
|
71
72
|
"echarts-for-react": "3.0.2",
|
|
72
73
|
"h5-imageviewer": "^0.7.8",
|
|
73
|
-
"react-grid-layout": "0.16.0",
|
|
74
|
-
"saltui": "^4.13.1",
|
|
75
|
-
|
|
76
74
|
"natty-fetch": "^2.5.2",
|
|
77
75
|
"object-assign": "^4.1.1",
|
|
78
76
|
"prop-types": "15.x",
|
|
79
|
-
"
|
|
77
|
+
"react-grid-layout": "0.16.0",
|
|
78
|
+
"react-photo-view": "^1.2.7",
|
|
79
|
+
"saltui": "^4.13.1"
|
|
80
80
|
}
|
|
81
81
|
}
|