@fonixtree/magic-design 0.0.90 → 0.0.93

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/bol/components/ImageText/defaultJSON.js

@@ -48,8 +48,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 12,
-        color: '#232F46',
-        width: 0
+        color: '#232F46'
       },
       underline: {
         open: false,
@@ -70,8 +69,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
-        color: '#8493AF',
-        width: 0
+        color: '#8493AF'
       },
       underline: {},
       vertical: {}

package/es/composite-comp/bol/components/Newsletter/defaultJSON.js

@@ -30,7 +30,7 @@ var getDefaultMetaTextJson = function getDefaultMetaTextJson() {
   return {
     id: (0, _uuid.v4)(),
     open: true,
-    type: 'Text',
+    type: 'TEXT',
     specialContent: [],
     text: 'Thank you for you subscription',
     content: {

package/es/composite-comp/bol/components/Text/defaultJSON.js

@@ -30,7 +30,7 @@ var getDefaultMetaTextJson = function getDefaultMetaTextJson() {
   return {
     id: (0, _uuid.v4)(),
     open: true,
-    type: 'Text',
+    type: 'TEXT',
     specialContent: [],
     text: 'Flash Deal',
     content: {

package/es/composite-comp/dito/components/FlashDeal/defaultJSON.js

@@ -21,7 +21,7 @@ var getDefaultJSON = function getDefaultJSON() {
       headline: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -135,7 +135,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -159,7 +159,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -183,7 +183,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {

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/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -204,7 +204,7 @@ var getDefaultJSON = function getDefaultJSON() {
       productName: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -227,7 +227,7 @@ var getDefaultJSON = function getDefaultJSON() {
       activityPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -250,7 +250,7 @@ var getDefaultJSON = function getDefaultJSON() {
       salesPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {

package/es/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -63,6 +63,8 @@ var getDefaultJSON = function getDefaultJSON() {
       mobile: {
         paddingTop: 8,
         paddingBottom: 8,
+        paddingLeft: 15,
+        paddingRight: 15,
         marginBottom: 0
       }
     },

package/es/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -1,6 +1,6 @@
 .m-search-bar {
   height: 48px;
-  padding: 8px 16px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -9,11 +9,13 @@
 
   .right {
     display: flex;
+    flex: 1;
+    margin-left: 15px;
     align-items: center;
     justify-content: space-between;
 
     .search-input-wrap {
-      width: 195px;
+      flex: 1;
       background: #fff;
       border-radius: 4px;
       border: 1px solid #D2D9E5;
@@ -24,7 +26,7 @@
 
     .message-wrap {
       position: relative;
-      margin-left: 16px;
+      margin-left: 10px;
 
       .num {
         position: absolute;

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/decorator/metaDecorator.js

@@ -41,6 +41,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -133,7 +149,7 @@ function metaDecorator(WrappedComponent) {
         return false;
       };
 
-      _this.getStyle = function () {
+      _this.getInteractStyle = function () {
         var _a = _this.state,
             hoveredMeta = _a.hoveredMeta,
             clickedMeta = _a.clickedMeta;
@@ -154,6 +170,22 @@ function metaDecorator(WrappedComponent) {
         }
 
         return style;
+      }; // text元组件在选中或悬浮时 需要实时展示其宽度
+
+
+      _this.getStyle = function () {
+        var _a = _this.props,
+            style = _a.style,
+            rest = __rest(_a, ["style"]);
+
+        var newStyle = __assign({}, style);
+
+        if (rest.data.type === 'TEXT') {
+          var width = window.magicDesign.device === 'pc' ? rest.data.content.pcWidth : rest.data.content.width;
+          newStyle.width = (width || 100) + "%";
+        }
+
+        return newStyle;
       };
 
       return _this;
@@ -177,13 +209,13 @@ function metaDecorator(WrappedComponent) {
     Wrapper.prototype.render = function () {
       var _a = this.props,
           className = _a.className,
-          style = _a.style,
-          rest = __rest(_a, ["className", "style"]);
+          rest = __rest(_a, ["className"]);
 
-      var hoverStyle = this.getStyle();
+      var hoverStyle = this.getInteractStyle();
+      console.log(rest);
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: className,
-        style: style
+        style: this.getStyle()
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "meta_wrap",
         onClick: this.onMetaClick,

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

@@ -94,7 +94,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 };
 
 var contentStyle = function contentStyle(content) {
-  var baseWidth = (window.magicDesign.device == 'pc' ? content.pcWidth : content.width) || 100;
   return {
     fontSize: window.magicDesign.device == 'pc' ? content.pcFontSize : content.fontSize,
     fontFamily: content.fontFamily,
@@ -103,8 +102,7 @@ var contentStyle = function contentStyle(content) {
     color: content.color,
     backgroundColor: content.backgroundColor,
     textAlign: content.textAlign,
-    // width: (window.magicDesign.device == 'pc' ? content.pcWidth :  content.width) || 'fit-content',
-    width: Math.min(baseWidth, 100) + "%"
+    width: '100%'
   };
 };
 /** 从父级数组中 分离出 片段数组 */
@@ -343,6 +341,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 +467,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/components/Text/index.less

@@ -1,6 +1,5 @@
 .m-meta-text {
   display: block;
-  margin: 0 auto;
 
   .select-container {
     position: relative;

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/bol/components/ImageText/defaultJSON.js

@@ -48,8 +48,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 12,
-        color: '#232F46',
-        width: 0
+        color: '#232F46'
       },
       underline: {
         open: false,
@@ -70,8 +69,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
-        color: '#8493AF',
-        width: 0
+        color: '#8493AF'
       },
       underline: {},
       vertical: {}

package/lib/composite-comp/bol/components/Newsletter/defaultJSON.js

@@ -30,7 +30,7 @@ var getDefaultMetaTextJson = function getDefaultMetaTextJson() {
   return {
     id: (0, _uuid.v4)(),
     open: true,
-    type: 'Text',
+    type: 'TEXT',
     specialContent: [],
     text: 'Thank you for you subscription',
     content: {

package/lib/composite-comp/bol/components/Text/defaultJSON.js

@@ -30,7 +30,7 @@ var getDefaultMetaTextJson = function getDefaultMetaTextJson() {
   return {
     id: (0, _uuid.v4)(),
     open: true,
-    type: 'Text',
+    type: 'TEXT',
     specialContent: [],
     text: 'Flash Deal',
     content: {

package/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js

@@ -21,7 +21,7 @@ var getDefaultJSON = function getDefaultJSON() {
       headline: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -135,7 +135,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -159,7 +159,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -183,7 +183,7 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {

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/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -204,7 +204,7 @@ var getDefaultJSON = function getDefaultJSON() {
       productName: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -227,7 +227,7 @@ var getDefaultJSON = function getDefaultJSON() {
       activityPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
@@ -250,7 +250,7 @@ var getDefaultJSON = function getDefaultJSON() {
       salesPrice: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {

package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -63,6 +63,8 @@ var getDefaultJSON = function getDefaultJSON() {
       mobile: {
         paddingTop: 8,
         paddingBottom: 8,
+        paddingLeft: 15,
+        paddingRight: 15,
         marginBottom: 0
       }
     },

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -1,6 +1,6 @@
 .m-search-bar {
   height: 48px;
-  padding: 8px 16px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -9,11 +9,13 @@
 
   .right {
     display: flex;
+    flex: 1;
+    margin-left: 15px;
     align-items: center;
     justify-content: space-between;
 
     .search-input-wrap {
-      width: 195px;
+      flex: 1;
       background: #fff;
       border-radius: 4px;
       border: 1px solid #D2D9E5;
@@ -24,7 +26,7 @@
 
     .message-wrap {
       position: relative;
-      margin-left: 16px;
+      margin-left: 10px;
 
       .num {
         position: absolute;

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/decorator/metaDecorator.js

@@ -41,6 +41,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -133,7 +149,7 @@ function metaDecorator(WrappedComponent) {
         return false;
       };
 
-      _this.getStyle = function () {
+      _this.getInteractStyle = function () {
         var _a = _this.state,
             hoveredMeta = _a.hoveredMeta,
             clickedMeta = _a.clickedMeta;
@@ -154,6 +170,22 @@ function metaDecorator(WrappedComponent) {
         }
 
         return style;
+      }; // text元组件在选中或悬浮时 需要实时展示其宽度
+
+
+      _this.getStyle = function () {
+        var _a = _this.props,
+            style = _a.style,
+            rest = __rest(_a, ["style"]);
+
+        var newStyle = __assign({}, style);
+
+        if (rest.data.type === 'TEXT') {
+          var width = window.magicDesign.device === 'pc' ? rest.data.content.pcWidth : rest.data.content.width;
+          newStyle.width = (width || 100) + "%";
+        }
+
+        return newStyle;
       };
 
       return _this;
@@ -177,13 +209,13 @@ function metaDecorator(WrappedComponent) {
     Wrapper.prototype.render = function () {
       var _a = this.props,
           className = _a.className,
-          style = _a.style,
-          rest = __rest(_a, ["className", "style"]);
+          rest = __rest(_a, ["className"]);
 
-      var hoverStyle = this.getStyle();
+      var hoverStyle = this.getInteractStyle();
+      console.log(rest);
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: className,
-        style: style
+        style: this.getStyle()
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "meta_wrap",
         onClick: this.onMetaClick,

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

@@ -94,7 +94,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 };
 
 var contentStyle = function contentStyle(content) {
-  var baseWidth = (window.magicDesign.device == 'pc' ? content.pcWidth : content.width) || 100;
   return {
     fontSize: window.magicDesign.device == 'pc' ? content.pcFontSize : content.fontSize,
     fontFamily: content.fontFamily,
@@ -103,8 +102,7 @@ var contentStyle = function contentStyle(content) {
     color: content.color,
     backgroundColor: content.backgroundColor,
     textAlign: content.textAlign,
-    // width: (window.magicDesign.device == 'pc' ? content.pcWidth :  content.width) || 'fit-content',
-    width: Math.min(baseWidth, 100) + "%"
+    width: '100%'
   };
 };
 /** 从父级数组中 分离出 片段数组 */
@@ -343,6 +341,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 +467,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/components/Text/index.less

@@ -1,6 +1,5 @@
 .m-meta-text {
   display: block;
-  margin: 0 auto;
 
   .select-container {
     position: relative;

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.93",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",