@fonixtree/magic-design 1.0.58 → 1.0.60

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 (15) hide show
  1. package/es/composite-comp/dito/components/CommonFunctions/mobile/index.js +1 -1
  2. package/es/composite-comp/dito/components/Orders/mobile/index.less +1 -6
  3. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js +5 -0
  4. package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less +1 -1
  5. package/es/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less +0 -1
  6. package/es/decorator/compositeDecorator.js +1 -1
  7. package/es/utils/commonUtil.js +6 -2
  8. package/lib/composite-comp/dito/components/CommonFunctions/mobile/index.js +1 -1
  9. package/lib/composite-comp/dito/components/Orders/mobile/index.less +1 -6
  10. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.js +5 -0
  11. package/lib/composite-comp/dito/components/PersonalInformation/mobile/index.less +1 -1
  12. package/lib/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less +0 -1
  13. package/lib/decorator/compositeDecorator.js +1 -1
  14. package/lib/utils/commonUtil.js +6 -2
  15. package/package.json +1 -1
package/es/composite-comp/dito/components/CommonFunctions/mobile/index.js CHANGED
@@ -56,7 +56,7 @@ function (_super) {
56
56
  _this.state = {};
57
57
 
58
58
  _this.onItemClick = function (item) {
59
- if ((0, _commonUtil.checkLogin)(true, '/main/account', true)) {
59
+ if ((0, _commonUtil.checkLogin)(true, '/main/account')) {
60
60
  var url = (0, _commonUtil.ensure)(function () {
61
61
  return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
62
62
  }, '');
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.js CHANGED
@@ -478,6 +478,11 @@ function (_super) {
478
478
  width: 44,
479
479
  background: userInfo.photo ? '#fff' : 'unset'
480
480
  }
481
+ }), /*#__PURE__*/_react["default"].createElement("input", {
482
+ accept: "image/*",
483
+ id: "userPhoto",
484
+ onChange: this.handleFileChange,
485
+ type: "file"
481
486
  })), /*#__PURE__*/_react["default"].createElement("div", {
482
487
  className: "userInfo"
483
488
  }, /*#__PURE__*/_react["default"].createElement("p", {
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
@@ -126,7 +126,7 @@ function compositeDecorator(WrappedComponent) {
126
126
  } // 解决pc导航hover上去，类目被下面组件遮罩的问题
127
127
 
128
128
 
129
- if (nodeData.type === 'PC_NAVIGATION') {
129
+ if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
130
130
  zIndex = '2';
131
131
  }
132
132
 
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/CommonFunctions/mobile/index.js CHANGED
@@ -56,7 +56,7 @@ function (_super) {
56
56
  _this.state = {};
57
57
 
58
58
  _this.onItemClick = function (item) {
59
- if ((0, _commonUtil.checkLogin)(true, '/main/account', true)) {
59
+ if ((0, _commonUtil.checkLogin)(true, '/main/account')) {
60
60
  var url = (0, _commonUtil.ensure)(function () {
61
61
  return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
62
62
  }, '');
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.js CHANGED
@@ -478,6 +478,11 @@ function (_super) {
478
478
  width: 44,
479
479
  background: userInfo.photo ? '#fff' : 'unset'
480
480
  }
481
+ }), /*#__PURE__*/_react["default"].createElement("input", {
482
+ accept: "image/*",
483
+ id: "userPhoto",
484
+ onChange: this.handleFileChange,
485
+ type: "file"
481
486
  })), /*#__PURE__*/_react["default"].createElement("div", {
482
487
  className: "userInfo"
483
488
  }, /*#__PURE__*/_react["default"].createElement("p", {
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
@@ -126,7 +126,7 @@ function compositeDecorator(WrappedComponent) {
126
126
  } // 解决pc导航hover上去，类目被下面组件遮罩的问题
127
127
 
128
128
 
129
- if (nodeData.type === 'PC_NAVIGATION') {
129
+ if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
130
130
  zIndex = '2';
131
131
  }
132
132
 
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.58",
4
+ "version": "1.0.60",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",