fmui-base 2.0.60 → 2.0.61
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/css/react_grid.css +956 -829
- package/lib/poppage/tree/tree.js +3 -3
- package/lib/react_grid/react_grid.js +7 -4
- package/lib/select-fileno/pageHome.js +1 -1
- package/lib/select-serialnumber/pageHome.js +1 -1
- package/lib/select-serialnumber/pageHome1.js +1 -1
- package/lib/signature/draw.js +3 -3
- package/lib/signature/sign.less +73 -73
- package/lib/signature//346/211/213/345/206/231/347/255/276/345/220/215/344/275/277/347/224/250/346/226/207/346/241/243.md +11 -11
- package/package.json +1 -1
package/lib/poppage/tree/tree.js
CHANGED
|
@@ -292,7 +292,10 @@ var MyGrid = function (_React$Component) {
|
|
|
292
292
|
var _this2 = this;
|
|
293
293
|
|
|
294
294
|
_db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMaild,unreadPubMail,toBeAttended" }).then(function (content) {
|
|
295
|
-
if (content.undo) {
|
|
295
|
+
if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount) {
|
|
296
|
+
console.log('====================================');
|
|
297
|
+
console.log(content, 'contentcontentcontent');
|
|
298
|
+
console.log('====================================');
|
|
296
299
|
_this2.setState({
|
|
297
300
|
undo: content.undo,
|
|
298
301
|
approveundo: content.approveundo,
|
|
@@ -728,7 +731,7 @@ var MyGrid = function (_React$Component) {
|
|
|
728
731
|
{ className: 'iconblock t-iconBC' + ele.iconColor },
|
|
729
732
|
_react2.default.createElement(
|
|
730
733
|
_Badge2.default,
|
|
731
|
-
{ count:
|
|
734
|
+
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
|
|
732
735
|
_react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
|
|
733
736
|
)
|
|
734
737
|
),
|
|
@@ -778,7 +781,7 @@ var MyGrid = function (_React$Component) {
|
|
|
778
781
|
{ className: 'iconblock t-iconBC' + ele.iconColor },
|
|
779
782
|
_react2.default.createElement(
|
|
780
783
|
_Badge2.default,
|
|
781
|
-
{ count:
|
|
784
|
+
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮件' ? t.state.unreadPubMailCount * 1 : '' },
|
|
782
785
|
_react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
|
|
783
786
|
)
|
|
784
787
|
),
|
|
@@ -1535,7 +1538,7 @@ var MyGrid = function (_React$Component) {
|
|
|
1535
1538
|
_react2.default.createElement(
|
|
1536
1539
|
'div',
|
|
1537
1540
|
{ className: 'lcfq-list-item-icon' },
|
|
1538
|
-
_react2.default.createElement('i', { className:
|
|
1541
|
+
_react2.default.createElement('i', { className: "iconfont-ywtb icon-ywtb-" + item.icon })
|
|
1539
1542
|
),
|
|
1540
1543
|
_react2.default.createElement(
|
|
1541
1544
|
'div',
|
package/lib/signature/draw.js
CHANGED
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
/**
|
|
7
|
-
* Created by louizhai on 17/6/30.
|
|
8
|
-
* description: Use canvas to draw.
|
|
6
|
+
/**
|
|
7
|
+
* Created by louizhai on 17/6/30.
|
|
8
|
+
* description: Use canvas to draw.
|
|
9
9
|
*/
|
|
10
10
|
function Draw(canvas, degree) {
|
|
11
11
|
var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
package/lib/signature/sign.less
CHANGED
|
@@ -1,73 +1,73 @@
|
|
|
1
|
-
.page-demo {
|
|
2
|
-
color:#666;
|
|
3
|
-
}
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
#canvasBox {
|
|
7
|
-
display: flex;
|
|
8
|
-
flex-direction: column;
|
|
9
|
-
height: 100%;
|
|
10
|
-
}
|
|
11
|
-
.greet {
|
|
12
|
-
padding: 20px;
|
|
13
|
-
font-size: 20px;
|
|
14
|
-
user-select: none;
|
|
15
|
-
}
|
|
16
|
-
.greet a {
|
|
17
|
-
cursor: pointer;
|
|
18
|
-
}
|
|
19
|
-
.greet select {
|
|
20
|
-
font-size: 18px;
|
|
21
|
-
}
|
|
22
|
-
canvas {
|
|
23
|
-
flex: 1;
|
|
24
|
-
//border: 0.5px solid #ccc;
|
|
25
|
-
cursor: crosshair;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
@media screen and (orientation: portrait) {
|
|
32
|
-
.dd-write-sign-page {
|
|
33
|
-
position: absolute;
|
|
34
|
-
width: 100vh;
|
|
35
|
-
height: 100vw;
|
|
36
|
-
top: 0;
|
|
37
|
-
left: 100vw;
|
|
38
|
-
-webkit-transform: rotate(90deg);
|
|
39
|
-
-moz-transform: rotate(90deg);
|
|
40
|
-
-ms-transform: rotate(90deg);
|
|
41
|
-
transform: rotate(90deg);
|
|
42
|
-
transform-origin: 0% 0%;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
@media screen and (orientation: landscape) {
|
|
47
|
-
.dd-write-sign-page {
|
|
48
|
-
-webkit-transform: rotate(0);
|
|
49
|
-
-moz-transform: rotate(0);
|
|
50
|
-
-ms-transform: rotate(0);
|
|
51
|
-
transform: rotate(0)
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
.dd-write-sign {
|
|
56
|
-
height: calc(~"100% - 83px");
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
.dd-write-sign-del.t-text-button {
|
|
60
|
-
height: 32px;
|
|
61
|
-
line-height: 32px;
|
|
62
|
-
|
|
63
|
-
.iconfont {
|
|
64
|
-
height: 32px;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
.img-border{
|
|
68
|
-
border:1px solid #ccc;
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
1
|
+
.page-demo {
|
|
2
|
+
color:#666;
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
#canvasBox {
|
|
7
|
+
display: flex;
|
|
8
|
+
flex-direction: column;
|
|
9
|
+
height: 100%;
|
|
10
|
+
}
|
|
11
|
+
.greet {
|
|
12
|
+
padding: 20px;
|
|
13
|
+
font-size: 20px;
|
|
14
|
+
user-select: none;
|
|
15
|
+
}
|
|
16
|
+
.greet a {
|
|
17
|
+
cursor: pointer;
|
|
18
|
+
}
|
|
19
|
+
.greet select {
|
|
20
|
+
font-size: 18px;
|
|
21
|
+
}
|
|
22
|
+
canvas {
|
|
23
|
+
flex: 1;
|
|
24
|
+
//border: 0.5px solid #ccc;
|
|
25
|
+
cursor: crosshair;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
@media screen and (orientation: portrait) {
|
|
32
|
+
.dd-write-sign-page {
|
|
33
|
+
position: absolute;
|
|
34
|
+
width: 100vh;
|
|
35
|
+
height: 100vw;
|
|
36
|
+
top: 0;
|
|
37
|
+
left: 100vw;
|
|
38
|
+
-webkit-transform: rotate(90deg);
|
|
39
|
+
-moz-transform: rotate(90deg);
|
|
40
|
+
-ms-transform: rotate(90deg);
|
|
41
|
+
transform: rotate(90deg);
|
|
42
|
+
transform-origin: 0% 0%;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
@media screen and (orientation: landscape) {
|
|
47
|
+
.dd-write-sign-page {
|
|
48
|
+
-webkit-transform: rotate(0);
|
|
49
|
+
-moz-transform: rotate(0);
|
|
50
|
+
-ms-transform: rotate(0);
|
|
51
|
+
transform: rotate(0)
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
.dd-write-sign {
|
|
56
|
+
height: calc(~"100% - 83px");
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
.dd-write-sign-del.t-text-button {
|
|
60
|
+
height: 32px;
|
|
61
|
+
line-height: 32px;
|
|
62
|
+
|
|
63
|
+
.iconfont {
|
|
64
|
+
height: 32px;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
.img-border{
|
|
68
|
+
border:1px solid #ccc;
|
|
69
|
+
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
# 手写签名使用文档
|
|
2
|
-
|
|
3
|
-
1. 安装fmui 0.0.36-ygy以上的版本
|
|
4
|
-
2. 引用： import Sign from 'fmui/lib/signature';
|
|
5
|
-
3. 写标签
|
|
6
|
-
```
|
|
7
|
-
<Sign upload={(val)=>{alert(val)}}/>
|
|
8
|
-
```
|
|
9
|
-
4. 参数
|
|
10
|
-
- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
|
|
11
|
-
- title : (必填项)显示的输入框标题
|
|
1
|
+
# 手写签名使用文档
|
|
2
|
+
|
|
3
|
+
1. 安装fmui 0.0.36-ygy以上的版本
|
|
4
|
+
2. 引用： import Sign from 'fmui/lib/signature';
|
|
5
|
+
3. 写标签
|
|
6
|
+
```
|
|
7
|
+
<Sign upload={(val)=>{alert(val)}}/>
|
|
8
|
+
```
|
|
9
|
+
4. 参数
|
|
10
|
+
- upload ： (必填项)回调方法，返回参数为生成手写签名图片的id
|
|
11
|
+
- title : (必填项)显示的输入框标题
|
|
12
12
|
- fileId : 初始化签名图片文件id
|