fmui-base 1.0.48 → 2.0.0
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 +13 -31
- package/lib/db/variables.js +1 -0
- package/lib/form/form.js +273 -86
- package/lib/form/subForm.js +3 -3
- package/lib/form/table.js +25 -14
- package/lib/form_info/formInfo.js +2 -2
- package/lib/poppage/table/table.js +2 -2
- package/lib/process_batch/processBatch.js +3 -3
- package/lib/process_info/FlowChart.js +62 -99
- package/lib/process_info/processInfo.js +166 -82
- package/lib/process_list/processList.js +94 -68
- package/lib/process_list/processList.less +1 -1
- package/lib/selectMember/select.js +1961 -1114
- package/lib/selectMember/select.less +21 -10
- package/lib/signature/sign.js +2 -2
- package/lib/upload/upload.js +89 -18
- package/package.json +3 -2
|
@@ -1,29 +1,40 @@
|
|
|
1
|
-
.t-crumb-scroll{
|
|
2
|
-
width:100% !important;
|
|
1
|
+
.t-crumb-scroll {
|
|
2
|
+
width: 100% !important;
|
|
3
3
|
|
|
4
4
|
}
|
|
5
|
-
|
|
5
|
+
|
|
6
|
+
.t-crumb {
|
|
6
7
|
height: 34px;
|
|
7
|
-
padding:5px 16px;
|
|
8
|
+
padding: 5px 16px;
|
|
8
9
|
}
|
|
9
|
-
|
|
10
|
+
|
|
11
|
+
.t-disable-mask {
|
|
10
12
|
position: absolute;
|
|
11
13
|
left: 0;
|
|
12
14
|
right: 0;
|
|
13
15
|
top: 0;
|
|
14
16
|
bottom: 0;
|
|
15
|
-
background-color: rgba(255,255,255
|
|
17
|
+
background-color: rgba(255, 255, 255, .4);
|
|
16
18
|
}
|
|
19
|
+
|
|
17
20
|
.t-checkbox-field-icon-list.disabled {
|
|
18
|
-
background-color: rgba(31,56,88
|
|
21
|
+
background-color: rgba(31, 56, 88, .1);
|
|
19
22
|
}
|
|
20
|
-
|
|
23
|
+
|
|
24
|
+
.dd-app-avatar {
|
|
21
25
|
height: 101px !important;
|
|
22
26
|
}
|
|
27
|
+
|
|
23
28
|
.t-checkbox-field-icon-list {
|
|
24
|
-
|
|
29
|
+
background: #38adff;
|
|
25
30
|
}
|
|
26
|
-
|
|
31
|
+
|
|
32
|
+
.select-member-div-top {
|
|
27
33
|
left: 0;
|
|
28
34
|
background: #f7f7f7;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
//4.0规范修改样式
|
|
38
|
+
.t-search-bar-input[type=search] {
|
|
39
|
+
border-radius: 83px !important;
|
|
29
40
|
}
|
package/lib/signature/sign.js
CHANGED
|
@@ -334,13 +334,13 @@ var Page = function (_React$Component) {
|
|
|
334
334
|
{ style: { background: '#f2f3f5', height: '35px', padding: '10px 5px' } },
|
|
335
335
|
_react2.default.createElement(
|
|
336
336
|
'span',
|
|
337
|
-
{ className: 't-
|
|
337
|
+
{ className: 't-FCblue' },
|
|
338
338
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14' }),
|
|
339
339
|
t.props.title
|
|
340
340
|
),
|
|
341
341
|
_react2.default.createElement(
|
|
342
342
|
'span',
|
|
343
|
-
{ onClick: t.popDraw.bind(t), className: 't-
|
|
343
|
+
{ onClick: t.popDraw.bind(t), className: 't-FCblue t-FR' },
|
|
344
344
|
t.state.fileId == "" ? "去手写签名" : "重写签名"
|
|
345
345
|
)
|
|
346
346
|
),
|
package/lib/upload/upload.js
CHANGED
|
@@ -15,6 +15,10 @@ var _Toast = require('saltui/lib/Toast');
|
|
|
15
15
|
|
|
16
16
|
var _Toast2 = _interopRequireDefault(_Toast);
|
|
17
17
|
|
|
18
|
+
var _Progress = require('saltui/lib/Progress');
|
|
19
|
+
|
|
20
|
+
var _Progress2 = _interopRequireDefault(_Progress);
|
|
21
|
+
|
|
18
22
|
var _uploadcore = require('uploadcore');
|
|
19
23
|
|
|
20
24
|
require('whatwg-fetch');
|
|
@@ -64,6 +68,8 @@ var PageHome = function (_React$Component) {
|
|
|
64
68
|
var canAdd = props.canAdd;
|
|
65
69
|
// 可删除
|
|
66
70
|
var canDel = props.canDel;
|
|
71
|
+
//可下载
|
|
72
|
+
var canDownload = props.canDownload;
|
|
67
73
|
|
|
68
74
|
//单次返回,默认返回所有
|
|
69
75
|
var returnOnce = props.returnOnce;
|
|
@@ -138,6 +144,7 @@ var PageHome = function (_React$Component) {
|
|
|
138
144
|
required: required,
|
|
139
145
|
canAdd: canAdd,
|
|
140
146
|
canDel: canDel,
|
|
147
|
+
canDownload: canDownload,
|
|
141
148
|
keyNum: keyNum,
|
|
142
149
|
uploadType: uploadType,
|
|
143
150
|
accept: accept,
|
|
@@ -156,7 +163,9 @@ var PageHome = function (_React$Component) {
|
|
|
156
163
|
addQueNum: 0,
|
|
157
164
|
viewType: viewType,
|
|
158
165
|
initList: initList,
|
|
159
|
-
returnOnce: returnOnce
|
|
166
|
+
returnOnce: returnOnce,
|
|
167
|
+
percent1: 0,
|
|
168
|
+
showProgress: true
|
|
160
169
|
};
|
|
161
170
|
return _this;
|
|
162
171
|
}
|
|
@@ -224,14 +233,18 @@ var PageHome = function (_React$Component) {
|
|
|
224
233
|
return false;
|
|
225
234
|
}
|
|
226
235
|
}
|
|
227
|
-
console.info('queuefileadded', file);
|
|
236
|
+
// console.info('queuefileadded', file);
|
|
228
237
|
file.session().progress(function (e) {
|
|
229
|
-
console.info('progress', e);
|
|
238
|
+
// console.info('progress', e);
|
|
230
239
|
}).fail(function (error) {
|
|
231
240
|
console.info(error);
|
|
232
241
|
}).done(function (response) {
|
|
233
242
|
console.info(response.getJson());
|
|
234
243
|
});
|
|
244
|
+
}).on(_uploadcore.Events.FILE_UPLOAD_PROGRESS, function (file, progress) {
|
|
245
|
+
_this2.setState({
|
|
246
|
+
percent1: progress.percentage
|
|
247
|
+
});
|
|
235
248
|
}).on(_uploadcore.Events.FILE_UPLOAD_ERROR, function (error) {
|
|
236
249
|
if (error.name == 'AbortError') {
|
|
237
250
|
//网络中断
|
|
@@ -310,7 +323,7 @@ var PageHome = function (_React$Component) {
|
|
|
310
323
|
}
|
|
311
324
|
}).on(_uploadcore.Events.FILE_UPLOAD_COMPLETED, function (file) {
|
|
312
325
|
if (file.getStatus() === _uploadcore.Status.SUCCESS) {
|
|
313
|
-
//alert('上传成功');
|
|
326
|
+
// alert('上传成功');
|
|
314
327
|
var result = file.response.getJson();
|
|
315
328
|
if (result.code == -1) {
|
|
316
329
|
alert(result.message);
|
|
@@ -325,13 +338,23 @@ var PageHome = function (_React$Component) {
|
|
|
325
338
|
type: 'error',
|
|
326
339
|
content: '附件名称包含' + returnMsg + '敏感词！'
|
|
327
340
|
});
|
|
341
|
+
_this2.setState({
|
|
342
|
+
showProgress: false
|
|
343
|
+
});
|
|
328
344
|
return false;
|
|
329
345
|
}
|
|
330
346
|
}
|
|
347
|
+
_this2.setState({
|
|
348
|
+
showProgress: false
|
|
349
|
+
});
|
|
331
350
|
//var checksum = json[0].checksum;
|
|
332
351
|
var initList = t.state.initList;
|
|
333
352
|
if (initList.length < _this2.state.limitNo) {
|
|
334
353
|
initList = initList.concat(json);
|
|
354
|
+
_this2.setState({
|
|
355
|
+
showProgress: true,
|
|
356
|
+
percent1: 0
|
|
357
|
+
});
|
|
335
358
|
if (t.state.returnOnce) {
|
|
336
359
|
t.props.onChange(json);
|
|
337
360
|
} else {
|
|
@@ -430,6 +453,21 @@ var PageHome = function (_React$Component) {
|
|
|
430
453
|
downloadFile(id);
|
|
431
454
|
}
|
|
432
455
|
}
|
|
456
|
+
}, {
|
|
457
|
+
key: 'downloadFile',
|
|
458
|
+
value: function (_downloadFile) {
|
|
459
|
+
function downloadFile(_x) {
|
|
460
|
+
return _downloadFile.apply(this, arguments);
|
|
461
|
+
}
|
|
462
|
+
|
|
463
|
+
downloadFile.toString = function () {
|
|
464
|
+
return _downloadFile.toString();
|
|
465
|
+
};
|
|
466
|
+
|
|
467
|
+
return downloadFile;
|
|
468
|
+
}(function (file) {
|
|
469
|
+
downloadFile(file.id);
|
|
470
|
+
})
|
|
433
471
|
|
|
434
472
|
//初始化ids
|
|
435
473
|
|
|
@@ -534,7 +572,7 @@ var PageHome = function (_React$Component) {
|
|
|
534
572
|
),
|
|
535
573
|
_react2.default.createElement(
|
|
536
574
|
'div',
|
|
537
|
-
{ className: t.state.uploadType == 'image' ? "t-FBH t-
|
|
575
|
+
{ className: t.state.uploadType == 'image' ? "t-FBH t-fw" : "upload" },
|
|
538
576
|
t.state.initList.map(function (item, i) {
|
|
539
577
|
function calculate(no) {
|
|
540
578
|
var a = no / 1024;
|
|
@@ -549,23 +587,43 @@ var PageHome = function (_React$Component) {
|
|
|
549
587
|
}
|
|
550
588
|
return t.state.uploadType == 'image' ? _react2.default.createElement(
|
|
551
589
|
'div',
|
|
552
|
-
{ className: '
|
|
553
|
-
_react2.default.createElement('img', { width: '
|
|
590
|
+
{ className: 'upload-image-item', key: i },
|
|
591
|
+
_react2.default.createElement('img', { width: '100', height: '98', src: t.state.urlPrev + item.id + '&token=' + t.state.token }),
|
|
554
592
|
_react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus' : 't-DN', onClick: _this3.del.bind(_this3, i) })
|
|
555
|
-
) :
|
|
593
|
+
) :
|
|
594
|
+
// <div className="t-FBH" key={i} >
|
|
595
|
+
// <div className="dd-t-border t-P6 t-MB10 t-FB1" onClick={this.view.bind(this, item)}>
|
|
596
|
+
// <i className="iconfont icon-file t-FC9 t-FL t-MR6" ></i>
|
|
597
|
+
// <div className="dd-t-list-text-content" >
|
|
598
|
+
// <div className="t-list-title t-omit t-LH1_4" >
|
|
599
|
+
// {typeof(item.fileDisplayName)=='undefined'?item.name:item.fileDisplayName}
|
|
600
|
+
// </div>
|
|
601
|
+
// <div className="dd-t-list-time t-FBAC" >{calculate(typeof(item.fileSize)=='undefined'?item.size:item.fileSize)}</div>
|
|
602
|
+
// </div>
|
|
603
|
+
// </div>
|
|
604
|
+
// <i className={t.state.canDel?'iconfont icon-minus t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10':'t-DN'} onClick={this.del.bind(this,i)}></i>
|
|
605
|
+
// </div>
|
|
606
|
+
|
|
607
|
+
/* 4.0修改 */
|
|
608
|
+
_react2.default.createElement(
|
|
556
609
|
'div',
|
|
557
|
-
{ className: '
|
|
610
|
+
{ className: 'upload-list', key: i },
|
|
558
611
|
_react2.default.createElement(
|
|
559
612
|
'div',
|
|
560
|
-
{ className: '
|
|
561
|
-
_react2.default.createElement('i', { className: 'iconfont icon-file t-FC9 t-FL t-MR6' }),
|
|
613
|
+
{ className: 'upload-content' },
|
|
562
614
|
_react2.default.createElement(
|
|
563
615
|
'div',
|
|
564
|
-
{ className: 'dd-t-list-
|
|
616
|
+
{ className: 'dd-t-border upload-list-item', onClick: _this3.view.bind(_this3, item) },
|
|
565
617
|
_react2.default.createElement(
|
|
566
618
|
'div',
|
|
567
|
-
{ className: '
|
|
568
|
-
|
|
619
|
+
{ className: 'upload-list-item-content' },
|
|
620
|
+
_react2.default.createElement('i', { className: 'iconfont icon-PDF' }),
|
|
621
|
+
_react2.default.createElement(
|
|
622
|
+
'div',
|
|
623
|
+
{ className: 't-list-title t-omit t-LH1_4' },
|
|
624
|
+
typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
|
|
625
|
+
),
|
|
626
|
+
_react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-delete' : 't-DN', onClick: _this3.del.bind(_this3, i) })
|
|
569
627
|
),
|
|
570
628
|
_react2.default.createElement(
|
|
571
629
|
'div',
|
|
@@ -573,14 +631,27 @@ var PageHome = function (_React$Component) {
|
|
|
573
631
|
calculate(typeof item.fileSize == 'undefined' ? item.size : item.fileSize)
|
|
574
632
|
)
|
|
575
633
|
)
|
|
576
|
-
)
|
|
577
|
-
_react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-minus t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10' : 't-DN', onClick: _this3.del.bind(_this3, i) })
|
|
634
|
+
)
|
|
578
635
|
);
|
|
579
636
|
}),
|
|
580
637
|
_react2.default.createElement(
|
|
581
638
|
'div',
|
|
582
|
-
{
|
|
583
|
-
_react2.default.createElement(
|
|
639
|
+
{ 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' },
|
|
640
|
+
_react2.default.createElement(
|
|
641
|
+
'div',
|
|
642
|
+
{ style: { width: '100%' } },
|
|
643
|
+
_react2.default.createElement(
|
|
644
|
+
'span',
|
|
645
|
+
{ className: 'upload-progress-tip' },
|
|
646
|
+
'\u6587\u4EF6\u4E0A\u4F20\u4E2D'
|
|
647
|
+
),
|
|
648
|
+
_react2.default.createElement(_Progress2.default, { className: 'upload-progress', percent: t.state.percent1, status: 'normal', strokeWidth: 4, showInfo: false })
|
|
649
|
+
)
|
|
650
|
+
),
|
|
651
|
+
_react2.default.createElement(
|
|
652
|
+
'div',
|
|
653
|
+
{ 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' },
|
|
654
|
+
_react2.default.createElement('i', { id: 'ddUploadPic' + t.state.keyNum, className: 'iconfont icon-plus' })
|
|
584
655
|
)
|
|
585
656
|
)
|
|
586
657
|
);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fmui-base",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"title": "fmui-base",
|
|
5
5
|
"description": "fmui移动端组件",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -67,6 +67,7 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"copy-webpack-plugin": "^3.0.1",
|
|
70
|
-
"saltui": "^4.13.1"
|
|
70
|
+
"saltui": "^4.13.1",
|
|
71
|
+
"h5-imageviewer": "^0.7.8"
|
|
71
72
|
}
|
|
72
73
|
}
|