fmui-base 2.0.39 → 2.0.41

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,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.41:表单文本字段级联计算修改
7
+ - 2.0.40:移动门户组件修改
6
8
  - 2.0.39:表单级联计算修改
7
9
  - 2.0.38:移动门户组件修改
8
10
  - 2.0.37:精选专题跳转
package/lib/db/db.js CHANGED
@@ -948,6 +948,19 @@ context.create('reactGrid', {
948
948
  duration: 800
949
949
  });
950
950
  }
951
+ },
952
+ getComAppInfo: {
953
+ url: _variables2.default.URLS.getComAppInfo,
954
+ method: 'GET',
955
+ header: {
956
+ Authorization: 'Bearer ' + getLoginUserInfo().token
957
+ },
958
+ willFetch: function willFetch() {
959
+ _Toast2.default.show({
960
+ content: _react2.default.createElement(_loading2.default, null),
961
+ duration: 800
962
+ });
963
+ }
951
964
  }
952
965
  });
953
966
 
@@ -114,7 +114,8 @@ exports.default = {
114
114
  getComponentInfoListAll: portalAllUrlPrefix + "getComponentInfoList" + '?token=' + getLoginUserInfo().token, //获取首页部件信息
115
115
  getNewHomePageTodoData: portalAllUrlPrefix + "getNewHomePageTodoData" + '?token=' + getLoginUserInfo().token,
116
116
  getNewHomePageCollectAppInfoList: portalAllUrlPrefix + "getNewHomePageCollectAppInfoList" + '?token=' + getLoginUserInfo().token,
117
- getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token
117
+ getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,
118
+ getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token //获取首页常用应用
118
119
  },
119
120
  nodataIcon: context + "/mobile/fmui/images/noData.png",
120
121
  loadingIcon: context + "/mobile/fmui/images/loading.gif",
package/lib/form/table.js CHANGED
@@ -1032,6 +1032,7 @@ var PageHome = function (_React$Component) {
1032
1032
  }, {
1033
1033
  key: 'forSubCalculateExpList',
1034
1034
  value: function forSubCalculateExpList(data, itemParam, uniqueName) {
1035
+ var that = this;
1035
1036
  var calculateExpList = data.subCalculateExpList;
1036
1037
  if (calculateExpList) {
1037
1038
  var calculateExpValue = calculateExpList[uniqueName];
@@ -1151,10 +1152,10 @@ var PageHome = function (_React$Component) {
1151
1152
  res = Number(res).toFixed(decimalPlace) + '';
1152
1153
  } else {
1153
1154
  if (fieldArray.length == 0) {
1154
- var aDP = getActualDecimalPlace(exp);
1155
+ var aDP = that.getActualDecimalPlace(exp);
1155
1156
  res = res.toFixed(aDP) + '';
1156
1157
  } else {
1157
- var maxDP = getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
1158
+ var maxDP = that.getMaxDecimalPlace(fieldItemArray); //获取参与计算的字段中 最长的小数位
1158
1159
  res = res.toFixed(maxDP) + '';
1159
1160
  }
1160
1161
  }
@@ -11,6 +11,8 @@ var _react = require('react');
11
11
 
12
12
  var _react2 = _interopRequireDefault(_react);
13
13
 
14
+ var _umi = require('umi');
15
+
14
16
  var _reactGridLayout = require('react-grid-layout');
15
17
 
16
18
  var _reactGridLayout2 = _interopRequireDefault(_reactGridLayout);
@@ -91,30 +93,85 @@ var MyGrid = function (_React$Component) {
91
93
  var t = _this;
92
94
  // 部件的初始化信息
93
95
  _db2.default.reactGrid.getPortalPage({ id: t.state.portalId, module: t.state.module }).then(function (res) {
94
- console.log('====================================');
95
- console.log(res, 'resresresresres');
96
- console.log('====================================');
96
+ // console.log('====================================');
97
+ // console.log(res, 'resresresresres');
98
+ // console.log('====================================');
97
99
 
98
100
  _this.setState({
99
101
  data: res
100
102
  });
101
103
  res.map(function (item) {
102
- if (item.portletCode !== 'banner' && item.portletCode !== 'tbgl') {
104
+ if (item.portletCode == 'banner') {
105
+ _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
106
+ } else if (item.portletCode == 'cyyy') {
107
+ console.log('====================================');
108
+ console.log(item.id, '//////////////////////////');
109
+ console.log('====================================');
110
+ t.getShoucangAppInfo(item.id);
111
+ t.getComAppInfo(item.id);
112
+ } else if (item.portletCode !== 'tbgl') {
103
113
  var params = {
104
114
  code: item.portletCode,
105
115
  ppId: item.id
106
116
  };
107
117
  _db2.default.reactGrid.getComponentInfoListAll(params).then(function (res) {
108
- console.log(res, '????????????????????????');
118
+ // console.log(res, '????????????????????????');
109
119
  _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
110
120
  });
111
- } else if (item.portletCode == 'banner') {
112
- _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
113
121
  }
114
122
  });
115
123
  });
116
124
  _this.getRemindCount();
117
- _this.getShoucangAppInfo();
125
+ };
126
+
127
+ _this.getShoucangAppInfo = function (id) {
128
+ console.log('====================================');
129
+ console.log(id, 'ididididididididiididiididiididididi');
130
+ console.log('====================================');
131
+ _db2.default.reactGrid.getNewHomePageCollectAppInfoList({ showClient: "DING" }).then(function (result) {
132
+ _this.setState(_defineProperty({}, 'wdsc' + '_' + id, result.data), function () {
133
+ console.log(_this.state, 'mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm');
134
+ });
135
+ }).catch(function (error) {});
136
+ };
137
+
138
+ _this.getComAppInfo = function (id) {
139
+ var userId = getLoginUserInfo().userId;
140
+ var userAppOftenList = [];
141
+ var params = { userId: userId };
142
+ _db2.default.reactGrid.getComAppInfo(params).then(function (result) {
143
+ if (result.data) {
144
+ _this.setState(_defineProperty({}, 'cyyy' + '_' + id, JSON.parse(result.data)));
145
+ localStorage.setItem(['cyyy' + '_' + id], result.data);
146
+ userAppOftenList = JSON.parse(result.data);
147
+ }
148
+ if (userAppOftenList.length < 1) {
149
+ // 没有用户设置,取系统默认值
150
+ _this.getOftenList(id);
151
+ }
152
+ }).catch(function (error) {
153
+ _this.getOftenList();
154
+ console.error(error);
155
+ });
156
+ };
157
+
158
+ _this.getOftenList = function (id) {
159
+ var data = getLoginUserInfo();
160
+ var thirdMenuType = data.thirdMenuType;
161
+ var params = { code: "cyyy" };
162
+ if (thirdMenuType == null || thirdMenuType == 'null' || thirdMenuType == undefined || thirdMenuType == 'undefined') {
163
+ thirdMenuType = 'DING';
164
+ }
165
+ params.showClient = thirdMenuType;
166
+ _db2.default.reactGrid.getComponentInfoListAll(params).then(function (result) {
167
+ if (result.data) {
168
+ _this.setState(_defineProperty({}, 'cyyy' + '_' + id, result.data));
169
+ var appOftenListlocal = JSON.stringify(result.data);
170
+ localStorage.setItem(['cyyy' + '_' + id], appOftenListlocal);
171
+ }
172
+ }).catch(function (error) {
173
+ console.error(error);
174
+ });
118
175
  };
119
176
 
120
177
  var portalId = props.portalId;
@@ -206,26 +263,22 @@ var MyGrid = function (_React$Component) {
206
263
  // 如果有两个相同的部件,将会用id请求部件内容,接口返回的数据需要 this.setState({【id】:result.data});这样存值
207
264
  // 取值的时候根据id取值
208
265
 
209
- }, {
210
- key: 'getShoucangAppInfo',
211
-
212
266
 
213
267
  // 获取收藏应用
214
- value: function getShoucangAppInfo() {
215
- var _this2 = this;
216
268
 
217
- _db2.default.reactGrid.getNewHomePageCollectAppInfoList({ showClient: "DING" }).then(function (result) {
218
- _this2.setState(_defineProperty({}, item.portletCode + '_' + item.id, res));
219
- }).catch(function (error) {});
220
- }
269
+
270
+ // 获取用户设置常用应用
271
+
272
+ // 获取默认系统常用应用
273
+
221
274
  }, {
222
275
  key: 'getRemindCount',
223
276
  value: function getRemindCount() {
224
- var _this3 = this;
277
+ var _this2 = this;
225
278
 
226
279
  _db2.default.reactGrid.getNewHomePageRemindCount({ codes: "undo" }).then(function (content) {
227
280
  if (content.undo) {
228
- _this3.setState({
281
+ _this2.setState({
229
282
  undo: content.undo
230
283
  });
231
284
  }
@@ -469,9 +522,9 @@ var MyGrid = function (_React$Component) {
469
522
  if (type == "all") {
470
523
  if (module == "hall_service") {
471
524
  var url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;
472
- if (searchVal != '') {
473
- url += "/" + searchVal;
474
- }
525
+ // if (searchVal != '') {
526
+ // url += "/" + searchVal;
527
+ // }
475
528
  url = url + queryurl;
476
529
  decodeURI(url);
477
530
  location.hash = url;
@@ -517,29 +570,6 @@ var MyGrid = function (_React$Component) {
517
570
  componentContent = _react2.default.createElement(
518
571
  'div',
519
572
  { className: 'react-grid-banner' },
520
- _react2.default.createElement(
521
- 'div',
522
- { className: 'banner' },
523
- _react2.default.createElement(
524
- 'div',
525
- { className: t.state.showSlide == true ? "t-PR" : "t-DN" },
526
- this.state.bannerList.map(function (item) {
527
- return _react2.default.createElement(
528
- 'div',
529
- { className: 'banner-gallery', index: item.index },
530
- _react2.default.createElement('img', { className: t.state.showItem == item.index ? "bannerimg" : "t-DN", src: item.src })
531
- );
532
- }),
533
- _react2.default.createElement(
534
- 'div',
535
- { className: 'gallery-list' },
536
- this.state.bannerList.map(function (item) {
537
- return _react2.default.createElement('span', { className: t.state.showItem == item.index ? "gallery-dot active" : "gallery-dot" });
538
- })
539
- )
540
- ),
541
- _react2.default.createElement('img', { className: t.state.showSlide == false ? "bannerimg" : "t-DN", src: pathUrl, onerror: '/mobile/fmui/images/home-banner.png\';this.onerror=null' })
542
- ),
543
573
  _react2.default.createElement(
544
574
  'div',
545
575
  { className: 'global-search' },
@@ -583,7 +613,7 @@ var MyGrid = function (_React$Component) {
583
613
  _react2.default.createElement(
584
614
  _Badge2.default,
585
615
  { count: item == 'daiban' ? t.state.undo : '' },
586
- _react2.default.createElement('i', { className: 'theme-color iconfont icon-' + todoInfo.icon })
616
+ _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb' + todoInfo.icon })
587
617
  )
588
618
  ),
589
619
  _react2.default.createElement(
@@ -595,6 +625,24 @@ var MyGrid = function (_React$Component) {
595
625
  }.bind(this)) : ''
596
626
  )
597
627
  );
628
+
629
+ return _react2.default.createElement(
630
+ 'div',
631
+ { className: 'react-grid-component', key: item.id, style: {
632
+ borderTopLeftRadius: _styleSetting.otherSet.radius.topLeft + 'px',
633
+ borderTopRightRadius: _styleSetting.otherSet.radius.topRight + 'px',
634
+ borderBottomLeftRadius: _styleSetting.otherSet.radius.bottomLeft + 'px',
635
+ borderBottomRightRadius: _styleSetting.otherSet.radius.bottomRight + 'px',
636
+ paddingLeft: _styleSetting.otherSet.paddingSet.pl + 'px',
637
+ paddingright: _styleSetting.otherSet.paddingSet.pr + 'px',
638
+ paddingTop: _styleSetting.otherSet.paddingSet.pt + 'px',
639
+ paddingBottom: _styleSetting.otherSet.paddingSet.pb + 'px',
640
+ backgroundColor: _styleSetting.otherSet.bgColor,
641
+ backgroundImage: t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].bannerImg ? 'url(' + pathUrl + ')' : ''
642
+ } },
643
+ _styleSetting.titleSet.titleStatus == 1 ? componentHead : '',
644
+ componentContent
645
+ );
598
646
  }
599
647
  if (item.portletCode === 'cyyy') {
600
648
  componentContent = _react2.default.createElement(
@@ -607,19 +655,19 @@ var MyGrid = function (_React$Component) {
607
655
  _Tab2.default.Item,
608
656
  { title: _react2.default.createElement(
609
657
  'div',
610
- { style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
611
659
  '\u5E38\u7528\u5E94\u7528'
612
660
  ) },
613
661
  _react2.default.createElement(
614
662
  _Grid2.default,
615
663
  { col: personalSetting.cols * 1, className: t.state.showcyyy ? '' : 't-DN' },
616
- t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].data.length > 0 ? t.state[item.portletCode + '_' + item.id].data.map(function (ele) {
664
+ t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].length > 0 ? t.state[item.portletCode + '_' + item.id].map(function (ele) {
617
665
  return _react2.default.createElement(
618
666
  'div',
619
667
  { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
620
668
  _react2.default.createElement(
621
669
  'div',
622
- { className: ele.iconColor == "" ? "iconblock t-iconBCred" : 'iconblock t-iconBC' + ele.iconColor },
670
+ { className: 'iconblock t-iconBC' + ele.iconColor },
623
671
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
624
672
  ),
625
673
  _react2.default.createElement(
@@ -631,7 +679,7 @@ var MyGrid = function (_React$Component) {
631
679
  }) : '',
632
680
  _react2.default.createElement(
633
681
  'div',
634
- { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols) },
682
+ { className: 'systemItem', onClick: t.jumpPage.bind(this, "homepage/home/applistSetting", personalSetting.cols * 1, item.id) },
635
683
  _react2.default.createElement(
636
684
  'div',
637
685
  { className: 'iconblock t-iconBCred' },
@@ -649,13 +697,13 @@ var MyGrid = function (_React$Component) {
649
697
  _Tab2.default.Item,
650
698
  { title: _react2.default.createElement(
651
699
  'div',
652
- { style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
653
701
  '\u6211\u7684\u6536\u85CF'
654
702
  ) },
655
703
  _react2.default.createElement(
656
704
  _Grid2.default,
657
705
  { col: personalSetting.cols * 1 },
658
- t.state[item.portletCode + '_' + item.id] && t.state[item.portletCode + '_' + item.id].data.length > 0 ? t.state[item.portletCode + '_' + item.id].data.map(function (ele) {
706
+ t.state['wdsc' + '_' + item.id] && t.state['wdsc' + '_' + item.id].length > 0 ? t.state['wdsc' + '_' + item.id].map(function (ele) {
659
707
  return _react2.default.createElement(
660
708
  'div',
661
709
  { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
@@ -701,7 +749,7 @@ var MyGrid = function (_React$Component) {
701
749
  return _react2.default.createElement(
702
750
  'div',
703
751
  { className: 'banshi-item', onClick: function onClick() {
704
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
752
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
705
753
  } },
706
754
  _react2.default.createElement(
707
755
  'div',
@@ -726,7 +774,7 @@ var MyGrid = function (_React$Component) {
726
774
  return _react2.default.createElement(
727
775
  'div',
728
776
  { className: 'banshi-item', onClick: function onClick() {
729
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
777
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
730
778
  } },
731
779
  _react2.default.createElement(
732
780
  'div',
@@ -750,7 +798,7 @@ var MyGrid = function (_React$Component) {
750
798
  _Tab2.default.Item,
751
799
  { title: _react2.default.createElement(
752
800
  'div',
753
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
754
802
  '\u4E2A\u4EBA\u529E\u4E8B'
755
803
  ), key: 0 },
756
804
  _react2.default.createElement(
@@ -766,7 +814,7 @@ var MyGrid = function (_React$Component) {
766
814
  _Tab2.default.Item,
767
815
  { key: 1, title: _react2.default.createElement(
768
816
  'div',
769
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
770
818
  '\u90E8\u95E8\u529E\u4E8B'
771
819
  ) },
772
820
  _react2.default.createElement(
@@ -959,7 +1007,7 @@ var MyGrid = function (_React$Component) {
959
1007
  _Tab2.default.Item,
960
1008
  { title: _react2.default.createElement(
961
1009
  'div',
962
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
963
1011
  item.columnName
964
1012
  ), key: item.columnId },
965
1013
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1090,7 +1138,7 @@ var MyGrid = function (_React$Component) {
1090
1138
  _Tab2.default.Item,
1091
1139
  { title: _react2.default.createElement(
1092
1140
  'div',
1093
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1094
1142
  '\u4E2A\u4EBA\u90AE\u7BB1'
1095
1143
  ), key: '0' },
1096
1144
  _react2.default.createElement(
@@ -1105,7 +1153,7 @@ var MyGrid = function (_React$Component) {
1105
1153
  _Tab2.default.Item,
1106
1154
  { title: _react2.default.createElement(
1107
1155
  'div',
1108
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1109
1157
  '\u516C\u5171\u90AE\u7BB1'
1110
1158
  ), key: '1' },
1111
1159
  _react2.default.createElement(
@@ -1141,7 +1189,7 @@ var MyGrid = function (_React$Component) {
1141
1189
  { activeKey: '0', className: 't-MB16' },
1142
1190
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1143
1191
  'div',
1144
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1145
1193
  '\u6211\u7684\u65E5\u7A0B'
1146
1194
  ), key: '0' })
1147
1195
  )
@@ -1319,7 +1367,7 @@ var MyGrid = function (_React$Component) {
1319
1367
  { activeKey: '0', className: 't-MB16' },
1320
1368
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1321
1369
  'div',
1322
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1323
1371
  '\u6211\u7684\u4F1A\u8BAE'
1324
1372
  ), key: '0' })
1325
1373
  )
@@ -1340,7 +1388,7 @@ var MyGrid = function (_React$Component) {
1340
1388
  { activeKey: '0', className: 't-MB16' },
1341
1389
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1342
1390
  'div',
1343
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1344
1392
  '\u4E8B\u9879\u53D1\u8D77'
1345
1393
  ), key: '0' })
1346
1394
  )
@@ -1348,13 +1396,13 @@ var MyGrid = function (_React$Component) {
1348
1396
  componentContent = '';
1349
1397
  if (t.state[item.portletCode + '_' + item.id]) {
1350
1398
  componentContent = _react2.default.createElement(
1351
- 'div',
1352
- { col: personalSetting.cols, className: 'sxbl_buttons' },
1399
+ _Grid2.default,
1400
+ { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
1353
1401
  t.state[item.portletCode + '_' + item.id].map(function (item) {
1354
1402
  return _react2.default.createElement(
1355
1403
  'button',
1356
1404
  { onClick: function onClick() {
1357
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
1405
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
1358
1406
  } },
1359
1407
  item.name
1360
1408
  );
@@ -1371,7 +1419,7 @@ var MyGrid = function (_React$Component) {
1371
1419
  { activeKey: '0', className: 't-MB16' },
1372
1420
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1373
1421
  'div',
1374
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1375
1423
  '\u56FE\u8868'
1376
1424
  ), key: '0' })
1377
1425
  )
@@ -1388,7 +1436,7 @@ var MyGrid = function (_React$Component) {
1388
1436
  { activeKey: '0', className: 't-MB16' },
1389
1437
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1390
1438
  'div',
1391
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1392
1440
  '\u6211\u7684\u4E8B\u9879'
1393
1441
  ), key: '0' })
1394
1442
  )
@@ -1398,7 +1446,7 @@ var MyGrid = function (_React$Component) {
1398
1446
  wdsxList = t.state[item.portletCode + '_' + item.id].map(function (item) {
1399
1447
  return _react2.default.createElement(
1400
1448
  'div',
1401
- { className: 'list-item', onClick: t.skip2Process.bind(t, item, 5) },
1449
+ { className: 'list-item', onClick: t.skip2Process.bind(t, item, 4) },
1402
1450
  _react2.default.createElement(
1403
1451
  'div',
1404
1452
  { className: 'item-content' },
@@ -1450,7 +1498,7 @@ var MyGrid = function (_React$Component) {
1450
1498
  { activeKey: '0', className: 't-MB16' },
1451
1499
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1452
1500
  'div',
1453
- { className: '', style: { color: styleSetting.titleSet.color, fontWeight: styleSetting.titleSet.fontWeight, fontSize: styleSetting.titleSet.titleSize, fontFamily: styleSetting.titleSet.fontFamily, fontStyle: styleSetting.titleSet.titleItalic } },
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" : '' } },
1454
1502
  '\u7CBE\u9009\u4E13\u9898'
1455
1503
  ), key: '0' })
1456
1504
  )
@@ -64,7 +64,9 @@
64
64
  width: 100%;
65
65
  height: 100%;
66
66
  padding: 0;
67
-
67
+ background-position: center;
68
+ background-repeat: no-repeat;
69
+ background-size: 100% 100%;
68
70
  .banner {
69
71
  position: absolute;
70
72
  top: 0;
@@ -980,13 +982,15 @@
980
982
  }
981
983
 
982
984
  .sxbl_buttons {
983
- display: flex;
984
- align-items: center;
985
- justify-content: space-between;
986
- padding: 0 10px;
985
+ // display: flex;
986
+ // align-items: center;
987
+ // justify-content: space-between;
988
+ border-top: none !important;
989
+ padding: 0 16px;
987
990
  button {
988
- width: 45.4%;
991
+ width: 98%;
989
992
  height: 35px;
993
+ margin-bottom: 10px;
990
994
  // line-height: 29px;
991
995
  background: rgba(112,58,58,0.12);
992
996
  border: 2px solid rgba(112,58,58,1);
@@ -994,6 +998,10 @@
994
998
  font-size: 16px;
995
999
  color: #703A3A;
996
1000
  }
1001
+
1002
+ .t-grid-row {
1003
+ border-bottom: none !important;
1004
+ }
997
1005
  }
998
1006
 
999
1007
  .wdsx-list {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.39",
3
+ "version": "2.0.41",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",