fmui-base 2.0.51 → 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.
Files changed (4) hide show
  1. package/README.md +3 -1
  2. package/lib/react_grid/react_grid.js +21 -21
  3. package/lib/react_grid/react_grid.less +2 -2
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -3,7 +3,9 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
- - 2.0.51：移动门户日程部件样式修改
6
+ - 2.0.53：移动门户日程部件多个显示问题
7
+ - 2.0.52：移动门户部件标题字体
8
+ - 2.0.51：移动门户部件样式修改
7
9
  - 2.0.50：移动门户部件标题修改
8
10
  - 2.0.49：移动门户图表组件修改
9
11
  - 2.0.48：移动门户组件修改
package/lib/react_grid/react_grid.js CHANGED
@@ -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
 
@@ -694,7 +694,7 @@ var MyGrid = function (_React$Component) {
694
694
  _Tab2.default.Item,
695
695
  { title: _react2.default.createElement(
696
696
  '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" : '' } },
697
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
698
698
  '\u5E38\u7528\u5E94\u7528'
699
699
  ) },
700
700
  t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -740,7 +740,7 @@ var MyGrid = function (_React$Component) {
740
740
  _Tab2.default.Item,
741
741
  { title: _react2.default.createElement(
742
742
  '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" : '' } },
743
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
744
744
  '\u6211\u7684\u6536\u85CF'
745
745
  ) },
746
746
  t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -857,7 +857,7 @@ var MyGrid = function (_React$Component) {
857
857
  _Tab2.default.Item,
858
858
  { title: _react2.default.createElement(
859
859
  '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" : '' } },
860
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
861
861
  '\u4E2A\u4EBA\u529E\u4E8B'
862
862
  ), key: 0 },
863
863
  _react2.default.createElement(
@@ -873,7 +873,7 @@ var MyGrid = function (_React$Component) {
873
873
  _Tab2.default.Item,
874
874
  { key: 1, title: _react2.default.createElement(
875
875
  '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" : '' } },
876
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
877
877
  '\u90E8\u95E8\u529E\u4E8B'
878
878
  ) },
879
879
  _react2.default.createElement(
@@ -1067,7 +1067,7 @@ var MyGrid = function (_React$Component) {
1067
1067
  _Tab2.default.Item,
1068
1068
  { title: _react2.default.createElement(
1069
1069
  '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" : '' } },
1070
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1071
1071
  item.columnName
1072
1072
  ), key: item.columnId },
1073
1073
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1210,7 +1210,7 @@ var MyGrid = function (_React$Component) {
1210
1210
  _Tab2.default.Item,
1211
1211
  { title: _react2.default.createElement(
1212
1212
  '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" : '' } },
1213
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1214
1214
  '\u4E2A\u4EBA\u90AE\u7BB1'
1215
1215
  ), key: '0' },
1216
1216
  _react2.default.createElement(
@@ -1225,7 +1225,7 @@ var MyGrid = function (_React$Component) {
1225
1225
  _Tab2.default.Item,
1226
1226
  { title: _react2.default.createElement(
1227
1227
  '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" : '' } },
1228
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1229
1229
  '\u516C\u5171\u90AE\u7BB1'
1230
1230
  ), key: '1' },
1231
1231
  _react2.default.createElement(
@@ -1266,7 +1266,7 @@ var MyGrid = function (_React$Component) {
1266
1266
  { activeKey: '0', className: 't-MB16' },
1267
1267
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1268
1268
  '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" : '' } },
1269
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1270
1270
  item.title
1271
1271
  ), key: '0' })
1272
1272
  )
@@ -1314,7 +1314,7 @@ var MyGrid = function (_React$Component) {
1314
1314
  });
1315
1315
  }
1316
1316
 
1317
- var calendarDom = _react2.default.createElement('div', { id: 'calendar' });
1317
+ var calendarDom = _react2.default.createElement('div', { id: 'calendar_ ' + item.id });
1318
1318
  var grrcList = '';
1319
1319
  if (t.state[item.portletCode + '_' + item.id]) {
1320
1320
  grrcList = _react2.default.createElement(
@@ -1444,7 +1444,7 @@ var MyGrid = function (_React$Component) {
1444
1444
  { activeKey: '0', className: 't-MB16' },
1445
1445
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1446
1446
  '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" : '' } },
1447
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1448
1448
  item.title
1449
1449
  ), key: '0' })
1450
1450
  )
@@ -1471,7 +1471,7 @@ var MyGrid = function (_React$Component) {
1471
1471
  { activeKey: '0', className: 't-MB16' },
1472
1472
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1473
1473
  '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" : '' } },
1474
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1475
1475
  item.title
1476
1476
  ), key: '0' })
1477
1477
  )
@@ -1501,7 +1501,7 @@ var MyGrid = function (_React$Component) {
1501
1501
  { activeKey: '0', className: 't-MB16' },
1502
1502
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1503
1503
  '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" : '' } },
1504
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1505
1505
  item.title
1506
1506
  ), key: '0' })
1507
1507
  )
@@ -1524,7 +1524,7 @@ var MyGrid = function (_React$Component) {
1524
1524
  { activeKey: '0', className: 't-MB16' },
1525
1525
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1526
1526
  '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" : '' } },
1527
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1528
1528
  item.title
1529
1529
  ), key: '0' })
1530
1530
  )
@@ -1592,7 +1592,7 @@ var MyGrid = function (_React$Component) {
1592
1592
  { activeKey: '0', className: 't-MB16' },
1593
1593
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1594
1594
  '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" : '' } },
1595
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1596
1596
  item.title
1597
1597
  ), key: '0' })
1598
1598
  )
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.53",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",