@fonixtree/magic-design 2.0.30 → 2.0.32

package/lib/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/lib/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/lib/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/lib/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/lib/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,

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

@@ -13,8 +13,6 @@ var _antd = require("antd");
 
 var _common = require("../../../../../common");
 
-var _storeLogo = _interopRequireDefault(require("../imgs/storeLogo.png"));
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _star = _interopRequireDefault(require("../imgs/star.svg"));
@@ -23,6 +21,8 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _locale = require("../../../../../locale");
 
+var _components = require("../../../../../meta-comp/components");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -210,10 +210,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -221,17 +220,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2
@@ -320,8 +317,8 @@ function (_super) {
         action: 'operation',
         params: {
           type: 'CHAT',
-          storeId: storeInfo.storeId,
-          sysAccount: storeInfo.sysAccount
+          storeId: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeId,
+          sysAccount: storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount
         }
       };
       window.magicDesign.handleAction(params);
@@ -335,14 +332,16 @@ function (_super) {
   };
 
   SignBoardMobile.prototype.render = function () {
-    var _this = this; // const { data } = this.props;
-    // console.log('--SignBoard', data);
+    var _this = this;
+
+    var _a, _b;
 
+    var data = this.props.data; // console.log('--SignBoard', data);
 
-    var _a = this.state,
-        storeInfo = _a.storeInfo,
-        isFollow = _a.isFollow,
-        inputVal = _a.inputVal;
+    var _c = this.state,
+        storeInfo = _c.storeInfo,
+        isFollow = _c.isFollow,
+        inputVal = _c.inputVal;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-sign-board-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -367,12 +366,18 @@ function (_super) {
       type: "icon-search2"
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-info-wrap"
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      className: "store-logo",
-      src: (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeLogoUrl) || _storeLogo["default"]
+    }, data.content && ((_a = data.content.logo) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "logo"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.content.logo,
+      style: {
+        height: 44,
+        width: 44
+      }
+    })), data.content && ((_b = data.content.title) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "card-text",
+      data: data.content.title
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "store-name"
-    }, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeName) || 'Compraqui'), /*#__PURE__*/_react["default"].createElement("div", {
       onClick: this.clickCollect
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: isFollow ? '#F1600F' : '#333333',
@@ -387,7 +392,7 @@ function (_super) {
       src: _star["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "number"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+', "  "), " ", (0, _locale.i18n)('FOLLOWERS')), (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.hasCustomerService) === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || 0, "  "), " ", (0, _locale.i18n)('FOLLOWERS')), (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.hasCustomerService) === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "chat-btn",
       onClick: this.toChat
     }, (0, _locale.i18n)('CHAT'))));

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

@@ -62,17 +62,3 @@
   text-transform: uppercase;
   color: #333333;
 }
-.m-sign-board-bar .store-info-wrap .store-logo {
-  width: 0.88rem;
-  height: 0.88rem;
-  border-radius: 50%;
-}
-.m-sign-board-bar .store-info-wrap .store-name {
-  flex: 1;
-  margin-left: 0.24rem;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  color: #070707;
-  font-family: 'Montserrat';
-}

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

@@ -212,10 +212,9 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, _a, res, isFollow;
-
-        return __generator(this, function (_b) {
-          switch (_b.label) {
+        var storeId, storeDetailInfo;
+        return __generator(this, function (_a) {
+          switch (_a.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
@@ -223,17 +222,15 @@ function (_super) {
               , 2];
               return [4
               /*yield*/
-              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
-                storeId: storeId
-              })])];
+              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
 
             case 1:
-              _a = _b.sent(), res = _a[0], isFollow = _a[1];
+              storeDetailInfo = _a.sent();
               this.setState({
-                storeInfo: res,
-                isFollow: isFollow == 'Y'
+                storeInfo: storeDetailInfo,
+                isFollow: storeDetailInfo.userHasFollowed == 'Y'
               });
-              _b.label = 2;
+              _a.label = 2;
 
             case 2:
               return [2

package/lib/composite-comp/dito/config-panels/SignBoardConfig/SignBoardConfigContent/index.js

@@ -15,6 +15,8 @@ var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/conf
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _TextConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/TextConfig"));
+
 var _locale = require("../../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -67,11 +69,9 @@ function (_super) {
   }
 
   SignBoardConfigContent.prototype.render = function () {
-    var _this = this;
-
     var panelProps = this.props.panelProps;
     var source = [{
-      key: 'search1',
+      key: 'logo',
       name: (0, _locale.i18n)('LOGO'),
       value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
         data: panelProps.logo
@@ -79,50 +79,12 @@ function (_super) {
       metaOption: panelProps.logo,
       toggleType: 'switch'
     }, {
-      key: 'search2',
-      name: (0, _locale.i18n)('SEARCH_BOX'),
-      value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        style: {
-          marginTop: 20
-        },
-        title: (0, _locale.i18n)('COLOR')
-      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
-        colorType: "rgba",
-        onChange: function onChange(v) {
-          if ((0, _coreUtil.isPc)()) {
-            panelProps.box.color.pc = v;
-          } else {
-            panelProps.box.color.mobile = v;
-          }
-
-          _this.selfRender();
-        },
-        value: (0, _coreUtil.isPc)() ? panelProps.box.color.pc : panelProps.box.color.mobile
-      })),
-      metaOption: panelProps.box,
-      toggleType: 'switch'
-    }, {
-      key: 'search3',
-      name: (0, _locale.i18n)('ICON'),
-      value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        style: {
-          marginTop: 20
-        },
-        title: (0, _locale.i18n)('COLOR')
-      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
-        colorType: "rgba",
-        onChange: function onChange(v) {
-          if ((0, _coreUtil.isPc)()) {
-            panelProps.icon.color.pc = v;
-          } else {
-            panelProps.icon.color.mobile = v;
-          }
-
-          _this.selfRender();
-        },
-        value: (0, _coreUtil.isPc)() ? panelProps.icon.color.pc : panelProps.icon.color.mobile
-      })),
-      metaOption: panelProps.icon,
+      key: 'title',
+      name: (0, _locale.i18n)('TITLE'),
+      value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+        data: panelProps.title
+      }),
+      metaOption: panelProps.title,
       toggleType: 'switch'
     }];
     return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {

package/lib/composite-comp/dito/config-panels/SignBoardConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _SignBoardConfigContent = _interopRequireDefault(require("./SignBoardConfigContent"));
+
 var _locale = require("../../../../locale");
 
 var _common = require("../../../../common");
@@ -57,8 +59,13 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "large",
-      source: [// { key: 'signBoard1', name: i18n('CONTENT'), value: <SignBoardConfigContent panelProps={data.content} /> },
-      {
+      source: [{
+        key: 'signBoard1',
+        name: (0, _locale.i18n)('CONTENT'),
+        value: /*#__PURE__*/_react["default"].createElement(_SignBoardConfigContent["default"], {
+          panelProps: data.content
+        })
+      }, {
         key: 'signBoard4',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js

@@ -228,8 +228,8 @@ function (_super) {
           this.setState({
             intelligentType: type,
             intelligentValue: []
-          });
-          this.getTypeData(type);
+          }); // this.getTypeData(type);
+
           this.props.onChange({
             intelligentType: type,
             intelligentValue: []
@@ -255,7 +255,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offercatgs/list")];
+              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list")];
 
             case 1:
               res = _a.sent();

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js

@@ -81,6 +81,18 @@ function (_super) {
 
     _this.state = {};
 
+    _this.hasSource = function (type) {
+      if (!window.systemParams || !window.systemParams.recommendSource) {
+        return true;
+      }
+
+      if (window.systemParams.recommendSource && window.systemParams.recommendSource.includes(type)) {
+        return true;
+      }
+
+      return false;
+    };
+
     _this.getContentPanel = function () {
       var panelProps = _this.props.panelProps;
 
@@ -95,9 +107,9 @@ function (_super) {
           _this.selfRender();
         },
         value: panelProps.sourceType
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, _this.hasSource('P') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "select"
-      }, (0, _locale.i18n)('SELECT_PRODUCT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, (0, _locale.i18n)('SELECT_PRODUCT')), _this.hasSource('A') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"

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

@@ -146,18 +146,30 @@ function (_super) {
         _this.props.quillRef.format('font', value);
       } else if (type == 'font-weight') {
         _this.props.quillRef.format('font-weight', value);
+      } else if (type == 'font-style') {
+        _this.props.quillRef.format('font-style', 'italic' === quillFormat['font-style'] ? '' : 'italic');
       } else if (type == 'font-family') {
         _this.props.quillRef.format('font-family', value);
       } else if (type == 'text-decoration-style') {
+        _this.props.quillRef.format('underline', true);
+
         _this.props.quillRef.format('text-decoration-style', value);
       } else if (type == 'bullet') {
         _this.props.quillRef.format('list-style-type', value);
 
-        _this.props.quillRef.format('list', 'bullet');
+        if (value === quillFormat['list-style-type']) {
+          _this.props.quillRef.format('list', '');
+        } else {
+          _this.props.quillRef.format('list', 'bullet');
+        }
       } else if (type == 'ordered') {
         _this.props.quillRef.format('list-style-type', value);
 
-        _this.props.quillRef.format('list', 'ordered');
+        if (value === quillFormat['list-style-type']) {
+          _this.props.quillRef.format('list', '');
+        } else {
+          _this.props.quillRef.format('list', 'ordered');
+        }
       } else if (type == 'text-decoration-color') {
         if (value) {
           _this.props.quillRef.format('underline', true);
@@ -269,9 +281,9 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "tool-item"
     }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
-      active: quillFormat['italic'],
+      active: quillFormat['font-style'] === 'italic',
       onChange: function onChange() {
-        _this.onToolBtnClick('italic');
+        _this.onToolBtnClick('font-style');
       },
       type: "italic"
     })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/core/Designer/index.js

@@ -510,6 +510,9 @@ function (_super) {
           break;
 
         case _constants.quickMenuCode.SAVE:
+          /** 如果保存则重置为mobile，同一移动端截图 #10504010 */
+          _this.onSwitchDevice(_constants.deviceTypeMap.PHONE);
+
           onSave(handleParams);
           break;
 

package/lib/decorator/index.js

@@ -9,12 +9,25 @@ Object.defineProperty(exports, "compositeDecorator", {
     return _compositeDecorator["default"];
   }
 });
+Object.defineProperty(exports, "lazy", {
+  enumerable: true,
+  get: function get() {
+    return _lazyLoadDecorator.lazy;
+  }
+});
+Object.defineProperty(exports, "lazyDestroy", {
+  enumerable: true,
+  get: function get() {
+    return _lazyLoadDecorator.lazyDestroy;
+  }
+});
 Object.defineProperty(exports, "metaDecorator", {
   enumerable: true,
   get: function get() {
     return _metaDecorator["default"];
   }
 });
+exports.shouldUpdate = shouldUpdate;
 Object.defineProperty(exports, "updateConfigDecorator", {
   enumerable: true,
   get: function get() {
@@ -28,4 +41,28 @@ var _metaDecorator = _interopRequireDefault(require("./metaDecorator"));
 
 var _updateConfigDecorator = _interopRequireDefault(require("./updateConfigDecorator"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _lazyLoadDecorator = require("./lazyLoadDecorator");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
+/** props 和 state 改变时才会render */
+function shouldUpdate() {
+  return function (target, name, descriptor) {
+    var fn = descriptor.value;
+
+    descriptor.value = function (nextProps, nextState) {
+      var nowPropsJson = JSON.stringify(nextProps);
+      var nowStateJson = JSON.stringify(nextState);
+      var should1 = nowPropsJson != this.preProps;
+      var should2 = nowStateJson != this.preState;
+      this.preProps = nowPropsJson;
+      this.preState = nowStateJson;
+      var result = should1 || should2;
+      return result && fn.apply(this, {
+        nextProps: nextProps
+      });
+    };
+  };
+}