fmui-base 2.0.40 → 2.0.42

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 +44 -25
  3. package/lib/react_grid/react_grid.less +17 -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.42：移动门户组件修改
7
+ - 2.0.41：表单文本字段级联计算修改
6
8
  - 2.0.40：移动门户组件修改
7
9
  - 2.0.39：表单级联计算修改
8
10
  - 2.0.38：移动门户组件修改
package/lib/react_grid/react_grid.js CHANGED
@@ -522,9 +522,9 @@ var MyGrid = function (_React$Component) {
522
522
  if (type == "all") {
523
523
  if (module == "hall_service") {
524
524
  var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
525
- if (searchVal != '') {
526
- url += "/" + searchVal;
527
- }
525
+ // if (searchVal != '') {
526
+ // url += "/" + searchVal;
527
+ // }
528
528
  url = url + queryurl;
529
529
  decodeURI(url);
530
530
  location.hash = url;
@@ -562,6 +562,7 @@ var MyGrid = function (_React$Component) {
562
562
  var pathUrl = "";
563
563
  var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
564
564
  if (t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg) {
565
+ debugger;
565
566
  var pathUrlId = t.state[item.portletCode + '_' + item.id].bannerImg;
566
567
  pathUrl = localStorage.getItem('context') + '/api/m/plugin/attachment/mobile/viewImage?token=' + localStorage.getItem('token') + '&fid=' + pathUrlId;
567
568
  } else {
@@ -613,7 +614,7 @@ var MyGrid = function (_React$Component) {
613
614
  _react2.default.createElement(
614
615
  _Badge2.default,
615
616
  { count: item == 'daiban' ? t.state.undo : '' },
616
- _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb' + todoInfo.icon })
617
+ _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb ' + todoInfo.icon })
617
618
  )
618
619
  ),
619
620
  _react2.default.createElement(
@@ -638,7 +639,7 @@ var MyGrid = function (_React$Component) {
638
639
  paddingTop: _styleSetting.otherSet.paddingSet.pt + 'px',
639
640
  paddingBottom: _styleSetting.otherSet.paddingSet.pb + 'px',
640
641
  backgroundColor: _styleSetting.otherSet.bgColor,
641
- backgroundImage: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg ? 'url(' + pathUrl + ')' : ''
642
+ backgroundImage: 'url(' + pathUrl + ')'
642
643
  } },
643
644
  _styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
644
645
  componentContent
@@ -655,7 +656,7 @@ var MyGrid = function (_React$Component) {
655
656
  _Tab2.default.Item,
656
657
  { title: _react2.default.createElement(
657
658
  '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" : '' } },
659
+ { 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
660
  '\u5E38\u7528\u5E94\u7528'
660
661
  ) },
661
662
  _react2.default.createElement(
@@ -697,7 +698,7 @@ var MyGrid = function (_React$Component) {
697
698
  _Tab2.default.Item,
698
699
  { title: _react2.default.createElement(
699
700
  '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" : '' } },
701
+ { 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
702
  '\u6211\u7684\u6536\u85CF'
702
703
  ) },
703
704
  _react2.default.createElement(
@@ -793,12 +794,12 @@ var MyGrid = function (_React$Component) {
793
794
  }
794
795
  }
795
796
  var bssxPerTab = '';
796
- if (styleSetting.titleSet.titleStatus == 1 && bssxShowList.indexOf('personWork') > -1) {
797
+ if (bssxShowList.indexOf('personWork') > -1) {
797
798
  bssxPerTab = _react2.default.createElement(
798
799
  _Tab2.default.Item,
799
800
  { title: _react2.default.createElement(
800
801
  '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" : '' } },
802
+ { 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
803
  '\u4E2A\u4EBA\u529E\u4E8B'
803
804
  ), key: 0 },
804
805
  _react2.default.createElement(
@@ -809,12 +810,12 @@ var MyGrid = function (_React$Component) {
809
810
  );
810
811
  }
811
812
  var bssxOrgTab = '';
812
- if (styleSetting.titleSet.titleStatus == 1 && bssxShowList.indexOf('deptWork') > -1) {
813
+ if (bssxShowList.indexOf('deptWork') > -1) {
813
814
  bssxOrgTab = _react2.default.createElement(
814
815
  _Tab2.default.Item,
815
816
  { key: 1, title: _react2.default.createElement(
816
817
  '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" : '' } },
818
+ { 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
819
  '\u90E8\u95E8\u529E\u4E8B'
819
820
  ) },
820
821
  _react2.default.createElement(
@@ -1007,7 +1008,7 @@ var MyGrid = function (_React$Component) {
1007
1008
  _Tab2.default.Item,
1008
1009
  { title: _react2.default.createElement(
1009
1010
  '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" : '' } },
1011
+ { 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
1012
  item.columnName
1012
1013
  ), key: item.columnId },
1013
1014
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1138,7 +1139,7 @@ var MyGrid = function (_React$Component) {
1138
1139
  _Tab2.default.Item,
1139
1140
  { title: _react2.default.createElement(
1140
1141
  '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" : '' } },
1142
+ { 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
1143
  '\u4E2A\u4EBA\u90AE\u7BB1'
1143
1144
  ), key: '0' },
1144
1145
  _react2.default.createElement(
@@ -1153,7 +1154,7 @@ var MyGrid = function (_React$Component) {
1153
1154
  _Tab2.default.Item,
1154
1155
  { title: _react2.default.createElement(
1155
1156
  '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" : '' } },
1157
+ { 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
1158
  '\u516C\u5171\u90AE\u7BB1'
1158
1159
  ), key: '1' },
1159
1160
  _react2.default.createElement(
@@ -1168,7 +1169,7 @@ var MyGrid = function (_React$Component) {
1168
1169
  null,
1169
1170
  _react2.default.createElement(
1170
1171
  'p',
1171
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
1172
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
1172
1173
  '\u66F4\u591A',
1173
1174
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1174
1175
  ),
@@ -1189,7 +1190,7 @@ var MyGrid = function (_React$Component) {
1189
1190
  { activeKey: '0', className: 't-MB16' },
1190
1191
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1191
1192
  '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" : '' } },
1193
+ { 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
1194
  '\u6211\u7684\u65E5\u7A0B'
1194
1195
  ), key: '0' })
1195
1196
  )
@@ -1358,7 +1359,7 @@ var MyGrid = function (_React$Component) {
1358
1359
  { className: 'component-bssx' },
1359
1360
  _react2.default.createElement(
1360
1361
  'p',
1361
- { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN' },
1362
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1362
1363
  '\u66F4\u591A',
1363
1364
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1364
1365
  ),
@@ -1367,7 +1368,7 @@ var MyGrid = function (_React$Component) {
1367
1368
  { activeKey: '0', className: 't-MB16' },
1368
1369
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1369
1370
  '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" : '' } },
1371
+ { 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
1372
  '\u6211\u7684\u4F1A\u8BAE'
1372
1373
  ), key: '0' })
1373
1374
  )
@@ -1383,12 +1384,18 @@ var MyGrid = function (_React$Component) {
1383
1384
  componentHead = _react2.default.createElement(
1384
1385
  'div',
1385
1386
  null,
1387
+ _react2.default.createElement(
1388
+ 'p',
1389
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1390
+ '\u66F4\u591A',
1391
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1392
+ ),
1386
1393
  _react2.default.createElement(
1387
1394
  _Tab2.default,
1388
1395
  { activeKey: '0', className: 't-MB16' },
1389
1396
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1390
1397
  '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" : '' } },
1398
+ { 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
1399
  '\u4E8B\u9879\u53D1\u8D77'
1393
1400
  ), key: '0' })
1394
1401
  )
@@ -1419,7 +1426,7 @@ var MyGrid = function (_React$Component) {
1419
1426
  { activeKey: '0', className: 't-MB16' },
1420
1427
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1421
1428
  '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" : '' } },
1429
+ { 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
1430
  '\u56FE\u8868'
1424
1431
  ), key: '0' })
1425
1432
  )
@@ -1431,12 +1438,18 @@ var MyGrid = function (_React$Component) {
1431
1438
  componentHead = _react2.default.createElement(
1432
1439
  'div',
1433
1440
  null,
1441
+ _react2.default.createElement(
1442
+ 'p',
1443
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1444
+ '\u66F4\u591A',
1445
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1446
+ ),
1434
1447
  _react2.default.createElement(
1435
1448
  _Tab2.default,
1436
1449
  { activeKey: '0', className: 't-MB16' },
1437
1450
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1438
1451
  '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" : '' } },
1452
+ { 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
1453
  '\u6211\u7684\u4E8B\u9879'
1441
1454
  ), key: '0' })
1442
1455
  )
@@ -1446,7 +1459,7 @@ var MyGrid = function (_React$Component) {
1446
1459
  wdsxList = t.state[item.portletCode + '_' + item.id].map(function (item) {
1447
1460
  return _react2.default.createElement(
1448
1461
  'div',
1449
- { className: 'list-item', onClick: t.skip2Process.bind(t, item, 5) },
1462
+ { className: 'list-item', onClick: t.skip2Process.bind(t, item, 4) },
1450
1463
  _react2.default.createElement(
1451
1464
  'div',
1452
1465
  { className: 'item-content' },
@@ -1493,12 +1506,18 @@ var MyGrid = function (_React$Component) {
1493
1506
  componentHead = _react2.default.createElement(
1494
1507
  'div',
1495
1508
  null,
1509
+ _react2.default.createElement(
1510
+ 'p',
1511
+ { className: styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
1512
+ '\u66F4\u591A',
1513
+ _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-tiaozhuan' })
1514
+ ),
1496
1515
  _react2.default.createElement(
1497
1516
  _Tab2.default,
1498
1517
  { activeKey: '0', className: 't-MB16' },
1499
1518
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1500
1519
  '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" : '' } },
1520
+ { 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
1521
  '\u7CBE\u9009\u4E13\u9898'
1503
1522
  ), key: '0' })
1504
1523
  )
@@ -1533,7 +1552,7 @@ var MyGrid = function (_React$Component) {
1533
1552
  }
1534
1553
  return _react2.default.createElement(
1535
1554
  'div',
1536
- { className: 'react-grid-component', key: item.id, style: {
1555
+ { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component' : 'noTitle', key: item.id, style: {
1537
1556
  borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
1538
1557
  borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
1539
1558
  borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',
@@ -1622,7 +1641,7 @@ var MyGrid = function (_React$Component) {
1622
1641
  rowHeight: 20,
1623
1642
  width: window.innerWidth,
1624
1643
  isDraggable: this.state.isDraggable,
1625
- margin: [0, 10]
1644
+ margin: [0, 5]
1626
1645
  },
1627
1646
  this.state.data.map(function (item) {
1628
1647
 
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 {
@@ -620,7 +630,7 @@
620
630
  }
621
631
 
622
632
  .calendar-container {
623
- background: #fff;
633
+ background: transparent;
624
634
  }
625
635
 
626
636
  .calendar-week {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.40",
3
+ "version": "2.0.42",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",