@fonixtree/magic-design 1.0.57 → 1.0.59

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 (11) hide show
  1. package/es/composite-comp/dito/components/Orders/mobile/index.less +1 -6
  2. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less +1 -1
  3. package/es/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less +0 -1
  4. package/es/decorator/compositeDecorator.js +3 -16
  5. package/es/utils/commonUtil.js +6 -2
  6. package/lib/composite-comp/dito/components/Orders/mobile/index.less +1 -6
  7. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less +1 -1
  8. package/lib/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less +0 -1
  9. package/lib/decorator/compositeDecorator.js +3 -16
  10. package/lib/utils/commonUtil.js +6 -2
  11. package/package.json +1 -1
package/es/composite-comp/dito/components/Orders/mobile/index.less CHANGED
@@ -1,5 +1,5 @@
1
1
  .orders-mobile {
2
- height: 1.4rem;
2
+ padding: 0 0.32rem;
3
3
  }
4
4
  .orders-mobile .fixed-wrap {
5
5
  display: flex;
@@ -8,11 +8,6 @@
8
8
  box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
9
9
  border-radius: 0.32rem;
10
10
  width: auto;
11
- position: absolute;
12
- z-index: 3;
13
- left: 0.32rem;
14
- right: 0.32rem;
15
- top: -1.4rem;
16
11
  padding: 0.32rem;
17
12
  }
18
13
  .orders-mobile .fixed-wrap .top {
package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less CHANGED
@@ -1,5 +1,5 @@
1
1
  .personal-information-mobile {
2
- height: 4.6rem;
2
+ height: 3.24rem;
3
3
  padding: 0.32rem;
4
4
  box-sizing: border-box;
5
5
  }
package/es/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less CHANGED
@@ -1 +0,0 @@
1
- .common_functions_second_conf_wrap {}
package/es/decorator/compositeDecorator.js CHANGED
@@ -117,8 +117,7 @@ function compositeDecorator(WrappedComponent) {
117
117
  background = nodeData.background;
118
118
  var _b = window.magicDesign,
119
119
  device = _b.device,
120
- compWidth = _b.compWidth,
121
- mode = _b.mode;
120
+ compWidth = _b.compWidth;
122
121
  var zIndex = '0';
123
122
  var position = 'relative';
124
123
 
@@ -127,13 +126,8 @@ function compositeDecorator(WrappedComponent) {
127
126
  } // 解决pc导航hover上去，类目被下面组件遮罩的问题
128
127
 
129
128
 
130
- if (nodeData.type === 'PC_NAVIGATION') {
129
+ if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
131
130
  zIndex = '2';
132
- } // 为了解决PERSONAL_INFOMATION组件里图片裁切弹窗的zIndex层级问题
133
-
134
-
135
- if (mode === 'renderer' && nodeData.type === 'PERSONAL_INFOMATION') {
136
- position = 'unset';
137
131
  }
138
132
 
139
133
  var wrapStyle = {
@@ -217,15 +211,8 @@ function compositeDecorator(WrappedComponent) {
217
211
 
218
212
  _this.getWrapStyle = function () {
219
213
  var mode = window.magicDesign.mode;
220
- var nodeData = _this.props.nodeData;
221
- var position = 'relative'; // 为了解决PERSONAL_INFOMATION组件里图片裁切弹窗的zIndex层级问题
222
-
223
- if (mode === 'renderer' && nodeData.type === 'PERSONAL_INFOMATION') {
224
- position = 'unset';
225
- }
226
-
227
214
  var style = {
228
- position: position,
215
+ position: 'relative',
229
216
  zIndex: '1'
230
217
  }; // const { clickedFloor } = this.state;
231
218
  // banner 和 recommend 在选中状态需要加padding,让选中的外边框展示出来
package/es/utils/commonUtil.js CHANGED
@@ -296,7 +296,7 @@ function commonFetch(url, data, method) {
296
296
  });
297
297
  }
298
298
 
299
- var navigateTo = function navigateTo(url) {
299
+ var navigateTo = function navigateTo(url, state) {
300
300
  console.log(url);
301
301
 
302
302
  if (!url) {
@@ -311,7 +311,11 @@ var navigateTo = function navigateTo(url) {
311
311
  if (!appUrl && !h5Url.startsWith('/')) {
312
312
  window.location.href = h5Url;
313
313
  } else if (window.magicDesign.history) {
314
- window.magicDesign.history.push(url);
314
+ // window.magicDesign.history.push(url);
315
+ window.magicDesign.history.push({
316
+ pathname: url,
317
+ state: __assign({}, state)
318
+ });
315
319
  } else if (window.magicDesign.navigatePreUrl) {
316
320
  // 预览模式跳转
317
321
  if (h5Url.startsWith('/')) {
package/lib/composite-comp/dito/components/Orders/mobile/index.less CHANGED
@@ -1,5 +1,5 @@
1
1
  .orders-mobile {
2
- height: 1.4rem;
2
+ padding: 0 0.32rem;
3
3
  }
4
4
  .orders-mobile .fixed-wrap {
5
5
  display: flex;
@@ -8,11 +8,6 @@
8
8
  box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
9
9
  border-radius: 0.32rem;
10
10
  width: auto;
11
- position: absolute;
12
- z-index: 3;
13
- left: 0.32rem;
14
- right: 0.32rem;
15
- top: -1.4rem;
16
11
  padding: 0.32rem;
17
12
  }
18
13
  .orders-mobile .fixed-wrap .top {
package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less CHANGED
@@ -1,5 +1,5 @@
1
1
  .personal-information-mobile {
2
- height: 4.6rem;
2
+ height: 3.24rem;
3
3
  padding: 0.32rem;
4
4
  box-sizing: border-box;
5
5
  }
package/lib/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less CHANGED
@@ -1 +0,0 @@
1
- .common_functions_second_conf_wrap {}
package/lib/decorator/compositeDecorator.js CHANGED
@@ -117,8 +117,7 @@ function compositeDecorator(WrappedComponent) {
117
117
  background = nodeData.background;
118
118
  var _b = window.magicDesign,
119
119
  device = _b.device,
120
- compWidth = _b.compWidth,
121
- mode = _b.mode;
120
+ compWidth = _b.compWidth;
122
121
  var zIndex = '0';
123
122
  var position = 'relative';
124
123
 
@@ -127,13 +126,8 @@ function compositeDecorator(WrappedComponent) {
127
126
  } // 解决pc导航hover上去，类目被下面组件遮罩的问题
128
127
 
129
128
 
130
- if (nodeData.type === 'PC_NAVIGATION') {
129
+ if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
131
130
  zIndex = '2';
132
- } // 为了解决PERSONAL_INFOMATION组件里图片裁切弹窗的zIndex层级问题
133
-
134
-
135
- if (mode === 'renderer' && nodeData.type === 'PERSONAL_INFOMATION') {
136
- position = 'unset';
137
131
  }
138
132
 
139
133
  var wrapStyle = {
@@ -217,15 +211,8 @@ function compositeDecorator(WrappedComponent) {
217
211
 
218
212
  _this.getWrapStyle = function () {
219
213
  var mode = window.magicDesign.mode;
220
- var nodeData = _this.props.nodeData;
221
- var position = 'relative'; // 为了解决PERSONAL_INFOMATION组件里图片裁切弹窗的zIndex层级问题
222
-
223
- if (mode === 'renderer' && nodeData.type === 'PERSONAL_INFOMATION') {
224
- position = 'unset';
225
- }
226
-
227
214
  var style = {
228
- position: position,
215
+ position: 'relative',
229
216
  zIndex: '1'
230
217
  }; // const { clickedFloor } = this.state;
231
218
  // banner 和 recommend 在选中状态需要加padding,让选中的外边框展示出来
package/lib/utils/commonUtil.js CHANGED
@@ -296,7 +296,7 @@ function commonFetch(url, data, method) {
296
296
  });
297
297
  }
298
298
 
299
- var navigateTo = function navigateTo(url) {
299
+ var navigateTo = function navigateTo(url, state) {
300
300
  console.log(url);
301
301
 
302
302
  if (!url) {
@@ -311,7 +311,11 @@ var navigateTo = function navigateTo(url) {
311
311
  if (!appUrl && !h5Url.startsWith('/')) {
312
312
  window.location.href = h5Url;
313
313
  } else if (window.magicDesign.history) {
314
- window.magicDesign.history.push(url);
314
+ // window.magicDesign.history.push(url);
315
+ window.magicDesign.history.push({
316
+ pathname: url,
317
+ state: __assign({}, state)
318
+ });
315
319
  } else if (window.magicDesign.navigatePreUrl) {
316
320
  // 预览模式跳转
317
321
  if (h5Url.startsWith('/')) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "1.0.57",
4
+ "version": "1.0.59",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",