fmui-base 2.0.43 → 2.0.45

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 CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.45:移动门户组件修改
7
+ - 2.0.44:移动门户组件修改
6
8
  - 2.0.43:移动门户组件修改
7
9
  - 2.0.42:移动门户组件修改
8
10
  - 2.0.41:表单文本字段级联计算修改
@@ -201,5 +201,6 @@ exports.default = {
201
201
  richeng: '#/', //日程
202
202
  dwxx: '#/' //单位信息
203
203
 
204
- }
204
+ },
205
+ ydPath: context + '/mobile/modules/yd/yd.html'
205
206
  };
@@ -45,6 +45,14 @@ var _Button = require('saltui/lib/Button');
45
45
 
46
46
  var _Button2 = _interopRequireDefault(_Button);
47
47
 
48
+ var _Toast = require('saltui/lib/Toast');
49
+
50
+ var _Toast2 = _interopRequireDefault(_Toast);
51
+
52
+ var _NoticeBar = require('saltui/lib/NoticeBar');
53
+
54
+ var _NoticeBar2 = _interopRequireDefault(_NoticeBar);
55
+
48
56
  require('react-grid-layout/css/styles.css');
49
57
 
50
58
  require('react-resizable/css/styles.css');
@@ -93,26 +101,34 @@ var MyGrid = function (_React$Component) {
93
101
  var t = _this;
94
102
  // 部件的初始化信息
95
103
  _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
96
- _this.setState({
97
- data: res
98
- });
99
- res.map(function (item) {
100
- if (item.portletCode == 'banner') {
101
- _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
102
- } else if (item.portletCode == 'cyyy') {
103
- t.getShoucangAppInfo(item.id);
104
- t.getComAppInfo(item.id);
105
- } else if (item.portletCode !== 'tbgl') {
106
- var params = {
107
- code: item.portletCode,
108
- ppId: item.id
109
- };
110
- _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
111
- // console.log(res, '????????????????????????');
112
- _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
113
- });
114
- }
115
- });
104
+ if (res && res.length > 0) {
105
+ _this.setState({
106
+ data: res
107
+ });
108
+ res.map(function (item) {
109
+ if (item.portletCode == 'banner') {
110
+ _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
111
+ } else if (item.portletCode == 'cyyy') {
112
+ t.getShoucangAppInfo(item.id);
113
+ t.getComAppInfo(item.id);
114
+ } else if (item.portletCode !== 'tbgl') {
115
+ var params = {
116
+ code: item.portletCode,
117
+ ppId: item.id
118
+ };
119
+ _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
120
+ // console.log(res, '????????????????????????');
121
+ _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
122
+ });
123
+ }
124
+ });
125
+ } else {
126
+ _Toast2.default.show({
127
+ type: 'fail',
128
+ content: '未设置移动端首页',
129
+ autoHide: false
130
+ });
131
+ }
116
132
  });
117
133
  _this.getRemindCount();
118
134
  };
@@ -164,6 +180,14 @@ var MyGrid = function (_React$Component) {
164
180
  });
165
181
  };
166
182
 
183
+ _this.toastNull = function () {
184
+ _Toast2.default.show({
185
+ type: 'fail',
186
+ content: '未设置移动端首页',
187
+ autoHide: false
188
+ });
189
+ };
190
+
167
191
  var portalId = props.portalId;
168
192
  var module = props.module;
169
193
  _this.state = {
@@ -361,7 +385,7 @@ var MyGrid = function (_React$Component) {
361
385
  }, {
362
386
  key: 'gotoYd',
363
387
  value: function gotoYd() {
364
- pageSkipDirectly(variables.ydPath);
388
+ pageSkipDirectly(_variables2.default.ydPath);
365
389
  }
366
390
 
367
391
  // 应用跳转
@@ -474,6 +498,8 @@ var MyGrid = function (_React$Component) {
474
498
  } else if (type == 'bssx') {
475
499
  //办事事项
476
500
  location.hash = "officehall";
501
+ } else if (type == "jxzt") {
502
+ location.hash = "officehall";
477
503
  }
478
504
  }
479
505
 
@@ -540,20 +566,22 @@ var MyGrid = function (_React$Component) {
540
566
  }, {
541
567
  key: 'handleChange',
542
568
  value: function handleChange(id, obj) {
543
- var _this3 = this;
544
569
 
545
- debugger;
546
570
  var t = this;
547
571
  console.log({
548
572
  activeIndex: obj.active,
549
573
  preActiveIndex: obj.preActive,
550
574
  data: id
551
575
  });
552
- this.setState(_defineProperty({}, 'activeIndex_mail_' + id, obj.active), function () {
553
- console.log('====================================');
554
- console.log(_this3.state);
555
- console.log('====================================');
556
- });
576
+ if (obj.active == '1') {
577
+ var _setState3;
578
+
579
+ this.setState((_setState3 = {}, _defineProperty(_setState3, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState3, 'activeIndex_gryj_' + id, false), _setState3));
580
+ } else {
581
+ var _setState4;
582
+
583
+ this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
584
+ }
557
585
  }
558
586
  }, {
559
587
  key: 'portalContent',
@@ -561,7 +589,11 @@ var MyGrid = function (_React$Component) {
561
589
  var t = this;
562
590
  var styleSetting = JSON.parse(item.styleSetting);
563
591
  var personalSetting = JSON.parse(item.personalSetting);
564
- var componentContent = '';
592
+ var componentContent = _react2.default.createElement(
593
+ 'div',
594
+ null,
595
+ _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
596
+ );
565
597
  var componentHead = '';
566
598
  if (item.portletCode === 'banner') {
567
599
  // 判断AI和menu
@@ -599,7 +631,7 @@ var MyGrid = function (_React$Component) {
599
631
  { className: isShowList.indexOf('AI') > -1 ? 't-FAC' : 't-DN', onClick: function onClick() {
600
632
  t.gotoYd();
601
633
  } },
602
- _react2.default.createElement('i', { className: 'iconfont icon-zhineng' }),
634
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-sousuo1' }),
603
635
  _react2.default.createElement(
604
636
  'div',
605
637
  { className: 't-FS12 t-MT4' },
@@ -752,7 +784,7 @@ var MyGrid = function (_React$Component) {
752
784
 
753
785
  var perList = '';
754
786
  if (t.state[item.portletCode + '_' + item.id]) {
755
- if (t.state[item.portletCode + '_' + item.id].perList) {
787
+ if (t.state[item.portletCode + '_' + item.id].perList && t.state[item.portletCode + '_' + item.id].perList.length > 0) {
756
788
  perList = t.state[item.portletCode + '_' + item.id].perList.map(function (item) {
757
789
  return _react2.default.createElement(
758
790
  'div',
@@ -773,11 +805,17 @@ var MyGrid = function (_React$Component) {
773
805
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' ic' })
774
806
  );
775
807
  });
808
+ } else {
809
+ perList = _react2.default.createElement(
810
+ 'div',
811
+ null,
812
+ _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
813
+ );
776
814
  }
777
815
  }
778
816
  var orgList = '';
779
817
  if (t.state[item.portletCode + '_' + item.id]) {
780
- if (t.state[item.portletCode + '_' + item.id].orgList) {
818
+ if (t.state[item.portletCode + '_' + item.id].orgList && t.state[item.portletCode + '_' + item.id].orgList.length > 0) {
781
819
  orgList = t.state[item.portletCode + '_' + item.id].orgList.map(function (item) {
782
820
  return _react2.default.createElement(
783
821
  'div',
@@ -798,6 +836,12 @@ var MyGrid = function (_React$Component) {
798
836
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + item.icon + ' ic' })
799
837
  );
800
838
  });
839
+ } else {
840
+ orgList = _react2.default.createElement(
841
+ 'div',
842
+ null,
843
+ _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
844
+ );
801
845
  }
802
846
  }
803
847
  var bssxPerTab = '';
@@ -837,7 +881,7 @@ var MyGrid = function (_React$Component) {
837
881
  { className: 'component-bssx' },
838
882
  _react2.default.createElement(
839
883
  'p',
840
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
884
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
841
885
  '\u66F4\u591A',
842
886
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
843
887
  ),
@@ -919,7 +963,7 @@ var MyGrid = function (_React$Component) {
919
963
  }
920
964
  if (item.portletCode === 'xwzx') {
921
965
  var xwzxContent = '';
922
- if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length) {
966
+ if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
923
967
  xwzxContent = t.state[item.portletCode + '_' + item.id].map(function (item) {
924
968
  var infoList = item.infoList.map(function (infoItem) {
925
969
  var imgSrc = "";
@@ -1031,8 +1075,7 @@ var MyGrid = function (_React$Component) {
1031
1075
  );
1032
1076
  });
1033
1077
  }
1034
-
1035
- if (t.state[item.portletCode + '_' + item.id]) {
1078
+ if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
1036
1079
  componentContent = _react2.default.createElement(
1037
1080
  _Tab2.default,
1038
1081
  { activeKey: t.state[item.portletCode + '_' + item.id][0].columnId, pageSize: 4, showExpandAll: false, speed: 2 },
@@ -1041,10 +1084,11 @@ var MyGrid = function (_React$Component) {
1041
1084
  }
1042
1085
  }
1043
1086
  if (item.portletCode === 'gryj') {
1087
+
1044
1088
  var gryjShowList = personalSetting.mailMenu;
1045
1089
  var gryjContent = '';
1046
1090
  if (t.state[item.portletCode + '_' + item.id]) {
1047
- if (t.state[item.portletCode + '_' + item.id].data.personList) {
1091
+ if (t.state[item.portletCode + '_' + item.id].data.personList && t.state[item.portletCode + '_' + item.id].data.personList.length > 0) {
1048
1092
  gryjContent = t.state[item.portletCode + '_' + item.id].data.personList.map(function (item) {
1049
1093
  return _react2.default.createElement(
1050
1094
  'div',
@@ -1089,11 +1133,17 @@ var MyGrid = function (_React$Component) {
1089
1133
  )
1090
1134
  );
1091
1135
  });
1136
+ } else {
1137
+ gryjContent = _react2.default.createElement(
1138
+ 'div',
1139
+ null,
1140
+ _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
1141
+ );
1092
1142
  }
1093
1143
  }
1094
1144
  var ggyjContent = '';
1095
1145
  if (t.state[item.portletCode + '_' + item.id]) {
1096
- if (t.state[item.portletCode + '_' + item.id].data.publicList) {
1146
+ if (t.state[item.portletCode + '_' + item.id].data.publicList && t.state[item.portletCode + '_' + item.id].data.publicList.length > 0) {
1097
1147
  ggyjContent = t.state[item.portletCode + '_' + item.id].data.publicList.map(function (item) {
1098
1148
  return _react2.default.createElement(
1099
1149
  'div',
@@ -1138,6 +1188,12 @@ var MyGrid = function (_React$Component) {
1138
1188
  )
1139
1189
  );
1140
1190
  });
1191
+ } else {
1192
+ ggyjContent = _react2.default.createElement(
1193
+ 'div',
1194
+ null,
1195
+ _react2.default.createElement('img', { className: 't-W100 t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
1196
+ );
1141
1197
  }
1142
1198
  }
1143
1199
  var personMailTab = '';
@@ -1174,14 +1230,14 @@ var MyGrid = function (_React$Component) {
1174
1230
  componentContent = _react2.default.createElement(
1175
1231
  'div',
1176
1232
  null,
1177
- t.state['activeIndex_mail_' + item.data] && t.state['activeIndex_mail_' + item.data] == "0" ? _react2.default.createElement(
1233
+ t.state['activeIndex_ggyj_' + item.id] && t.state['activeIndex_ggyj_' + item.id] === true ? _react2.default.createElement(
1178
1234
  'p',
1179
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'gryj') },
1235
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
1180
1236
  '\u66F4\u591A',
1181
1237
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1182
1238
  ) : _react2.default.createElement(
1183
1239
  'p',
1184
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
1240
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'gryj') },
1185
1241
  '\u66F4\u591A',
1186
1242
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1187
1243
  ),
@@ -1203,7 +1259,7 @@ var MyGrid = function (_React$Component) {
1203
1259
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1204
1260
  'div',
1205
1261
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1206
- '\u6211\u7684\u65E5\u7A0B'
1262
+ item.title
1207
1263
  ), key: '0' })
1208
1264
  )
1209
1265
  );
@@ -1371,7 +1427,7 @@ var MyGrid = function (_React$Component) {
1371
1427
  { className: 'component-bssx' },
1372
1428
  _react2.default.createElement(
1373
1429
  'p',
1374
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1430
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1375
1431
  '\u66F4\u591A',
1376
1432
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1377
1433
  ),
@@ -1381,7 +1437,7 @@ var MyGrid = function (_React$Component) {
1381
1437
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1382
1438
  'div',
1383
1439
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1384
- '\u6211\u7684\u4F1A\u8BAE'
1440
+ item.title
1385
1441
  ), key: '0' })
1386
1442
  )
1387
1443
  );
@@ -1398,7 +1454,7 @@ var MyGrid = function (_React$Component) {
1398
1454
  null,
1399
1455
  _react2.default.createElement(
1400
1456
  'p',
1401
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1457
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1402
1458
  '\u66F4\u591A',
1403
1459
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1404
1460
  ),
@@ -1408,12 +1464,11 @@ var MyGrid = function (_React$Component) {
1408
1464
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1409
1465
  'div',
1410
1466
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1411
- '\u4E8B\u9879\u53D1\u8D77'
1467
+ item.title
1412
1468
  ), key: '0' })
1413
1469
  )
1414
1470
  );
1415
- componentContent = '';
1416
- if (t.state[item.portletCode + '_' + item.id]) {
1471
+ if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
1417
1472
  componentContent = _react2.default.createElement(
1418
1473
  _Grid2.default,
1419
1474
  { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
@@ -1439,7 +1494,7 @@ var MyGrid = function (_React$Component) {
1439
1494
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1440
1495
  'div',
1441
1496
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1442
- '\u56FE\u8868'
1497
+ item.title
1443
1498
  ), key: '0' })
1444
1499
  )
1445
1500
  );
@@ -1452,7 +1507,7 @@ var MyGrid = function (_React$Component) {
1452
1507
  null,
1453
1508
  _react2.default.createElement(
1454
1509
  'p',
1455
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1510
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1456
1511
  '\u66F4\u591A',
1457
1512
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1458
1513
  ),
@@ -1462,12 +1517,12 @@ var MyGrid = function (_React$Component) {
1462
1517
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1463
1518
  'div',
1464
1519
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1465
- '\u6211\u7684\u4E8B\u9879'
1520
+ item.title
1466
1521
  ), key: '0' })
1467
1522
  )
1468
1523
  );
1469
1524
  var wdsxList = '';
1470
- if (t.state[item.portletCode + '_' + item.id]) {
1525
+ if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
1471
1526
  wdsxList = t.state[item.portletCode + '_' + item.id].map(function (item) {
1472
1527
  return _react2.default.createElement(
1473
1528
  'div',
@@ -1507,12 +1562,12 @@ var MyGrid = function (_React$Component) {
1507
1562
  )
1508
1563
  );
1509
1564
  });
1565
+ componentContent = _react2.default.createElement(
1566
+ 'div',
1567
+ { className: 'list-RT-label wdsx-list' },
1568
+ wdsxList
1569
+ );
1510
1570
  }
1511
- componentContent = _react2.default.createElement(
1512
- 'div',
1513
- { className: 'list-RT-label wdsx-list' },
1514
- wdsxList
1515
- );
1516
1571
  }
1517
1572
  if (item.portletCode === 'jxzt') {
1518
1573
  componentHead = _react2.default.createElement(
@@ -1520,7 +1575,7 @@ var MyGrid = function (_React$Component) {
1520
1575
  null,
1521
1576
  _react2.default.createElement(
1522
1577
  'p',
1523
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1578
+ { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1524
1579
  '\u66F4\u591A',
1525
1580
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1526
1581
  ),
@@ -1530,11 +1585,11 @@ var MyGrid = function (_React$Component) {
1530
1585
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1531
1586
  'div',
1532
1587
  { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.titleFamily, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1533
- '\u7CBE\u9009\u4E13\u9898'
1588
+ item.title
1534
1589
  ), key: '0' })
1535
1590
  )
1536
1591
  );
1537
- componentContent = '';
1592
+
1538
1593
  var _carouselItem = '';
1539
1594
  if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0) {
1540
1595
 
@@ -1546,7 +1601,7 @@ var MyGrid = function (_React$Component) {
1546
1601
  { title: '\u6807\u9898', code: item.code, className: 't-image-slide-item t-R10', style: { backgroundImage: 'url(' + imgUrlPath + ')' } },
1547
1602
  _react2.default.createElement(
1548
1603
  'p',
1549
- { className: 't-FS20 t-ML20 t-PT20 t-MB10 t-FCf' },
1604
+ { className: 't-FS20 t-ML20 t-PT20 t-MB10' },
1550
1605
  item.name
1551
1606
  )
1552
1607
  );
@@ -1597,72 +1652,31 @@ var MyGrid = function (_React$Component) {
1597
1652
  };
1598
1653
  });
1599
1654
 
1600
- var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
1601
- // 控制【常用应用】显示列数
1602
- var colNum1 = 4;
1603
-
1604
- var grrcContent = t.state.grrc_list.map(function (item) {
1605
- var completed = false;
1606
- if (item.startTime) {
1607
- var date = new Date(item.startTime.replace(/-/g, '/'));
1608
- var H = date.getHours();
1609
- var M = date.getMinutes();
1610
- if (H < 10) {
1611
- H = "0" + H;
1612
- }
1613
- if (M < 10) {
1614
- M = "0" + M;
1615
- }
1616
- var time = H + ":" + M;
1617
- var now = new Date();
1618
- if (date < now) {
1619
- //过去时
1620
- completed = true;
1621
- }
1622
- }
1655
+ if (!layout || layout.length === 0) {
1656
+ return null;
1657
+ } else {
1623
1658
  return _react2.default.createElement(
1624
- HBox,
1625
- { className: completed ? 'rc-item t-PR rc-completed' : 'rc-item t-PR', vAlign: 'center' },
1626
- _react2.default.createElement(
1627
- Box,
1628
- { className: 'rc-item-time' },
1629
- time
1630
- ),
1631
- _react2.default.createElement(
1632
- Box,
1633
- { className: 'rc-item-time-line' },
1634
- _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-fuhao' })
1635
- ),
1659
+ 'div',
1660
+ { className: 'react-grid' },
1636
1661
  _react2.default.createElement(
1637
- Box,
1638
- { flex: 1, className: 'rc-item-title t-omit' },
1639
- item.title
1662
+ _reactGridLayout2.default,
1663
+ {
1664
+ className: 'layout',
1665
+ layout: layout,
1666
+ cols: 12,
1667
+ rowHeight: 20,
1668
+ width: window.innerWidth,
1669
+ isDraggable: this.state.isDraggable,
1670
+ margin: [0, 5]
1671
+ },
1672
+ this.state.data.map(function (item) {
1673
+ return t.portalContent(item) || null;
1674
+
1675
+ // 添加一个默认返回值,以避免未指定键的错误
1676
+ })
1640
1677
  )
1641
1678
  );
1642
- });
1643
-
1644
- return _react2.default.createElement(
1645
- 'div',
1646
- { className: 'react-grid' },
1647
- _react2.default.createElement(
1648
- _reactGridLayout2.default,
1649
- {
1650
- className: 'layout',
1651
- layout: layout,
1652
- cols: 12,
1653
- rowHeight: 20,
1654
- width: window.innerWidth,
1655
- isDraggable: this.state.isDraggable,
1656
- margin: [0, 5]
1657
- },
1658
- this.state.data.map(function (item) {
1659
-
1660
- return t.portalContent(item) || null;
1661
-
1662
- // 添加一个默认返回值,以避免未指定键的错误
1663
- })
1664
- )
1665
- );
1679
+ }
1666
1680
  }
1667
1681
  }]);
1668
1682
 
@@ -22,7 +22,8 @@
22
22
  background-color: transparent;
23
23
 
24
24
  div {
25
- max-width: 95px;
25
+ max-width: 81px;
26
+ height: inherit;
26
27
  white-space: nowrap;
27
28
  overflow: hidden;
28
29
  text-overflow: ellipsis;
@@ -197,7 +198,7 @@
197
198
  }
198
199
 
199
200
  .t-grid {
200
- margin: 8px;
201
+ margin: 0 8px;
201
202
  border: none;
202
203
 
203
204
  .t-grid-row {
@@ -482,7 +483,7 @@
482
483
  }
483
484
 
484
485
  .jxzt-content {
485
- margin: 16px;
486
+ margin: 0 16px;
486
487
  .t-image-slide-item {
487
488
  // height: 91px !important;
488
489
  background-image: url(/mobile/fmui/images/notice-card-bg.png);
@@ -658,7 +659,7 @@
658
659
  }
659
660
 
660
661
  .calendar-content div.today span {
661
- background: transparent !important;
662
+ background: #F6F6F6 !important;
662
663
  }
663
664
 
664
665
  .calendar-content span.hasEvent:before {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.43",
3
+ "version": "2.0.45",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",