@fonixtree/magic-design 0.0.169 → 0.0.171

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

@@ -418,11 +418,10 @@ function (_super) {
         key: item.id,
         data: __assign(__assign({}, item), {
           salePercent: isWill ? 0 : item.salePercent
-        }),
+        }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          var _a;
-
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || '') + "}");
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

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

@@ -536,11 +536,10 @@ function (_super) {
         }),
         fixHeight: true,
         imgHeight: imgHeight,
-        imgWidth: imgWidth,
+        imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          var _a;
-
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || '') + "}");
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

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

@@ -229,22 +229,25 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
 
   switch (objType) {
     case 'Category':
-      jumpUrl = "/product/list/" + objValue.objId;
+      // jumpUrl = `/product/list/${objValue.objId}`;
+      jumpUrl = "catg-" + objValue.objId;
       break;
 
     case 'ProductDetail':
       {
         var offerId = objValue.objId && objValue.objId.split(',')[0];
-        var productId = objValue.objId && objValue.objId.split(',')[1];
-        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
+        var productId = objValue.objId && objValue.objId.split(',')[1]; // jumpUrl = `/product/detail/${offerId}?productId=${productId}`;
+
+        jumpUrl = "proDetail-" + offerId + "-" + productId;
         break;
       }
 
     case 'FilteredProducts':
       {
         var params = JsonToUrl(objValue.filteredProductsRela);
-        params = params.replace('productName', 'q');
-        jumpUrl = "/product/list/null?" + params;
+        params = params.replace('productName', 'q'); // jumpUrl = `/product/list/null?${params}`;
+
+        jumpUrl = "filter-" + params;
         break;
       }
 
@@ -256,8 +259,8 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
       }
 
     case 'CustomizedPage':
-      jumpUrl = "/poster/" + objValue.objId;
-      (0, _commonUtil.navigateTo)(jumpUrl);
+      // jumpUrl = `/poster/${objValue.objId}`;
+      jumpUrl = "customized-" + objValue.objId;
       break;
 
     case 'URL':
@@ -271,7 +274,7 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
         }
 
         window.location.href = lastUrl;
-        break;
+        return;
       }
 
     default:

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

@@ -486,23 +486,17 @@ function (_super) {
     return _this;
   }
 
-  RecommendMobile.prototype.componentDidMount = function () {
-    var _this = this;
-
-    var panelProps = this.props.panelProps;
-    var source = [];
-    panelProps.groupSource.map(function (m) {
-      var show = m.image.open || m.groupName.open;
-      if (show) source.push(m);
-    });
-    this.setState({
-      groupSource: source
-    }, function () {
-      _this.initTab(0);
-
-      _this.getProductList(0);
-    });
-    this.listenWidth();
+  RecommendMobile.prototype.componentDidMount = function () {// const { panelProps } = this.props;
+    // const source = [];
+    // panelProps.groupSource.map(m => {
+    //   const show = m.image.open || m.groupName.open;
+    //   if (show) source.push(m);
+    // });
+    // this.setState({ groupSource: source }, () => {
+    //   this.initTab(0);
+    //   this.getProductList(0);
+    // });
+    // this.listenWidth();
   };
 
   RecommendMobile.prototype.componentWillReceiveProps = function (nextProps) {
@@ -637,9 +631,10 @@ function (_super) {
         fixHeight: layout === 'layout3',
         imgHeight: imgHeight,
         imgWidth: imgWidth,
-        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
+        layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -662,9 +657,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgHeight,
-        imgWidth: imgWidth,
+        imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || '') + "}");
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -699,9 +699,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: "100%",
+        imgWidth: "100%" // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -727,9 +728,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: imgSize,
+        imgWidth: imgSize // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -319,7 +319,8 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data, mode) {
+    _this.renderText = function (data) {
+      var mode = window.magicDesign.mode;
       var outputType = _this.props.outputType || window.magicDesign.outputType;
       if (!_this.textRef.current) return;
 
@@ -437,14 +438,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data, this.props.mode);
+    this.renderText(this.props.data);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data, _this.props.mode);
+        _this.renderText(_this.props.data);
       }
     });
   };
@@ -456,7 +457,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data, this.props.mode);
+      this.renderText(nextProps.data);
     }
 
     return result;
@@ -473,8 +474,8 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput,
-        mode = _a.mode;
+        onTextInput = _a.onTextInput;
+    var mode = window.magicDesign.mode;
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -498,8 +499,6 @@ function (_super) {
     //   textDecorationColor: data?.underline.textDecorationColor,
     //   textDecorationStyle: data?.underline.textDecorationStyle,
     // };
-    // mode == 'designer' && !readonly
-    // console.log('!readonly: ', mode, readonly);
 
 
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -534,7 +533,6 @@ function (_super) {
 
   Text.defaultProps = {
     readonly: false,
-    mode: 'designer',
     onTextInput: function onTextInput() {}
   };
   Text = __decorate([_decorator.metaDecorator], Text);

package/es/utils/businessUtil.js

@@ -128,7 +128,8 @@ var parseUrl = function parseUrl(url) {
         '/main/social-commerce': 'SOCIAL_COMMERCE',
         '/social-commerce/my-cashback': 'CASHBACK',
         '/account/wallet': 'WALLET',
-        '/product/GroupBuy': 'GROUP'
+        '/product/GroupBuy': 'GROUP',
+        '/search-page': 'SEARCH_PAGE'
       };
       link = url;
       params = {

package/es/utils/commonUtil.js

@@ -284,7 +284,7 @@ var navigateTo = function navigateTo(url) {
   if (url.startsWith('/')) {
     window.magicDesign.history.push(url);
   } else {
-    window.location.href = link;
+    window.location.href = url;
   }
 };
 

package/es/utils/coreUtil.js

@@ -289,16 +289,15 @@ var getCoupon = function getCoupon(couponId) {
 var clickUrl = function clickUrl(url) {
   console.log('clickUrl...', url);
 
+  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+    return;
+  }
+
   var _a = (0, _businessUtil.parseUrl)(url),
       link = _a.link,
       data = _a.data;
 
-  var params = data.params;
-
-  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
-    return;
-  } // 如果是video 放开return
-
+  var params = data.params; // 如果是video 放开return
 
   if (params.type !== 'VIDEO' && window.magicDesign.readOnly) {
     return;

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

@@ -418,11 +418,10 @@ function (_super) {
         key: item.id,
         data: __assign(__assign({}, item), {
           salePercent: isWill ? 0 : item.salePercent
-        }),
+        }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          var _a;
-
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || '') + "}");
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

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

@@ -536,11 +536,10 @@ function (_super) {
         }),
         fixHeight: true,
         imgHeight: imgHeight,
-        imgWidth: imgWidth,
+        imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          var _a;
-
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || '') + "}");
         },
         panelProps: panelProps.content,
         unknownPrice: isWill

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

@@ -229,22 +229,25 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
 
   switch (objType) {
     case 'Category':
-      jumpUrl = "/product/list/" + objValue.objId;
+      // jumpUrl = `/product/list/${objValue.objId}`;
+      jumpUrl = "catg-" + objValue.objId;
       break;
 
     case 'ProductDetail':
       {
         var offerId = objValue.objId && objValue.objId.split(',')[0];
-        var productId = objValue.objId && objValue.objId.split(',')[1];
-        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
+        var productId = objValue.objId && objValue.objId.split(',')[1]; // jumpUrl = `/product/detail/${offerId}?productId=${productId}`;
+
+        jumpUrl = "proDetail-" + offerId + "-" + productId;
         break;
       }
 
     case 'FilteredProducts':
       {
         var params = JsonToUrl(objValue.filteredProductsRela);
-        params = params.replace('productName', 'q');
-        jumpUrl = "/product/list/null?" + params;
+        params = params.replace('productName', 'q'); // jumpUrl = `/product/list/null?${params}`;
+
+        jumpUrl = "filter-" + params;
         break;
       }
 
@@ -256,8 +259,8 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
       }
 
     case 'CustomizedPage':
-      jumpUrl = "/poster/" + objValue.objId;
-      (0, _commonUtil.navigateTo)(jumpUrl);
+      // jumpUrl = `/poster/${objValue.objId}`;
+      jumpUrl = "customized-" + objValue.objId;
       break;
 
     case 'URL':
@@ -271,7 +274,7 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
         }
 
         window.location.href = lastUrl;
-        break;
+        return;
       }
 
     default:

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

@@ -486,23 +486,17 @@ function (_super) {
     return _this;
   }
 
-  RecommendMobile.prototype.componentDidMount = function () {
-    var _this = this;
-
-    var panelProps = this.props.panelProps;
-    var source = [];
-    panelProps.groupSource.map(function (m) {
-      var show = m.image.open || m.groupName.open;
-      if (show) source.push(m);
-    });
-    this.setState({
-      groupSource: source
-    }, function () {
-      _this.initTab(0);
-
-      _this.getProductList(0);
-    });
-    this.listenWidth();
+  RecommendMobile.prototype.componentDidMount = function () {// const { panelProps } = this.props;
+    // const source = [];
+    // panelProps.groupSource.map(m => {
+    //   const show = m.image.open || m.groupName.open;
+    //   if (show) source.push(m);
+    // });
+    // this.setState({ groupSource: source }, () => {
+    //   this.initTab(0);
+    //   this.getProductList(0);
+    // });
+    // this.listenWidth();
   };
 
   RecommendMobile.prototype.componentWillReceiveProps = function (nextProps) {
@@ -637,9 +631,10 @@ function (_super) {
         fixHeight: layout === 'layout3',
         imgHeight: imgHeight,
         imgWidth: imgWidth,
-        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
+        layout: layout === 'layout2' ? 'horizontal' : 'vertical' // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -662,9 +657,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgHeight,
-        imgWidth: imgWidth,
+        imgWidth: imgWidth // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId || item.productId || ''}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || '') + "}");
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -699,9 +699,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: "100%",
+        imgWidth: "100%" // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -727,9 +728,10 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: imgSize,
+        imgWidth: imgSize // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
+        ,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId);
+          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -319,7 +319,8 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data, mode) {
+    _this.renderText = function (data) {
+      var mode = window.magicDesign.mode;
       var outputType = _this.props.outputType || window.magicDesign.outputType;
       if (!_this.textRef.current) return;
 
@@ -437,14 +438,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data, this.props.mode);
+    this.renderText(this.props.data);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data, _this.props.mode);
+        _this.renderText(_this.props.data);
       }
     });
   };
@@ -456,7 +457,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data, this.props.mode);
+      this.renderText(nextProps.data);
     }
 
     return result;
@@ -473,8 +474,8 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput,
-        mode = _a.mode;
+        onTextInput = _a.onTextInput;
+    var mode = window.magicDesign.mode;
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -498,8 +499,6 @@ function (_super) {
     //   textDecorationColor: data?.underline.textDecorationColor,
     //   textDecorationStyle: data?.underline.textDecorationStyle,
     // };
-    // mode == 'designer' && !readonly
-    // console.log('!readonly: ', mode, readonly);
 
 
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -534,7 +533,6 @@ function (_super) {
 
   Text.defaultProps = {
     readonly: false,
-    mode: 'designer',
     onTextInput: function onTextInput() {}
   };
   Text = __decorate([_decorator.metaDecorator], Text);

package/lib/utils/businessUtil.js

@@ -128,7 +128,8 @@ var parseUrl = function parseUrl(url) {
         '/main/social-commerce': 'SOCIAL_COMMERCE',
         '/social-commerce/my-cashback': 'CASHBACK',
         '/account/wallet': 'WALLET',
-        '/product/GroupBuy': 'GROUP'
+        '/product/GroupBuy': 'GROUP',
+        '/search-page': 'SEARCH_PAGE'
       };
       link = url;
       params = {

package/lib/utils/commonUtil.js

@@ -284,7 +284,7 @@ var navigateTo = function navigateTo(url) {
   if (url.startsWith('/')) {
     window.magicDesign.history.push(url);
   } else {
-    window.location.href = link;
+    window.location.href = url;
   }
 };
 

package/lib/utils/coreUtil.js

@@ -289,16 +289,15 @@ var getCoupon = function getCoupon(couponId) {
 var clickUrl = function clickUrl(url) {
   console.log('clickUrl...', url);
 
+  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+    return;
+  }
+
   var _a = (0, _businessUtil.parseUrl)(url),
       link = _a.link,
       data = _a.data;
 
-  var params = data.params;
-
-  if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
-    return;
-  } // 如果是video 放开return
-
+  var params = data.params; // 如果是video 放开return
 
   if (params.type !== 'VIDEO' && window.magicDesign.readOnly) {
     return;

package/package.json

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