@fonixtree/magic-design 2.0.169 → 2.0.170

package/es/utils/businessUtil.js

@@ -287,14 +287,40 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/search-page': 'SEARCH_PAGE',
         '/commission': 'COMMISSION'
       };
-      params = {
-        action: 'jump',
-        params: {
-          type: map[link] || name,
-          link: link,
-          url: link
+      var typeTemp = map[link];
+
+      if (!typeTemp) {
+        if (type === _constants.urlTypeMap.FUNCTION_PAGE) {
+          params = {
+            action: 'jump',
+            params: {
+              type: 'WEBVIEW',
+              link: link,
+              url: link
+            }
+          };
+        } else if (!type) {
+          // 直接填的完整外链
+          params = {
+            action: 'jump',
+            params: {
+              type: 'NAVIGATE',
+              link: link,
+              url: link
+            }
+          };
         }
-      };
+      } else {
+        params = {
+          action: 'jump',
+          params: {
+            type: typeTemp || name,
+            link: link,
+            url: link
+          }
+        };
+      }
+
   }
 
   return {

package/lib/common/LayoutSelector/index.js

@@ -11,14 +11,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.less");
 
-var _left = _interopRequireDefault(require("./imgs/left.png"));
-
-var _center = _interopRequireDefault(require("./imgs/center.png"));
-
-var _right = _interopRequireDefault(require("./imgs/right.png"));
-
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
+var _layout = require("../../constants/layout");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -47,20 +43,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var defaultSource = [{
-  id: 'layout1',
-  name: 'left',
-  image: _left["default"]
-}, {
-  id: 'layout2',
-  name: 'center',
-  image: _center["default"]
-}, {
-  id: 'layout3',
-  name: 'right',
-  image: _right["default"]
-}];
-
 var LayoutSelector =
 /** @class */
 function (_super) {
@@ -78,7 +60,7 @@ function (_super) {
         source = _a.source,
         onChange = _a.onChange,
         value = _a.value;
-    var sourceList = source || defaultSource;
+    var sourceList = source || _layout.defaultLayout;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-layout-selector"
     }, sourceList.map(function (item) {

package/lib/composite-comp/bol/components/ImageGallery/mobile/index.less

@@ -1,3 +1,6 @@
+.m-image-gallery-mobile {
+  min-height: 0.02rem;
+}
 .m-image-gallery-mobile .content .line {
   margin-bottom: 0.24rem;
 }

package/lib/composite-comp/bol/config-panels/ButtonCompConfig/index.js

@@ -9,10 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _ButtonConfigGroup = _interopRequireDefault(require("./ButtonConfigGroup"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
-var _layout2 = _interopRequireDefault(require("./imgs/layout2.png"));
-
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -23,6 +19,8 @@ var _SpacingConfig = _interopRequireDefault(require("../../../common/config-pane
 
 var _locale = require("../../../../locale");
 
+var _layout = require("../../../../constants/layout");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function ButtonConfig(props) {
@@ -47,15 +45,7 @@ function ButtonConfig(props) {
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }, {
-          id: 'layout2',
-          name: 'layout2',
-          image: _layout2["default"]
-        }]
+        layoutSource: _layout.buttonLayout
       })
     }, {
       key: '4',

package/lib/composite-comp/bol/config-panels/TagCompConfig/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _TagConfigContent = _interopRequireDefault(require("./TagConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -21,6 +19,8 @@ var _SpacingConfig = _interopRequireDefault(require("../../../common/config-pane
 
 var _locale = require("../../../../locale");
 
+var _layout = require("../../../../constants/layout");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function TagCompConfig(props) {
@@ -46,11 +46,7 @@ function TagCompConfig(props) {
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.tagLayout
       })
     }, {
       key: '4',

package/lib/composite-comp/bol/config-panels/TextCompConfig/index.js

@@ -11,8 +11,6 @@ var _TextConfigGroup = _interopRequireDefault(require("./TextConfigGroup"));
 
 var _TextConfigContent = _interopRequireDefault(require("./TextConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -21,6 +19,8 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -53,11 +53,7 @@ function TextConfig(props) {
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'left',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.textLayout
       })
     }, {
       key: '5',

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

@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
 
 var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.bargainLayout
       })
     }, {
       key: '5',

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

@@ -11,8 +11,6 @@ var _GroupBuyConfigTitle = _interopRequireDefault(require("./GroupBuyConfigTitle
 
 var _GroupBuyConfigContent = _interopRequireDefault(require("./GroupBuyConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function GroupBuyConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.groupBuyLayout
       })
     }, {
       key: '5',

package/lib/composite-comp/monpay/components/MonpayFlashDeal/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
 
-var _pc = _interopRequireDefault(require("./pc"));
-
 var _defaultJSON = require("./defaultJSON");
 
 var _coreUtil = require("../../../../utils/coreUtil");
@@ -72,9 +70,7 @@ function (_super) {
 
   FlashDeal.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
-      panelProps: nodeData
-    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       panelProps: nodeData
     }));
   };

package/lib/composite-comp/monpay/components/MonpayRecommend/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
 
-var _pc = _interopRequireDefault(require("./pc"));
-
 var _defaultJSON = require("./defaultJSON");
 
 var _coreUtil = require("../../../../utils/coreUtil");
@@ -72,9 +70,7 @@ function (_super) {
 
   Recommend.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
-      panelProps: nodeData
-    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       panelProps: nodeData
     }));
   };

package/lib/composite-comp/monpay/config-panels/BundleConfig/index.js

@@ -11,8 +11,6 @@ var _ConfigTitle = _interopRequireDefault(require("./ConfigTitle"));
 
 var _ConfigContent = _interopRequireDefault(require("./ConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function InterestProductsConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.bundleLayout
       })
     }, {
       key: '5',

package/lib/composite-comp/monpay/config-panels/InterestProductsConfig/index.js

@@ -11,8 +11,6 @@ var _ConfigTitle = _interopRequireDefault(require("./ConfigTitle"));
 
 var _ConfigContent = _interopRequireDefault(require("./ConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function InterestProductsConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.interestLayout
       })
     }, {
       key: '5',

package/lib/composite-comp/monpay/config-panels/MerchantSalesConfig/index.js

@@ -11,8 +11,6 @@ var _ConfigTitle = _interopRequireDefault(require("./ConfigTitle"));
 
 var _ConfigContent = _interopRequireDefault(require("./ConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function MerchantSalesConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.merchantSalesLayout
       })
     }, {
       key: '5',

package/lib/composite-comp/monpay/config-panels/MonpayFlashDealConfig/index.js

@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
 
 var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -21,6 +19,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _layout = require("../../../../constants/layout");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.monpayFlashDealLayout
       })
     }, {
       key: '5',