fmui-base 2.2.49 → 2.2.51

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 (4) hide show
  1. package/README.md +2 -0
  2. package/lib/process_info/processInfo.js +10 -3
  3. package/lib/upload/upload.js +45 -3
  4. package/package.json +5 -5
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.2.51: 北京CA跳转小程序
7
+ - 2.2.50: 上传组件查看图片功能适配桌端
6
8
  - 2.2.49: 表单组件支持回显已删除的用户
7
9
  - 2.2.48: 选人组件支持回显已删除的用户
8
10
  - 2.2.47: 选人组件党员，非党员默认选中支持配置
package/lib/process_info/processInfo.js CHANGED
@@ -475,7 +475,7 @@ var PageHome = function (_React$Component) {
475
475
  selectProcessCode: '', //选中的子流程
476
476
  subProcessType: '', //子流程类型 0串行 1并行
477
477
  urgencyList: [], //紧急程度列表
478
- urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
478
+ urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'addlotsReturn', ''), _param);
479
479
  FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
480
480
 
481
481
  //处理特有参数
@@ -1217,9 +1217,14 @@ var PageHome = function (_React$Component) {
1217
1217
  //是否是产品CA 1是 0否
1218
1218
  var caIsPrd = "";
1219
1219
  var oauthWindowURL = "";
1220
+ var signDataId = "";
1221
+ if (content.signDataId && content.signDataId != null && content.signDataId != 'null' && typeof content.signDataId != 'undefined' && content.signDataId != '') {
1222
+ signDataId = content.signDataId;
1223
+ }
1224
+
1220
1225
  if (content.oauthWindowURL && content.oauthWindowURL != null && content.oauthWindowURL != 'null' && typeof content.oauthWindowURL != 'undefined' && content.oauthWindowURL != '') {
1221
1226
  oauthWindowURL = content.oauthWindowURL;
1222
- t.openCaPage(oauthWindowURL, content.caFirm);
1227
+ t.openCaPage(oauthWindowURL, content.caFirm, signDataId);
1223
1228
  }
1224
1229
  var isCaUser = "0";
1225
1230
  if (content.isCaUser && content.isCaUser != null && content.isCaUser != 'null' && typeof content.isCaUser != 'undefined' && content.isCaUser != '') {
@@ -1476,6 +1481,7 @@ var PageHome = function (_React$Component) {
1476
1481
  urgentSelectList: urgentSelectList,
1477
1482
  backInitiatorEndFlow: backInitiatorEndFlow,
1478
1483
  oauthWindowURL: oauthWindowURL,
1484
+ signDataId: signDataId,
1479
1485
  isCaUser: isCaUser,
1480
1486
  caFirm: caFirm,
1481
1487
  addlotsReturn: addlotsReturn
@@ -7630,12 +7636,13 @@ var PageHome = function (_React$Component) {
7630
7636
 
7631
7637
  }, {
7632
7638
  key: 'openCaPage',
7633
- value: function openCaPage(oauthWindowURL, caFirm) {
7639
+ value: function openCaPage(oauthWindowURL, caFirm, signDataId) {
7634
7640
  setTimeout(function () {
7635
7641
  console.log('oauthWindowURL', oauthWindowURL);
7636
7642
  if (oauthWindowURL && oauthWindowURL != null && oauthWindowURL != 'null' && typeof oauthWindowURL != 'undefined' && oauthWindowURL != '' && caFirm && caFirm != null && caFirm != 'null' && typeof caFirm != 'undefined' && caFirm != '') {
7637
7643
  localStorage.setItem('oauthWindowURL', oauthWindowURL);
7638
7644
  localStorage.setItem('caFirm', caFirm);
7645
+ localStorage.setItem('signDataId', signDataId);
7639
7646
  // console.log(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
7640
7647
  // window.open(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
7641
7648
  location.href = getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html';
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
- _react2.default.createElement('img', { width: '100', height: '98', onClick: _this3.viewImageHandel.bind(_this3, t.state.urlPrev + item.id), src: t.state.urlPrev + item.id }),
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.49",
3
+ "version": "2.2.51",
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
- "classnames": "^2.2.6"
77
+ "react-grid-layout": "0.16.0",
78
+ "react-photo-view": "^1.2.7",
79
+ "saltui": "^4.13.1"
80
80
  }
81
81
  }