@fonixtree/magic-design 0.0.90 → 0.0.92

package/es/common/LinkModal/FilteredProductModal/index.js

@@ -453,6 +453,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
                   return v.key;
                 }).join(','),
                 labelIds: labelId.key,
+                // q: productName,
                 productName: productName,
                 storeId: storeId,
                 minPrice: minimum * precision || '',

package/es/composite-comp/bol/components/Carousel/mobile/index.js

@@ -166,6 +166,12 @@ function (_super) {
 
     this.destroy = (0, _mobx.autorun)(function () {
       _this.sliderGoTo(_this.props.data.groupSource);
+      /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+
+      if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+        _this.sliderRef.slickPause();
+      }
     });
     this.listenWidth();
     window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -159,6 +159,12 @@ function (_super) {
 
     this.destroy = (0, _mobx.autorun)(function () {
       _this.sliderGoTo(_this.props.data.groupSource);
+      /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+
+      if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+        _this.sliderRef.slickPause();
+      }
     });
     this.listenWidth();
     window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));

package/es/composite-comp/dito/components/FlashDeal/mobile/index.js

@@ -9,11 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
-var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
-
-var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
-
-var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
+var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
@@ -222,30 +218,34 @@ var defaultData = [{
   imgUrlContent: {
     url: _defImg["default"]
   },
-  offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 1100,
-  marketPrice: 100,
-  discountPercent: 51,
-  salePercent: 5000
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg2["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level Up 99 x 365 days',
-  salesPrice: 594,
-  marketPrice: 1188,
-  discountPercent: 50,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg3["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }];
 
@@ -266,7 +266,7 @@ function (_super) {
       effDate: '',
       expDate: '',
       now: '',
-      isWill: true
+      isWill: false
     };
 
     _this.getFlashData = function (pageSize, campaign) {

package/es/composite-comp/dito/components/FlashDeal/pc/index.js

@@ -11,9 +11,7 @@ require("./index.less");
 
 var _lodash = _interopRequireDefault(require("lodash.throttle"));
 
-var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
-
-var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
+var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
@@ -224,21 +222,67 @@ var defaultData = [{
   imgUrlContent: {
     url: _defImg["default"]
   },
-  offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 49,
-  marketPrice: 100,
-  discountPercent: 51,
-  salePercent: 5000,
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg2["default"]
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level Up 99 x 365 days',
-  salesPrice: 594,
-  marketPrice: 1188,
-  discountPercent: 50,
-  salePercent: 5000,
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }];
 

package/es/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -304,7 +304,9 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {}, 'GET')];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
+                terminalType: 'PC'
+              }, 'GET')];
 
             case 1:
               res = _a.sent();

package/es/core/Designer/AppointmentModal/index.js

@@ -57,7 +57,8 @@ function AppointmentModal(props) {
     onCancel: onClose,
     title: (0, _locale.i18n)('PUBLISH_LATER'),
     visible: visible,
-    width: 500
+    width: 500,
+    wrapClassName: "m-appointment-modal"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     autoComplete: "off",
     form: form,

package/es/core/Designer/AppointmentModal/index.less

@@ -1,10 +1,23 @@
-.footer {
-  display: flex;
-  justify-content: flex-end;
-}
-.tips {
-  font-size: 13px;
-  line-height: 18px;
-  color: #A3AEC3;
-  margin-bottom:40px;
+[magic_design] .m-appointment-modal {
+
+  .footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .tips {
+    font-size: 13px;
+    line-height: 18px;
+    color: #A3AEC3;
+    margin-bottom: 40px;
+  }
+
+  .ant-modal-body {
+    overflow: unset;
+  }
+
+  .ant-picker-ok button {
+    color: #fff;
+  }
+
 }

package/es/meta-comp/components/Text/index.js

@@ -343,6 +343,15 @@ function (_super) {
           var node = document.createElement('span');
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
           node.innerText = (_a = data.text).slice.apply(_a, c.range);
+
+          node.onclick = function (e) {
+            if (c.content.clickUrl) {
+              e.stopPropagation();
+            }
+
+            (0, _coreUtil.clickUrl)(c.content.clickUrl);
+          };
+
           _this.selectionRefMap[JSON.stringify(c.range)] = node;
 
           _this.textRef.current.appendChild(node);
@@ -460,6 +469,9 @@ function (_super) {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
       contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
+      onClick: function onClick() {
+        (0, _coreUtil.clickUrl)(data.content.clickUrl);
+      },
       onInput: function onInput(e) {
         var text = e.target.textContent;
         data.text = text;

package/es/meta-comp/config-panels/TextConfig/index.js

@@ -274,7 +274,7 @@ function (_super) {
 
             _this.selfRender();
           },
-          value: data.content.clickUrl
+          value: textData.clickUrl
         })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
           title: (0, _locale.i18n)('CONTENT_WIDTH')
         }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {

package/lib/common/LinkModal/FilteredProductModal/index.js

@@ -453,6 +453,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
                   return v.key;
                 }).join(','),
                 labelIds: labelId.key,
+                // q: productName,
                 productName: productName,
                 storeId: storeId,
                 minPrice: minimum * precision || '',

package/lib/composite-comp/bol/components/Carousel/mobile/index.js

@@ -166,6 +166,12 @@ function (_super) {
 
     this.destroy = (0, _mobx.autorun)(function () {
       _this.sliderGoTo(_this.props.data.groupSource);
+      /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+
+      if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+        _this.sliderRef.slickPause();
+      }
     });
     this.listenWidth();
     window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));

package/lib/composite-comp/bol/components/Carousel/pc/index.js

@@ -159,6 +159,12 @@ function (_super) {
 
     this.destroy = (0, _mobx.autorun)(function () {
       _this.sliderGoTo(_this.props.data.groupSource);
+      /** 设计器模式下 如果选中特定group 自动播放关闭 */
+
+
+      if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+        _this.sliderRef.slickPause();
+      }
     });
     this.listenWidth();
     window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));

package/lib/composite-comp/dito/components/FlashDeal/mobile/index.js

@@ -9,11 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
-var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
-
-var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
-
-var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
+var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
@@ -222,30 +218,34 @@ var defaultData = [{
   imgUrlContent: {
     url: _defImg["default"]
   },
-  offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 1100,
-  marketPrice: 100,
-  discountPercent: 51,
-  salePercent: 5000
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg2["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level Up 99 x 365 days',
-  salesPrice: 594,
-  marketPrice: 1188,
-  discountPercent: 50,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg3["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }];
 
@@ -266,7 +266,7 @@ function (_super) {
       effDate: '',
       expDate: '',
       now: '',
-      isWill: true
+      isWill: false
     };
 
     _this.getFlashData = function (pageSize, campaign) {

package/lib/composite-comp/dito/components/FlashDeal/pc/index.js

@@ -11,9 +11,7 @@ require("./index.less");
 
 var _lodash = _interopRequireDefault(require("lodash.throttle"));
 
-var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
-
-var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
+var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
@@ -224,21 +222,67 @@ var defaultData = [{
   imgUrlContent: {
     url: _defImg["default"]
   },
-  offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 49,
-  marketPrice: 100,
-  discountPercent: 51,
-  salePercent: 5000,
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg2["default"]
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
+  },
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
+  sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level Up 99 x 365 days',
-  salesPrice: 594,
-  marketPrice: 1188,
-  discountPercent: 50,
-  salePercent: 5000,
+  offerName: 'Product Name Long text',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }];
 

package/lib/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -304,7 +304,9 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {}, 'GET')];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/h5/pages/buyer/displaycatgs", {
+                terminalType: 'PC'
+              }, 'GET')];
 
             case 1:
               res = _a.sent();

package/lib/core/Designer/AppointmentModal/index.js

@@ -57,7 +57,8 @@ function AppointmentModal(props) {
     onCancel: onClose,
     title: (0, _locale.i18n)('PUBLISH_LATER'),
     visible: visible,
-    width: 500
+    width: 500,
+    wrapClassName: "m-appointment-modal"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     autoComplete: "off",
     form: form,

package/lib/core/Designer/AppointmentModal/index.less

@@ -1,10 +1,23 @@
-.footer {
-  display: flex;
-  justify-content: flex-end;
-}
-.tips {
-  font-size: 13px;
-  line-height: 18px;
-  color: #A3AEC3;
-  margin-bottom:40px;
+[magic_design] .m-appointment-modal {
+
+  .footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .tips {
+    font-size: 13px;
+    line-height: 18px;
+    color: #A3AEC3;
+    margin-bottom: 40px;
+  }
+
+  .ant-modal-body {
+    overflow: unset;
+  }
+
+  .ant-picker-ok button {
+    color: #fff;
+  }
+
 }

package/lib/meta-comp/components/Text/index.js

@@ -343,6 +343,15 @@ function (_super) {
           var node = document.createElement('span');
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
           node.innerText = (_a = data.text).slice.apply(_a, c.range);
+
+          node.onclick = function (e) {
+            if (c.content.clickUrl) {
+              e.stopPropagation();
+            }
+
+            (0, _coreUtil.clickUrl)(c.content.clickUrl);
+          };
+
           _this.selectionRefMap[JSON.stringify(c.range)] = node;
 
           _this.textRef.current.appendChild(node);
@@ -460,6 +469,9 @@ function (_super) {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
       contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
+      onClick: function onClick() {
+        (0, _coreUtil.clickUrl)(data.content.clickUrl);
+      },
       onInput: function onInput(e) {
         var text = e.target.textContent;
         data.text = text;

package/lib/meta-comp/config-panels/TextConfig/index.js

@@ -274,7 +274,7 @@ function (_super) {
 
             _this.selfRender();
           },
-          value: data.content.clickUrl
+          value: textData.clickUrl
         })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
           title: (0, _locale.i18n)('CONTENT_WIDTH')
         }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.90",
+  "version": "0.0.92",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",