@fonixtree/magic-design 2.0.122 → 2.0.123

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.
@@ -18,7 +18,7 @@
18
18
  .cylon-modal-body {
19
19
  padding: 16px 16px 12px 16px !important;
20
20
  max-height: 800px !important;
21
- // overflow: scroll;
21
+ overflow: auto !important;
22
22
  }
23
23
  }
24
24
  }
@@ -21,6 +21,8 @@ var _locale = require("../../../../../locale");
21
21
 
22
22
  var _decorator = require("../../../../../decorator");
23
23
 
24
+ var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
25
+
24
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
27
 
26
28
  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); }
@@ -98,6 +100,22 @@ function (_super) {
98
100
 
99
101
  ImageTextConfigGroup.prototype.render = function () {
100
102
  var source = this.props.source;
103
+ console.log('source', source);
104
+
105
+ var _renderCard = function renderCard(src) {
106
+ return /*#__PURE__*/_react["default"].createElement("div", {
107
+ className: "card_wrap"
108
+ }, /*#__PURE__*/_react["default"].createElement("img", {
109
+ alt: "",
110
+ src: src.image.content.h5ImgSrc || _defaultImg["default"]
111
+ }), /*#__PURE__*/_react["default"].createElement("div", {
112
+ className: "name",
113
+ dangerouslySetInnerHTML: {
114
+ __html: src.title.html || src.title.text
115
+ }
116
+ }));
117
+ };
118
+
101
119
  return /*#__PURE__*/_react["default"].createElement("div", {
102
120
  className: "banner_group"
103
121
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,6 +124,9 @@ function (_super) {
106
124
  className: "notice"
107
125
  }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
108
126
  onClickItem: this.onClickItem,
127
+ renderCard: function renderCard(v) {
128
+ return _renderCard(v);
129
+ },
109
130
  reRender: this.reRender,
110
131
  source: source
111
132
  })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -238,7 +238,7 @@ function (_super) {
238
238
  storeDetailInfo = _a.sent();
239
239
  this.setState({
240
240
  storeInfo: storeDetailInfo,
241
- isFollow: storeDetailInfo.userHasFollowed == 'Y'
241
+ isFollow: storeDetailInfo.collected == 'Y'
242
242
  });
243
243
  _a.label = 2;
244
244
 
@@ -18,7 +18,7 @@
18
18
  .cylon-modal-body {
19
19
  padding: 16px 16px 12px 16px !important;
20
20
  max-height: 800px !important;
21
- // overflow: scroll;
21
+ overflow: auto !important;
22
22
  }
23
23
  }
24
24
  }
@@ -21,6 +21,8 @@ var _locale = require("../../../../../locale");
21
21
 
22
22
  var _decorator = require("../../../../../decorator");
23
23
 
24
+ var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
25
+
24
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
27
 
26
28
  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); }
@@ -98,6 +100,22 @@ function (_super) {
98
100
 
99
101
  ImageTextConfigGroup.prototype.render = function () {
100
102
  var source = this.props.source;
103
+ console.log('source', source);
104
+
105
+ var _renderCard = function renderCard(src) {
106
+ return /*#__PURE__*/_react["default"].createElement("div", {
107
+ className: "card_wrap"
108
+ }, /*#__PURE__*/_react["default"].createElement("img", {
109
+ alt: "",
110
+ src: src.image.content.h5ImgSrc || _defaultImg["default"]
111
+ }), /*#__PURE__*/_react["default"].createElement("div", {
112
+ className: "name",
113
+ dangerouslySetInnerHTML: {
114
+ __html: src.title.html || src.title.text
115
+ }
116
+ }));
117
+ };
118
+
101
119
  return /*#__PURE__*/_react["default"].createElement("div", {
102
120
  className: "banner_group"
103
121
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,6 +124,9 @@ function (_super) {
106
124
  className: "notice"
107
125
  }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
108
126
  onClickItem: this.onClickItem,
127
+ renderCard: function renderCard(v) {
128
+ return _renderCard(v);
129
+ },
109
130
  reRender: this.reRender,
110
131
  source: source
111
132
  })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -238,7 +238,7 @@ function (_super) {
238
238
  storeDetailInfo = _a.sent();
239
239
  this.setState({
240
240
  storeInfo: storeDetailInfo,
241
- isFollow: storeDetailInfo.userHasFollowed == 'Y'
241
+ isFollow: storeDetailInfo.collected == 'Y'
242
242
  });
243
243
  _a.label = 2;
244
244
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.122",
4
+ "version": "2.0.123",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",