fmui-base 2.0.60 → 2.0.62
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 +2 -0
- package/lib/form/form.js +20 -3
- package/lib/form/table.js +20 -3
- package/lib/react_grid/react_grid.js +7 -4
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -2684,6 +2684,14 @@ var PageHome = function (_React$Component) {
|
|
|
2684
2684
|
});
|
|
2685
2685
|
}
|
|
2686
2686
|
}
|
|
2687
|
+
|
|
2688
|
+
//常用语设置跳转
|
|
2689
|
+
|
|
2690
|
+
}, {
|
|
2691
|
+
key: 'skipToCommonwordsSet',
|
|
2692
|
+
value: function skipToCommonwordsSet() {
|
|
2693
|
+
pageSkip('mobile/modules/mobileoffice/dist/index.html', '#/hospitalmanage/personal/setting/listPhrase');
|
|
2694
|
+
}
|
|
2687
2695
|
}, {
|
|
2688
2696
|
key: 'phraseItemClick',
|
|
2689
2697
|
value: function phraseItemClick(commonwords) {
|
|
@@ -3211,11 +3219,20 @@ var PageHome = function (_React$Component) {
|
|
|
3211
3219
|
_react2.default.createElement(_List2.default, { list: t.state.itemParam.value }),
|
|
3212
3220
|
_react2.default.createElement(
|
|
3213
3221
|
'div',
|
|
3214
|
-
{ className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10' : 't-DN' },
|
|
3222
|
+
{ className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },
|
|
3215
3223
|
_react2.default.createElement(
|
|
3216
3224
|
'div',
|
|
3217
|
-
{ className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 t-FS16 commonwords' : 't-DN'
|
|
3218
|
-
|
|
3225
|
+
{ className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 t-FS16 commonwords' : 't-DN' },
|
|
3226
|
+
_react2.default.createElement(
|
|
3227
|
+
'div',
|
|
3228
|
+
{ onClick: this.selectCommonwords.bind(this) },
|
|
3229
|
+
'\u5E38\u7528\u8BED'
|
|
3230
|
+
),
|
|
3231
|
+
_react2.default.createElement(
|
|
3232
|
+
'div',
|
|
3233
|
+
{ onClick: this.skipToCommonwordsSet.bind(this) },
|
|
3234
|
+
'\u7F16\u8F91'
|
|
3235
|
+
)
|
|
3219
3236
|
),
|
|
3220
3237
|
_react2.default.createElement(
|
|
3221
3238
|
'div',
|
package/lib/form/table.js
CHANGED
|
@@ -1482,6 +1482,14 @@ var PageHome = function (_React$Component) {
|
|
|
1482
1482
|
});
|
|
1483
1483
|
}
|
|
1484
1484
|
}
|
|
1485
|
+
|
|
1486
|
+
//常用语设置跳转
|
|
1487
|
+
|
|
1488
|
+
}, {
|
|
1489
|
+
key: 'skipToCommonwordsSet',
|
|
1490
|
+
value: function skipToCommonwordsSet() {
|
|
1491
|
+
pageSkip('mobile/modules/mobileoffice/dist/index.html', '#/hospitalmanage/personal/setting/listPhrase');
|
|
1492
|
+
}
|
|
1485
1493
|
}, {
|
|
1486
1494
|
key: 'phraseItemClick',
|
|
1487
1495
|
value: function phraseItemClick(commonwords) {
|
|
@@ -1638,11 +1646,20 @@ var PageHome = function (_React$Component) {
|
|
|
1638
1646
|
_react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }),
|
|
1639
1647
|
_react2.default.createElement(
|
|
1640
1648
|
'div',
|
|
1641
|
-
{ className: t.props.commentField == "default" ? 't-PL10' : 't-DN' },
|
|
1649
|
+
{ className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
|
|
1642
1650
|
_react2.default.createElement(
|
|
1643
1651
|
'div',
|
|
1644
|
-
{ className: 'theme-color t-P6 t-FS16 commonwords'
|
|
1645
|
-
|
|
1652
|
+
{ className: 'theme-color t-P6 t-FS16 commonwords' },
|
|
1653
|
+
_react2.default.createElement(
|
|
1654
|
+
'div',
|
|
1655
|
+
{ onClick: this.selectCommonwords.bind(this) },
|
|
1656
|
+
'\u5E38\u7528\u8BED'
|
|
1657
|
+
),
|
|
1658
|
+
_react2.default.createElement(
|
|
1659
|
+
'div',
|
|
1660
|
+
{ onClick: this.skipToCommonwordsSet.bind(this) },
|
|
1661
|
+
'\u7F16\u8F91'
|
|
1662
|
+
)
|
|
1646
1663
|
),
|
|
1647
1664
|
_react2.default.createElement(_TextareaField2.default, {
|
|
1648
1665
|
readOnly: false,
|
|
@@ -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',
|