@fonixtree/magic-design 1.0.176 → 1.0.179

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 (35) hide show
  1. package/es/composite-comp/dito/components/PersonalInformationSecond/mobile/images/edit.png +0 -0
  2. package/es/composite-comp/dito/components/PersonalInformationSecond/mobile/index.js +6 -2
  3. package/es/composite-comp/dito/components/PersonalInformationSecond/mobile/index.less +18 -10
  4. package/es/composite-comp/dito/components/SearchBanner/defaultJSON.js +4 -0
  5. package/es/composite-comp/dito/components/SearchBanner/mobile/index.js +19 -6
  6. package/es/composite-comp/dito/components/SearchBanner/mobile/index.less +2 -4
  7. package/es/composite-comp/dito/components/SlideImage/defaultJSON.js +22 -28
  8. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.js +22 -16
  9. package/es/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less +0 -3
  10. package/es/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +21 -5
  11. package/es/composite-comp/dito/config-panels/SlideImageConfig/index.js +19 -1
  12. package/es/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.js +14 -0
  13. package/es/locale/en/en.json +1 -0
  14. package/es/locale/es/es.json +1 -0
  15. package/es/locale/id/id.json +1 -0
  16. package/es/meta-comp/config-panels/ImageConfig/index.js +24 -16
  17. package/es/utils/commonUtil.js +17 -2
  18. package/lib/composite-comp/dito/components/PersonalInformationSecond/mobile/images/edit.png +0 -0
  19. package/lib/composite-comp/dito/components/PersonalInformationSecond/mobile/index.js +6 -2
  20. package/lib/composite-comp/dito/components/PersonalInformationSecond/mobile/index.less +18 -10
  21. package/lib/composite-comp/dito/components/SearchBanner/defaultJSON.js +4 -0
  22. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.js +19 -6
  23. package/lib/composite-comp/dito/components/SearchBanner/mobile/index.less +2 -4
  24. package/lib/composite-comp/dito/components/SlideImage/defaultJSON.js +22 -28
  25. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.js +22 -16
  26. package/lib/composite-comp/dito/components/SlideImage/pc/components/VideoItem/index.less +0 -3
  27. package/lib/composite-comp/dito/config-panels/SearchBannerConfig/ConfigContent/index.js +21 -5
  28. package/lib/composite-comp/dito/config-panels/SlideImageConfig/index.js +19 -1
  29. package/lib/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.js +14 -0
  30. package/lib/locale/en/en.json +1 -0
  31. package/lib/locale/es/es.json +1 -0
  32. package/lib/locale/id/id.json +1 -0
  33. package/lib/meta-comp/config-panels/ImageConfig/index.js +24 -16
  34. package/lib/utils/commonUtil.js +17 -2
  35. package/package.json +1 -1
@@ -15,6 +15,8 @@ var _antd = require("antd");
15
15
 
16
16
  var _avatar = _interopRequireDefault(require("./images/avatar.png"));
17
17
 
18
+ var _edit = _interopRequireDefault(require("./images/edit.png"));
19
+
18
20
  var _components = require("../../../../../meta-comp/components");
19
21
 
20
22
  var _androidUtil = require("../../../../../utils/androidUtil");
@@ -593,8 +595,6 @@ function (_super) {
593
595
  className: "photo",
594
596
  src: userInfo.photo || _avatar["default"],
595
597
  style: {
596
- height: 44,
597
- width: 44,
598
598
  background: userInfo.photo ? '#fff' : 'unset'
599
599
  }
600
600
  }), /*#__PURE__*/_react["default"].createElement("input", {
@@ -602,6 +602,10 @@ function (_super) {
602
602
  id: "userPhoto",
603
603
  onChange: this.handleFileChange,
604
604
  type: "file"
605
+ }), /*#__PURE__*/_react["default"].createElement("img", {
606
+ alt: "",
607
+ className: "edit-icon",
608
+ src: _edit["default"]
605
609
  })), /*#__PURE__*/_react["default"].createElement("div", {
606
610
  className: "userInfo"
607
611
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -5,7 +5,7 @@
5
5
  .personal-information-second-mobile .top {
6
6
  display: flex;
7
7
  justify-content: space-between;
8
- align-items: flex-start;
8
+ align-items: center;
9
9
  }
10
10
  .personal-information-second-mobile .top .pInfoWrap {
11
11
  display: flex;
@@ -16,8 +16,8 @@
16
16
  display: inline-block;
17
17
  vertical-align: middle;
18
18
  margin-right: 0.32rem;
19
- height: 0.88rem;
20
- width: 0.88rem;
19
+ height: 0.76rem;
20
+ width: 0.76rem;
21
21
  }
22
22
  .personal-information-second-mobile .top .pInfoWrap .photoWrap > input {
23
23
  position: absolute;
@@ -31,10 +31,10 @@
31
31
  .personal-information-second-mobile .top .pInfoWrap .photoWrap .decorationIcon {
32
32
  position: absolute;
33
33
  z-index: 1;
34
- width: 1.4rem;
35
- height: 1.4rem;
36
- left: -0.26rem;
37
- top: -0.26rem;
34
+ width: 1.2rem;
35
+ height: 1.2rem;
36
+ left: -0.22rem;
37
+ top: -0.22rem;
38
38
  }
39
39
  .personal-information-second-mobile .top .pInfoWrap .userInfo {
40
40
  display: inline-block;
@@ -75,12 +75,20 @@
75
75
  }
76
76
  .personal-information-second-mobile .top .pInfoWrap .photo {
77
77
  display: inline-block;
78
- width: 0.88rem;
79
- height: 0.88rem;
78
+ width: 0.76rem;
79
+ height: 0.76rem;
80
80
  line-height: 1.2rem;
81
81
  text-align: center;
82
82
  border-radius: 50%;
83
83
  }
84
+ .personal-information-second-mobile .top .pInfoWrap .edit-icon {
85
+ position: absolute;
86
+ z-index: 2;
87
+ bottom: 0;
88
+ right: 0;
89
+ width: 0.3rem;
90
+ height: 0.3rem;
91
+ }
84
92
  .personal-information-second-mobile .top .pInfoWrap .btnLogin {
85
93
  font-size: 0.32rem;
86
94
  font-weight: 600;
@@ -149,7 +157,7 @@
149
157
  flex-direction: row;
150
158
  justify-content: space-between;
151
159
  height: 1.04rem;
152
- margin-top: 0.24rem;
160
+ margin-top: 0.36rem;
153
161
  margin-bottom: 0.02rem;
154
162
  }
155
163
  .personal-information-second-mobile .orders .fixed-wrap .list .item {
@@ -73,6 +73,10 @@ var getDefaultJSON = function getDefaultJSON() {
73
73
  backgroundColor: {
74
74
  pc: 'transparent',
75
75
  mobile: 'transparent'
76
+ },
77
+ iconColor: {
78
+ pc: '#fff',
79
+ mobile: '#fff'
76
80
  }
77
81
  },
78
82
  cartIcon: {
@@ -167,18 +167,31 @@ function (_super) {
167
167
  backgroundColor: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.backgroundColor) === null || _e === void 0 ? void 0 : _e.mobile
168
168
  }
169
169
  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
170
- color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.color) === null || _g === void 0 ? void 0 : _g.mobile,
170
+ bold: true,
171
+ color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.iconColor) === null || _g === void 0 ? void 0 : _g.mobile,
171
172
  size: (0, _commonUtil.convertToRem)(20),
172
- type: "icon-search2"
173
+ type: "icon-search-short"
173
174
  })), data.content && ((_h = data.content.cartIcon) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
174
175
  className: "right-icon",
175
- data: data.content.cartIcon
176
+ data: data.content.cartIcon,
177
+ style: {
178
+ width: '25px',
179
+ height: '25px'
180
+ }
176
181
  }), data.content && ((_j = data.content.chatbotIcon) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
177
182
  className: "right-icon",
178
- data: data.content.chatbotIcon
183
+ data: data.content.chatbotIcon,
184
+ style: {
185
+ width: '32px',
186
+ height: '32px'
187
+ }
179
188
  }), data.content && ((_k = data.content.messageIcon) === null || _k === void 0 ? void 0 : _k.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
180
189
  className: "right-icon",
181
- data: data.content.messageIcon
190
+ data: data.content.messageIcon,
191
+ style: {
192
+ width: '25px',
193
+ height: '25px'
194
+ }
182
195
  })), data.content && ((_l = data.content.logo) === null || _l === void 0 ? void 0 : _l.open) && /*#__PURE__*/_react["default"].createElement("div", {
183
196
  className: "logo",
184
197
  onClick: function onClick() {
@@ -196,7 +209,7 @@ function (_super) {
196
209
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
197
210
  data: data.content.logo,
198
211
  style: {
199
- height: 20
212
+ height: 23
200
213
  }
201
214
  }))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
202
215
  ref: this.carouselRef,
@@ -25,8 +25,8 @@
25
25
  background: transparent;
26
26
  border-radius: 0.4rem;
27
27
  border: 0.02rem solid #fff;
28
- padding: 0.08rem 0.2rem;
29
- height: 0.56rem;
28
+ padding: 0.08rem 0.2rem 0.08rem 0.08rem;
29
+ height: 0.54rem;
30
30
  text-align: right;
31
31
  display: flex;
32
32
  justify-content: flex-start;
@@ -34,8 +34,6 @@
34
34
  .m-search-banner-mobile .search-bar .right .right-icon {
35
35
  margin-left: 0.2rem;
36
36
  display: inline-block;
37
- width: 0.5rem;
38
- height: 0.5rem;
39
37
  }
40
38
  .m-search-banner-mobile .search-bar .logo img {
41
39
  width: auto;
@@ -66,13 +66,7 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
66
66
  },
67
67
  vertical: {}
68
68
  },
69
- clickUrl: '',
70
- background: {
71
- opacity: 100,
72
- color: '#fff',
73
- image: '',
74
- bgType: 'image'
75
- }
69
+ clickUrl: ''
76
70
  };
77
71
  };
78
72
 
@@ -83,27 +77,27 @@ var getDefaultJSON = function getDefaultJSON() {
83
77
  return {
84
78
  id: groupId,
85
79
  type: 'SLIDE_IMAGE',
86
- content: {
87
- moveIcon: {
88
- id: (0, _uuid.v4)(),
89
- open: true,
90
- type: 'IMAGE',
91
- content: {
92
- h5Name: 'Image Name',
93
- pcName: 'Image Name',
94
- h5ImgSrc: '',
95
- pcImgSrc: '',
96
- clickUrl: ''
97
- },
98
- hover: {
99
- open: false,
100
- backgroundType: 'enlarge',
101
- magnification: 1.5,
102
- pcImgHoverUrl: '',
103
- h5ImgHoverUrl: ''
104
- }
105
- }
106
- },
80
+ // content: {
81
+ // moveIcon: {
82
+ // id: uuidv4(),
83
+ // open: true,
84
+ // type: 'IMAGE',
85
+ // content: {
86
+ // h5Name: 'Image Name',
87
+ // pcName: 'Image Name',
88
+ // h5ImgSrc: '',
89
+ // pcImgSrc: '',
90
+ // clickUrl: '',
91
+ // },
92
+ // hover: {
93
+ // open: false,
94
+ // backgroundType: 'enlarge',
95
+ // magnification: 1.5,
96
+ // pcImgHoverUrl: '',
97
+ // h5ImgHoverUrl: '',
98
+ // },
99
+ // },
100
+ // },
107
101
  groupSource: [groupSourceJSON(groupId), groupSourceJSON(groupId), groupSourceJSON(groupId)],
108
102
  spacing: {
109
103
  pc: {
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
+ var _commonUtil = require("../../../../../../../utils/commonUtil");
13
+
12
14
  require("./index.less");
13
15
 
14
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,14 +47,15 @@ function (_super) {
45
47
  __extends(VideoItem, _super);
46
48
 
47
49
  function VideoItem() {
48
- var _this = _super !== null && _super.apply(this, arguments) || this;
50
+ var _a;
51
+
52
+ var _this = _super.apply(this, arguments) || this;
49
53
 
50
54
  _this.state = {
51
- playing: false,
55
+ playing: !!(((_a = _this.props.data.video) === null || _a === void 0 ? void 0 : _a.sourceUrl) && (0, _commonUtil.isPad)()),
52
56
  videoPoster: ''
53
57
  };
54
58
  _this.videoRef = /*#__PURE__*/_react["default"].createRef();
55
- _this.cardRef = /*#__PURE__*/_react["default"].createRef();
56
59
  _this.canvasRef = /*#__PURE__*/_react["default"].createRef();
57
60
 
58
61
  _this.onMouseEnter = function () {
@@ -85,11 +88,11 @@ function (_super) {
85
88
  VideoItem.prototype.componentDidMount = function () {
86
89
  var _this = this;
87
90
 
88
- var dom = this.cardRef.current;
89
- dom.addEventListener('mousemove', this.handleMouseMove);
90
- dom.addEventListener('mouseleave', this.handleMouseLeave);
91
+ if (this.videoRef.current && (0, _commonUtil.isPad)()) {
92
+ this.videoRef.current.autoplay = true;
93
+ }
91
94
 
92
- if (this.videoRef.current) {
95
+ if (this.videoRef.current && !(0, _commonUtil.isPad)()) {
93
96
  var video_1 = this.videoRef.current;
94
97
  var canvas_1 = this.canvasRef.current;
95
98
  video_1.addEventListener('loadedmetadata', function () {
@@ -111,13 +114,9 @@ function (_super) {
111
114
  }
112
115
  };
113
116
 
114
- VideoItem.prototype.componentWillUnmount = function () {
115
- var dom = this.cardRef.current;
116
- dom.removeEventListener('mousemove', this.handleMouseMove);
117
- dom.removeEventListener('mouseleave', this.handleMouseLeave);
118
- };
119
-
120
117
  VideoItem.prototype.render = function () {
118
+ var _this = this;
119
+
121
120
  var _a, _b, _c, _d, _e, _f, _g, _h;
122
121
 
123
122
  var _j = this.props,
@@ -130,10 +129,17 @@ function (_super) {
130
129
  videoPoster = _k.videoPoster;
131
130
  var img = ((_b = (_a = data.overilay) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.pcImgSrc) || videoPoster;
132
131
  return /*#__PURE__*/_react["default"].createElement("div", {
133
- ref: this.cardRef,
134
132
  className: "slide-image-video-wrap",
135
- onMouseEnter: this.onMouseEnter,
136
- onMouseLeave: this.onMouseLeave,
133
+ onMouseEnter: function onMouseEnter() {
134
+ if (!(0, _commonUtil.isPad)()) {
135
+ _this.onMouseEnter();
136
+ }
137
+ },
138
+ onMouseLeave: function onMouseLeave() {
139
+ if (!(0, _commonUtil.isPad)()) {
140
+ _this.onMouseLeave();
141
+ }
142
+ },
137
143
  style: {
138
144
  cursor: cursor && (moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.open) ? "url('" + ((_c = moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.content) === null || _c === void 0 ? void 0 : _c.pcImgSrc) + "'), pointer" : 'unset'
139
145
  }
@@ -1,9 +1,6 @@
1
1
  .slide-image-video-wrap {
2
2
  position: relative;
3
- display: flex;
4
3
  border-radius: 16px;
5
- --dx: calc(var(--size) - var(--x));
6
- --dy: calc(var(--size) - var(--y));
7
4
 
8
5
  &:hover {
9
6
  box-shadow: 0px 12px 48px 0px #00000029;
@@ -71,7 +71,7 @@ function (_super) {
71
71
  SearchBarConfigContent.prototype.render = function () {
72
72
  var _this = this;
73
73
 
74
- var _a, _b, _c, _d, _e, _f, _g;
74
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
75
75
 
76
76
  var panelProps = this.props.panelProps;
77
77
  var source = [{
@@ -101,6 +101,22 @@ function (_super) {
101
101
  _this.selfRender();
102
102
  },
103
103
  value: (0, _coreUtil.isPc)() ? panelProps.box.color.pc : panelProps.box.color.mobile
104
+ })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
105
+ title: (0, _locale.i18n)('ICON_COLOR')
106
+ }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
107
+ colorType: "rgba",
108
+ onChange: function onChange(v) {
109
+ if ((0, _coreUtil.isPc)()) {
110
+ panelProps.box.iconColor.pc = v;
111
+ } else {
112
+ panelProps.box.iconColor = {
113
+ mobile: v
114
+ };
115
+ }
116
+
117
+ _this.selfRender();
118
+ },
119
+ value: (0, _coreUtil.isPc)() ? (_a = panelProps.box.iconColor) === null || _a === void 0 ? void 0 : _a.pc : (_b = panelProps.box.iconColor) === null || _b === void 0 ? void 0 : _b.mobile
104
120
  })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
105
121
  style: {
106
122
  marginTop: 16
@@ -117,26 +133,26 @@ function (_super) {
117
133
 
118
134
  _this.selfRender();
119
135
  },
120
- value: (0, _coreUtil.isPc)() ? (_b = (_a = panelProps.box) === null || _a === void 0 ? void 0 : _a.backgroundColor) === null || _b === void 0 ? void 0 : _b.pc : (_d = (_c = panelProps.box) === null || _c === void 0 ? void 0 : _c.backgroundColor) === null || _d === void 0 ? void 0 : _d.mobile
136
+ value: (0, _coreUtil.isPc)() ? (_d = (_c = panelProps.box) === null || _c === void 0 ? void 0 : _c.backgroundColor) === null || _d === void 0 ? void 0 : _d.pc : (_f = (_e = panelProps.box) === null || _e === void 0 ? void 0 : _e.backgroundColor) === null || _f === void 0 ? void 0 : _f.mobile
121
137
  }))),
122
138
  metaOption: panelProps.box,
123
139
  toggleType: 'switch'
124
140
  }, {
125
- key: (_e = panelProps.cartIcon) === null || _e === void 0 ? void 0 : _e.id,
141
+ key: (_g = panelProps.cartIcon) === null || _g === void 0 ? void 0 : _g.id,
126
142
  name: (0, _locale.i18n)('CART_ICON'),
127
143
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
128
144
  data: panelProps.cartIcon
129
145
  }),
130
146
  metaOption: panelProps.cartIcon
131
147
  }, {
132
- key: (_f = panelProps.chatbotIcon) === null || _f === void 0 ? void 0 : _f.id,
148
+ key: (_h = panelProps.chatbotIcon) === null || _h === void 0 ? void 0 : _h.id,
133
149
  name: (0, _locale.i18n)('CHATBOT_ICON'),
134
150
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
135
151
  data: panelProps.chatbotIcon
136
152
  }),
137
153
  metaOption: panelProps.chatbotIcon
138
154
  }, {
139
- key: (_g = panelProps.messageIcon) === null || _g === void 0 ? void 0 : _g.id,
155
+ key: (_j = panelProps.messageIcon) === null || _j === void 0 ? void 0 : _j.id,
140
156
  name: (0, _locale.i18n)('MESSAGE_ICON'),
141
157
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
142
158
  data: panelProps.messageIcon
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -15,7 +17,7 @@ var _SpacingConfig = _interopRequireDefault(require("../../../common/config-pane
15
17
 
16
18
  var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
17
19
 
18
- var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
20
+ var _ImageConfig = _interopRequireWildcard(require("../../../../meta-comp/config-panels/ImageConfig"));
19
21
 
20
22
  var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
21
23
 
@@ -23,6 +25,10 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
23
25
 
24
26
  var _locale = require("../../../../locale");
25
27
 
28
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
29
+
30
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
31
+
26
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
33
 
28
34
  var __extends = void 0 && (void 0).__extends || function () {
@@ -60,6 +66,18 @@ function (_super) {
60
66
  return _super !== null && _super.apply(this, arguments) || this;
61
67
  }
62
68
 
69
+ SlideImageConfig.prototype.componentDidMount = function () {
70
+ var _a;
71
+
72
+ var data = this.props.data;
73
+
74
+ if (!((_a = data.content) === null || _a === void 0 ? void 0 : _a.moveIcon)) {
75
+ data.content = {
76
+ moveIcon: _ImageConfig.imageJson
77
+ };
78
+ }
79
+ };
80
+
63
81
  SlideImageConfig.prototype.render = function () {
64
82
  var _a, _b;
65
83
 
@@ -207,6 +207,20 @@ function (_super) {
207
207
  return _this;
208
208
  }
209
209
 
210
+ SlideImageSecondConfig.prototype.componentDidMount = function () {
211
+ var panelProps = this.props.panelProps;
212
+
213
+ if (!panelProps.background) {
214
+ panelProps.background = {
215
+ opacity: 100,
216
+ color: '#fff',
217
+ image: '',
218
+ bgType: 'image'
219
+ };
220
+ this.reRender();
221
+ }
222
+ };
223
+
210
224
  SlideImageSecondConfig.prototype.render = function () {
211
225
  var panelProps = this.props.panelProps;
212
226
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Flash Sale",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Oferta relámpago",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Flash Sale",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports["default"] = void 0;
6
+ exports.imageJson = exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -11,6 +11,8 @@ var _antd = require("antd");
11
11
 
12
12
  require("./index.less");
13
13
 
14
+ var _uuid = require("uuid");
15
+
14
16
  var _HotAreaConfig = _interopRequireDefault(require("./HotAreaConfig"));
15
17
 
16
18
  var _commonUtil = require("../../../utils/commonUtil");
@@ -194,6 +196,26 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
194
196
  }
195
197
  };
196
198
 
199
+ var imageJson = {
200
+ id: (0, _uuid.v4)(),
201
+ open: true,
202
+ type: 'IMAGE',
203
+ content: {
204
+ clickUrl: '',
205
+ pcImgSrc: '',
206
+ h5ImgSrc: '',
207
+ name: ''
208
+ },
209
+ hover: {
210
+ open: false,
211
+ backgroundType: 'enlarge',
212
+ h5ImgHoverUrl: '',
213
+ pcImgHoverUrl: '',
214
+ magnification: 1
215
+ }
216
+ };
217
+ exports.imageJson = imageJson;
218
+
197
219
  var ImageConfig =
198
220
  /** @class */
199
221
  function (_super) {
@@ -422,21 +444,7 @@ function (_super) {
422
444
  };
423
445
 
424
446
  ImageConfig.defaultProps = {
425
- data: {
426
- content: {
427
- clickUrl: '',
428
- pcImgSrc: '',
429
- h5ImgSrc: '',
430
- name: ''
431
- },
432
- hover: {
433
- open: false,
434
- backgroundType: 'enlarge',
435
- h5ImgHoverUrl: '',
436
- pcImgHoverUrl: '',
437
- magnification: 1
438
- }
439
- },
447
+ data: imageJson,
440
448
  needHover: true,
441
449
  needClickArea: true,
442
450
  needURL: true
@@ -21,7 +21,7 @@ exports.getUrlParams = void 0;
21
21
  exports.goLogin = goLogin;
22
22
  exports.importAsync = void 0;
23
23
  exports.isLogin = isLogin;
24
- exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
24
+ exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.isPad = void 0;
25
25
  exports.pushGA = pushGA;
26
26
  exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
27
27
  exports.shareFacebook = shareFacebook;
@@ -516,6 +516,21 @@ var JsonToUrl = function JsonToUrl(data) {
516
516
 
517
517
  var urlParamsStr = tempArr.join('&');
518
518
  return urlParamsStr;
519
+ };
520
+
521
+ exports.JsonToUrl = JsonToUrl;
522
+
523
+ var isPad = function isPad() {
524
+ var ua = navigator.userAgent;
525
+ var isMac = /Macintosh/i.test(ua);
526
+ var isIOS = /iPad|iPhone|iPod/i.test(ua);
527
+ var isTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0; // iPad检测 (包括iPadOS 13+)
528
+
529
+ if (isMac && isTouch || isIOS) {
530
+ return true;
531
+ }
532
+
533
+ return false;
519
534
  }; // export const jumpUrlConfig = item => {
520
535
  // const { objType, objValue } = item || {};
521
536
  // let jumpUrl = '';
@@ -581,7 +596,7 @@ var JsonToUrl = function JsonToUrl(data) {
581
596
  */
582
597
 
583
598
 
584
- exports.JsonToUrl = JsonToUrl;
599
+ exports.isPad = isPad;
585
600
 
586
601
  var addZero = function addZero(num) {
587
602
  return String(num).length === 1 ? "0" + String(num) : String(num);
@@ -15,6 +15,8 @@ var _antd = require("antd");
15
15
 
16
16
  var _avatar = _interopRequireDefault(require("./images/avatar.png"));
17
17
 
18
+ var _edit = _interopRequireDefault(require("./images/edit.png"));
19
+
18
20
  var _components = require("../../../../../meta-comp/components");
19
21
 
20
22
  var _androidUtil = require("../../../../../utils/androidUtil");
@@ -593,8 +595,6 @@ function (_super) {
593
595
  className: "photo",
594
596
  src: userInfo.photo || _avatar["default"],
595
597
  style: {
596
- height: 44,
597
- width: 44,
598
598
  background: userInfo.photo ? '#fff' : 'unset'
599
599
  }
600
600
  }), /*#__PURE__*/_react["default"].createElement("input", {
@@ -602,6 +602,10 @@ function (_super) {
602
602
  id: "userPhoto",
603
603
  onChange: this.handleFileChange,
604
604
  type: "file"
605
+ }), /*#__PURE__*/_react["default"].createElement("img", {
606
+ alt: "",
607
+ className: "edit-icon",
608
+ src: _edit["default"]
605
609
  })), /*#__PURE__*/_react["default"].createElement("div", {
606
610
  className: "userInfo"
607
611
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -5,7 +5,7 @@
5
5
  .personal-information-second-mobile .top {
6
6
  display: flex;
7
7
  justify-content: space-between;
8
- align-items: flex-start;
8
+ align-items: center;
9
9
  }
10
10
  .personal-information-second-mobile .top .pInfoWrap {
11
11
  display: flex;
@@ -16,8 +16,8 @@
16
16
  display: inline-block;
17
17
  vertical-align: middle;
18
18
  margin-right: 0.32rem;
19
- height: 0.88rem;
20
- width: 0.88rem;
19
+ height: 0.76rem;
20
+ width: 0.76rem;
21
21
  }
22
22
  .personal-information-second-mobile .top .pInfoWrap .photoWrap > input {
23
23
  position: absolute;
@@ -31,10 +31,10 @@
31
31
  .personal-information-second-mobile .top .pInfoWrap .photoWrap .decorationIcon {
32
32
  position: absolute;
33
33
  z-index: 1;
34
- width: 1.4rem;
35
- height: 1.4rem;
36
- left: -0.26rem;
37
- top: -0.26rem;
34
+ width: 1.2rem;
35
+ height: 1.2rem;
36
+ left: -0.22rem;
37
+ top: -0.22rem;
38
38
  }
39
39
  .personal-information-second-mobile .top .pInfoWrap .userInfo {
40
40
  display: inline-block;
@@ -75,12 +75,20 @@
75
75
  }
76
76
  .personal-information-second-mobile .top .pInfoWrap .photo {
77
77
  display: inline-block;
78
- width: 0.88rem;
79
- height: 0.88rem;
78
+ width: 0.76rem;
79
+ height: 0.76rem;
80
80
  line-height: 1.2rem;
81
81
  text-align: center;
82
82
  border-radius: 50%;
83
83
  }
84
+ .personal-information-second-mobile .top .pInfoWrap .edit-icon {
85
+ position: absolute;
86
+ z-index: 2;
87
+ bottom: 0;
88
+ right: 0;
89
+ width: 0.3rem;
90
+ height: 0.3rem;
91
+ }
84
92
  .personal-information-second-mobile .top .pInfoWrap .btnLogin {
85
93
  font-size: 0.32rem;
86
94
  font-weight: 600;
@@ -149,7 +157,7 @@
149
157
  flex-direction: row;
150
158
  justify-content: space-between;
151
159
  height: 1.04rem;
152
- margin-top: 0.24rem;
160
+ margin-top: 0.36rem;
153
161
  margin-bottom: 0.02rem;
154
162
  }
155
163
  .personal-information-second-mobile .orders .fixed-wrap .list .item {
@@ -73,6 +73,10 @@ var getDefaultJSON = function getDefaultJSON() {
73
73
  backgroundColor: {
74
74
  pc: 'transparent',
75
75
  mobile: 'transparent'
76
+ },
77
+ iconColor: {
78
+ pc: '#fff',
79
+ mobile: '#fff'
76
80
  }
77
81
  },
78
82
  cartIcon: {
@@ -167,18 +167,31 @@ function (_super) {
167
167
  backgroundColor: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.backgroundColor) === null || _e === void 0 ? void 0 : _e.mobile
168
168
  }
169
169
  }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
170
- color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.color) === null || _g === void 0 ? void 0 : _g.mobile,
170
+ bold: true,
171
+ color: (_g = (_f = data.content.box) === null || _f === void 0 ? void 0 : _f.iconColor) === null || _g === void 0 ? void 0 : _g.mobile,
171
172
  size: (0, _commonUtil.convertToRem)(20),
172
- type: "icon-search2"
173
+ type: "icon-search-short"
173
174
  })), data.content && ((_h = data.content.cartIcon) === null || _h === void 0 ? void 0 : _h.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
174
175
  className: "right-icon",
175
- data: data.content.cartIcon
176
+ data: data.content.cartIcon,
177
+ style: {
178
+ width: '25px',
179
+ height: '25px'
180
+ }
176
181
  }), data.content && ((_j = data.content.chatbotIcon) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
177
182
  className: "right-icon",
178
- data: data.content.chatbotIcon
183
+ data: data.content.chatbotIcon,
184
+ style: {
185
+ width: '32px',
186
+ height: '32px'
187
+ }
179
188
  }), data.content && ((_k = data.content.messageIcon) === null || _k === void 0 ? void 0 : _k.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
180
189
  className: "right-icon",
181
- data: data.content.messageIcon
190
+ data: data.content.messageIcon,
191
+ style: {
192
+ width: '25px',
193
+ height: '25px'
194
+ }
182
195
  })), data.content && ((_l = data.content.logo) === null || _l === void 0 ? void 0 : _l.open) && /*#__PURE__*/_react["default"].createElement("div", {
183
196
  className: "logo",
184
197
  onClick: function onClick() {
@@ -196,7 +209,7 @@ function (_super) {
196
209
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
197
210
  data: data.content.logo,
198
211
  style: {
199
- height: 20
212
+ height: 23
200
213
  }
201
214
  }))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
202
215
  ref: this.carouselRef,
@@ -25,8 +25,8 @@
25
25
  background: transparent;
26
26
  border-radius: 0.4rem;
27
27
  border: 0.02rem solid #fff;
28
- padding: 0.08rem 0.2rem;
29
- height: 0.56rem;
28
+ padding: 0.08rem 0.2rem 0.08rem 0.08rem;
29
+ height: 0.54rem;
30
30
  text-align: right;
31
31
  display: flex;
32
32
  justify-content: flex-start;
@@ -34,8 +34,6 @@
34
34
  .m-search-banner-mobile .search-bar .right .right-icon {
35
35
  margin-left: 0.2rem;
36
36
  display: inline-block;
37
- width: 0.5rem;
38
- height: 0.5rem;
39
37
  }
40
38
  .m-search-banner-mobile .search-bar .logo img {
41
39
  width: auto;
@@ -66,13 +66,7 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
66
66
  },
67
67
  vertical: {}
68
68
  },
69
- clickUrl: '',
70
- background: {
71
- opacity: 100,
72
- color: '#fff',
73
- image: '',
74
- bgType: 'image'
75
- }
69
+ clickUrl: ''
76
70
  };
77
71
  };
78
72
 
@@ -83,27 +77,27 @@ var getDefaultJSON = function getDefaultJSON() {
83
77
  return {
84
78
  id: groupId,
85
79
  type: 'SLIDE_IMAGE',
86
- content: {
87
- moveIcon: {
88
- id: (0, _uuid.v4)(),
89
- open: true,
90
- type: 'IMAGE',
91
- content: {
92
- h5Name: 'Image Name',
93
- pcName: 'Image Name',
94
- h5ImgSrc: '',
95
- pcImgSrc: '',
96
- clickUrl: ''
97
- },
98
- hover: {
99
- open: false,
100
- backgroundType: 'enlarge',
101
- magnification: 1.5,
102
- pcImgHoverUrl: '',
103
- h5ImgHoverUrl: ''
104
- }
105
- }
106
- },
80
+ // content: {
81
+ // moveIcon: {
82
+ // id: uuidv4(),
83
+ // open: true,
84
+ // type: 'IMAGE',
85
+ // content: {
86
+ // h5Name: 'Image Name',
87
+ // pcName: 'Image Name',
88
+ // h5ImgSrc: '',
89
+ // pcImgSrc: '',
90
+ // clickUrl: '',
91
+ // },
92
+ // hover: {
93
+ // open: false,
94
+ // backgroundType: 'enlarge',
95
+ // magnification: 1.5,
96
+ // pcImgHoverUrl: '',
97
+ // h5ImgHoverUrl: '',
98
+ // },
99
+ // },
100
+ // },
107
101
  groupSource: [groupSourceJSON(groupId), groupSourceJSON(groupId), groupSourceJSON(groupId)],
108
102
  spacing: {
109
103
  pc: {
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
+ var _commonUtil = require("../../../../../../../utils/commonUtil");
13
+
12
14
  require("./index.less");
13
15
 
14
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,14 +47,15 @@ function (_super) {
45
47
  __extends(VideoItem, _super);
46
48
 
47
49
  function VideoItem() {
48
- var _this = _super !== null && _super.apply(this, arguments) || this;
50
+ var _a;
51
+
52
+ var _this = _super.apply(this, arguments) || this;
49
53
 
50
54
  _this.state = {
51
- playing: false,
55
+ playing: !!(((_a = _this.props.data.video) === null || _a === void 0 ? void 0 : _a.sourceUrl) && (0, _commonUtil.isPad)()),
52
56
  videoPoster: ''
53
57
  };
54
58
  _this.videoRef = /*#__PURE__*/_react["default"].createRef();
55
- _this.cardRef = /*#__PURE__*/_react["default"].createRef();
56
59
  _this.canvasRef = /*#__PURE__*/_react["default"].createRef();
57
60
 
58
61
  _this.onMouseEnter = function () {
@@ -85,11 +88,11 @@ function (_super) {
85
88
  VideoItem.prototype.componentDidMount = function () {
86
89
  var _this = this;
87
90
 
88
- var dom = this.cardRef.current;
89
- dom.addEventListener('mousemove', this.handleMouseMove);
90
- dom.addEventListener('mouseleave', this.handleMouseLeave);
91
+ if (this.videoRef.current && (0, _commonUtil.isPad)()) {
92
+ this.videoRef.current.autoplay = true;
93
+ }
91
94
 
92
- if (this.videoRef.current) {
95
+ if (this.videoRef.current && !(0, _commonUtil.isPad)()) {
93
96
  var video_1 = this.videoRef.current;
94
97
  var canvas_1 = this.canvasRef.current;
95
98
  video_1.addEventListener('loadedmetadata', function () {
@@ -111,13 +114,9 @@ function (_super) {
111
114
  }
112
115
  };
113
116
 
114
- VideoItem.prototype.componentWillUnmount = function () {
115
- var dom = this.cardRef.current;
116
- dom.removeEventListener('mousemove', this.handleMouseMove);
117
- dom.removeEventListener('mouseleave', this.handleMouseLeave);
118
- };
119
-
120
117
  VideoItem.prototype.render = function () {
118
+ var _this = this;
119
+
121
120
  var _a, _b, _c, _d, _e, _f, _g, _h;
122
121
 
123
122
  var _j = this.props,
@@ -130,10 +129,17 @@ function (_super) {
130
129
  videoPoster = _k.videoPoster;
131
130
  var img = ((_b = (_a = data.overilay) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.pcImgSrc) || videoPoster;
132
131
  return /*#__PURE__*/_react["default"].createElement("div", {
133
- ref: this.cardRef,
134
132
  className: "slide-image-video-wrap",
135
- onMouseEnter: this.onMouseEnter,
136
- onMouseLeave: this.onMouseLeave,
133
+ onMouseEnter: function onMouseEnter() {
134
+ if (!(0, _commonUtil.isPad)()) {
135
+ _this.onMouseEnter();
136
+ }
137
+ },
138
+ onMouseLeave: function onMouseLeave() {
139
+ if (!(0, _commonUtil.isPad)()) {
140
+ _this.onMouseLeave();
141
+ }
142
+ },
137
143
  style: {
138
144
  cursor: cursor && (moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.open) ? "url('" + ((_c = moveIcon === null || moveIcon === void 0 ? void 0 : moveIcon.content) === null || _c === void 0 ? void 0 : _c.pcImgSrc) + "'), pointer" : 'unset'
139
145
  }
@@ -1,9 +1,6 @@
1
1
  .slide-image-video-wrap {
2
2
  position: relative;
3
- display: flex;
4
3
  border-radius: 16px;
5
- --dx: calc(var(--size) - var(--x));
6
- --dy: calc(var(--size) - var(--y));
7
4
 
8
5
  &:hover {
9
6
  box-shadow: 0px 12px 48px 0px #00000029;
@@ -71,7 +71,7 @@ function (_super) {
71
71
  SearchBarConfigContent.prototype.render = function () {
72
72
  var _this = this;
73
73
 
74
- var _a, _b, _c, _d, _e, _f, _g;
74
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
75
75
 
76
76
  var panelProps = this.props.panelProps;
77
77
  var source = [{
@@ -101,6 +101,22 @@ function (_super) {
101
101
  _this.selfRender();
102
102
  },
103
103
  value: (0, _coreUtil.isPc)() ? panelProps.box.color.pc : panelProps.box.color.mobile
104
+ })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
105
+ title: (0, _locale.i18n)('ICON_COLOR')
106
+ }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
107
+ colorType: "rgba",
108
+ onChange: function onChange(v) {
109
+ if ((0, _coreUtil.isPc)()) {
110
+ panelProps.box.iconColor.pc = v;
111
+ } else {
112
+ panelProps.box.iconColor = {
113
+ mobile: v
114
+ };
115
+ }
116
+
117
+ _this.selfRender();
118
+ },
119
+ value: (0, _coreUtil.isPc)() ? (_a = panelProps.box.iconColor) === null || _a === void 0 ? void 0 : _a.pc : (_b = panelProps.box.iconColor) === null || _b === void 0 ? void 0 : _b.mobile
104
120
  })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
105
121
  style: {
106
122
  marginTop: 16
@@ -117,26 +133,26 @@ function (_super) {
117
133
 
118
134
  _this.selfRender();
119
135
  },
120
- value: (0, _coreUtil.isPc)() ? (_b = (_a = panelProps.box) === null || _a === void 0 ? void 0 : _a.backgroundColor) === null || _b === void 0 ? void 0 : _b.pc : (_d = (_c = panelProps.box) === null || _c === void 0 ? void 0 : _c.backgroundColor) === null || _d === void 0 ? void 0 : _d.mobile
136
+ value: (0, _coreUtil.isPc)() ? (_d = (_c = panelProps.box) === null || _c === void 0 ? void 0 : _c.backgroundColor) === null || _d === void 0 ? void 0 : _d.pc : (_f = (_e = panelProps.box) === null || _e === void 0 ? void 0 : _e.backgroundColor) === null || _f === void 0 ? void 0 : _f.mobile
121
137
  }))),
122
138
  metaOption: panelProps.box,
123
139
  toggleType: 'switch'
124
140
  }, {
125
- key: (_e = panelProps.cartIcon) === null || _e === void 0 ? void 0 : _e.id,
141
+ key: (_g = panelProps.cartIcon) === null || _g === void 0 ? void 0 : _g.id,
126
142
  name: (0, _locale.i18n)('CART_ICON'),
127
143
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
128
144
  data: panelProps.cartIcon
129
145
  }),
130
146
  metaOption: panelProps.cartIcon
131
147
  }, {
132
- key: (_f = panelProps.chatbotIcon) === null || _f === void 0 ? void 0 : _f.id,
148
+ key: (_h = panelProps.chatbotIcon) === null || _h === void 0 ? void 0 : _h.id,
133
149
  name: (0, _locale.i18n)('CHATBOT_ICON'),
134
150
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
135
151
  data: panelProps.chatbotIcon
136
152
  }),
137
153
  metaOption: panelProps.chatbotIcon
138
154
  }, {
139
- key: (_g = panelProps.messageIcon) === null || _g === void 0 ? void 0 : _g.id,
155
+ key: (_j = panelProps.messageIcon) === null || _j === void 0 ? void 0 : _j.id,
140
156
  name: (0, _locale.i18n)('MESSAGE_ICON'),
141
157
  value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
142
158
  data: panelProps.messageIcon
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -15,7 +17,7 @@ var _SpacingConfig = _interopRequireDefault(require("../../../common/config-pane
15
17
 
16
18
  var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
17
19
 
18
- var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
20
+ var _ImageConfig = _interopRequireWildcard(require("../../../../meta-comp/config-panels/ImageConfig"));
19
21
 
20
22
  var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
21
23
 
@@ -23,6 +25,10 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
23
25
 
24
26
  var _locale = require("../../../../locale");
25
27
 
28
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
29
+
30
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
31
+
26
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
27
33
 
28
34
  var __extends = void 0 && (void 0).__extends || function () {
@@ -60,6 +66,18 @@ function (_super) {
60
66
  return _super !== null && _super.apply(this, arguments) || this;
61
67
  }
62
68
 
69
+ SlideImageConfig.prototype.componentDidMount = function () {
70
+ var _a;
71
+
72
+ var data = this.props.data;
73
+
74
+ if (!((_a = data.content) === null || _a === void 0 ? void 0 : _a.moveIcon)) {
75
+ data.content = {
76
+ moveIcon: _ImageConfig.imageJson
77
+ };
78
+ }
79
+ };
80
+
63
81
  SlideImageConfig.prototype.render = function () {
64
82
  var _a, _b;
65
83
 
@@ -207,6 +207,20 @@ function (_super) {
207
207
  return _this;
208
208
  }
209
209
 
210
+ SlideImageSecondConfig.prototype.componentDidMount = function () {
211
+ var panelProps = this.props.panelProps;
212
+
213
+ if (!panelProps.background) {
214
+ panelProps.background = {
215
+ opacity: 100,
216
+ color: '#fff',
217
+ image: '',
218
+ bgType: 'image'
219
+ };
220
+ this.reRender();
221
+ }
222
+ };
223
+
210
224
  SlideImageSecondConfig.prototype.render = function () {
211
225
  var panelProps = this.props.panelProps;
212
226
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Flash Sale",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Oferta relámpago",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -1,4 +1,5 @@
1
1
  {
2
+ "ICON_COLOR": "Icon Color",
2
3
  "FLASH_SALE": "Flash Sale",
3
4
  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
4
5
  "MOVE_IN_LOGO": "Move In Logo",
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports["default"] = void 0;
6
+ exports.imageJson = exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -11,6 +11,8 @@ var _antd = require("antd");
11
11
 
12
12
  require("./index.less");
13
13
 
14
+ var _uuid = require("uuid");
15
+
14
16
  var _HotAreaConfig = _interopRequireDefault(require("./HotAreaConfig"));
15
17
 
16
18
  var _commonUtil = require("../../../utils/commonUtil");
@@ -194,6 +196,26 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
194
196
  }
195
197
  };
196
198
 
199
+ var imageJson = {
200
+ id: (0, _uuid.v4)(),
201
+ open: true,
202
+ type: 'IMAGE',
203
+ content: {
204
+ clickUrl: '',
205
+ pcImgSrc: '',
206
+ h5ImgSrc: '',
207
+ name: ''
208
+ },
209
+ hover: {
210
+ open: false,
211
+ backgroundType: 'enlarge',
212
+ h5ImgHoverUrl: '',
213
+ pcImgHoverUrl: '',
214
+ magnification: 1
215
+ }
216
+ };
217
+ exports.imageJson = imageJson;
218
+
197
219
  var ImageConfig =
198
220
  /** @class */
199
221
  function (_super) {
@@ -422,21 +444,7 @@ function (_super) {
422
444
  };
423
445
 
424
446
  ImageConfig.defaultProps = {
425
- data: {
426
- content: {
427
- clickUrl: '',
428
- pcImgSrc: '',
429
- h5ImgSrc: '',
430
- name: ''
431
- },
432
- hover: {
433
- open: false,
434
- backgroundType: 'enlarge',
435
- h5ImgHoverUrl: '',
436
- pcImgHoverUrl: '',
437
- magnification: 1
438
- }
439
- },
447
+ data: imageJson,
440
448
  needHover: true,
441
449
  needClickArea: true,
442
450
  needURL: true
@@ -21,7 +21,7 @@ exports.getUrlParams = void 0;
21
21
  exports.goLogin = goLogin;
22
22
  exports.importAsync = void 0;
23
23
  exports.isLogin = isLogin;
24
- exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
24
+ exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.isPad = void 0;
25
25
  exports.pushGA = pushGA;
26
26
  exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
27
27
  exports.shareFacebook = shareFacebook;
@@ -516,6 +516,21 @@ var JsonToUrl = function JsonToUrl(data) {
516
516
 
517
517
  var urlParamsStr = tempArr.join('&');
518
518
  return urlParamsStr;
519
+ };
520
+
521
+ exports.JsonToUrl = JsonToUrl;
522
+
523
+ var isPad = function isPad() {
524
+ var ua = navigator.userAgent;
525
+ var isMac = /Macintosh/i.test(ua);
526
+ var isIOS = /iPad|iPhone|iPod/i.test(ua);
527
+ var isTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0; // iPad检测 (包括iPadOS 13+)
528
+
529
+ if (isMac && isTouch || isIOS) {
530
+ return true;
531
+ }
532
+
533
+ return false;
519
534
  }; // export const jumpUrlConfig = item => {
520
535
  // const { objType, objValue } = item || {};
521
536
  // let jumpUrl = '';
@@ -581,7 +596,7 @@ var JsonToUrl = function JsonToUrl(data) {
581
596
  */
582
597
 
583
598
 
584
- exports.JsonToUrl = JsonToUrl;
599
+ exports.isPad = isPad;
585
600
 
586
601
  var addZero = function addZero(num) {
587
602
  return String(num).length === 1 ? "0" + String(num) : String(num);
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.176",
4
+ "version": "1.0.179",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",