@fonixtree/magic-design 0.1.81 → 0.1.82

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

@@ -68,23 +68,28 @@ var getDefaultJSON = function getDefaultJSON() {
     groupSource: defaultHeadName.map(function (group) {
       return groupSourceHeadJSON(group);
     }),
-    displayPage: [{
-      name: 'Store Home',
-      type: '/store-home',
-      state: true
-    }, {
-      name: 'Product Detail',
-      type: '/product/list',
-      state: true
-    }, {
-      name: 'Poster Page',
-      type: '/poster',
-      state: true
-    }, {
-      name: 'Community',
-      type: '/main/community',
-      state: true
-    }],
+    // displayPage: [
+    //   {
+    //     name: 'Store Home',
+    //     type: '/store-home',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Product Detail',
+    //     type: '/product/list',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Poster Page',
+    //     type: '/poster',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Community',
+    //     type: '/main/community',
+    //     state: true,
+    //   },
+    // ],
     background: {
       opacity: 100,
       color: '#fff',

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

@@ -62,8 +62,8 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var showNav = this.state.showNav;
-    console.log('---head data', data);
+    var showNav = this.state.showNav; // console.log('---head data', data);
+
     var GAData = (0, _commonUtil.getGAData)(data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-head-navigation"

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

@@ -308,14 +308,14 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
-        var _g, _h, _j;
+        var _h, _j, _k;
 
         var _this = this;
 
-        return __generator(this, function (_k) {
-          switch (_k.label) {
+        return __generator(this, function (_l) {
+          switch (_l.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -327,7 +327,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
+                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -339,12 +339,12 @@ function (_super) {
                 }
               }
 
-              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
+              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _k.label = 1;
+              _l.label = 1;
 
             case 1:
-              _k.trys.push([1, 9,, 10]);
+              _l.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -352,22 +352,25 @@ function (_super) {
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
+              if (!prodIds) return [2
+              /*return*/
+              ];
+              params = {
+                state: 'A'
+              };
 
-              if (!prodIds) {
-                return [2
-                /*return*/
-                ];
+              if (prodType === 'spu') {
+                params.offers = prodIds;
+              } else {
+                params.products = prodIds;
               }
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
-                products: prodIds,
-                state: 'A'
-              }, 'GET')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -386,11 +389,11 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -398,7 +401,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _k.label = 6;
+              _l.label = 6;
 
             case 6:
               return [3
@@ -407,7 +410,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _k.label = 8;
+              _l.label = 8;
 
             case 8:
               return [3
@@ -415,7 +418,7 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _k.sent();
+              e_1 = _l.sent();
               newData = [];
               return [3
               /*break*/
@@ -424,10 +427,10 @@ function (_super) {
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
-              this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
+              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
                 _this.resetLayout();
               });
               return [2

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

@@ -381,7 +381,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

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

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _antd = require("antd");
-
 var _HeadNavConfigImageGroup = _interopRequireDefault(require("./HeadNavConfigImageGroup"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -19,8 +17,6 @@ var _locale = require("../../../../locale");
 
 var _coreUtil = require("../../../../utils/coreUtil");
 
-var _common = require("../../../../common");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -65,25 +61,30 @@ function (_super) {
       _this.setState({});
     };
 
-    _this.getDisplayPage = function () {
-      var data = _this.props.data;
-      return /*#__PURE__*/_react["default"].createElement(_common.Field, null, data.displayPage.map(function (one) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          key: one.name,
-          className: "head-navigation-display-wrap"
-        }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
-          checked: one.state,
-          onChange: function onChange(e) {
-            one.state = e.target.checked;
-
-            _this.selfRender();
-          }
-        }, one.name));
-      }));
-    };
-
     return _this;
-  }
+  } // getDisplayPage = () => {
+  //   const { data } = this.props;
+  //   return (
+  //     <Field>
+  //       {
+  //         data.displayPage.map(one => (
+  //           <div key={one.name} className="head-navigation-display-wrap">
+  //             <Checkbox
+  //               checked={one.state}
+  //               onChange={e => {
+  //                 one.state = e.target.checked;
+  //                 this.selfRender();
+  //               }}
+  //             >
+  //               {one.name}
+  //             </Checkbox>
+  //           </div>
+  //         ))
+  //       }
+  //     </Field>
+  //   );
+  // }
+
 
   HeadNavConfigImageGroup.prototype.render = function () {
     var data = this.props.data;
@@ -98,11 +99,8 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_HeadNavConfigImageGroup["default"], {
           source: data.groupSource
         })
-      }, {
-        key: 'headNavigation3',
-        name: (0, _locale.i18n)('DISPLAY_PAGE'),
-        value: this.getDisplayPage()
-      }, {
+      }, // { key: 'headNavigation3', name: i18n('DISPLAY_PAGE'), value: this.getDisplayPage() },
+      {
         key: 'headNavigation2',
         name: (0, _locale.i18n)('BACKGROUND'),
         value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {

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

@@ -114,11 +114,13 @@ function (_super) {
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"
       }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
-        onChange: function onChange(v) {
-          panelProps.prodIds = v;
+        onChange: function onChange(ids, type) {
+          panelProps.prodIds = ids;
+          panelProps.prodType = type;
 
           _this.selfRender();
         },
+        prodType: panelProps.prodType,
         value: panelProps.prodIds
       }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
         onChange: function onChange(val) {

package/lib/constants/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.walletType = exports.urlTypeMap = exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.partyTypeMap = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
+exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.partyTypeMap = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
   LOCALE: 'magicLocale',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
@@ -42,7 +42,7 @@ var walletType = {
   BNPL: 'BNPL',
   B2B: 'B2B PayLater',
   BALANCE: 'Balance',
-  CENDUIT: 'Cenduit'
+  CENDUIT: 'CenDuit'
 };
 exports.walletType = walletType;
 var urlType = {
@@ -99,7 +99,9 @@ var quickMenuCode = {
   PUBLISH: 'PUBLISH',
   PUBLISH_LATER: 'PUBLISH_LATER',
   MODE_PC: 'MODE_PC',
-  MODE_PHONE: 'MODE_PHONE'
+  MODE_PHONE: 'MODE_PHONE',
+  PUSH: 'PUSH',
+  SET_AS_TEMPLATE: 'SET_AS_TEMPLATE'
 };
 exports.quickMenuCode = quickMenuCode;
 var compInfoMap = {
@@ -263,4 +265,11 @@ var partyTypeMap = {
   'operation/v1': 'P',
   'trade/v1': 'S'
 };
-exports.partyTypeMap = partyTypeMap;
+/** 模版类型 */
+
+exports.partyTypeMap = partyTypeMap;
+var tempTypeMap = {
+  PAGE: 'Page',
+  TEMPLATE: 'TemplateLibrary'
+};
+exports.tempTypeMap = tempTypeMap;

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

@@ -293,7 +293,7 @@ function PageCompList(_a) {
       type: "icon-drag"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "card-title ml16"
-    }, index + 1, ". ", (_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name)), /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+    }, index + 1, ". ", (_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name)), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
       overlay: menu,
       placement: "bottomRight",
       trigger: ['click']

package/lib/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/lib/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/lib/locale/en/en.json

@@ -98,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/lib/locale/es/es.json

@@ -98,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/lib/locale/id/id.json

@@ -98,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/lib/utils/businessUtil.js

@@ -98,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: {
@@ -272,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/lib/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/package.json

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