fmui-base 2.1.0-beta.2 → 2.1.0-beta.4

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 (6) hide show
  1. package/README.md +2 -0
  2. package/lib/form/form.js +2 -5
  3. package/lib/process_info/processInfo.js +36 -29
  4. package/lib/selectMember/select.less +39 -28
  5. package/lib/upload/upload.js +36 -20
  6. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish --tag beta
4
4
 
5
5
  ## 更新日志
6
+ - 2.1.0-beta.4：表单html组件样式修改;上传组件修改;上传进度条增加
7
+ - 2.1.0-beta.3：各种样式修复
6
8
  - 2.1.0-beta.2：修改上传组件样式
7
9
  - 2.1.0-beta.1：修改基础组件样式
8
10
  - 2.1.0-beta.0：2.0beta版本提交
package/lib/form/form.js CHANGED
@@ -2482,7 +2482,6 @@ var PageHome = function (_React$Component) {
2482
2482
  label: t.state.itemParam.title,
2483
2483
  readOnly: t.state.itemParam.readOnly,
2484
2484
  minRows: 3,
2485
- layout: 'v',
2486
2485
  placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
2487
2486
  value: t.state.itemParam.value,
2488
2487
  onChange: function onChange(value) {
@@ -2737,10 +2736,9 @@ var PageHome = function (_React$Component) {
2737
2736
  { className: 't-W100' },
2738
2737
  _react2.default.createElement(
2739
2738
  _Field2.default,
2740
- { label: t.state.itemParam.title, layout: 'h', multiLine: true },
2739
+ { label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
2741
2740
  _react2.default.createElement(_upload2.default, {
2742
2741
  ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
2743
- required: t.state.itemParam.required,
2744
2742
  canAdd: t.state.itemParam.readOnly == true ? false : true,
2745
2743
  canDel: t.state.itemParam.readOnly == true ? false : true,
2746
2744
  initList: t.state.itemParam.value,
@@ -2770,10 +2768,9 @@ var PageHome = function (_React$Component) {
2770
2768
  { className: 't-W100' },
2771
2769
  _react2.default.createElement(
2772
2770
  _Field2.default,
2773
- { label: t.state.itemParam.title, layout: 'h', multiLine: true },
2771
+ { label: t.state.itemParam.title, required: t.state.itemParam.required, layout: 'h', multiLine: true },
2774
2772
  _react2.default.createElement(_upload2.default, {
2775
2773
  ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
2776
- required: t.state.itemParam.required,
2777
2774
  canAdd: t.state.itemParam.readOnly == true ? false : true,
2778
2775
  canDel: t.state.itemParam.readOnly == true ? false : true,
2779
2776
  initList: t.state.itemParam.value,
package/lib/process_info/processInfo.js CHANGED
@@ -30,6 +30,10 @@ var _RadioField = require('saltui/lib/RadioField');
30
30
 
31
31
  var _RadioField2 = _interopRequireDefault(_RadioField);
32
32
 
33
+ var _Field = require('saltui/lib/Field');
34
+
35
+ var _Field2 = _interopRequireDefault(_Field);
36
+
33
37
  var _TextareaField = require('saltui/lib/TextareaField');
34
38
 
35
39
  var _TextareaField2 = _interopRequireDefault(_TextareaField);
@@ -6358,7 +6362,7 @@ var PageHome = function (_React$Component) {
6358
6362
  _react2.default.createElement(
6359
6363
  'span',
6360
6364
  { className: 'approval-card-left' },
6361
- '\u738B\u5C0F\u660E\u7684\u836F\u54C1\u767B\u8BB0\u5BA1\u6279'
6365
+ this.state.processTitle
6362
6366
  ),
6363
6367
  _react2.default.createElement('img', { className: 'approval-card-right', src: _variables2.default.approvalCardIcon })
6364
6368
  )
@@ -6436,7 +6440,7 @@ var PageHome = function (_React$Component) {
6436
6440
  { className: this.state.pageStatus == '1' && this.state.operate == 1 ? '' : 't-DN' },
6437
6441
  _react2.default.createElement(
6438
6442
  'div',
6439
- { className: this.state.nextActivityList.length == 0 && this.state.nextRadomList.length == 0 ? '' : '', style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6443
+ { className: this.state.nextActivityList.length == 0 && this.state.nextRadomList.length == 0 ? '' : '', style: { background: '#f2f3f5', padding: '10px 5px' } },
6440
6444
  _react2.default.createElement(
6441
6445
  'span',
6442
6446
  { className: 't-FCblue' },
@@ -6668,7 +6672,7 @@ var PageHome = function (_React$Component) {
6668
6672
  { className: this.state.pageStatus == '1' && this.state.operate == 3 ? '' : 't-DN' },
6669
6673
  _react2.default.createElement(
6670
6674
  'div',
6671
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6675
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6672
6676
  _react2.default.createElement(
6673
6677
  'span',
6674
6678
  { className: 't-FCblue' },
@@ -6730,7 +6734,7 @@ var PageHome = function (_React$Component) {
6730
6734
  { className: this.state.operate == 2 && this.state.canBackActivity.length > 0 ? '' : 't-DN' },
6731
6735
  _react2.default.createElement(
6732
6736
  'div',
6733
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6737
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6734
6738
  _react2.default.createElement(
6735
6739
  'span',
6736
6740
  { className: 't-FCblue' },
@@ -6760,22 +6764,25 @@ var PageHome = function (_React$Component) {
6760
6764
  placeholder: '请输入退回原因',
6761
6765
  value: this.state.backReasonText,
6762
6766
  onChange: this.changeBackReasonText.bind(this) }),
6763
- _react2.default.createElement(_upload2.default, {
6764
- required: false,
6765
- canAdd: true,
6766
- canDel: true,
6767
- label: '\u9644\u4EF6',
6768
- initList: this.state.backInitList,
6769
- initIds: '',
6770
- dir: 'approve',
6771
- onChange: function onChange(value, isInit) {
6772
- t.handleChangePic(value);
6773
- },
6774
- onDel: function onDel(value) {
6775
- t.handleChangePic(value);
6776
- },
6777
- ref: 'backRef'
6778
- }),
6767
+ _react2.default.createElement(
6768
+ _Field2.default,
6769
+ { label: '\u9644\u4EF6', layout: 'h', multiLine: true },
6770
+ _react2.default.createElement(_upload2.default, {
6771
+ required: false,
6772
+ canAdd: true,
6773
+ canDel: true,
6774
+ initList: this.state.backInitList,
6775
+ initIds: '',
6776
+ dir: 'approve',
6777
+ onChange: function onChange(value, isInit) {
6778
+ t.handleChangePic(value);
6779
+ },
6780
+ onDel: function onDel(value) {
6781
+ t.handleChangePic(value);
6782
+ },
6783
+ ref: 'backRef'
6784
+ })
6785
+ ),
6779
6786
  _react2.default.createElement(_CheckboxField2.default, {
6780
6787
  data: this.state.shortMessageList,
6781
6788
  className: '',
@@ -6788,7 +6795,7 @@ var PageHome = function (_React$Component) {
6788
6795
  { className: this.state.operate == 5 && this.state.nextJumpActivity.length > 0 ? '' : 't-DN' },
6789
6796
  _react2.default.createElement(
6790
6797
  'div',
6791
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6798
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6792
6799
  _react2.default.createElement(
6793
6800
  'span',
6794
6801
  { className: 't-FCblue' },
@@ -6827,7 +6834,7 @@ var PageHome = function (_React$Component) {
6827
6834
  { className: this.state.operate == 6 ? '' : 't-DN' },
6828
6835
  _react2.default.createElement(
6829
6836
  'div',
6830
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6837
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6831
6838
  _react2.default.createElement(
6832
6839
  'span',
6833
6840
  { className: 't-FCblue' },
@@ -6859,7 +6866,7 @@ var PageHome = function (_React$Component) {
6859
6866
  { className: this.state.operate == 4 ? '' : 't-DN' },
6860
6867
  _react2.default.createElement(
6861
6868
  'div',
6862
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6869
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6863
6870
  _react2.default.createElement(
6864
6871
  'span',
6865
6872
  { className: 't-FCblue' },
@@ -6891,7 +6898,7 @@ var PageHome = function (_React$Component) {
6891
6898
  { className: this.state.operate == 20 ? '' : 't-DN' },
6892
6899
  _react2.default.createElement(
6893
6900
  'div',
6894
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6901
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6895
6902
  _react2.default.createElement(
6896
6903
  'span',
6897
6904
  { className: 't-FCblue' },
@@ -6923,7 +6930,7 @@ var PageHome = function (_React$Component) {
6923
6930
  { className: this.state.operate == 12 && this.state.urgeDataList.length > 0 ? '' : 't-DN' },
6924
6931
  _react2.default.createElement(
6925
6932
  'div',
6926
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6933
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6927
6934
  _react2.default.createElement(
6928
6935
  'span',
6929
6936
  { className: 't-FCblue' },
@@ -6964,7 +6971,7 @@ var PageHome = function (_React$Component) {
6964
6971
  { className: this.state.operate == 14 ? '' : 't-DN' },
6965
6972
  _react2.default.createElement(
6966
6973
  'div',
6967
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6974
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6968
6975
  _react2.default.createElement(
6969
6976
  'span',
6970
6977
  { className: 't-FCblue' },
@@ -6986,7 +6993,7 @@ var PageHome = function (_React$Component) {
6986
6993
  { className: this.state.operate == 18 ? '' : 't-DN' },
6987
6994
  _react2.default.createElement(
6988
6995
  'div',
6989
- { style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
6996
+ { style: { background: '#f2f3f5', padding: '10px 5px' } },
6990
6997
  _react2.default.createElement(
6991
6998
  'span',
6992
6999
  { className: 't-FCblue' },
@@ -7035,12 +7042,12 @@ var PageHome = function (_React$Component) {
7035
7042
  null,
7036
7043
  _react2.default.createElement(
7037
7044
  _Button2.default,
7038
- { type: 'secondary', display: 'banner', onClick: this.handleCancelClick.bind(this) },
7045
+ { type: 'secondary', display: 'inline', onClick: this.handleCancelClick.bind(this) },
7039
7046
  '\u53D6\u6D88'
7040
7047
  ),
7041
7048
  _react2.default.createElement(
7042
7049
  _Button2.default,
7043
- { type: 'primary', display: 'banner', onClick: this.handleSubmitClick.bind(this) },
7050
+ { type: 'primary', display: 'inline', onClick: this.handleSubmitClick.bind(this) },
7044
7051
  '\u786E\u8BA4'
7045
7052
  )
7046
7053
  )
package/lib/selectMember/select.less CHANGED
@@ -1,29 +1,40 @@
1
- .t-crumb-scroll{
2
- width:100% !important;
3
-
4
- }
5
- .t-crumb{
6
- height: 34px;
7
- padding:5px 16px;
8
- }
9
- .t-disable-mask{
10
- position: absolute;
11
- left: 0;
12
- right: 0;
13
- top: 0;
14
- bottom: 0;
15
- background-color: rgba(255,255,255,.4);
16
- }
17
- .t-checkbox-field-icon-list.disabled {
18
- background-color: rgba(31,56,88,.1);
19
- }
20
- .dd-app-avatar{
21
- height: 101px !important;
22
- }
23
- .t-checkbox-field-icon-list {
24
- background: #38adff;
25
- }
26
- .select-member-div-top{
27
- left: 0;
28
- background: #f7f7f7;
1
+ .t-crumb-scroll {
2
+ width: 100% !important;
3
+
4
+ }
5
+
6
+ .t-crumb {
7
+ height: 34px;
8
+ padding: 5px 16px;
9
+ }
10
+
11
+ .t-disable-mask {
12
+ position: absolute;
13
+ left: 0;
14
+ right: 0;
15
+ top: 0;
16
+ bottom: 0;
17
+ background-color: rgba(255, 255, 255, .4);
18
+ }
19
+
20
+ .t-checkbox-field-icon-list.disabled {
21
+ background-color: rgba(31, 56, 88, .1);
22
+ }
23
+
24
+ .dd-app-avatar {
25
+ height: 101px !important;
26
+ }
27
+
28
+ .t-checkbox-field-icon-list {
29
+ background: #38adff;
30
+ }
31
+
32
+ .select-member-div-top {
33
+ left: 0;
34
+ background: #f7f7f7;
35
+ }
36
+
37
+ //4.0规范修改样式
38
+ .t-search-bar-input[type=search] {
39
+ border-radius: 83px !important;
29
40
  }
package/lib/upload/upload.js CHANGED
@@ -15,6 +15,8 @@ var _Toast = require('saltui/lib/Toast');
15
15
 
16
16
  var _Toast2 = _interopRequireDefault(_Toast);
17
17
 
18
+ var _saltui = require('saltui');
19
+
18
20
  var _uploadcore = require('uploadcore');
19
21
 
20
22
  require('whatwg-fetch');
@@ -148,6 +150,7 @@ var PageHome = function (_React$Component) {
148
150
  limitNo: limitNo,
149
151
  context: context,
150
152
  uploadUrl: context + '/api/m/plugin/attachment/mobile/createFile?token=' + token,
153
+ // uploadUrl: context + '/api/m/plugin/attachment/mobile/createFile?token=eyJhbGciOiJIUzUxMiIsInppcCI6IkRFRiJ9.eNqMjztOAzEQQO_iOpb82TV2OspIiCoXsMfjsJCsV_ZuCEI0cBBEQ8exInEMxkBFRennpzczj-x2HtiaJZ2C0MnzCxsd77QDbq2VvDeuj9hrECqyFatLIFmB0z4Ib3UICCYIaUkILhkInU9A4lBrq-7xFHxFPuc7HHnFcsTSfv3M1tI4LZ2USqwYnqYfoKRzDUAu0yZSQpAO47U_ID0-X97OH6_n92eC-7wbxu3D1Ph035ZbqH8JkJeR6uzm0CbllAbAq-YSm8uCv-J3_B-H5LL7o5ouep2aaqzSENF3tpfs6QsAAP__.C7cU_X4iYSnhbG7wa8zPO-x9zgb9KpEUasfLUicIInOlQkHW7Yix21-xHbwqgjMQVvIBkOHMtBoPrqZ5oTd6Jg',
151
154
  urlPrev: context + '/api/m/plugin/attachment/mobile/viewImage?token=' + token + '&fid=',
152
155
  queryUrl: context + '/api/m/plugin/attachment/mobile/getAttachmentByIds?token=' + token + '&ids=',
153
156
  //queryUrl: context + '/client/approve/getCanBackActivity?ids=',
@@ -156,7 +159,9 @@ var PageHome = function (_React$Component) {
156
159
  addQueNum: 0,
157
160
  viewType: viewType,
158
161
  initList: initList,
159
- returnOnce: returnOnce
162
+ returnOnce: returnOnce,
163
+ percent1: 0,
164
+ showProgress: true
160
165
  };
161
166
  return _this;
162
167
  }
@@ -224,14 +229,18 @@ var PageHome = function (_React$Component) {
224
229
  return false;
225
230
  }
226
231
  }
227
- console.info('queuefileadded', file);
232
+ // console.info('queuefileadded', file);
228
233
  file.session().progress(function (e) {
229
- console.info('progress', e);
234
+ // console.info('progress', e);
230
235
  }).fail(function (error) {
231
236
  console.info(error);
232
237
  }).done(function (response) {
233
238
  console.info(response.getJson());
234
239
  });
240
+ }).on(_uploadcore.Events.FILE_UPLOAD_PROGRESS, function (file, progress) {
241
+ _this2.setState({
242
+ percent1: progress.percentage
243
+ });
235
244
  }).on(_uploadcore.Events.FILE_UPLOAD_ERROR, function (error) {
236
245
  if (error.name == 'AbortError') {
237
246
  //网络中断
@@ -310,7 +319,7 @@ var PageHome = function (_React$Component) {
310
319
  }
311
320
  }).on(_uploadcore.Events.FILE_UPLOAD_COMPLETED, function (file) {
312
321
  if (file.getStatus() === _uploadcore.Status.SUCCESS) {
313
- //alert('上传成功');
322
+ // alert('上传成功');
314
323
  var result = file.response.getJson();
315
324
  if (result.code == -1) {
316
325
  alert(result.message);
@@ -328,10 +337,17 @@ var PageHome = function (_React$Component) {
328
337
  return false;
329
338
  }
330
339
  }
340
+ _this2.setState({
341
+ showProgress: false
342
+ });
331
343
  //var checksum = json[0].checksum;
332
344
  var initList = t.state.initList;
333
345
  if (initList.length < _this2.state.limitNo) {
334
346
  initList = initList.concat(json);
347
+ _this2.setState({
348
+ showProgress: true,
349
+ percent1: 0
350
+ });
335
351
  if (t.state.returnOnce) {
336
352
  t.props.onChange(json);
337
353
  } else {
@@ -532,21 +548,7 @@ var PageHome = function (_React$Component) {
532
548
  ),
533
549
  _react2.default.createElement(
534
550
  'div',
535
- { className: t.state.uploadType == 'image' ? "t-FBH t-PL16 t-fw" : " " },
536
- _react2.default.createElement(
537
- 'div',
538
- { className: t.state.uploadType == 'image' ? 'upload-image-test' : 'upload-image-test-hidden' },
539
- _react2.default.createElement(
540
- 'div',
541
- { className: 'upload-image-test-left' },
542
- '\u76F8\u5173\u56FE\u7247'
543
- ),
544
- _react2.default.createElement(
545
- 'div',
546
- { className: 'upload-image-test-right' },
547
- '\u53EF\u4E0A\u4F20jpg,gif\u7C7B\u578B\u6587\u4EF6\uFF0C\u5927\u5C0F\u9650\u52363M'
548
- )
549
- ),
551
+ { className: t.state.uploadType == 'image' ? "t-FBH t-fw" : "upload" },
550
552
  t.state.initList.map(function (item, i) {
551
553
  function calculate(no) {
552
554
  var a = no / 1024;
@@ -610,7 +612,21 @@ var PageHome = function (_React$Component) {
610
612
  }),
611
613
  _react2.default.createElement(
612
614
  'div',
613
- { flex: 1, className: t.state.canAdd && (t.state.limitNo > t.props.initList.length || t.state.limitNo == -1) ? t.state.uploadType == 'image' ? 'upload-image' : 'upload-file' : 't-DN' },
615
+ { className: t.state.canAdd && (t.state.limitNo > t.state.initList.length || t.state.limitNo == -1) && t.state.percent1 > 0 && t.state.showProgress ? t.state.uploadType == 'image' ? 'upload-image-p' : 'upload-file-p' : 't-DN' },
616
+ _react2.default.createElement(
617
+ 'div',
618
+ { style: { width: '100%' } },
619
+ _react2.default.createElement(
620
+ 'span',
621
+ { className: 'upload-progress-tip' },
622
+ '\u6587\u4EF6\u4E0A\u4F20\u4E2D'
623
+ ),
624
+ _react2.default.createElement(_saltui.Progress, { className: 'upload-progress', percent: t.state.percent1, status: 'normal', strokeWidth: 4, showInfo: false })
625
+ )
626
+ ),
627
+ _react2.default.createElement(
628
+ 'div',
629
+ { flex: 1, className: t.state.canAdd && (t.state.limitNo > t.state.initList.length || t.state.limitNo == -1) ? t.state.uploadType == 'image' ? 'upload-image' : 'upload-file' : 't-DN' },
614
630
  _react2.default.createElement('i', { id: 'ddUploadPic' + t.state.keyNum, className: 'iconfont icon-plus' })
615
631
  )
616
632
  )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.0-beta.2",
3
+ "version": "2.1.0-beta.4",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",