@fonixtree/magic-design 2.0.30 → 2.0.32

package/es/assets/less/modal.less

@@ -18,7 +18,7 @@
       .cylon-modal-body {
         padding: 16px 16px 12px 16px !important;
         max-height: 800px !important;
-        overflow: scroll;
+        // overflow: scroll;
       }
     }
   }

package/es/common/ImageLazy/index.js

@@ -100,9 +100,11 @@ function (_super) {
 
     this.intersectionObserver = new IntersectionObserver(function (entries) {
       if (entries[0].isIntersecting) {
-        _this.setState({
-          show: true
-        });
+        if (!_this.state.show) {
+          _this.setState({
+            show: true
+          });
+        }
       }
     }, {
       root: (_a = this.props) === null || _a === void 0 ? void 0 : _a.rootContainer(),
@@ -120,14 +122,13 @@ function (_super) {
     var _this = this;
 
     var _a = this.props,
-        root = _a.root,
         _b = _a.lazy,
         lazy = _b === void 0 ? true : _b,
         src = _a.src,
         onLoadFunc = _a.onLoadFunc,
         style = _a.style,
         className = _a.className,
-        rest = __rest(_a, ["root", "lazy", "src", "onLoadFunc", "style", "className"]);
+        rest = __rest(_a, ["lazy", "src", "onLoadFunc", "style", "className"]);
 
     var show = this.state.show;
     var isShow = lazy ? show : true;

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

@@ -447,7 +447,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           switch (_a.label) {
             case 0:
               precision = Math.pow(10, (0, _commonUtil.ensure)(function () {
-                return window.ecommerce.precision;
+                return window.systemParams.precision;
               }, '0'));
               params = {
                 catgIds: tValue.join(','),
@@ -532,12 +532,14 @@ var FilteredProductModal = function FilteredProductModal(props) {
     layout: "vertical"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
     label: "Category"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
-    allowClear: true,
+  }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect // allowClear
+  , {
     dropdownStyle: {
       maxHeight: 400,
       overflow: 'auto'
     },
+    maxTagCount: 2,
+    maxTagTextLength: 5,
     multiple: true,
     onChange: onChange,
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -549,6 +551,8 @@ var FilteredProductModal = function FilteredProductModal(props) {
     label: "Brand"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
     defaultValue: [],
+    maxTagCount: 2,
+    maxTagTextLength: 5,
     mode: "multiple",
     onChange: handleBrandChange,
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),

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

@@ -84,7 +84,7 @@
       }
 
       .leftCot {
-        width: 230px;
+        width: 280px;
         // height: 400px;
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;

package/es/common/LinkModal/index.js

@@ -285,7 +285,7 @@ var LinkModal = function LinkModal(props) {
     ,
     title: (0, _locale.i18n)('URL_SETUP'),
     visible: visible,
-    width: "900px",
+    width: "1000px",
     wrapClassName: "magicLinkModal"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
     activeKey: selected,

package/es/common/ProductModal/index.js

@@ -204,8 +204,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   return r;
 };
 
-var precision = (0, _currencyUtil.getPrecision)();
-
 var formatData = function formatData(list) {
   list.map(function (item) {
     item.preSalesPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.salesPrice);
@@ -377,21 +375,18 @@ var ProductModal = function ProductModal(props) {
 
   var queryOfferCatgs = function queryOfferCatgs() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var res, arr;
+      var res, tree;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers/catgs', {}, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
-            arr = [];
-            res.forEach(function (f) {
-              if (f.children) arr.push.apply(arr, f.children);
-            });
-            setCatgsList(arr);
+            tree = (0, _businessUtil.listToTree)(res);
+            setCatgsList(tree);
             return [2
             /*return*/
             ];
@@ -409,7 +404,7 @@ var ProductModal = function ProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offerdiscatgs/brands", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -565,35 +560,33 @@ var ProductModal = function ProductModal(props) {
     layout: "vertical"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
     label: "Category"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-    mode: "multiple",
-    onChange: function onChange(value, option) {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
+    dropdownStyle: {
+      maxHeight: 400,
+      overflow: 'auto'
+    },
+    maxTagCount: 2,
+    maxTagTextLength: 5,
+    multiple: true,
+    onChange: function onChange(value) {
       setSelCatgsList(value);
     },
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
     size: "small",
+    treeData: catgsList,
+    treeDefaultExpandAll: true,
     value: selCatgsList
-  }, catgsList.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(OptGroup, {
-      key: item.model.catgId,
-      label: item.model.catgName
-    }, (item.children || []).map(function (i) {
-      return /*#__PURE__*/_react["default"].createElement(Option, {
-        key: i.model.catgId,
-        value: i.model.catgId
-      }, i.model.catgName);
-    }));
-  }))), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+  })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
     label: "Brand"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
     mode: "multiple",
-    onChange: function onChange(value, option) {
+    onChange: function onChange(value) {
       setSelBrandsList(value);
     },
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
     size: "small",
     value: selBrandsList
-  }, brandsList.map(function (item, index) {
+  }, brandsList.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: item.catgId,
       value: item.brandId
@@ -706,8 +699,8 @@ var ProductModal = function ProductModal(props) {
         productCode: productCode,
         storeId: storeId,
         cmpTypeId: promotions || '',
-        minPrice: minPrice === '' ? '' : minPrice * Math.pow(10, precision),
-        maxPrice: maxPrice === '' ? '' : maxPrice * Math.pow(10, precision),
+        minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
+        maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
         catgIds: selCatgsList.join(','),
         brandIds: selBrandsList.join(','),
         labelIds: selLabelData.value || '',
@@ -736,8 +729,8 @@ var ProductModal = function ProductModal(props) {
           productName: productName,
           productCode: productCode,
           cmpTypeId: promotions || '',
-          minPrice: minPrice === '' ? '' : minPrice * Math.pow(10, precision),
-          maxPrice: maxPrice === '' ? '' : maxPrice * Math.pow(10, precision),
+          minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
+          maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
           catgIds: selCatgsList.join(','),
           brandIds: selBrandsList.join(','),
           labelIds: selLabelData.value || '',

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

@@ -208,6 +208,12 @@ function (_super) {
         style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
+        onClick: function onClick() {
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_promotion');
+          }
+        },
         onMouseEnter: _this.mouseEnterWrap,
         onMouseLeave: _this.mouseLeaveWrap,
         style: _this.getItemStyle(item)

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

@@ -15,6 +15,8 @@ var _defaultJSON = require("./defaultJSON");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+var _decorator = require("../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -68,40 +70,26 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      show: false
+      lazyShow: false
     };
     _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
     _this.intersectionObserver = null;
     return _this;
   }
 
-  Carousel.prototype.componentDidMount = function () {
-    var _this = this;
+  Carousel.prototype.componentDidMount = function () {};
 
-    this.intersectionObserver = new IntersectionObserver(function (entries) {
-      if (entries[0].isIntersecting) {
-        _this.setState({
-          show: true
-        });
-      }
-    }, {
-      root: null,
-      // threshold: 0.8,
-      rootMargin: '0px 0px 100px 0px'
-    });
-    this.intersectionObserver.observe(this.carouselRef.current);
-  };
-
-  Carousel.prototype.componentWillUnmount = function () {
-    this.intersectionObserver.disconnect(this.carouselRef.current);
-  };
+  Carousel.prototype.componentWillUnmount = function () {};
 
   Carousel.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    var show = this.state.show;
+    var lazyShow = this.state.lazyShow;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      ref: this.carouselRef
-    }, show && (window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      ref: this.carouselRef,
+      style: {
+        height: lazyShow ? 'auto' : 300
+      }
+    }, lazyShow && (window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       data: nodeData
@@ -111,6 +99,11 @@ function (_super) {
   Carousel.defaultProps = {};
   Carousel.type = 'CAROUSEL';
   Carousel.getDefaultJSON = _defaultJSON.getDefaultJSON;
+
+  __decorate([(0, _decorator.lazy)('carouselRef')], Carousel.prototype, "componentDidMount", null);
+
+  __decorate([_decorator.lazyDestroy], Carousel.prototype, "componentWillUnmount", null);
+
   Carousel = __decorate([_compositeDecorator["default"]], Carousel);
   return Carousel;
 }(_react.Component);

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

@@ -73,24 +73,13 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
-var MOBILE_IMG_SIZE = {
-  1: {
-    maxH: 282
-  },
-  2: {
-    maxH: 137
-  },
-  3: {
-    maxH: 87
-  },
-  4: {
-    maxH: 66
-  },
-  5: {
-    maxH: 50
-  }
-};
-
+// const MOBILE_IMG_SIZE = {
+//   1: { maxH: 282 },
+//   2: { maxH: 137 },
+//   3: { maxH: 87 },
+//   4: { maxH: 66 },
+//   5: { maxH: 50 },
+// };
 var CarouselMobile =
 /** @class */
 function (_super) {

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

@@ -101,6 +101,18 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        },
+        mobile: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        }
+      },
       text: 'Button Tag'
     },
     secondButtonTag: {
@@ -126,6 +138,18 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
         borderColor: '',
         borderRadius: 4
       },
+      spacing: {
+        pc: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        },
+        mobile: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        }
+      },
       buttonIcon: {
         iconUrl: '',
         layout: 'right'

package/es/composite-comp/bol/second-config-panels/VideoSecondConfig/index.js

@@ -79,7 +79,6 @@ function (_super) {
       var _a;
 
       var obj = null;
-      console.log(customize);
 
       if ((0, _coreUtil.isPc)()) {
         switch ((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) {

package/es/composite-comp/common/components/ProductItem/index.js

@@ -133,7 +133,7 @@ function (_super) {
     }
 
     var pricePrefix = (0, _commonUtil.ensure)(function () {
-      return window.ecommerce.prefix;
+      return window.systemParams.prefix;
     }, 'Rp');
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
@@ -226,7 +226,9 @@ function (_super) {
       style: {
         width: salePercent + "%"
       }
-    })))));
+    }))), !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sold-count"
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")));
   };
 
   ProductItem.defaultProps = {

package/es/composite-comp/common/components/ProductItem/index.less

@@ -5,6 +5,15 @@
   border: 1px solid #D2D9E5;
   width: 142px;
   cursor: pointer;
+  position: relative;
+
+  .sold-count {
+    color: #7b7b7b;
+    font-size: 12px;
+    position: absolute;
+    right: 8px;
+    bottom: 8px;
+  }
 
   .img-wrap {
     position: relative;

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

@@ -98,7 +98,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo,
       },
       hover: null
     },
-    sourceType: 'recommend',
+    sourceType: 'select',
     prodIds: '',
     intelligentType: 'Hot',
     intelligentValue: [],

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

@@ -635,7 +635,14 @@ function (_super) {
         layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA(item, 'select_item', {
+              event_action: 'Select Item'
+            });
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -661,7 +668,12 @@ function (_super) {
         imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
         ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_item', item);
+          }
+
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -11,43 +11,47 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'SIGN_BOARD',
-    // content: {
-    //   logo: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     type: 'IMAGE',
-    //     content: {
-    //       h5Name: 'name2',
-    //       pcName: 'name2',
-    //       h5ImgSrc: '',
-    //       pcImgSrc: '',
-    //       clickUrl: '',
-    //     },
-    //     hover: {
-    //       open: false,
-    //       backgroundType: 'enlarge',
-    //       magnification: 1.5,
-    //       pcImgHoverUrl: '',
-    //       h5ImgHoverUrl: '',
-    //     },
-    //   },
-    //   box: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     color: {
-    //       pc: '#D92929',
-    //       mobile: '#8493AF',
-    //     },
-    //   },
-    //   icon: {
-    //     id: uuidv4(),
-    //     open: true,
-    //     color: {
-    //       pc: '#D92929',
-    //       mobile: '#232F46',
-    //     },
-    //   },
-    // },
+    content: {
+      logo: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      title: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: 'Title',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 600,
+          fontSize: 16,
+          color: '#070707'
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {}
+      }
+    },
     spacing: {
       pc: {
         paddingTop: 20,