fmui-base 2.0.63 → 2.0.65
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 +4 -2
- package/lib/css/react_grid.css +6 -1
- package/lib/form/form.js +20 -3
- package/lib/form/table.js +20 -3
- package/lib/react_grid/react_grid.js +36 -33
- package/lib/react_grid/react_grid.less +6 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/css/react_grid.css
CHANGED
|
@@ -97,8 +97,10 @@
|
|
|
97
97
|
.react-grid .react-grid-component .react-grid-banner .global-search .t-filter-wrapper {
|
|
98
98
|
height: 30px;
|
|
99
99
|
padding: 5px 0;
|
|
100
|
-
background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0.6) 100%);
|
|
101
100
|
border-radius: 4px 0 0 4px;
|
|
101
|
+
background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0.6) 100%);
|
|
102
|
+
border: 1px solid #ffffff;
|
|
103
|
+
border-radius: 4px;
|
|
102
104
|
}
|
|
103
105
|
.react-grid .react-grid-component .react-grid-banner .global-search .t-filter-bar-wrapper {
|
|
104
106
|
width: 70px;
|
|
@@ -227,6 +229,8 @@
|
|
|
227
229
|
border: 2px solid #fff;
|
|
228
230
|
}
|
|
229
231
|
.react-grid .react-grid-component.banner {
|
|
232
|
+
width: 100% !important;
|
|
233
|
+
transform: translate(0, 8px) !important;
|
|
230
234
|
background-color: transparent;
|
|
231
235
|
}
|
|
232
236
|
.react-grid .t-grid-row:nth-child(n+1) .t-grid-item:nth-child(n+1) .systemItem .iconblock {
|
|
@@ -290,6 +294,7 @@
|
|
|
290
294
|
}
|
|
291
295
|
.react-grid .systemItem .t-badge .badge-inner {
|
|
292
296
|
line-height: 13px;
|
|
297
|
+
font-weight: 400;
|
|
293
298
|
border: 2px solid #fff;
|
|
294
299
|
}
|
|
295
300
|
.react-grid .react-app-collect {
|
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,
|
|
@@ -113,7 +113,8 @@ var MyGrid = function (_React$Component) {
|
|
|
113
113
|
_this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
|
|
114
114
|
} else if (item.portletCode == 'cyyy') {
|
|
115
115
|
t.getShoucangAppInfo(item.id);
|
|
116
|
-
t.
|
|
116
|
+
t.getOftenList(item.id);
|
|
117
|
+
_this.getRemindCount();
|
|
117
118
|
} else if (item.portletCode !== 'tbgl') {
|
|
118
119
|
var _params = {
|
|
119
120
|
code: item.portletCode,
|
|
@@ -143,12 +144,12 @@ var MyGrid = function (_React$Component) {
|
|
|
143
144
|
_db2.default.reactGrid.getNewHomePageTodoData(params).then(function (content) {
|
|
144
145
|
var openModule = content.hpOpenModule ? content.hpOpenModule : "";
|
|
145
146
|
localStorage.setItem('hpOpenModule', openModule);
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
if (!pageTitle || pageTitle == '') {
|
|
149
|
-
|
|
150
|
-
}
|
|
151
|
-
setPageTitle(pageTitle);
|
|
147
|
+
// let todoData = content.todoData != null ? content.todoData.entity : {};
|
|
148
|
+
// let pageTitle = todoData.pageTitle;
|
|
149
|
+
// if (!pageTitle || pageTitle == '') {
|
|
150
|
+
// pageTitle = '一网通办管理平台'
|
|
151
|
+
// }
|
|
152
|
+
// setPageTitle(pageTitle);
|
|
152
153
|
});
|
|
153
154
|
};
|
|
154
155
|
|
|
@@ -160,26 +161,6 @@ var MyGrid = function (_React$Component) {
|
|
|
160
161
|
}).catch(function (error) {});
|
|
161
162
|
};
|
|
162
163
|
|
|
163
|
-
_this.getComAppInfo = function (id) {
|
|
164
|
-
var userId = getLoginUserInfo().userId;
|
|
165
|
-
var userAppOftenList = [];
|
|
166
|
-
var params = { userId: userId };
|
|
167
|
-
_db2.default.reactGrid.getComAppInfo(params).then(function (result) {
|
|
168
|
-
if (result.data) {
|
|
169
|
-
_this.setState(_defineProperty({}, 'cyyy' + '_' + id, JSON.parse(result.data)));
|
|
170
|
-
localStorage.setItem(['cyyy' + '_' + id], result.data);
|
|
171
|
-
userAppOftenList = JSON.parse(result.data);
|
|
172
|
-
}
|
|
173
|
-
if (userAppOftenList.length < 1) {
|
|
174
|
-
// 没有用户设置，取系统默认值
|
|
175
|
-
_this.getOftenList(id);
|
|
176
|
-
}
|
|
177
|
-
}).catch(function (error) {
|
|
178
|
-
_this.getOftenList();
|
|
179
|
-
console.error(error);
|
|
180
|
-
});
|
|
181
|
-
};
|
|
182
|
-
|
|
183
164
|
_this.getOftenList = function (id) {
|
|
184
165
|
var data = getLoginUserInfo();
|
|
185
166
|
var thirdMenuType = data.thirdMenuType;
|
|
@@ -238,6 +219,7 @@ var MyGrid = function (_React$Component) {
|
|
|
238
219
|
undo: 0, //待办数量
|
|
239
220
|
approveundo: 0, //审批数量
|
|
240
221
|
toBeAttendedCount: 0, //会议数量
|
|
222
|
+
unreadMailCount: 0, //未读邮件
|
|
241
223
|
unreadPubMailCount: 0, //未读公共邮件
|
|
242
224
|
appOftenList: [], //常用应用
|
|
243
225
|
collectAppInfoList: [], //收藏应用
|
|
@@ -296,7 +278,27 @@ var MyGrid = function (_React$Component) {
|
|
|
296
278
|
|
|
297
279
|
|
|
298
280
|
// 获取用户设置常用应用
|
|
299
|
-
|
|
281
|
+
// getComAppInfo = (id) => {
|
|
282
|
+
// let userId = getLoginUserInfo().userId;
|
|
283
|
+
// var userAppOftenList = [];
|
|
284
|
+
// var params = { userId: userId };
|
|
285
|
+
// DB.reactGrid.getComAppInfo(params).then((result) => {
|
|
286
|
+
// if (result.data) {
|
|
287
|
+
// this.setState({
|
|
288
|
+
// ['cyyy' + '_' + id]: JSON.parse(result.data)
|
|
289
|
+
// });
|
|
290
|
+
// localStorage.setItem(['cyyy' + '_' + id], result.data);
|
|
291
|
+
// userAppOftenList = JSON.parse(result.data);
|
|
292
|
+
// }
|
|
293
|
+
// if (userAppOftenList.length < 1) {
|
|
294
|
+
// // 没有用户设置，取系统默认值
|
|
295
|
+
// this.getOftenList(id);
|
|
296
|
+
// }
|
|
297
|
+
// }).catch((error) => {
|
|
298
|
+
// this.getOftenList();
|
|
299
|
+
// console.error(error);
|
|
300
|
+
// });
|
|
301
|
+
// }
|
|
300
302
|
// 获取默认系统常用应用
|
|
301
303
|
|
|
302
304
|
}, {
|
|
@@ -305,11 +307,11 @@ var MyGrid = function (_React$Component) {
|
|
|
305
307
|
var _this2 = this;
|
|
306
308
|
|
|
307
309
|
_db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo,unreadMail,unreadPubMail,toBeAttended,approveundo" }).then(function (content) {
|
|
308
|
-
if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount || content.
|
|
310
|
+
if (content.undo || content.approveundo || content.toBeAttendedCount || content.unreadPubMailCount || content.unreadMailCount) {
|
|
309
311
|
|
|
310
312
|
_this2.setState({
|
|
311
313
|
undo: content.undo,
|
|
312
|
-
|
|
314
|
+
unreadMailCount: content.unreadMailCount,
|
|
313
315
|
approveundo: content.approveundo,
|
|
314
316
|
toBeAttendedCount: content.toBeAttendedCount,
|
|
315
317
|
unreadPubMailCount: content.unreadPubMailCount
|
|
@@ -743,7 +745,7 @@ var MyGrid = function (_React$Component) {
|
|
|
743
745
|
{ className: 'iconblock t-iconBC' + ele.iconColor },
|
|
744
746
|
_react2.default.createElement(
|
|
745
747
|
_Badge2.default,
|
|
746
|
-
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '
|
|
748
|
+
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮箱' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMailCount : '' },
|
|
747
749
|
_react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
|
|
748
750
|
)
|
|
749
751
|
),
|
|
@@ -793,7 +795,7 @@ var MyGrid = function (_React$Component) {
|
|
|
793
795
|
{ className: 'iconblock t-iconBC' + ele.iconColor },
|
|
794
796
|
_react2.default.createElement(
|
|
795
797
|
_Badge2.default,
|
|
796
|
-
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '
|
|
798
|
+
{ count: ele.name == '会议' ? t.state.toBeAttendedCount * 1 : ele.name == '审批' ? t.state.approveundo : ele.name == '公共邮箱' ? t.state.unreadPubMailCount * 1 : ele.name == '邮件' ? t.state.unreadMailCount : '' },
|
|
797
799
|
_react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
|
|
798
800
|
)
|
|
799
801
|
),
|
|
@@ -1801,7 +1803,8 @@ var MyGrid = function (_React$Component) {
|
|
|
1801
1803
|
rowHeight: 20,
|
|
1802
1804
|
width: window.innerWidth,
|
|
1803
1805
|
isDraggable: this.state.isDraggable,
|
|
1804
|
-
margin: [0,
|
|
1806
|
+
margin: [0, 15],
|
|
1807
|
+
containerPadding: [8, 8]
|
|
1805
1808
|
},
|
|
1806
1809
|
this.state.data.map(function (item) {
|
|
1807
1810
|
return t.portalContent(item) || null;
|
|
@@ -85,7 +85,6 @@
|
|
|
85
85
|
background-size: 100% 100%;
|
|
86
86
|
// background-color: #fff;
|
|
87
87
|
}
|
|
88
|
-
|
|
89
88
|
.react-grid-component {
|
|
90
89
|
background-color: #fff;
|
|
91
90
|
.react-grid-banner-img {
|
|
@@ -134,6 +133,9 @@
|
|
|
134
133
|
padding: 5px 0;
|
|
135
134
|
background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.3) 0%, rgba(255, 255, 255, 0.6) 100%);
|
|
136
135
|
border-radius: 4px 0 0 4px;
|
|
136
|
+
background-image: linear-gradient(180deg, rgba(255,255,255,0.30) 0%, rgba(255,255,255,0.60) 100%);
|
|
137
|
+
border: 1px solid rgba(255,255,255,1);
|
|
138
|
+
border-radius: 4px;
|
|
137
139
|
}
|
|
138
140
|
|
|
139
141
|
.t-filter-bar-wrapper {
|
|
@@ -296,6 +298,8 @@
|
|
|
296
298
|
}
|
|
297
299
|
|
|
298
300
|
.react-grid-component.banner {
|
|
301
|
+
width: 100% !important;
|
|
302
|
+
transform: translate(0, 8px) !important;
|
|
299
303
|
background-color: transparent;
|
|
300
304
|
}
|
|
301
305
|
|
|
@@ -397,6 +401,7 @@
|
|
|
397
401
|
|
|
398
402
|
.t-badge .badge-inner {
|
|
399
403
|
line-height: 13px;
|
|
404
|
+
font-weight: 400;
|
|
400
405
|
border: 2px solid #fff;
|
|
401
406
|
}
|
|
402
407
|
}
|