fmui-base 2.0.52 → 2.0.53

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,8 +3,9 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
- - 2.0.52:移动门户日程部件标题字体
7
- - 2.0.51:移动门户日程部件样式修改
6
+ - 2.0.53:移动门户日程部件多个显示问题
7
+ - 2.0.52:移动门户部件标题字体
8
+ - 2.0.51:移动门户部件样式修改
8
9
  - 2.0.50:移动门户部件标题修改
9
10
  - 2.0.49:移动门户图表组件修改
10
11
  - 2.0.48:移动门户组件修改
@@ -294,9 +294,9 @@ var MyGrid = function (_React$Component) {
294
294
  }, {
295
295
  key: 'initCleader',
296
296
  value: function initCleader(event, id) {
297
- if (this.state.initCleader == false) {
297
+ if (!this.state["initCleader_" + id] || this.state["initCleader_" + id] == false) {
298
298
  var t = this;
299
- var calendar = document.getElementById("calendar");
299
+ var calendar = document.getElementById('calendar_ ' + id);
300
300
  if (calendar) {
301
301
  var cld = new CalendarMobile({
302
302
  el: 'box',
@@ -325,7 +325,7 @@ var MyGrid = function (_React$Component) {
325
325
  t.showCalendarList(Date, event, id);
326
326
  }
327
327
  });
328
- this.setState({ initCleader: true });
328
+ this.setState(_defineProperty({}, "initCleader_" + id, true));
329
329
  }
330
330
  }
331
331
  }
@@ -570,13 +570,13 @@ var MyGrid = function (_React$Component) {
570
570
  data: id
571
571
  });
572
572
  if (obj.active == '1') {
573
- var _setState3;
573
+ var _setState4;
574
574
 
575
- this.setState((_setState3 = {}, _defineProperty(_setState3, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState3, 'activeIndex_gryj_' + id, false), _setState3));
575
+ this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState4, 'activeIndex_gryj_' + id, false), _setState4));
576
576
  } else {
577
- var _setState4;
577
+ var _setState5;
578
578
 
579
- this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
579
+ this.setState((_setState5 = {}, _defineProperty(_setState5, 'activeIndex_gryj_' + id, true), _defineProperty(_setState5, 'activeIndex_ggyj_' + id, false), _setState5));
580
580
  }
581
581
  }
582
582
 
@@ -588,17 +588,6 @@ 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
- }
602
591
  var componentContent = _react2.default.createElement(
603
592
  'div',
604
593
  null,
@@ -705,7 +694,7 @@ var MyGrid = function (_React$Component) {
705
694
  _Tab2.default.Item,
706
695
  { title: _react2.default.createElement(
707
696
  'div',
708
- { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
697
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
709
698
  '\u5E38\u7528\u5E94\u7528'
710
699
  ) },
711
700
  t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -751,7 +740,7 @@ var MyGrid = function (_React$Component) {
751
740
  _Tab2.default.Item,
752
741
  { title: _react2.default.createElement(
753
742
  'div',
754
- { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
743
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
755
744
  '\u6211\u7684\u6536\u85CF'
756
745
  ) },
757
746
  t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -868,7 +857,7 @@ var MyGrid = function (_React$Component) {
868
857
  _Tab2.default.Item,
869
858
  { title: _react2.default.createElement(
870
859
  'div',
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" : '' } },
860
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
872
861
  '\u4E2A\u4EBA\u529E\u4E8B'
873
862
  ), key: 0 },
874
863
  _react2.default.createElement(
@@ -884,7 +873,7 @@ var MyGrid = function (_React$Component) {
884
873
  _Tab2.default.Item,
885
874
  { key: 1, title: _react2.default.createElement(
886
875
  'div',
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" : '' } },
876
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
888
877
  '\u90E8\u95E8\u529E\u4E8B'
889
878
  ) },
890
879
  _react2.default.createElement(
@@ -1078,7 +1067,7 @@ var MyGrid = function (_React$Component) {
1078
1067
  _Tab2.default.Item,
1079
1068
  { title: _react2.default.createElement(
1080
1069
  'div',
1081
- { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize, fontFamily: fontFamilyType, fontStyle: styleSetting.titleSet.titleItalic === "1" ? "italic" : '' } },
1070
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1082
1071
  item.columnName
1083
1072
  ), key: item.columnId },
1084
1073
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1221,7 +1210,7 @@ var MyGrid = function (_React$Component) {
1221
1210
  _Tab2.default.Item,
1222
1211
  { title: _react2.default.createElement(
1223
1212
  'div',
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" : '' } },
1213
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1225
1214
  '\u4E2A\u4EBA\u90AE\u7BB1'
1226
1215
  ), key: '0' },
1227
1216
  _react2.default.createElement(
@@ -1236,7 +1225,7 @@ var MyGrid = function (_React$Component) {
1236
1225
  _Tab2.default.Item,
1237
1226
  { title: _react2.default.createElement(
1238
1227
  'div',
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" : '' } },
1228
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1240
1229
  '\u516C\u5171\u90AE\u7BB1'
1241
1230
  ), key: '1' },
1242
1231
  _react2.default.createElement(
@@ -1277,7 +1266,7 @@ var MyGrid = function (_React$Component) {
1277
1266
  { activeKey: '0', className: 't-MB16' },
1278
1267
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1279
1268
  'div',
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" : '' } },
1269
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1281
1270
  item.title
1282
1271
  ), key: '0' })
1283
1272
  )
@@ -1325,7 +1314,7 @@ var MyGrid = function (_React$Component) {
1325
1314
  });
1326
1315
  }
1327
1316
 
1328
- var calendarDom = _react2.default.createElement('div', { id: 'calendar' });
1317
+ var calendarDom = _react2.default.createElement('div', { id: 'calendar_ ' + item.id });
1329
1318
  var grrcList = '';
1330
1319
  if (t.state[item.portletCode + '_' + item.id]) {
1331
1320
  grrcList = _react2.default.createElement(
@@ -1455,7 +1444,7 @@ var MyGrid = function (_React$Component) {
1455
1444
  { activeKey: '0', className: 't-MB16' },
1456
1445
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1457
1446
  'div',
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" : '' } },
1447
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1459
1448
  item.title
1460
1449
  ), key: '0' })
1461
1450
  )
@@ -1482,7 +1471,7 @@ var MyGrid = function (_React$Component) {
1482
1471
  { activeKey: '0', className: 't-MB16' },
1483
1472
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1484
1473
  'div',
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" : '' } },
1474
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1486
1475
  item.title
1487
1476
  ), key: '0' })
1488
1477
  )
@@ -1512,7 +1501,7 @@ var MyGrid = function (_React$Component) {
1512
1501
  { activeKey: '0', className: 't-MB16' },
1513
1502
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1514
1503
  'div',
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" : '' } },
1504
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1516
1505
  item.title
1517
1506
  ), key: '0' })
1518
1507
  )
@@ -1535,7 +1524,7 @@ var MyGrid = function (_React$Component) {
1535
1524
  { activeKey: '0', className: 't-MB16' },
1536
1525
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1537
1526
  'div',
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" : '' } },
1527
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1539
1528
  item.title
1540
1529
  ), key: '0' })
1541
1530
  )
@@ -1603,7 +1592,7 @@ var MyGrid = function (_React$Component) {
1603
1592
  { activeKey: '0', className: 't-MB16' },
1604
1593
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1605
1594
  'div',
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" : '' } },
1595
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1607
1596
  item.title
1608
1597
  ), key: '0' })
1609
1598
  )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.52",
3
+ "version": "2.0.53",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",