fmui-base 2.0.51 → 2.0.52

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 +1 -0
  2. package/lib/react_grid/react_grid.js +24 -13
  3. package/lib/react_grid/react_grid.less +2 -2
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.52：移动门户日程部件标题字体
6
7
  - 2.0.51：移动门户日程部件样式修改
7
8
  - 2.0.50：移动门户部件标题修改
8
9
  - 2.0.49：移动门户图表组件修改
package/lib/react_grid/react_grid.js CHANGED
@@ -588,6 +588,17 @@ var MyGrid = function (_React$Component) {
588
588
  var t = this;
589
589
  var styleSetting = JSON.parse(item.styleSetting);
590
590
  var personalSetting = JSON.parse(item.personalSetting);
591
+ var fontFamilyType = styleSetting.titleSet.titleFamily;
592
+ console.log('====================================');
593
+ console.log(fontFamilyType, 'fontFamilyTypefontFamilyType');
594
+ console.log('====================================');
595
+ if (fontFamilyType == 'SimSun') {
596
+ fontFamilyType = 'sans-serif';
597
+ } else if (fontFamilyType == 'SimHei') {
598
+ fontFamilyType = 'serif';
599
+ } else {
600
+ fontFamilyType = 'monospace';
601
+ }
591
602
  var componentContent = _react2.default.createElement(
592
603
  'div',
593
604
  null,
@@ -694,7 +705,7 @@ var MyGrid = function (_React$Component) {
694
705
  _Tab2.default.Item,
695
706
  { title: _react2.default.createElement(
696
707
  'div',
697
- { 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: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
698
709
  '\u5E38\u7528\u5E94\u7528'
699
710
  ) },
700
711
  t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -740,7 +751,7 @@ var MyGrid = function (_React$Component) {
740
751
  _Tab2.default.Item,
741
752
  { title: _react2.default.createElement(
742
753
  'div',
743
- { 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" : '' } },
754
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
744
755
  '\u6211\u7684\u6536\u85CF'
745
756
  ) },
746
757
  t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -857,7 +868,7 @@ var MyGrid = function (_React$Component) {
857
868
  _Tab2.default.Item,
858
869
  { title: _react2.default.createElement(
859
870
  'div',
860
- { 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" : '' } },
871
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
861
872
  '\u4E2A\u4EBA\u529E\u4E8B'
862
873
  ), key: 0 },
863
874
  _react2.default.createElement(
@@ -873,7 +884,7 @@ var MyGrid = function (_React$Component) {
873
884
  _Tab2.default.Item,
874
885
  { key: 1, title: _react2.default.createElement(
875
886
  'div',
876
- { 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" : '' } },
887
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
877
888
  '\u90E8\u95E8\u529E\u4E8B'
878
889
  ) },
879
890
  _react2.default.createElement(
@@ -1067,7 +1078,7 @@ var MyGrid = function (_React$Component) {
1067
1078
  _Tab2.default.Item,
1068
1079
  { title: _react2.default.createElement(
1069
1080
  'div',
1070
- { 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" : '' } },
1081
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1071
1082
  item.columnName
1072
1083
  ), key: item.columnId },
1073
1084
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1210,7 +1221,7 @@ var MyGrid = function (_React$Component) {
1210
1221
  _Tab2.default.Item,
1211
1222
  { title: _react2.default.createElement(
1212
1223
  'div',
1213
- { 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" : '' } },
1224
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1214
1225
  '\u4E2A\u4EBA\u90AE\u7BB1'
1215
1226
  ), key: '0' },
1216
1227
  _react2.default.createElement(
@@ -1225,7 +1236,7 @@ var MyGrid = function (_React$Component) {
1225
1236
  _Tab2.default.Item,
1226
1237
  { title: _react2.default.createElement(
1227
1238
  'div',
1228
- { 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" : '' } },
1239
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1229
1240
  '\u516C\u5171\u90AE\u7BB1'
1230
1241
  ), key: '1' },
1231
1242
  _react2.default.createElement(
@@ -1266,7 +1277,7 @@ var MyGrid = function (_React$Component) {
1266
1277
  { activeKey: '0', className: 't-MB16' },
1267
1278
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1268
1279
  'div',
1269
- { 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" : '' } },
1280
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1270
1281
  item.title
1271
1282
  ), key: '0' })
1272
1283
  )
@@ -1444,7 +1455,7 @@ var MyGrid = function (_React$Component) {
1444
1455
  { activeKey: '0', className: 't-MB16' },
1445
1456
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1446
1457
  'div',
1447
- { 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" : '' } },
1458
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1448
1459
  item.title
1449
1460
  ), key: '0' })
1450
1461
  )
@@ -1471,7 +1482,7 @@ var MyGrid = function (_React$Component) {
1471
1482
  { activeKey: '0', className: 't-MB16' },
1472
1483
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1473
1484
  'div',
1474
- { 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" : '' } },
1485
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1475
1486
  item.title
1476
1487
  ), key: '0' })
1477
1488
  )
@@ -1501,7 +1512,7 @@ var MyGrid = function (_React$Component) {
1501
1512
  { activeKey: '0', className: 't-MB16' },
1502
1513
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1503
1514
  'div',
1504
- { 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" : '' } },
1515
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1505
1516
  item.title
1506
1517
  ), key: '0' })
1507
1518
  )
@@ -1524,7 +1535,7 @@ var MyGrid = function (_React$Component) {
1524
1535
  { activeKey: '0', className: 't-MB16' },
1525
1536
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1526
1537
  'div',
1527
- { 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" : '' } },
1538
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1528
1539
  item.title
1529
1540
  ), key: '0' })
1530
1541
  )
@@ -1592,7 +1603,7 @@ var MyGrid = function (_React$Component) {
1592
1603
  { activeKey: '0', className: 't-MB16' },
1593
1604
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1594
1605
  'div',
1595
- { 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" : '' } },
1606
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1596
1607
  item.title
1597
1608
  ), key: '0' })
1598
1609
  )
package/lib/react_grid/react_grid.less CHANGED
@@ -16,14 +16,14 @@
16
16
  color: #888;
17
17
  flex: initial;
18
18
  // padding: 0 8px;
19
- height: 33px;
19
+ height: 38px;
20
20
  line-height: 20px;
21
21
  display: block;
22
22
  background-color: transparent;
23
23
 
24
24
  div {
25
25
  max-width: 95px;
26
- padding: 0 5px;
26
+ padding: 2px 5px;
27
27
  height: inherit;
28
28
  white-space: nowrap;
29
29
  overflow: hidden;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.51",
3
+ "version": "2.0.52",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",