@fonixtree/magic-design 0.1.80 → 0.1.82

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

@@ -183,7 +183,11 @@ function (_super) {
       type: "light"
     }, (0, _locale.i18n)('SAVE'))) : /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu_right"
-    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      "data-code": _constants.quickMenuCode.SET_AS_TEMPLATE,
+      onClick: this.onBtnClick,
+      type: "text"
+    }, (0, _locale.i18n)('SET_AS_TEMPLATE')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PREVIEW,
       onClick: this.onBtnClick
     }, (0, _locale.i18n)('PREVIEW')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
@@ -200,7 +204,7 @@ function (_super) {
       onClick: this.onBtnClick,
       tip: "The page is in use. Please copy or create a new page",
       type: "primary"
-    }, (0, _locale.i18n)('PUBLISH_NOW'), /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+    }, (0, _locale.i18n)('PUBLISH_NOW'), window.magicDesign.templateType === 'Page' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
       getPopupContainer: function getPopupContainer() {
         return document.querySelector('.publish_wrap');
       },

package/es/core/Designer/index.js

@@ -467,7 +467,9 @@ function (_super) {
       var _a = _this.props,
           onPublish = _a.onPublish,
           onSave = _a.onSave,
-          onPreviews = _a.onPreviews;
+          onPreviews = _a.onPreviews,
+          onPush = _a.onPush,
+          onSetAsTemp = _a.onSetAsTemp;
       var _b = _this.state,
           device = _b.device,
           MPageData = _b.MPageData;
@@ -502,6 +504,14 @@ function (_super) {
 
           break;
 
+        case _constants.quickMenuCode.PUSH:
+          onPush(handleParams);
+          break;
+
+        case _constants.quickMenuCode.SET_AS_TEMPLATE:
+          onSetAsTemp(handleParams);
+          break;
+
         case _constants.quickMenuCode.PUBLISH:
           onPublish(handleParams);
           break;

package/es/decorator/metaDecorator.js

@@ -95,7 +95,7 @@ function metaDecorator(WrappedComponent) {
               GAData = _c.GAData;
           (0, _commonUtil.pushGA)(__assign(__assign({}, GAData), {
             elementId: data.id,
-            elementName: data.text || GAData.groupName
+            elementName: data.text || (GAData === null || GAData === void 0 ? void 0 : GAData.groupName)
           }));
           return;
         } // 组织冒泡

package/es/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "ANCHOR": "Anchor",
+  "PUSH": "Push",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -95,7 +98,8 @@
   "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
-  "PRODUCT_CODE": "Product Code",
+  "SKU_CODE": "SKU Code",
+  "SPU_CODE": "SPU Code",
   "SKU": "SKU",
   "PRICE": "Price",
   "BRAND": "Brand",

package/es/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "ANCHOR": "Anchor",
+  "PUSH": "Push",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -95,7 +98,8 @@
   "BANNER_HEIGHT": "Altura del banner",
   "IMAGE": "Imagen",
   "PRODUCT_NAME": "Nombre del producto",
-  "PRODUCT_CODE": "Código de producto",
+  "SKU_CODE": "Código SKU",
+  "SPU_CODE": "Código spu",
   "SKU": "SKU",
   "PRICE": "Precio",
   "BRAND": "Marca",

package/es/locale/id/id.json

@@ -1,4 +1,7 @@
 {
+  "ANCHOR": "Anchor",
+  "PUSH": "Push",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -95,7 +98,8 @@
   "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
-  "PRODUCT_CODE": "Product Code",
+  "SKU_CODE": "SKU Code",
+  "SPU_CODE": "SPU Code",
   "SKU": "SKU",
   "PRICE": "Price",
   "BRAND": "Brand",

package/es/utils/businessUtil.js

@@ -31,7 +31,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       productId = urlObj.productId;
 
   switch (type) {
+    // 锚点跳转
+    case _constants.urlTypeMap.ANCHOR:
+      params = {
+        action: 'operation',
+        params: {
+          type: 'ANCHOR',
+          data: value
+        }
+      };
+      break;
     // 商品详情
+
     case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
       if (offerId) {
         link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
@@ -87,7 +98,7 @@ var newParseUrl = function newParseUrl(urlObj) {
     // 商品列表
 
     case _constants.urlTypeMap.FILTERED_PRODUCT:
-      link = "/product/list?" + value;
+      link = "/product/list/?" + value;
       params = {
         action: 'jump',
         params: {
@@ -261,7 +272,7 @@ var parseUrl = function parseUrl(url) {
     // 商品列表
 
     case _constants.urlType.PROD_FILTER:
-      link = "/product/list?" + arg1;
+      link = "/product/list/?" + arg1;
       params = {
         action: 'jump',
         params: {

package/es/utils/commonUtil.js

@@ -291,14 +291,22 @@ var navigateTo = function navigateTo(url) {
     return;
   }
 
-  if (url.startsWith('/')) {
-    if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
-      window.magicDesign.history.push(url);
-    } else {
+  var _a = url.split(';'),
+      h5Url = _a[0],
+      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+
+
+  if (!appUrl && !h5Url.startsWith('/')) {
+    window.location.href = h5Url;
+  } else if (window.magicDesign.history) {
+    window.magicDesign.history.push(url);
+  } else if (window.magicDesign.navigatePreUrl) {
+    // 预览模式跳转
+    if (h5Url.startsWith('/')) {
       window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+    } else {
+      window.location.href = h5Url;
     }
-  } else {
-    window.location.href = url;
   }
 };
 

package/es/utils/coreUtil.js

@@ -286,6 +286,22 @@ var getCoupon = function getCoupon(couponId) {
   });
 };
 
+function isUrl(string) {
+  // var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
+  //   '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
+  //   '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
+  //   '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
+  //   '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
+  //   '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
+  // return !!pattern.test(string);
+  try {
+    new URL(string);
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
 var clickUrl = function clickUrl(url) {
   if (url === void 0) {
     url = '';
@@ -310,6 +326,17 @@ var clickUrl = function clickUrl(url) {
       url: params.link
     }
   });
+  /** 锚点跳转 */
+
+  if (params.type === 'ANCHOR') {
+    (0, _commonUtil.ensure)(function () {
+      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
+      document.querySelector("#node-" + nodeId).scrollIntoView({
+        behavior: 'smooth'
+      });
+    });
+    return;
+  }
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
@@ -342,9 +369,23 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
+    } // 输入的是完整的跳转地址
+
+
+    if (isUrl(link)) {
+      if (!link.includes(window.location.host)) {
+        // 跳转外链 需要把userToken带上
+        if (link.includes('?')) {
+          var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
+        } else {
+          var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
+          window.open(a);
+        }
+      }
+    } else {
+      (0, _commonUtil.navigateTo)(link);
     }
-
-    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1700809570587') format('woff2'),
-       url('magic-box-iconfont.woff?t=1700809570587') format('woff'),
-       url('magic-box-iconfont.ttf?t=1700809570587') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1704245006151') format('woff2'),
+       url('magic-box-iconfont.woff?t=1704245006151') format('woff'),
+       url('magic-box-iconfont.ttf?t=1704245006151') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-anchor:before {
+  content: "\e642";
+}
+
 .magic-box-icon-circle-down:before {
   content: "\e686";
 }
@@ -21,7 +25,7 @@
   content: "\e687";
 }
 
-.magic-box-icon-Sidebar:before {
+.magic-box-icon-template:before {
   content: "\e685";
 }
 

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1700809570587') format('woff2'),
-       url('magic-box-iconfont.woff?t=1700809570587') format('woff'),
-       url('magic-box-iconfont.ttf?t=1700809570587') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1704245006151') format('woff2'),
+       url('magic-box-iconfont.woff?t=1704245006151') format('woff'),
+       url('magic-box-iconfont.ttf?t=1704245006151') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-anchor:before {
+  content: "\e642";
+}
+
 .icon-circle-down:before {
   content: "\e686";
 }
@@ -21,7 +25,7 @@
   content: "\e687";
 }
 
-.icon-Sidebar:before {
+.icon-template:before {
   content: "\e685";
 }