fmui-base 2.0.38 → 2.0.40

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.40:移动门户组件修改
7
+ - 2.0.39:表单级联计算修改
6
8
  - 2.0.38:移动门户组件修改
7
9
  - 2.0.37:精选专题跳转
8
10
  - 2.0.36:移动门户组件修改
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
@@ -1170,6 +1170,7 @@ var PageHome = function (_React$Component) {
1170
1170
  }
1171
1171
  if (returnResultItem && returnResultItem.length > 0) {
1172
1172
  for (var r = 0; r < returnResultItem.length; r++) {
1173
+ this.forCalculateExpList(data, itemParam, returnResultItem[r]);
1173
1174
  this.forSubCalculateExpList(data, itemParam, returnResultItem[r]);
1174
1175
  }
1175
1176
  }
@@ -149,7 +149,7 @@ var PageHome = function (_React$Component) {
149
149
  savePhraseList: savePhraseList, //是否保存为常用语的选项列表
150
150
  savePhrase: [], //是否保存为常用语,1是,0否
151
151
  level: '',
152
- shortMessageList: [{ value: "2", checked: false, content: '移动端提醒', disable: false }]
152
+ shortMessageList: [{ value: "2", checked: true, content: '移动端提醒', disable: false }]
153
153
  };
154
154
 
155
155
  // FlowCommon = require('pages/flow_common/'+module).default?require('pages/flow_common/'+module).default:require('pages/flow_common/'+module);
@@ -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
  }
@@ -404,6 +457,36 @@ var MyGrid = function (_React$Component) {
404
457
  location.hash = "topicservice/" + code;
405
458
  }
406
459
 
460
+ //跳转更多
461
+
462
+ }, {
463
+ key: 'skip2More',
464
+ value: function skip2More(type) {
465
+ var url = "";
466
+ if (type == 'grhy') {
467
+ //会议
468
+ url = getLoginUserInfo().context + '/mobile/modules/meeting/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1';
469
+ pageSkipDirectly(url);
470
+ } else if (type == 'gryj') {
471
+ //个人邮件
472
+ url = getLoginUserInfo().context + '/mobile/modules/mail/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1&isPublic=0#/mail/home/1/';
473
+ pageSkipDirectly(url);
474
+ } else if (type == 'ggyj') {
475
+ //公共邮件
476
+ url = getLoginUserInfo().context + '/mobile/modules/mail/dist/index.html?&context=' + getLoginUserInfo().context + '&hasBottomTab=1&isPublic=1#/mail/home/1/';
477
+ pageSkipDirectly(url);
478
+ } else if (type == 'lcfq') {
479
+ //流程发起
480
+ location.hash = "officehall";
481
+ } else if (type == 'wdsx') {
482
+ //我的事项
483
+ location.hash = "approval/all/5";
484
+ } else if (type == 'bssx') {
485
+ //办事事项
486
+ location.hash = "officehall";
487
+ }
488
+ }
489
+
407
490
  //跳转到我的事项
408
491
 
409
492
  }, {
@@ -474,7 +557,7 @@ var MyGrid = function (_React$Component) {
474
557
  var componentHead = '';
475
558
  if (item.portletCode === 'banner') {
476
559
  // 判断AI和menu
477
- var isShowList = JSON.parse(item.personalSetting).bannerSet.split(',');
560
+ var isShowList = JSON.parse(item.personalSetting).bannerSet;
478
561
  var _styleSetting = JSON.parse(item.styleSetting);
479
562
  var pathUrl = "";
480
563
  var colNum = t.state.todoList.length > 0 ? t.state.todoList.length : 5;
@@ -487,29 +570,6 @@ var MyGrid = function (_React$Component) {
487
570
  componentContent = _react2.default.createElement(
488
571
  'div',
489
572
  { className: 'react-grid-banner' },
490
- _react2.default.createElement(
491
- 'div',
492
- { className: 'banner' },
493
- _react2.default.createElement(
494
- 'div',
495
- { className: t.state.showSlide == true ? "t-PR" : "t-DN" },
496
- this.state.bannerList.map(function (item) {
497
- return _react2.default.createElement(
498
- 'div',
499
- { className: 'banner-gallery', index: item.index },
500
- _react2.default.createElement('img', { className: t.state.showItem == item.index ? "bannerimg" : "t-DN", src: item.src })
501
- );
502
- }),
503
- _react2.default.createElement(
504
- 'div',
505
- { className: 'gallery-list' },
506
- this.state.bannerList.map(function (item) {
507
- return _react2.default.createElement('span', { className: t.state.showItem == item.index ? "gallery-dot active" : "gallery-dot" });
508
- })
509
- )
510
- ),
511
- _react2.default.createElement('img', { className: t.state.showSlide == false ? "bannerimg" : "t-DN", src: pathUrl, onerror: '/mobile/fmui/images/home-banner.png\';this.onerror=null' })
512
- ),
513
573
  _react2.default.createElement(
514
574
  'div',
515
575
  { className: 'global-search' },
@@ -553,7 +613,7 @@ var MyGrid = function (_React$Component) {
553
613
  _react2.default.createElement(
554
614
  _Badge2.default,
555
615
  { count: item == 'daiban' ? t.state.undo : '' },
556
- _react2.default.createElement('i', { className: 'theme-color iconfont icon-' + todoInfo.icon })
616
+ _react2.default.createElement('i', { className: 'theme-color iconfont-ywtb' + todoInfo.icon })
557
617
  )
558
618
  ),
559
619
  _react2.default.createElement(
@@ -565,6 +625,24 @@ var MyGrid = function (_React$Component) {
565
625
  }.bind(this)) : ''
566
626
  )
567
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
+ );
568
646
  }
569
647
  if (item.portletCode === 'cyyy') {
570
648
  componentContent = _react2.default.createElement(
@@ -577,19 +655,19 @@ var MyGrid = function (_React$Component) {
577
655
  _Tab2.default.Item,
578
656
  { title: _react2.default.createElement(
579
657
  'div',
580
- { 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" : '' } },
581
659
  '\u5E38\u7528\u5E94\u7528'
582
660
  ) },
583
661
  _react2.default.createElement(
584
662
  _Grid2.default,
585
663
  { col: personalSetting.cols * 1, className: t.state.showcyyy ? '' : 't-DN' },
586
- 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) {
587
665
  return _react2.default.createElement(
588
666
  'div',
589
667
  { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
590
668
  _react2.default.createElement(
591
669
  'div',
592
- { className: ele.iconColor == "" ? "iconblock t-iconBCred" : 'iconblock t-iconBC' + ele.iconColor },
670
+ { className: 'iconblock t-iconBC' + ele.iconColor },
593
671
  _react2.default.createElement('i', { className: 'iconfont-ywtb icon-ywtb-' + ele.icon })
594
672
  ),
595
673
  _react2.default.createElement(
@@ -601,7 +679,7 @@ var MyGrid = function (_React$Component) {
601
679
  }) : '',
602
680
  _react2.default.createElement(
603
681
  'div',
604
- { 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) },
605
683
  _react2.default.createElement(
606
684
  'div',
607
685
  { className: 'iconblock t-iconBCred' },
@@ -619,13 +697,13 @@ var MyGrid = function (_React$Component) {
619
697
  _Tab2.default.Item,
620
698
  { title: _react2.default.createElement(
621
699
  'div',
622
- { 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" : '' } },
623
701
  '\u6211\u7684\u6536\u85CF'
624
702
  ) },
625
703
  _react2.default.createElement(
626
704
  _Grid2.default,
627
705
  { col: personalSetting.cols * 1 },
628
- 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) {
629
707
  return _react2.default.createElement(
630
708
  'div',
631
709
  { className: 'systemItem', onClick: t.newPageSkip.bind(t, ele.dingUrl, ele.wxUrl, ele.mhUrl, ele.cocallUrl) },
@@ -671,7 +749,7 @@ var MyGrid = function (_React$Component) {
671
749
  return _react2.default.createElement(
672
750
  'div',
673
751
  { className: 'banshi-item', onClick: function onClick() {
674
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
752
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
675
753
  } },
676
754
  _react2.default.createElement(
677
755
  'div',
@@ -696,7 +774,7 @@ var MyGrid = function (_React$Component) {
696
774
  return _react2.default.createElement(
697
775
  'div',
698
776
  { className: 'banshi-item', onClick: function onClick() {
699
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
777
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
700
778
  } },
701
779
  _react2.default.createElement(
702
780
  'div',
@@ -720,7 +798,7 @@ var MyGrid = function (_React$Component) {
720
798
  _Tab2.default.Item,
721
799
  { title: _react2.default.createElement(
722
800
  'div',
723
- { 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" : '' } },
724
802
  '\u4E2A\u4EBA\u529E\u4E8B'
725
803
  ), key: 0 },
726
804
  _react2.default.createElement(
@@ -736,7 +814,7 @@ var MyGrid = function (_React$Component) {
736
814
  _Tab2.default.Item,
737
815
  { key: 1, title: _react2.default.createElement(
738
816
  'div',
739
- { 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" : '' } },
740
818
  '\u90E8\u95E8\u529E\u4E8B'
741
819
  ) },
742
820
  _react2.default.createElement(
@@ -929,7 +1007,7 @@ var MyGrid = function (_React$Component) {
929
1007
  _Tab2.default.Item,
930
1008
  { title: _react2.default.createElement(
931
1009
  'div',
932
- { 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" : '' } },
933
1011
  item.columnName
934
1012
  ), key: item.columnId },
935
1013
  item.infoList.length > 0 ? _react2.default.createElement(
@@ -1060,7 +1138,7 @@ var MyGrid = function (_React$Component) {
1060
1138
  _Tab2.default.Item,
1061
1139
  { title: _react2.default.createElement(
1062
1140
  'div',
1063
- { 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" : '' } },
1064
1142
  '\u4E2A\u4EBA\u90AE\u7BB1'
1065
1143
  ), key: '0' },
1066
1144
  _react2.default.createElement(
@@ -1075,7 +1153,7 @@ var MyGrid = function (_React$Component) {
1075
1153
  _Tab2.default.Item,
1076
1154
  { title: _react2.default.createElement(
1077
1155
  'div',
1078
- { 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" : '' } },
1079
1157
  '\u516C\u5171\u90AE\u7BB1'
1080
1158
  ), key: '1' },
1081
1159
  _react2.default.createElement(
@@ -1111,7 +1189,7 @@ var MyGrid = function (_React$Component) {
1111
1189
  { activeKey: '0', className: 't-MB16' },
1112
1190
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1113
1191
  'div',
1114
- { 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" : '' } },
1115
1193
  '\u6211\u7684\u65E5\u7A0B'
1116
1194
  ), key: '0' })
1117
1195
  )
@@ -1289,7 +1367,7 @@ var MyGrid = function (_React$Component) {
1289
1367
  { activeKey: '0', className: 't-MB16' },
1290
1368
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1291
1369
  'div',
1292
- { 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" : '' } },
1293
1371
  '\u6211\u7684\u4F1A\u8BAE'
1294
1372
  ), key: '0' })
1295
1373
  )
@@ -1310,7 +1388,7 @@ var MyGrid = function (_React$Component) {
1310
1388
  { activeKey: '0', className: 't-MB16' },
1311
1389
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1312
1390
  'div',
1313
- { 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" : '' } },
1314
1392
  '\u4E8B\u9879\u53D1\u8D77'
1315
1393
  ), key: '0' })
1316
1394
  )
@@ -1318,13 +1396,13 @@ var MyGrid = function (_React$Component) {
1318
1396
  componentContent = '';
1319
1397
  if (t.state[item.portletCode + '_' + item.id]) {
1320
1398
  componentContent = _react2.default.createElement(
1321
- 'div',
1322
- { col: personalSetting.cols, className: 'sxbl_buttons' },
1399
+ _Grid2.default,
1400
+ { col: personalSetting.cols * 1, className: 'sxbl_buttons' },
1323
1401
  t.state[item.portletCode + '_' + item.id].map(function (item) {
1324
1402
  return _react2.default.createElement(
1325
1403
  'button',
1326
1404
  { onClick: function onClick() {
1327
- history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
1405
+ _umi.history.push('/officeguid' + ('?id=' + item.id + '&code=' + item.code));
1328
1406
  } },
1329
1407
  item.name
1330
1408
  );
@@ -1341,7 +1419,7 @@ var MyGrid = function (_React$Component) {
1341
1419
  { activeKey: '0', className: 't-MB16' },
1342
1420
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1343
1421
  'div',
1344
- { 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" : '' } },
1345
1423
  '\u56FE\u8868'
1346
1424
  ), key: '0' })
1347
1425
  )
@@ -1358,7 +1436,7 @@ var MyGrid = function (_React$Component) {
1358
1436
  { activeKey: '0', className: 't-MB16' },
1359
1437
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1360
1438
  'div',
1361
- { 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" : '' } },
1362
1440
  '\u6211\u7684\u4E8B\u9879'
1363
1441
  ), key: '0' })
1364
1442
  )
@@ -1420,7 +1498,7 @@ var MyGrid = function (_React$Component) {
1420
1498
  { activeKey: '0', className: 't-MB16' },
1421
1499
  _react2.default.createElement(_Tab2.default.Item, { title: _react2.default.createElement(
1422
1500
  'div',
1423
- { 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" : '' } },
1424
1502
  '\u7CBE\u9009\u4E13\u9898'
1425
1503
  ), key: '0' })
1426
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;
@@ -973,16 +975,22 @@
973
975
  z-index: 999;
974
976
  padding: 2px;
975
977
  font-size: 14px;
978
+
979
+ .iconfont-ywtb {
980
+ font-size: 7px;
981
+ }
976
982
  }
977
983
 
978
984
  .sxbl_buttons {
979
- display: flex;
980
- align-items: center;
981
- justify-content: space-between;
982
- padding: 0 10px;
985
+ // display: flex;
986
+ // align-items: center;
987
+ // justify-content: space-between;
988
+ border-top: none !important;
989
+ padding: 0 16px;
983
990
  button {
984
- width: 45.4%;
991
+ width: 98%;
985
992
  height: 35px;
993
+ margin-bottom: 10px;
986
994
  // line-height: 29px;
987
995
  background: rgba(112,58,58,0.12);
988
996
  border: 2px solid rgba(112,58,58,1);
@@ -990,6 +998,10 @@
990
998
  font-size: 16px;
991
999
  color: #703A3A;
992
1000
  }
1001
+
1002
+ .t-grid-row {
1003
+ border-bottom: none !important;
1004
+ }
993
1005
  }
994
1006
 
995
1007
  .wdsx-list {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.38",
3
+ "version": "2.0.40",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",