fmui-base 2.0.41 → 2.0.43

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.
Files changed (4) hide show
  1. package/README.md +2 -0
  2. package/lib/react_grid/react_grid.js +67 -36
  3. package/lib/react_grid/react_grid.less +20 -7
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.43：移动门户组件修改
7
+ - 2.0.42：移动门户组件修改
6
8
  - 2.0.41：表单文本字段级联计算修改
7
9
  - 2.0.40：移动门户组件修改
8
10
  - 2.0.39：表单级联计算修改
package/lib/react_grid/react_grid.js CHANGED
@@ -93,10 +93,6 @@ var MyGrid = function (_React$Component) {
93
93
  var t = _this;
94
94
  // 部件的初始化信息
95
95
  _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
96
- // console.log('====================================');
97
- // console.log(res, 'resresresresres');
98
- // console.log('====================================');
99
-
100
96
  _this.setState({
101
97
  data: res
102
98
  });
@@ -104,9 +100,6 @@ var MyGrid = function (_React$Component) {
104
100
  if (item.portletCode == 'banner') {
105
101
  _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
106
102
  } else if (item.portletCode == 'cyyy') {
107
- console.log('====================================');
108
- console.log(item.id, '//////////////////////////');
109
- console.log('====================================');
110
103
  t.getShoucangAppInfo(item.id);
111
104
  t.getComAppInfo(item.id);
112
105
  } else if (item.portletCode !== 'tbgl') {
@@ -125,12 +118,9 @@ var MyGrid = function (_React$Component) {
125
118
  };
126
119
 
127
120
  _this.getShoucangAppInfo = function (id) {
128
- console.log('====================================');
129
- console.log(id, 'ididididididididiididiididiididididi');
130
- console.log('====================================');
131
121
  _db2.default.reactGrid.getNewHomePageCollectAppInfoList({ showClient: "DING" }).then(function (result) {
132
122
  _this.setState(_defineProperty({}, 'wdsc' + '_' + id, result.data), function () {
133
- console.log(_this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
123
+ // console.log(this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
134
124
  });
135
125
  }).catch(function (error) {});
136
126
  };
@@ -246,8 +236,8 @@ var MyGrid = function (_React$Component) {
246
236
  bssxPer_show: true, //办事事项_个人_是否显示
247
237
  bssxOrg_show: true, //办事事项_个人_是否显示,
248
238
  cyyyUsuTab_show: true, //常用应用_是否显示
249
- cyyyPerTab_show: true //我的收藏_是否显示
250
-
239
+ cyyyPerTab_show: true, //我的收藏_是否显示
240
+ activeIndex_mail: 0
251
241
 
252
242
  };
253
243
  return _this;
@@ -547,6 +537,24 @@ var MyGrid = function (_React$Component) {
547
537
  }
548
538
  }
549
539
  }
540
+ }, {
541
+ key: 'handleChange',
542
+ value: function handleChange(id, obj) {
543
+ var _this3 = this;
544
+
545
+ debugger;
546
+ var t = this;
547
+ console.log({
548
+ activeIndex: obj.active,
549
+ preActiveIndex: obj.preActive,
550
+ data: id
551
+ });
552
+ this.setState(_defineProperty({}, 'activeIndex_mail_' + id, obj.active), function () {
553
+ console.log('====================================');
554
+ console.log(_this3.state);
555
+ console.log('====================================');
556
+ });
557
+ }
550
558
  }, {
551
559
  key: 'portalContent',
552
560
  value: function portalContent(item) {
@@ -613,7 +621,7 @@ var MyGrid = function (_React$Component) {
613
621
  _react2.default.createElement(
614
622
  _Badge2.default,
615
623
  { count: item == 'daiban' ? t.state.undo : '' },
616
- _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb' + todoInfo.icon })
624
+ _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb ' + todoInfo.icon })
617
625
  )
618
626
  ),
619
627
  _react2.default.createElement(
@@ -638,7 +646,7 @@ var MyGrid = function (_React$Component) {
638
646
  paddingTop: _styleSetting.otherSet.paddingSet.pt + 'px',
639
647
  paddingBottom: _styleSetting.otherSet.paddingSet.pb + 'px',
640
648
  backgroundColor: _styleSetting.otherSet.bgColor,
641
- backgroundImage: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg ? 'url(' + pathUrl + ')' : ''
649
+ backgroundImage: 'url(' + pathUrl + ')'
642
650
  } },
643
651
  _styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
644
652
  componentContent
@@ -655,7 +663,7 @@ var MyGrid = function (_React$Component) {
655
663
  _Tab2.default.Item,
656
664
  { title: _react2.default.createElement(
657
665
  'div',
658
- { 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" : '' } },
666
+ { 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" : '' } },
659
667
  '\u5E38\u7528\u5E94\u7528'
660
668
  ) },
661
669
  _react2.default.createElement(
@@ -697,7 +705,7 @@ var MyGrid = function (_React$Component) {
697
705
  _Tab2.default.Item,
698
706
  { title: _react2.default.createElement(
699
707
  'div',
700
- { 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" : '' } },
708
+ { 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" : '' } },
701
709
  '\u6211\u7684\u6536\u85CF'
702
710
  ) },
703
711
  _react2.default.createElement(
@@ -793,12 +801,12 @@ var MyGrid = function (_React$Component) {
793
801
  }
794
802
  }
795
803
  var bssxPerTab = '';
796
- if (styleSetting.titleSet.titleStatus == 1 && bssxShowList.indexOf('personWork') > -1) {
804
+ if (bssxShowList.indexOf('personWork') > -1) {
797
805
  bssxPerTab = _react2.default.createElement(
798
806
  _Tab2.default.Item,
799
807
  { title: _react2.default.createElement(
800
808
  'div',
801
- { 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" : '' } },
809
+ { 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" : '' } },
802
810
  '\u4E2A\u4EBA\u529E\u4E8B'
803
811
  ), key: 0 },
804
812
  _react2.default.createElement(
@@ -809,12 +817,12 @@ var MyGrid = function (_React$Component) {
809
817
  );
810
818
  }
811
819
  var bssxOrgTab = '';
812
- if (styleSetting.titleSet.titleStatus == 1 && bssxShowList.indexOf('deptWork') > -1) {
820
+ if (bssxShowList.indexOf('deptWork') > -1) {
813
821
  bssxOrgTab = _react2.default.createElement(
814
822
  _Tab2.default.Item,
815
823
  { key: 1, title: _react2.default.createElement(
816
824
  'div',
817
- { 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" : '' } },
825
+ { 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" : '' } },
818
826
  '\u90E8\u95E8\u529E\u4E8B'
819
827
  ) },
820
828
  _react2.default.createElement(
@@ -1007,7 +1015,7 @@ var MyGrid = function (_React$Component) {
1007
1015
  _Tab2.default.Item,
1008
1016
  { title: _react2.default.createElement(
1009
1017
  'div',
1010
- { 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" : '' } },
1018
+ { 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" : '' } },
1011
1019
  item.columnName
1012
1020
  ), key: item.columnId },
1013
1021
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1138,7 +1146,7 @@ var MyGrid = function (_React$Component) {
1138
1146
  _Tab2.default.Item,
1139
1147
  { title: _react2.default.createElement(
1140
1148
  'div',
1141
- { 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" : '' } },
1149
+ { 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" : '' } },
1142
1150
  '\u4E2A\u4EBA\u90AE\u7BB1'
1143
1151
  ), key: '0' },
1144
1152
  _react2.default.createElement(
@@ -1153,7 +1161,7 @@ var MyGrid = function (_React$Component) {
1153
1161
  _Tab2.default.Item,
1154
1162
  { title: _react2.default.createElement(
1155
1163
  'div',
1156
- { 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" : '' } },
1164
+ { 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" : '' } },
1157
1165
  '\u516C\u5171\u90AE\u7BB1'
1158
1166
  ), key: '1' },
1159
1167
  _react2.default.createElement(
@@ -1166,15 +1174,20 @@ var MyGrid = function (_React$Component) {
1166
1174
  componentContent = _react2.default.createElement(
1167
1175
  'div',
1168
1176
  null,
1169
- _react2.default.createElement(
1177
+ t.state['activeIndex_mail_' + item.data] && t.state['activeIndex_mail_' + item.data] == "0" ? _react2.default.createElement(
1170
1178
  'p',
1171
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
1179
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'gryj') },
1180
+ '\u66F4\u591A',
1181
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1182
+ ) : _react2.default.createElement(
1183
+ 'p',
1184
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
1172
1185
  '\u66F4\u591A',
1173
1186
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1174
1187
  ),
1175
1188
  _react2.default.createElement(
1176
1189
  _Tab2.default,
1177
- { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1" },
1190
+ { activeKey: gryjShowList.indexOf('personMail') > -1 ? "0" : "1", onChange: t.handleChange.bind(this, item.id) },
1178
1191
  personMailTab,
1179
1192
  publicMailTab
1180
1193
  )
@@ -1189,7 +1202,7 @@ var MyGrid = function (_React$Component) {
1189
1202
  { activeKey: '0', className: 't-MB16' },
1190
1203
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1191
1204
  'div',
1192
- { 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" : '' } },
1205
+ { 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" : '' } },
1193
1206
  '\u6211\u7684\u65E5\u7A0B'
1194
1207
  ), key: '0' })
1195
1208
  )
@@ -1358,7 +1371,7 @@ var MyGrid = function (_React$Component) {
1358
1371
  { className: 'component-bssx' },
1359
1372
  _react2.default.createElement(
1360
1373
  'p',
1361
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
1374
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1362
1375
  '\u66F4\u591A',
1363
1376
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1364
1377
  ),
@@ -1367,7 +1380,7 @@ var MyGrid = function (_React$Component) {
1367
1380
  { activeKey: '0', className: 't-MB16' },
1368
1381
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1369
1382
  'div',
1370
- { 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" : '' } },
1383
+ { 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" : '' } },
1371
1384
  '\u6211\u7684\u4F1A\u8BAE'
1372
1385
  ), key: '0' })
1373
1386
  )
@@ -1383,12 +1396,18 @@ var MyGrid = function (_React$Component) {
1383
1396
  componentHead = _react2.default.createElement(
1384
1397
  'div',
1385
1398
  null,
1399
+ _react2.default.createElement(
1400
+ 'p',
1401
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1402
+ '\u66F4\u591A',
1403
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1404
+ ),
1386
1405
  _react2.default.createElement(
1387
1406
  _Tab2.default,
1388
1407
  { activeKey: '0', className: 't-MB16' },
1389
1408
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1390
1409
  'div',
1391
- { 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" : '' } },
1410
+ { 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" : '' } },
1392
1411
  '\u4E8B\u9879\u53D1\u8D77'
1393
1412
  ), key: '0' })
1394
1413
  )
@@ -1419,7 +1438,7 @@ var MyGrid = function (_React$Component) {
1419
1438
  { activeKey: '0', className: 't-MB16' },
1420
1439
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1421
1440
  'div',
1422
- { 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" : '' } },
1441
+ { 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" : '' } },
1423
1442
  '\u56FE\u8868'
1424
1443
  ), key: '0' })
1425
1444
  )
@@ -1431,12 +1450,18 @@ var MyGrid = function (_React$Component) {
1431
1450
  componentHead = _react2.default.createElement(
1432
1451
  'div',
1433
1452
  null,
1453
+ _react2.default.createElement(
1454
+ 'p',
1455
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1456
+ '\u66F4\u591A',
1457
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1458
+ ),
1434
1459
  _react2.default.createElement(
1435
1460
  _Tab2.default,
1436
1461
  { activeKey: '0', className: 't-MB16' },
1437
1462
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1438
1463
  'div',
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" : '' } },
1464
+ { 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" : '' } },
1440
1465
  '\u6211\u7684\u4E8B\u9879'
1441
1466
  ), key: '0' })
1442
1467
  )
@@ -1493,12 +1518,18 @@ var MyGrid = function (_React$Component) {
1493
1518
  componentHead = _react2.default.createElement(
1494
1519
  'div',
1495
1520
  null,
1521
+ _react2.default.createElement(
1522
+ 'p',
1523
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1524
+ '\u66F4\u591A',
1525
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1526
+ ),
1496
1527
  _react2.default.createElement(
1497
1528
  _Tab2.default,
1498
1529
  { activeKey: '0', className: 't-MB16' },
1499
1530
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1500
1531
  'div',
1501
- { 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" : '' } },
1532
+ { 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" : '' } },
1502
1533
  '\u7CBE\u9009\u4E13\u9898'
1503
1534
  ), key: '0' })
1504
1535
  )
@@ -1533,7 +1564,7 @@ var MyGrid = function (_React$Component) {
1533
1564
  }
1534
1565
  return _react2.default.createElement(
1535
1566
  'div',
1536
- { className: 'react-grid-component', key: item.id, style: {
1567
+ { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component' : 'noTitle', key: item.id, style: {
1537
1568
  borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
1538
1569
  borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
1539
1570
  borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',
@@ -1622,7 +1653,7 @@ var MyGrid = function (_React$Component) {
1622
1653
  rowHeight: 20,
1623
1654
  width: window.innerWidth,
1624
1655
  isDraggable: this.state.isDraggable,
1625
- margin: [0, 10]
1656
+ margin: [0, 5]
1626
1657
  },
1627
1658
  this.state.data.map(function (item) {
1628
1659
 
package/lib/react_grid/react_grid.less CHANGED
@@ -1,24 +1,34 @@
1
1
  .react-grid {
2
2
 
3
+ .noTitle {
4
+ .t-tab-bar {
5
+ display: none;
6
+ }
7
+ }
8
+
3
9
  .t-tab-bar {
4
10
  padding-left: 6px;
5
11
  }
6
12
 
7
13
  .t-tab-bar .t-tab-tab {
8
14
  font-size: 16px;
15
+ min-width: 95px;
9
16
  color: #888;
10
17
  flex: initial;
11
18
  padding: 0 10px;
12
- min-width: 95px;
13
19
  height: 33px;
14
20
  line-height: 20px;
15
21
  display: block;
16
- white-space: nowrap;
17
- overflow: hidden;
18
- text-overflow: ellipsis;
19
- -webkit-line-clamp: 1;
20
- -webkit-box-orient: vertical;
21
22
  background-color: transparent;
23
+
24
+ div {
25
+ max-width: 95px;
26
+ white-space: nowrap;
27
+ overflow: hidden;
28
+ text-overflow: ellipsis;
29
+ -webkit-line-clamp: 1;
30
+ -webkit-box-orient: vertical;
31
+ }
22
32
  }
23
33
 
24
34
  .t-tab-bar .t-tab-tab-active {
@@ -55,6 +65,9 @@
55
65
  // width: 100% !important;
56
66
  // margin: 0 10px;
57
67
  overflow: auto;
68
+ background-size: contain;
69
+ background-repeat: no-repeat;
70
+ background-size: 100% 100%;
58
71
  // background-color: #fff;
59
72
  }
60
73
 
@@ -620,7 +633,7 @@
620
633
  }
621
634
 
622
635
  .calendar-container {
623
- background: #fff;
636
+ background: transparent;
624
637
  }
625
638
 
626
639
  .calendar-week {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.41",
3
+ "version": "2.0.43",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",