fmui-base 2.0.52 → 2.0.54

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,10 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
- - 2.0.52:移动门户日程部件标题字体
7
- - 2.0.51:移动门户日程部件样式修改
6
+ - 2.0.54:移动门户添加下拉刷新
7
+ - 2.0.53:移动门户日程部件多个显示问题
8
+ - 2.0.52:移动门户部件标题字体
9
+ - 2.0.51:移动门户部件样式修改
8
10
  - 2.0.50:移动门户部件标题修改
9
11
  - 2.0.49:移动门户图表组件修改
10
12
  - 2.0.48:移动门户组件修改
@@ -49,6 +49,10 @@ var _Toast = require('saltui/lib/Toast');
49
49
 
50
50
  var _Toast2 = _interopRequireDefault(_Toast);
51
51
 
52
+ var _Refreshcontrol = require('saltui/lib/Refreshcontrol');
53
+
54
+ var _Refreshcontrol2 = _interopRequireDefault(_Refreshcontrol);
55
+
52
56
  require('react-grid-layout/css/styles.css');
53
57
 
54
58
  require('react-resizable/css/styles.css');
@@ -265,7 +269,6 @@ var MyGrid = function (_React$Component) {
265
269
  value: function componentDidMount() {
266
270
  this.initPage();
267
271
  }
268
-
269
272
  // 遍历初始化得到的data,奖id给请求部件的内容的接口
270
273
  // 如果有两个相同的部件,将会用id请求部件内容,接口返回的数据需要 this.setState({【id】:result.data});这样存值
271
274
  // 取值的时候根据id取值
@@ -294,9 +297,9 @@ var MyGrid = function (_React$Component) {
294
297
  }, {
295
298
  key: 'initCleader',
296
299
  value: function initCleader(event, id) {
297
- if (this.state.initCleader == false) {
300
+ if (!this.state["initCleader_" + id] || this.state["initCleader_" + id] == false) {
298
301
  var t = this;
299
- var calendar = document.getElementById("calendar");
302
+ var calendar = document.getElementById('calendar_ ' + id);
300
303
  if (calendar) {
301
304
  var cld = new CalendarMobile({
302
305
  el: 'box',
@@ -325,7 +328,7 @@ var MyGrid = function (_React$Component) {
325
328
  t.showCalendarList(Date, event, id);
326
329
  }
327
330
  });
328
- this.setState({ initCleader: true });
331
+ this.setState(_defineProperty({}, "initCleader_" + id, true));
329
332
  }
330
333
  }
331
334
  }
@@ -380,7 +383,6 @@ var MyGrid = function (_React$Component) {
380
383
  value: function gotoYd() {
381
384
  pageSkipDirectly(_variables2.default.ydPath);
382
385
  }
383
-
384
386
  // 应用跳转
385
387
 
386
388
  }, {
@@ -570,13 +572,13 @@ var MyGrid = function (_React$Component) {
570
572
  data: id
571
573
  });
572
574
  if (obj.active == '1') {
573
- var _setState3;
575
+ var _setState4;
574
576
 
575
- this.setState((_setState3 = {}, _defineProperty(_setState3, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState3, 'activeIndex_gryj_' + id, false), _setState3));
577
+ this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_ggyj_' + id, true), _defineProperty(_setState4, 'activeIndex_gryj_' + id, false), _setState4));
576
578
  } else {
577
- var _setState4;
579
+ var _setState5;
578
580
 
579
- this.setState((_setState4 = {}, _defineProperty(_setState4, 'activeIndex_gryj_' + id, true), _defineProperty(_setState4, 'activeIndex_ggyj_' + id, false), _setState4));
581
+ this.setState((_setState5 = {}, _defineProperty(_setState5, 'activeIndex_gryj_' + id, true), _defineProperty(_setState5, 'activeIndex_ggyj_' + id, false), _setState5));
580
582
  }
581
583
  }
582
584
 
@@ -588,17 +590,6 @@ var MyGrid = function (_React$Component) {
588
590
  var t = this;
589
591
  var styleSetting = JSON.parse(item.styleSetting);
590
592
  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
593
  var componentContent = _react2.default.createElement(
603
594
  'div',
604
595
  null,
@@ -705,7 +696,7 @@ var MyGrid = function (_React$Component) {
705
696
  _Tab2.default.Item,
706
697
  { title: _react2.default.createElement(
707
698
  '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" : '' } },
699
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
709
700
  '\u5E38\u7528\u5E94\u7528'
710
701
  ) },
711
702
  t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -751,7 +742,7 @@ var MyGrid = function (_React$Component) {
751
742
  _Tab2.default.Item,
752
743
  { title: _react2.default.createElement(
753
744
  '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" : '' } },
745
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
755
746
  '\u6211\u7684\u6536\u85CF'
756
747
  ) },
757
748
  t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? _react2.default.createElement(
@@ -868,7 +859,7 @@ var MyGrid = function (_React$Component) {
868
859
  _Tab2.default.Item,
869
860
  { title: _react2.default.createElement(
870
861
  '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" : '' } },
862
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
872
863
  '\u4E2A\u4EBA\u529E\u4E8B'
873
864
  ), key: 0 },
874
865
  _react2.default.createElement(
@@ -884,7 +875,7 @@ var MyGrid = function (_React$Component) {
884
875
  _Tab2.default.Item,
885
876
  { key: 1, title: _react2.default.createElement(
886
877
  '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" : '' } },
878
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
888
879
  '\u90E8\u95E8\u529E\u4E8B'
889
880
  ) },
890
881
  _react2.default.createElement(
@@ -1078,7 +1069,7 @@ var MyGrid = function (_React$Component) {
1078
1069
  _Tab2.default.Item,
1079
1070
  { title: _react2.default.createElement(
1080
1071
  '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" : '' } },
1072
+ { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1082
1073
  item.columnName
1083
1074
  ), key: item.columnId },
1084
1075
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1221,7 +1212,7 @@ var MyGrid = function (_React$Component) {
1221
1212
  _Tab2.default.Item,
1222
1213
  { title: _react2.default.createElement(
1223
1214
  '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" : '' } },
1215
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1225
1216
  '\u4E2A\u4EBA\u90AE\u7BB1'
1226
1217
  ), key: '0' },
1227
1218
  _react2.default.createElement(
@@ -1236,7 +1227,7 @@ var MyGrid = function (_React$Component) {
1236
1227
  _Tab2.default.Item,
1237
1228
  { title: _react2.default.createElement(
1238
1229
  '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" : '' } },
1230
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1240
1231
  '\u516C\u5171\u90AE\u7BB1'
1241
1232
  ), key: '1' },
1242
1233
  _react2.default.createElement(
@@ -1277,7 +1268,7 @@ var MyGrid = function (_React$Component) {
1277
1268
  { activeKey: '0', className: 't-MB16' },
1278
1269
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1279
1270
  '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" : '' } },
1271
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1281
1272
  item.title
1282
1273
  ), key: '0' })
1283
1274
  )
@@ -1325,7 +1316,7 @@ var MyGrid = function (_React$Component) {
1325
1316
  });
1326
1317
  }
1327
1318
 
1328
- var calendarDom = _react2.default.createElement('div', { id: 'calendar' });
1319
+ var calendarDom = _react2.default.createElement('div', { id: 'calendar_ ' + item.id });
1329
1320
  var grrcList = '';
1330
1321
  if (t.state[item.portletCode + '_' + item.id]) {
1331
1322
  grrcList = _react2.default.createElement(
@@ -1455,7 +1446,7 @@ var MyGrid = function (_React$Component) {
1455
1446
  { activeKey: '0', className: 't-MB16' },
1456
1447
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1457
1448
  '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" : '' } },
1449
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1459
1450
  item.title
1460
1451
  ), key: '0' })
1461
1452
  )
@@ -1482,7 +1473,7 @@ var MyGrid = function (_React$Component) {
1482
1473
  { activeKey: '0', className: 't-MB16' },
1483
1474
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1484
1475
  '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" : '' } },
1476
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1486
1477
  item.title
1487
1478
  ), key: '0' })
1488
1479
  )
@@ -1512,7 +1503,7 @@ var MyGrid = function (_React$Component) {
1512
1503
  { activeKey: '0', className: 't-MB16' },
1513
1504
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1514
1505
  '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" : '' } },
1506
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1516
1507
  item.title
1517
1508
  ), key: '0' })
1518
1509
  )
@@ -1535,7 +1526,7 @@ var MyGrid = function (_React$Component) {
1535
1526
  { activeKey: '0', className: 't-MB16' },
1536
1527
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1537
1528
  '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" : '' } },
1529
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1539
1530
  item.title
1540
1531
  ), key: '0' })
1541
1532
  )
@@ -1603,7 +1594,7 @@ var MyGrid = function (_React$Component) {
1603
1594
  { activeKey: '0', className: 't-MB16' },
1604
1595
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1605
1596
  '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" : '' } },
1597
+ { className: '', style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
1607
1598
  item.title
1608
1599
  ), key: '0' })
1609
1600
  )
@@ -1653,6 +1644,26 @@ var MyGrid = function (_React$Component) {
1653
1644
  componentContent
1654
1645
  );
1655
1646
  }
1647
+
1648
+ // 下拉刷新
1649
+
1650
+ }, {
1651
+ key: 'onRefresh',
1652
+ value: function onRefresh() {
1653
+ var _this3 = this;
1654
+
1655
+ // debugger;
1656
+ this.setState({ refreshing: true });
1657
+ this.initPage();
1658
+ // this.setState({
1659
+ // refreshing: false,
1660
+ // });
1661
+ setTimeout(function () {
1662
+ _this3.setState({
1663
+ refreshing: false
1664
+ });
1665
+ }, 1000);
1666
+ }
1656
1667
  }, {
1657
1668
  key: 'render',
1658
1669
  value: function render() {
@@ -1678,21 +1689,25 @@ var MyGrid = function (_React$Component) {
1678
1689
  'div',
1679
1690
  { className: 'react-grid' },
1680
1691
  _react2.default.createElement(
1681
- _reactGridLayout2.default,
1682
- {
1683
- className: 'layout',
1684
- layout: layout,
1685
- cols: 12,
1686
- rowHeight: 20,
1687
- width: window.innerWidth,
1688
- isDraggable: this.state.isDraggable,
1689
- margin: [0, 5]
1690
- },
1691
- this.state.data.map(function (item) {
1692
- return t.portalContent(item) || null;
1693
-
1694
- // 添加一个默认返回值,以避免未指定键的错误
1695
- })
1692
+ _Refreshcontrol2.default,
1693
+ { refreshing: this.state.refreshing, onRefresh: this.onRefresh.bind(this), beforePullLoadText: '\u4E0B\u62C9\u5237\u65B0', afterPullLoadText: '\u4E0B\u62C9\u5237\u65B0\u7ED3\u675F' },
1694
+ _react2.default.createElement(
1695
+ _reactGridLayout2.default,
1696
+ {
1697
+ className: 'layout',
1698
+ layout: layout,
1699
+ cols: 12,
1700
+ rowHeight: 20,
1701
+ width: window.innerWidth,
1702
+ isDraggable: this.state.isDraggable,
1703
+ margin: [0, 5]
1704
+ },
1705
+ this.state.data.map(function (item) {
1706
+ return t.portalContent(item) || null;
1707
+
1708
+ // 添加一个默认返回值,以避免未指定键的错误
1709
+ })
1710
+ )
1696
1711
  )
1697
1712
  );
1698
1713
  }
@@ -1048,5 +1048,30 @@
1048
1048
  border-left: none !important;
1049
1049
  }
1050
1050
 
1051
+
1052
+ .t-refresh-control{
1053
+ .t-refresh-control-inner {
1054
+ z-index: 0;
1055
+ }
1056
+ }
1057
+
1058
+ .t-refresh-control.ready {
1059
+ .t-refresh-control-inner {
1060
+ z-index: -1;
1061
+ }
1062
+ }
1063
+
1064
+ .t-refresh-control.refreshAnimate.refreshing {
1065
+ .t-refresh-control-inner {
1066
+ z-index: 0;
1067
+ }
1068
+ }
1069
+
1070
+ .t-refresh-control.refreshAnimate {
1071
+ .t-refresh-control-inner {
1072
+ z-index: -1;
1073
+ }
1074
+ }
1075
+
1051
1076
  }
1052
1077
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.52",
3
+ "version": "2.0.54",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",