@fonixtree/magic-design 0.1.7 → 0.1.8

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 (59) hide show
  1. package/es/assets/images/layout-icon/carouselLayout3.png +0 -0
  2. package/es/common/LinkModal/BundleCampaign/index.js +22 -5
  3. package/es/common/LinkModal/BundleCampaign/index.less +6 -4
  4. package/es/common/LinkModal/CatgTable/index.js +11 -4
  5. package/es/common/LinkModal/CouponTable/index.js +7 -2
  6. package/es/common/LinkModal/CustomTable/index.js +11 -4
  7. package/es/common/LinkModal/FilteredProductModal/index.js +5 -1
  8. package/es/common/LinkModal/FilteredProductModal/index.less +1 -0
  9. package/es/common/LinkModal/FunctionTable/index.js +10 -3
  10. package/es/common/LinkModal/ProductDetailPage/index.js +6 -3
  11. package/es/common/LinkModal/ProductDetailPage/index.less +1 -3
  12. package/es/common/LinkModal/SelectVideoModal/index.js +10 -3
  13. package/es/common/LinkModal/SelectVideoModal/index.less +3 -3
  14. package/es/common/LinkModal/ShareUrl/index.js +33 -0
  15. package/es/common/LinkModal/ShareUrl/index.less +3 -0
  16. package/es/common/LinkModal/index.js +79 -79
  17. package/es/common/LinkModal/index.less +31 -30
  18. package/es/common/UrlPicker/index.js +14 -4
  19. package/es/common/UrlPicker/index.less +3 -0
  20. package/es/common/VideoUpload/index.js +1 -1
  21. package/es/common/VideoUpload/index.less +1 -0
  22. package/es/composite-comp/bol/components/Carousel/mobile/index.js +17 -6
  23. package/es/composite-comp/bol/components/Carousel/mobile/index.less +2 -2
  24. package/es/composite-comp/bol/components/Carousel/pc/index.js +20 -9
  25. package/es/constants/index.js +13 -1
  26. package/es/constants/layout.js +6 -0
  27. package/es/utils/businessUtil.js +133 -1
  28. package/es/utils/commonUtil.js +3 -1
  29. package/es/utils/coreUtil.js +10 -1
  30. package/lib/assets/images/layout-icon/carouselLayout3.png +0 -0
  31. package/lib/common/LinkModal/BundleCampaign/index.js +22 -5
  32. package/lib/common/LinkModal/BundleCampaign/index.less +6 -4
  33. package/lib/common/LinkModal/CatgTable/index.js +11 -4
  34. package/lib/common/LinkModal/CouponTable/index.js +7 -2
  35. package/lib/common/LinkModal/CustomTable/index.js +11 -4
  36. package/lib/common/LinkModal/FilteredProductModal/index.js +5 -1
  37. package/lib/common/LinkModal/FilteredProductModal/index.less +1 -0
  38. package/lib/common/LinkModal/FunctionTable/index.js +10 -3
  39. package/lib/common/LinkModal/ProductDetailPage/index.js +6 -3
  40. package/lib/common/LinkModal/ProductDetailPage/index.less +1 -3
  41. package/lib/common/LinkModal/SelectVideoModal/index.js +10 -3
  42. package/lib/common/LinkModal/SelectVideoModal/index.less +3 -3
  43. package/lib/common/LinkModal/ShareUrl/index.js +33 -0
  44. package/lib/common/LinkModal/ShareUrl/index.less +3 -0
  45. package/lib/common/LinkModal/index.js +79 -79
  46. package/lib/common/LinkModal/index.less +31 -30
  47. package/lib/common/UrlPicker/index.js +14 -4
  48. package/lib/common/UrlPicker/index.less +3 -0
  49. package/lib/common/VideoUpload/index.js +1 -1
  50. package/lib/common/VideoUpload/index.less +1 -0
  51. package/lib/composite-comp/bol/components/Carousel/mobile/index.js +17 -6
  52. package/lib/composite-comp/bol/components/Carousel/mobile/index.less +2 -2
  53. package/lib/composite-comp/bol/components/Carousel/pc/index.js +20 -9
  54. package/lib/constants/index.js +13 -1
  55. package/lib/constants/layout.js +6 -0
  56. package/lib/utils/businessUtil.js +133 -1
  57. package/lib/utils/commonUtil.js +3 -1
  58. package/lib/utils/coreUtil.js +10 -1
  59. package/package.json +1 -1
@@ -202,7 +202,7 @@ function CustomTable(props) {
202
202
  verType: 'Formal',
203
203
  configVersion: 'V2',
204
204
  state: 'Using',
205
- siteId: window.magicDesign.siteId
205
+ siteId: window.magicDesign.siteId || 1
206
206
  });
207
207
  }, []);
208
208
  var columns = [{
@@ -211,11 +211,18 @@ function CustomTable(props) {
211
211
  }];
212
212
  var rowSelection = {
213
213
  onChange: function onChange(selectedRowKeys, selectedRows) {
214
- _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
214
+ _onChange({
215
+ value: selectedRows[0].pageCode || selectedRows[0].bdPageId,
216
+ name: selectedRows[0].pageName
217
+ });
215
218
  },
216
219
  type: 'radio'
217
220
  };
218
- return /*#__PURE__*/_react["default"].createElement(_antd.Table, {
221
+ return /*#__PURE__*/_react["default"].createElement("div", {
222
+ style: {
223
+ height: 550
224
+ }
225
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
219
226
  bordered: false,
220
227
  columns: columns,
221
228
  dataSource: cusPageList,
@@ -226,5 +233,5 @@ function CustomTable(props) {
226
233
  scroll: {
227
234
  y: 480
228
235
  }
229
- });
236
+ }));
230
237
  }
@@ -570,6 +570,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
570
570
  optionFilterProp: "children",
571
571
  placeholder: "Please select",
572
572
  showSearch: true,
573
+ size: "small",
573
574
  value: storeId
574
575
  }, storeList && storeList.length > 0 && storeList.map(function (v) {
575
576
  return /*#__PURE__*/_react["default"].createElement(Option, {
@@ -658,7 +659,10 @@ var FilteredProductModal = function FilteredProductModal(props) {
658
659
  paginationParams.current = 1;
659
660
  loadGoods().then(function (res) {
660
661
  if (res.total !== 0) {
661
- onDataChange("filter-" + res.url, res.total);
662
+ onDataChange({
663
+ value: res.url,
664
+ name: res.url
665
+ }, res.total);
662
666
  } else {
663
667
  onDataChange('', res.total); // message.warn('no goods!');
664
668
  }
@@ -1,4 +1,5 @@
1
1
  .mFilteredProductModal {
2
+ height: 550px;
2
3
  .proModalWrap {
3
4
  .info {
4
5
  background: #ecf1fd;
@@ -180,7 +180,10 @@ function FunctionTable(props) {
180
180
  var rowSelection = {
181
181
  type: 'radio',
182
182
  onChange: function onChange(selectedRowKeys, selectedRows) {
183
- _onChange(selectedRows[0].url);
183
+ _onChange({
184
+ name: selectedRows[0].urlName,
185
+ value: selectedRows[0].url
186
+ });
184
187
  }
185
188
  };
186
189
 
@@ -210,7 +213,11 @@ function FunctionTable(props) {
210
213
  (0, _react.useEffect)(function () {
211
214
  qryFunctions();
212
215
  }, []);
213
- return /*#__PURE__*/_react["default"].createElement(_antd.Table, {
216
+ return /*#__PURE__*/_react["default"].createElement("div", {
217
+ style: {
218
+ height: 550
219
+ }
220
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
214
221
  columns: columns,
215
222
  dataSource: functions,
216
223
  loading: loading,
@@ -220,5 +227,5 @@ function FunctionTable(props) {
220
227
  scroll: {
221
228
  y: 480
222
229
  }
223
- });
230
+ }));
224
231
  }
@@ -196,7 +196,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
196
196
  var Option = _antd.Select.Option;
197
197
 
198
198
  var ProductDetailPage = function ProductDetailPage(props) {
199
- var setUrl = props.setUrl;
199
+ var _onChange = props.onChange;
200
200
 
201
201
  var _a = (0, _react.useState)([]),
202
202
  productList = _a[0],
@@ -265,8 +265,11 @@ var ProductDetailPage = function ProductDetailPage(props) {
265
265
  }];
266
266
  var rowSelection = {
267
267
  onChange: function onChange(selectedRowKeys, selectedRows) {
268
- setUrl("proDetail-" + selectedRows[0].offerId + "-" + selectedRows[0].productId);
269
- console.log("selectedRowKeys: " + selectedRowKeys, 'selectedRows: ', selectedRows);
268
+ _onChange({
269
+ offerId: selectedRows[0].offerId,
270
+ productId: selectedRows[0].productId,
271
+ name: selectedRows[0].productName
272
+ });
270
273
  },
271
274
  type: 'radio'
272
275
  };
@@ -1,7 +1,5 @@
1
1
  .productDetailPage {
2
- width: 100%;
3
- padding-top: 12px;
4
- border-top: 1px solid #f0f0f0;
2
+ height: 550px;
5
3
  .prodImage {
6
4
  width: 36px;
7
5
  height: 36px;
@@ -69,9 +69,15 @@ function (_super) {
69
69
  _this.onFieldChange = function (data) {
70
70
  _extends(_this.videoSetting, data);
71
71
 
72
+ console.log(data);
73
+
72
74
  _this.setState({});
73
75
 
74
- _this.props.setUrl('video-' + JSON.stringify(_this.videoSetting));
76
+ _this.props.setUrl({
77
+ value: JSON.stringify(_this.videoSetting),
78
+ name: data.name || 'Video'
79
+ }); // this.props.setUrl('video-' + JSON.stringify(this.videoSetting));
80
+
75
81
  };
76
82
 
77
83
  return _this;
@@ -124,9 +130,10 @@ function (_super) {
124
130
  size: "20px",
125
131
  type: "icon-delete1"
126
132
  })))), this.videoSetting.sourceType === 'Upload' && /*#__PURE__*/_react["default"].createElement(_VideoUpload["default"], {
127
- onChange: function onChange(v) {
133
+ onChange: function onChange(v, n) {
128
134
  _this.onFieldChange({
129
- sourceUrl: v
135
+ sourceUrl: v,
136
+ name: n
130
137
  });
131
138
  },
132
139
  value: this.videoSetting.sourceUrl
@@ -1,8 +1,8 @@
1
1
  .SelectVideoModal-container {
2
2
  display: flex;
3
- padding: 20px 80px;
4
- border-top: 1px solid #f0f0f0;
5
-
3
+ // padding: 20px 80px;
4
+ // border-top: 1px solid #f0f0f0;
5
+ height: 550px;
6
6
  .video-left-wrap {
7
7
  display: flex;
8
8
  flex-direction: column;
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = ShareUrl;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ require("./index.less");
11
+
12
+ var _antd = require("antd");
13
+
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
+
16
+ function ShareUrl(_a) {
17
+ var onChange = _a.onChange;
18
+
19
+ var onChangeUrl = function onChangeUrl(e) {
20
+ onChange({
21
+ value: e.target.value,
22
+ name: e.target.value
23
+ });
24
+ };
25
+
26
+ return /*#__PURE__*/_react["default"].createElement("div", {
27
+ className: "shareWrap"
28
+ }, /*#__PURE__*/_react["default"].createElement("div", {
29
+ className: "label"
30
+ }, "Share Url"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
31
+ onChange: onChangeUrl
32
+ }));
33
+ }
@@ -0,0 +1,3 @@
1
+ .shareWrap {
2
+ height: 550px;
3
+ }
@@ -27,6 +27,8 @@ var _BundleCampaign = _interopRequireDefault(require("./BundleCampaign"));
27
27
 
28
28
  var _SelectVideoModal = _interopRequireDefault(require("./SelectVideoModal"));
29
29
 
30
+ var _ShareUrl = _interopRequireDefault(require("./ShareUrl"));
31
+
30
32
  var _locale = require("../../locale");
31
33
 
32
34
  var _commonUtil = require("../../utils/commonUtil");
@@ -39,6 +41,22 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
39
41
 
40
42
  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; }
41
43
 
44
+ var __assign = void 0 && (void 0).__assign || function () {
45
+ __assign = Object.assign || function (t) {
46
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
47
+ s = arguments[i];
48
+
49
+ for (var p in s) {
50
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
51
+ }
52
+ }
53
+
54
+ return t;
55
+ };
56
+
57
+ return __assign.apply(this, arguments);
58
+ };
59
+
42
60
  var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
43
61
  function adopt(value) {
44
62
  return value instanceof P ? value : new P(function (resolve) {
@@ -182,20 +200,6 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
182
200
  }
183
201
  };
184
202
 
185
- var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
186
- for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
187
- s += arguments[i].length;
188
- }
189
-
190
- for (var r = Array(s), k = 0, i = 0; i < il; i++) {
191
- for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
192
- r[k] = a[j];
193
- }
194
- }
195
-
196
- return r;
197
- };
198
-
199
203
  var LinkModal = function LinkModal(props) {
200
204
  var onConfirm = props.onConfirm,
201
205
  onClose = props.onClose,
@@ -205,10 +209,9 @@ var LinkModal = function LinkModal(props) {
205
209
  linkUrl = _a[0],
206
210
  setLinkUrl = _a[1];
207
211
 
208
- var _b = (0, _react.useState)(''),
212
+ var _b = (0, _react.useState)('Category'),
209
213
  selected = _b[0],
210
- setSelected = _b[1]; // const list = ['Category', 'Customized Page', 'Product Details Page', 'Filtered Products', 'Function Page', 'Coupons', 'Bundle Campaign', 'Video'];
211
-
214
+ setSelected = _b[1];
212
215
 
213
216
  var _c = (0, _react.useState)([]),
214
217
  linkTypes = _c[0],
@@ -230,12 +233,7 @@ var LinkModal = function LinkModal(props) {
230
233
 
231
234
  case 1:
232
235
  types = _a.sent();
233
- setLinkTypes(__spreadArrays(types, [{
234
- comments: 'Video',
235
- linkTypeCode: 'Video',
236
- linkTypeName: 'Video',
237
- seq: 7
238
- }]));
236
+ setLinkTypes(types);
239
237
  setSelected(types[0].linkTypeCode);
240
238
  return [2
241
239
  /*return*/
@@ -252,9 +250,11 @@ var LinkModal = function LinkModal(props) {
252
250
  setTotal(0);
253
251
  }, [visible]);
254
252
 
255
- var onModalSava = function onModalSava() {
253
+ var onModalSave = function onModalSave() {
256
254
  if (onConfirm) {
257
- onConfirm(linkUrl);
255
+ onConfirm(__assign(__assign({}, linkUrl), {
256
+ type: selected
257
+ }));
258
258
  }
259
259
 
260
260
  if (onClose) {
@@ -262,69 +262,69 @@ var LinkModal = function LinkModal(props) {
262
262
  }
263
263
  };
264
264
 
265
+ var onTabsChange = function onTabsChange(type) {
266
+ setSelected(type);
267
+ };
268
+
265
269
  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
266
270
  cancelText: (0, _locale.i18n)('CANCEL'),
267
271
  draggable: false,
268
272
  footer: null,
269
273
  okText: "OK",
270
- onCancel: onClose,
271
- onOk: onConfirm,
274
+ onCancel: onClose // onOk={onConfirm}
275
+ ,
272
276
  title: (0, _locale.i18n)('URL_SETUP'),
273
277
  visible: visible,
274
- width: "1000",
278
+ width: "900px",
275
279
  wrapClassName: "linkModal"
276
- }, /*#__PURE__*/_react["default"].createElement("div", {
277
- className: "urlModalWrap"
278
- }, /*#__PURE__*/_react["default"].createElement("div", {
279
- className: "linkType"
280
- }, /*#__PURE__*/_react["default"].createElement("div", {
281
- className: "typeTitle"
282
- }, (0, _locale.i18n)('LINK_TYPE'), ":"), linkTypes.map(function (item, index) {
283
- return /*#__PURE__*/_react["default"].createElement("div", {
284
- key: index,
285
- className: "typeItem " + (selected === item.linkTypeCode ? 'selected' : ''),
286
- onClick: function onClick() {
287
- return setSelected(item.linkTypeCode);
280
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
281
+ activeKey: selected,
282
+ onChange: onTabsChange
283
+ }, linkTypes.map(function (item) {
284
+ return /*#__PURE__*/_react["default"].createElement(_antd.Tabs.TabPane, {
285
+ key: item.linkTypeCode,
286
+ tab: item.linkTypeName
287
+ }, item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
288
+ onChange: function onChange(value) {
289
+ return setLinkUrl(value);
288
290
  }
289
- }, item.linkTypeName);
290
- })), /*#__PURE__*/_react["default"].createElement("div", {
291
- className: "content"
292
- }, selected === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
293
- onChange: function onChange(value) {
294
- return setLinkUrl(value);
295
- }
296
- }), selected === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
297
- onChange: function onChange(value) {
298
- return setLinkUrl(value);
299
- }
300
- }), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
301
- setUrl: function setUrl(url) {
302
- return setLinkUrl(url);
303
- }
304
- }), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
305
- onDataChange: function onDataChange(url, t) {
306
- setLinkUrl(url);
307
- setTotal(t);
308
- }
309
- }), selected === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
310
- onChange: function onChange(value) {
311
- return setLinkUrl(value);
312
- }
313
- }), selected === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
314
- onChange: function onChange(value) {
315
- return setLinkUrl(value);
316
- }
317
- }), selected === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
318
- setUrl: function setUrl(url) {
319
- return setLinkUrl(url);
320
- }
321
- }), selected === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
322
- setUrl: function setUrl(url) {
323
- return setLinkUrl(url);
324
- }
291
+ }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
292
+ onChange: function onChange(value) {
293
+ return setLinkUrl(value);
294
+ }
295
+ }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
296
+ onChange: function onChange(url) {
297
+ return setLinkUrl(url);
298
+ }
299
+ }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
300
+ onDataChange: function onDataChange(url, t) {
301
+ setLinkUrl(url);
302
+ setTotal(t);
303
+ }
304
+ }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
305
+ onChange: function onChange(value) {
306
+ return setLinkUrl(value);
307
+ }
308
+ }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
309
+ onChange: function onChange(value) {
310
+ return setLinkUrl(value);
311
+ }
312
+ }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
313
+ onChange: function onChange(value) {
314
+ return setLinkUrl(value);
315
+ }
316
+ }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
317
+ setUrl: function setUrl(value) {
318
+ return setLinkUrl(value);
319
+ }
320
+ }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
321
+ onChange: function onChange(value) {
322
+ return setLinkUrl(value);
323
+ }
324
+ }));
325
325
  })), /*#__PURE__*/_react["default"].createElement("div", {
326
326
  className: "footer"
327
- }, selected === 'Filtered Products' ? /*#__PURE__*/_react["default"].createElement("div", {
327
+ }, selected === 'FilteredProduct' ? /*#__PURE__*/_react["default"].createElement("div", {
328
328
  className: "total"
329
329
  }, total, " Products In Total") : /*#__PURE__*/_react["default"].createElement("div", null), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
330
330
  className: "btn-cancel",
@@ -333,9 +333,9 @@ var LinkModal = function LinkModal(props) {
333
333
  }
334
334
  }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
335
335
  className: "btn-confirm",
336
- onClick: onModalSava,
336
+ onClick: onModalSave,
337
337
  type: "primary"
338
- }, (0, _locale.i18n)('OK'))))));
338
+ }, (0, _locale.i18n)('OK')))));
339
339
  };
340
340
 
341
341
  var _default = LinkModal;
@@ -1,8 +1,12 @@
1
- .linkModal {
2
- width: 1300px;
1
+ [magic_design] .linkModal {
2
+ // width: 1300px;
3
3
  right: unset !important;
4
4
  left: unset !important;
5
5
 
6
+ .ant-modal .ant-modal-content .ant-modal-body {
7
+ padding-bottom: 60px !important;
8
+ padding-top: 0 !important;
9
+ }
6
10
  .urlModalWrap {
7
11
  font-family: 'Open Sans';
8
12
  font-style: normal;
@@ -64,40 +68,37 @@
64
68
  align-items: center;
65
69
  }
66
70
  }
71
+ }
72
+ .shareUrlWrap {
73
+ height: 500px;
74
+ }
67
75
 
68
- .footer {
69
- padding: 10px 0;
70
- display: flex;
71
- align-items: center;
72
- justify-content: space-between;
73
- border-top: 1px solid #e0e0e0;
74
- position: absolute;
75
- bottom: 0;
76
- left: 24px;
77
- right: 24px;
76
+ .footer {
77
+ padding: 10px 0;
78
+ display: flex;
79
+ align-items: center;
80
+ justify-content: space-between;
81
+ border-top: 1px solid #e0e0e0;
82
+ position: absolute;
83
+ bottom: 0;
84
+ left: 24px;
85
+ right: 24px;
78
86
 
79
- .btn-cancel {
80
- background: #E9F0FF;
81
- border-radius: 6px;
82
- color: #2F54EB;
83
- border: none;
84
- margin-right: 12px;
85
- }
86
-
87
- .btn-confirm {
88
- background: #2F54EB;
89
- border: none;
90
- border-radius: 6px;
91
- }
87
+ .btn-cancel {
88
+ background: #E9F0FF;
89
+ border-radius: 6px;
90
+ color: #2F54EB;
91
+ border: none;
92
+ margin-right: 12px;
93
+ }
94
+ .btn-confirm {
95
+ background: #2F54EB;
96
+ border: none;
97
+ border-radius: 6px;
92
98
  }
93
-
94
99
  .total {
95
100
  font-size: 13px;
96
101
  color: #2d3040;
97
102
  }
98
103
  }
99
-
100
- .ant-modal {
101
- top: 25px;
102
- }
103
104
  }
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  require("./index.less");
11
11
 
12
+ var _classnames = _interopRequireDefault(require("classnames"));
13
+
12
14
  var _locale = require("../../locale");
13
15
 
14
16
  var _LinkModal = _interopRequireDefault(require("../LinkModal"));
@@ -64,20 +66,28 @@ function (_super) {
64
66
  var _a = this.props,
65
67
  value = _a.value,
66
68
  _onChange = _a.onChange,
67
- disabled = _a.disabled;
69
+ disabled = _a.disabled; // 弹框选择url不可编辑,需要先清除
70
+
71
+ var editable = !value || !value.type;
68
72
  return /*#__PURE__*/_react["default"].createElement("div", {
69
73
  className: "m-url-picker"
70
74
  }, disabled && /*#__PURE__*/_react["default"].createElement("div", {
71
75
  className: "disabled"
72
76
  }), /*#__PURE__*/_react["default"].createElement("div", {
73
- className: "input-url"
77
+ className: (0, _classnames["default"])('input-url', {
78
+ noEditable: !editable
79
+ })
74
80
  }, /*#__PURE__*/_react["default"].createElement("input", {
81
+ disabled: !editable,
75
82
  onChange: function onChange(e) {
76
- return _onChange(e.target.value);
83
+ return _onChange({
84
+ name: e.target.value,
85
+ value: e.target.value
86
+ });
77
87
  },
78
88
  placeholder: (0, _locale.i18n)('PLEASE_ADD_A_LINK'),
79
89
  type: "text",
80
- value: value
90
+ value: value.name || ''
81
91
  }), /*#__PURE__*/_react["default"].createElement("div", {
82
92
  className: "icon-btns"
83
93
  }, window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
@@ -11,6 +11,9 @@
11
11
  opacity: 0.5;
12
12
  border-radius: 8px;
13
13
  }
14
+ .noEditable {
15
+ background: rgba(239,239,239,0.3) !important;
16
+ }
14
17
  .input-url {
15
18
  width: 100%;
16
19
  height: 40px;
@@ -67,7 +67,7 @@ function (_super) {
67
67
  });
68
68
 
69
69
  if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
70
- _this.props.onChange(data[0].url);
70
+ _this.props.onChange(data[0].url, data[0].contentTitle);
71
71
  }
72
72
  };
73
73
 
@@ -20,6 +20,7 @@
20
20
  video {
21
21
  width: 100%;
22
22
  height: 100%;
23
+ max-height: 300px;
23
24
  }
24
25
 
25
26
  &:hover {
@@ -185,8 +185,18 @@ function (_super) {
185
185
 
186
186
  var data = this.props.data;
187
187
  var sliderIndex = this.state.sliderIndex;
188
- var showText = data.customize.layout === 'layout2';
189
- var colNum = showText ? 1 : Math.min(data.customize.rowNum, data.groupSource.length);
188
+ var _a = data.customize,
189
+ layout = _a.layout,
190
+ rowNum = _a.rowNum;
191
+ var colNum = 1;
192
+
193
+ if (layout === 'layout1') {
194
+ colNum = Math.min(rowNum, data.groupSource.length);
195
+ } else if (layout === 'layout3') {
196
+ colNum = Math.min(rowNum + 0.2, data.groupSource.length);
197
+ }
198
+
199
+ var floorColNum = Math.floor(colNum);
190
200
  var GAData = {
191
201
  moduleId: data.id,
192
202
  moduleName: data.moduleIndex + '.' + data.type
@@ -212,7 +222,8 @@ function (_super) {
212
222
  _this.setState({
213
223
  sliderIndex: newIndex
214
224
  });
215
- }
225
+ },
226
+ variableWidth: true
216
227
  };
217
228
  var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) + 12 + "px";
218
229
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -220,7 +231,7 @@ function (_super) {
220
231
  }, /*#__PURE__*/_react["default"].createElement("div", {
221
232
  className: "content",
222
233
  style: {
223
- paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? dotsSpace : '0'
234
+ paddingBottom: data.setting.dots.open && data.groupSource.length / floorColNum > 1 ? dotsSpace : '0'
224
235
  }
225
236
  }, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
226
237
  ref: function ref(slider) {
@@ -238,7 +249,7 @@ function (_super) {
238
249
  groupId: item.id,
239
250
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
240
251
  })
241
- })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
252
+ })), layout === 'layout2' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
242
253
  className: "title"
243
254
  }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
244
255
  data: item.title,
@@ -276,7 +287,7 @@ function (_super) {
276
287
  groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
277
288
  })
278
289
  }))));
279
- })), data.setting.dots.open && Math.ceil(data.groupSource.length / colNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
290
+ })), data.setting.dots.open && Math.ceil(data.groupSource.length / floorColNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
280
291
  className: "swiper-ban"
281
292
  }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
282
293
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -13,8 +13,8 @@
13
13
  line-height: 1;
14
14
 
15
15
  .slick-list {
16
- margin-left: -11px;
17
- margin-right: -11px;
16
+ // margin-left: -11px;
17
+ // margin-right: -11px;
18
18
  padding: 0;
19
19
 
20
20
  &:hover {