fmui-base 2.0.69 → 2.0.71

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 (5) hide show
  1. package/README.md +2 -0
  2. package/lib/css/react_grid.css +23 -20
  3. package/lib/react_grid/react_grid.js +5 -4
  4. package/lib/react_grid/react_grid.less +9 -4
  5. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.71：移动门户部件样式修改
7
+ - 2.0.70：移动端常用应用接口增加列数参数
6
8
  - 2.0.69：移动门户banner部件模式调整
7
9
  - 2.0.68：dom结构加载完成回调
8
10
  - 2.0.67：批示意见常用语样式修改和加载逻辑修改
package/lib/css/react_grid.css CHANGED
@@ -1,6 +1,9 @@
1
1
  .react-grid .noTitle .t-tab-bar {
2
2
  display: none;
3
3
  }
4
+ .react-grid .t-tab {
5
+ padding-top: 10px;
6
+ }
4
7
  .react-grid .t-tab-bar {
5
8
  position: relative;
6
9
  padding-left: 16px;
@@ -54,7 +57,7 @@
54
57
  .react-grid .react-grid-component {
55
58
  background-color: #fff;
56
59
  }
57
- .react-grid .react-grid-component .react-grid-banner-type1 .react-grid-banner-img {
60
+ .react-grid .react-grid-component .react-grid-banner-type2 .react-grid-banner-img {
58
61
  position: absolute;
59
62
  width: 114%;
60
63
  height: 130px;
@@ -63,15 +66,15 @@
63
66
  top: 0;
64
67
  z-index: -1;
65
68
  }
66
- .react-grid .react-grid-component .react-grid-banner-type1 .react-grid-banner-img img {
69
+ .react-grid .react-grid-component .react-grid-banner-type2 .react-grid-banner-img img {
67
70
  width: 114%;
68
71
  height: 100%;
69
72
  border-radius: 0 0 50% 50%;
70
73
  }
71
- .react-grid .react-grid-component .react-grid-banner-type1 .global-search {
74
+ .react-grid .react-grid-component .react-grid-banner-type2 .global-search {
72
75
  padding: 16px 16px 45px 16px;
73
76
  }
74
- .react-grid .react-grid-component .react-grid-banner-type2 .react-grid-banner-img {
77
+ .react-grid .react-grid-component .react-grid-banner-type1 .react-grid-banner-img {
75
78
  position: absolute;
76
79
  width: 100%;
77
80
  height: 100%;
@@ -80,11 +83,11 @@
80
83
  top: 0;
81
84
  z-index: -1;
82
85
  }
83
- .react-grid .react-grid-component .react-grid-banner-type2 .react-grid-banner-img img {
86
+ .react-grid .react-grid-component .react-grid-banner-type1 .react-grid-banner-img img {
84
87
  width: 100%;
85
88
  height: 100%;
86
89
  }
87
- .react-grid .react-grid-component .react-grid-banner-type2 .global-search {
90
+ .react-grid .react-grid-component .react-grid-banner-type1 .global-search {
88
91
  padding: 16px 16px 25px 16px;
89
92
  }
90
93
  .react-grid .react-grid-component .react-grid-banner {
@@ -93,7 +96,6 @@
93
96
  width: 100%;
94
97
  height: 100%;
95
98
  padding: 0;
96
- overflow-x: hidden;
97
99
  }
98
100
  .react-grid .react-grid-component .react-grid-banner .banner {
99
101
  position: absolute;
@@ -207,55 +209,57 @@
207
209
  margin-bottom: 10px;
208
210
  margin-top: 5px;
209
211
  }
210
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 {
212
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 {
211
213
  width: 100%;
212
214
  background: #FFFFFF;
213
215
  background-image: linear-gradient(180deg, rgba(202, 160, 141, 0.33) 0%, rgba(202, 160, 141, 0) 40%);
214
216
  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.09);
215
217
  border-radius: 6px;
216
218
  }
217
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .banshicolor {
219
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .banshicolor {
218
220
  background: #FE907220;
219
221
  color: #FE9072;
220
222
  }
221
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .zixuncolor {
223
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .zixuncolor {
222
224
  background: #1AC8D120;
223
225
  color: #1AC8D1;
224
226
  }
225
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .yingyongcolor {
227
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .yingyongcolor {
226
228
  background: #FFBD3F20;
227
229
  color: #FFBD3F;
228
230
  }
229
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .daibancolor {
231
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .daibancolor {
230
232
  background: #3FACF620;
231
233
  color: #3FACF6;
232
234
  }
233
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .wodecolor {
235
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .wodecolor {
234
236
  background: #7C80DA20;
235
237
  color: #7C80DA;
236
238
  }
237
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 i {
239
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 i {
238
240
  font-size: 20px;
239
241
  }
240
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .menu-title {
242
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .menu-title {
241
243
  color: #121314;
242
244
  }
243
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .t-badge {
245
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .t-badge {
244
246
  background: #fff;
245
247
  color: #703A3A;
246
248
  }
247
- .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type2 .menu-title {
249
+ .react-grid .react-grid-component .react-grid-banner .react-grid-banner-type1 .menu-title {
248
250
  color: #fff;
249
251
  }
250
252
  .react-grid .t-badge .badge-inner {
251
253
  font-weight: 400;
252
254
  top: 3px;
255
+ right: 3px;
253
256
  border: 1px solid #fff;
254
257
  }
255
258
  .react-grid .react-grid-component.banner {
256
259
  width: 100% !important;
257
- transform: translate(0, 8px) !important;
260
+ transform: translate(8px, 0) !important;
258
261
  background-color: transparent;
262
+ overflow: hidden !important;
259
263
  }
260
264
  .react-grid .t-grid-row:nth-child(1) .t-grid-item:nth-child(1) .systemItem .iconblock {
261
265
  background: #2D899D;
@@ -344,8 +348,7 @@
344
348
  display: flex;
345
349
  flex-wrap: wrap;
346
350
  justify-content: space-between;
347
- padding: 10px 16px 16px 16px;
348
- padding-bottom: 0;
351
+ padding: 10px;
349
352
  }
350
353
  .react-grid .banshi-list .banshi-item {
351
354
  width: calc(50% - 8px);
package/lib/react_grid/react_grid.js CHANGED
@@ -112,8 +112,9 @@ var MyGrid = function (_React$Component) {
112
112
  } else if (item.portletCode == 'image') {
113
113
  _this.setState(_defineProperty({}, item.portletCode + '_' + item.id, JSON.parse(item.personalSetting)));
114
114
  } else if (item.portletCode == 'cyyy') {
115
+ var cyyyCols = JSON.parse(item.personalSetting).cols;
115
116
  t.getShoucangAppInfo(item.id);
116
- t.getOftenList(item.id);
117
+ t.getOftenList(item.id, cyyyCols);
117
118
  _this.getRemindCount();
118
119
  } else if (item.portletCode !== 'tbgl') {
119
120
  var _params = {
@@ -161,10 +162,10 @@ var MyGrid = function (_React$Component) {
161
162
  }).catch(function (error) {});
162
163
  };
163
164
 
164
- _this.getOftenList = function (id) {
165
+ _this.getOftenList = function (id, cyyyCols) {
165
166
  var data = getLoginUserInfo();
166
167
  var thirdMenuType = data.thirdMenuType;
167
- var params = { code: "cyyy" };
168
+ var params = { code: "cyyy", cols: cyyyCols };
168
169
  if (thirdMenuType == null || thirdMenuType == 'null' || thirdMenuType == undefined || thirdMenuType == 'undefined') {
169
170
  thirdMenuType = 'DING';
170
171
  }
@@ -1790,7 +1791,7 @@ var MyGrid = function (_React$Component) {
1790
1791
  width: window.innerWidth,
1791
1792
  isDraggable: this.state.isDraggable,
1792
1793
  margin: [0, 15],
1793
- containerPadding: [8, 8]
1794
+ containerPadding: [8, 0]
1794
1795
  },
1795
1796
  this.state.data.map(function (item) {
1796
1797
  return t.portalContent(item) || null;
package/lib/react_grid/react_grid.less CHANGED
@@ -6,6 +6,10 @@
6
6
  }
7
7
  }
8
8
 
9
+ .t-tab {
10
+ padding-top: 10px;
11
+ }
12
+
9
13
  .t-tab-bar {
10
14
  position: relative;
11
15
  padding-left: 16px;
@@ -136,7 +140,7 @@
136
140
  width: 100%;
137
141
  height: 100%;
138
142
  padding: 0;
139
- overflow-x: hidden;
143
+ // overflow-x: hidden;
140
144
  .banner {
141
145
  position: absolute;
142
146
  top: 0;
@@ -337,8 +341,9 @@
337
341
 
338
342
  .react-grid-component.banner {
339
343
  width: 100% !important;
340
- transform: translate(0, 8px) !important;
344
+ transform: translate(0, 0) !important;
341
345
  background-color: transparent;
346
+ overflow: hidden !important;
342
347
  }
343
348
 
344
349
  .t-grid-row:nth-child(1) .t-grid-item:nth-child(1) .systemItem .iconblock {
@@ -468,6 +473,7 @@
468
473
  .rightMore {
469
474
  position: absolute;
470
475
  right: 10px;
476
+ top: 12px;
471
477
  color: #999;
472
478
  z-index: 999;
473
479
  padding: 2px;
@@ -478,8 +484,7 @@
478
484
  display: flex;
479
485
  flex-wrap: wrap;
480
486
  justify-content: space-between;
481
- padding: 10px 16px 16px 16px;
482
- padding-bottom: 0;
487
+ padding: 10px;
483
488
 
484
489
  .banshi-item {
485
490
  width: calc(50% - 8px);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.69",
3
+ "version": "2.0.71",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",