@fonixtree/magic-design 1.0.135 → 1.0.136

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 (17) hide show
  1. package/es/common/Video/index.js +1 -1
  2. package/es/composite-comp/dito/components/GroupedCarousel/pc/index.js +2 -7
  3. package/es/composite-comp/dito/components/GroupedCarousel/pc/index.less +1 -1
  4. package/es/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js +2 -1
  5. package/es/composite-comp/dito/components/SearchDITO/pc/index.js +2 -2
  6. package/es/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less +71 -0
  7. package/es/meta-comp/components/Button/index.js +8 -3
  8. package/es/utils/coreUtil.js +3 -4
  9. package/lib/common/Video/index.js +1 -1
  10. package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.js +2 -7
  11. package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.less +1 -1
  12. package/lib/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js +2 -1
  13. package/lib/composite-comp/dito/components/SearchDITO/pc/index.js +2 -2
  14. package/lib/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less +71 -0
  15. package/lib/meta-comp/components/Button/index.js +8 -3
  16. package/lib/utils/coreUtil.js +3 -4
  17. package/package.json +1 -1
package/es/common/Video/index.js CHANGED
@@ -334,7 +334,7 @@ var createAliVideo = function createAliVideo(domId, opts) {
334
334
  rePlay: false,
335
335
  playsinline: true,
336
336
  preload: true,
337
- controlBarVisibility: 'hover',
337
+ controlBarVisibility: opts.controlBarHide ? 'never' : 'hover',
338
338
  useH5Prism: true,
339
339
  skinLayout: skinLayout
340
340
  }, _defineProperty(_window$Aliplayer, "autoplay", opts.autoplay), _defineProperty(_window$Aliplayer, "rePlay", opts.loop), _defineProperty(_window$Aliplayer, "components", [{
package/es/composite-comp/dito/components/GroupedCarousel/pc/index.js CHANGED
@@ -128,14 +128,9 @@ function (_super) {
128
128
  }
129
129
  }, tab.groupName.open && (tabIndex === index ? /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
130
130
  data: tab.hover.groupName,
131
- onTextInput: function onTextInput(text) {
132
- tab.groupName.text = text;
133
- }
131
+ iconHeight: 46
134
132
  }) : /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
135
- data: tab.groupName,
136
- onTextInput: function onTextInput(text) {
137
- tab.hover.groupName.text = text;
138
- }
133
+ data: tab.groupName
139
134
  })));
140
135
  })), /*#__PURE__*/_react["default"].createElement("div", {
141
136
  className: "tab-content"
package/es/composite-comp/dito/components/GroupedCarousel/pc/index.less CHANGED
@@ -8,7 +8,7 @@
8
8
  display: flex;
9
9
  align-items: center;
10
10
  justify-content: center;
11
- height: 26px;
11
+ height: 46px;
12
12
  overflow: auto;
13
13
  position: relative;
14
14
  margin-top: 12px;
package/es/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js CHANGED
@@ -123,7 +123,8 @@ function (_super) {
123
123
  },
124
124
  opts: __assign(__assign({}, data.video), {
125
125
  cover: (0, _coreUtil.getVideoCover)(data),
126
- source: data.video.sourceUrl
126
+ source: data.video.sourceUrl,
127
+ controlBarHide: true
127
128
  }),
128
129
  play: (_a = this.videoRefMap[data.id]) === null || _a === void 0 ? void 0 : _a.playing,
129
130
  videoId: data.id
package/es/composite-comp/dito/components/SearchDITO/pc/index.js CHANGED
@@ -524,9 +524,9 @@ function (_super) {
524
524
  },
525
525
  size: 24,
526
526
  type: "icon-ShoppingCartSimple1"
527
- })), ((_q = (_p = data.content) === null || _p === void 0 ? void 0 : _p.login) === null || _q === void 0 ? void 0 : _q.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
527
+ })), ((_q = (_p = data.content) === null || _p === void 0 ? void 0 : _p.login) === null || _q === void 0 ? void 0 : _q.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _commonUtil.isLogin)() ? /*#__PURE__*/_react["default"].createElement("div", null) : /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
528
528
  data: (_r = data.content) === null || _r === void 0 ? void 0 : _r.login
529
- }))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
529
+ })))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
530
530
  key: JSON.stringify(data.groupSource),
531
531
  ref: this.carouselRef,
532
532
  afterChange: function afterChange(n) {
package/es/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less CHANGED
@@ -0,0 +1,71 @@
1
+ .slide_image_second_conf_wrap {
2
+ .input-url {
3
+ width: 100%;
4
+ height: 40px;
5
+ background: #FFFFFF;
6
+ border: 1px solid #D2D9E5;
7
+ border-radius: 8px;
8
+ display: flex;
9
+ padding: 9px 14px;
10
+ display: flex;
11
+ align-items: center;
12
+
13
+ input {
14
+ border: none;
15
+ outline: none;
16
+ height: 24px;
17
+ flex-grow: 1;
18
+ font-family: 'Open Sans';
19
+ font-style: normal;
20
+ font-weight: 400;
21
+ font-size: 14px;
22
+ color: #232F46;
23
+ }
24
+
25
+ /* 使用webkit内核的浏览器 */
26
+ input::-webkit-input-placeholder {
27
+ font-family: 'Open Sans';
28
+ font-style: normal;
29
+ font-weight: 400;
30
+ font-size: 14px;
31
+ color: #8493AF;
32
+ }
33
+
34
+ /* Firefox版本4-18 */
35
+ input:-moz-placeholder {
36
+ font-family: 'Open Sans';
37
+ font-style: normal;
38
+ font-weight: 400;
39
+ font-size: 14px;
40
+ color: #8493AF;
41
+ }
42
+
43
+ /* Firefox版本19+ */
44
+ input::-moz-placeholder {
45
+ font-family: 'Open Sans';
46
+ font-style: normal;
47
+ font-weight: 400;
48
+ font-size: 14px;
49
+ color: #8493AF;
50
+ }
51
+
52
+ /* IE浏览器 */
53
+ input:-ms-input-placeholder {
54
+ font-family: 'Open Sans';
55
+ font-style: normal;
56
+ font-weight: 400;
57
+ font-size: 14px;
58
+ color: #8493AF;
59
+ }
60
+
61
+ .icon-btns {
62
+ display: flex;
63
+ align-items: center;
64
+
65
+ &>span {
66
+ margin-left: 12px;
67
+ cursor: pointer;
68
+ }
69
+ }
70
+ }
71
+ }
package/es/meta-comp/components/Button/index.js CHANGED
@@ -104,7 +104,8 @@ function (_super) {
104
104
 
105
105
  var _b = this.props,
106
106
  data = _b.data,
107
- className = _b.className;
107
+ className = _b.className,
108
+ iconHeight = _b.iconHeight;
108
109
  var hover = this.state.hover;
109
110
  this.preData = JSON.stringify(data);
110
111
  this.preDevice = window.magicDesign.device;
@@ -163,7 +164,10 @@ function (_super) {
163
164
  }, (iconLayout === 'right' || iconLayout === 'bottom') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props), iconUrl && /*#__PURE__*/_react["default"].createElement("img", {
164
165
  alt: "",
165
166
  className: "icon",
166
- src: iconUrl
167
+ src: iconUrl,
168
+ style: {
169
+ height: iconHeight + "px"
170
+ }
167
171
  }), (iconLayout === 'left' || iconLayout === 'top') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props)));
168
172
  };
169
173
 
@@ -171,7 +175,8 @@ function (_super) {
171
175
  data: {},
172
176
  className: '',
173
177
  readonly: false,
174
- onTextInput: function onTextInput() {}
178
+ onTextInput: function onTextInput() {},
179
+ iconHeight: 20
175
180
  };
176
181
 
177
182
  __decorate([(0, _decorator.shouldUpdate)()], Button.prototype, "shouldComponentUpdate", null);
package/es/utils/coreUtil.js CHANGED
@@ -316,13 +316,12 @@ var clickUrl = function clickUrl(url, state) {
316
316
  }
317
317
 
318
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
319
- link = _b.link,
319
+ _link = _b.link,
320
320
  data = _b.data;
321
321
 
322
+ var link = !isPc() ? "/web" + _link : _link;
322
323
  var _c = data.params,
323
- params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
324
- // console.log({ type: 'jumpBrowser', params: { url: params.link } });
325
-
324
+ params = _c === void 0 ? {} : _c;
326
325
  /** 锚点跳转 */
327
326
 
328
327
  if (params.type === 'ANCHOR') {
package/lib/common/Video/index.js CHANGED
@@ -334,7 +334,7 @@ var createAliVideo = function createAliVideo(domId, opts) {
334
334
  rePlay: false,
335
335
  playsinline: true,
336
336
  preload: true,
337
- controlBarVisibility: 'hover',
337
+ controlBarVisibility: opts.controlBarHide ? 'never' : 'hover',
338
338
  useH5Prism: true,
339
339
  skinLayout: skinLayout
340
340
  }, _defineProperty(_window$Aliplayer, "autoplay", opts.autoplay), _defineProperty(_window$Aliplayer, "rePlay", opts.loop), _defineProperty(_window$Aliplayer, "components", [{
package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.js CHANGED
@@ -128,14 +128,9 @@ function (_super) {
128
128
  }
129
129
  }, tab.groupName.open && (tabIndex === index ? /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
130
130
  data: tab.hover.groupName,
131
- onTextInput: function onTextInput(text) {
132
- tab.groupName.text = text;
133
- }
131
+ iconHeight: 46
134
132
  }) : /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
135
- data: tab.groupName,
136
- onTextInput: function onTextInput(text) {
137
- tab.hover.groupName.text = text;
138
- }
133
+ data: tab.groupName
139
134
  })));
140
135
  })), /*#__PURE__*/_react["default"].createElement("div", {
141
136
  className: "tab-content"
package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.less CHANGED
@@ -8,7 +8,7 @@
8
8
  display: flex;
9
9
  align-items: center;
10
10
  justify-content: center;
11
- height: 26px;
11
+ height: 46px;
12
12
  overflow: auto;
13
13
  position: relative;
14
14
  margin-top: 12px;
package/lib/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js CHANGED
@@ -123,7 +123,8 @@ function (_super) {
123
123
  },
124
124
  opts: __assign(__assign({}, data.video), {
125
125
  cover: (0, _coreUtil.getVideoCover)(data),
126
- source: data.video.sourceUrl
126
+ source: data.video.sourceUrl,
127
+ controlBarHide: true
127
128
  }),
128
129
  play: (_a = this.videoRefMap[data.id]) === null || _a === void 0 ? void 0 : _a.playing,
129
130
  videoId: data.id
package/lib/composite-comp/dito/components/SearchDITO/pc/index.js CHANGED
@@ -524,9 +524,9 @@ function (_super) {
524
524
  },
525
525
  size: 24,
526
526
  type: "icon-ShoppingCartSimple1"
527
- })), ((_q = (_p = data.content) === null || _p === void 0 ? void 0 : _p.login) === null || _q === void 0 ? void 0 : _q.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
527
+ })), ((_q = (_p = data.content) === null || _p === void 0 ? void 0 : _p.login) === null || _q === void 0 ? void 0 : _q.open) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _commonUtil.isLogin)() ? /*#__PURE__*/_react["default"].createElement("div", null) : /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
528
528
  data: (_r = data.content) === null || _r === void 0 ? void 0 : _r.login
529
- }))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
529
+ })))), /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
530
530
  key: JSON.stringify(data.groupSource),
531
531
  ref: this.carouselRef,
532
532
  afterChange: function afterChange(n) {
package/lib/composite-comp/dito/second-config-panels/SlideImageSecondConfig/index.less CHANGED
@@ -0,0 +1,71 @@
1
+ .slide_image_second_conf_wrap {
2
+ .input-url {
3
+ width: 100%;
4
+ height: 40px;
5
+ background: #FFFFFF;
6
+ border: 1px solid #D2D9E5;
7
+ border-radius: 8px;
8
+ display: flex;
9
+ padding: 9px 14px;
10
+ display: flex;
11
+ align-items: center;
12
+
13
+ input {
14
+ border: none;
15
+ outline: none;
16
+ height: 24px;
17
+ flex-grow: 1;
18
+ font-family: 'Open Sans';
19
+ font-style: normal;
20
+ font-weight: 400;
21
+ font-size: 14px;
22
+ color: #232F46;
23
+ }
24
+
25
+ /* 使用webkit内核的浏览器 */
26
+ input::-webkit-input-placeholder {
27
+ font-family: 'Open Sans';
28
+ font-style: normal;
29
+ font-weight: 400;
30
+ font-size: 14px;
31
+ color: #8493AF;
32
+ }
33
+
34
+ /* Firefox版本4-18 */
35
+ input:-moz-placeholder {
36
+ font-family: 'Open Sans';
37
+ font-style: normal;
38
+ font-weight: 400;
39
+ font-size: 14px;
40
+ color: #8493AF;
41
+ }
42
+
43
+ /* Firefox版本19+ */
44
+ input::-moz-placeholder {
45
+ font-family: 'Open Sans';
46
+ font-style: normal;
47
+ font-weight: 400;
48
+ font-size: 14px;
49
+ color: #8493AF;
50
+ }
51
+
52
+ /* IE浏览器 */
53
+ input:-ms-input-placeholder {
54
+ font-family: 'Open Sans';
55
+ font-style: normal;
56
+ font-weight: 400;
57
+ font-size: 14px;
58
+ color: #8493AF;
59
+ }
60
+
61
+ .icon-btns {
62
+ display: flex;
63
+ align-items: center;
64
+
65
+ &>span {
66
+ margin-left: 12px;
67
+ cursor: pointer;
68
+ }
69
+ }
70
+ }
71
+ }
package/lib/meta-comp/components/Button/index.js CHANGED
@@ -104,7 +104,8 @@ function (_super) {
104
104
 
105
105
  var _b = this.props,
106
106
  data = _b.data,
107
- className = _b.className;
107
+ className = _b.className,
108
+ iconHeight = _b.iconHeight;
108
109
  var hover = this.state.hover;
109
110
  this.preData = JSON.stringify(data);
110
111
  this.preDevice = window.magicDesign.device;
@@ -163,7 +164,10 @@ function (_super) {
163
164
  }, (iconLayout === 'right' || iconLayout === 'bottom') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props), iconUrl && /*#__PURE__*/_react["default"].createElement("img", {
164
165
  alt: "",
165
166
  className: "icon",
166
- src: iconUrl
167
+ src: iconUrl,
168
+ style: {
169
+ height: iconHeight + "px"
170
+ }
167
171
  }), (iconLayout === 'left' || iconLayout === 'top') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props)));
168
172
  };
169
173
 
@@ -171,7 +175,8 @@ function (_super) {
171
175
  data: {},
172
176
  className: '',
173
177
  readonly: false,
174
- onTextInput: function onTextInput() {}
178
+ onTextInput: function onTextInput() {},
179
+ iconHeight: 20
175
180
  };
176
181
 
177
182
  __decorate([(0, _decorator.shouldUpdate)()], Button.prototype, "shouldComponentUpdate", null);
package/lib/utils/coreUtil.js CHANGED
@@ -316,13 +316,12 @@ var clickUrl = function clickUrl(url, state) {
316
316
  }
317
317
 
318
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
319
- link = _b.link,
319
+ _link = _b.link,
320
320
  data = _b.data;
321
321
 
322
+ var link = !isPc() ? "/web" + _link : _link;
322
323
  var _c = data.params,
323
- params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
324
- // console.log({ type: 'jumpBrowser', params: { url: params.link } });
325
-
324
+ params = _c === void 0 ? {} : _c;
326
325
  /** 锚点跳转 */
327
326
 
328
327
  if (params.type === 'ANCHOR') {
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.135",
4
+ "version": "1.0.136",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",