@fonixtree/magic-design 2.0.122 → 2.0.125

package/es/assets/less/menu.less

@@ -1,8 +1,10 @@
 .cylon-dropdown {
-  .cylon-dropdown-menu{
+  .cylon-dropdown-menu {
     border-radius: 10px;
-    width: 200px;
+    max-width: 300px;
+    min-width: 200px;
     padding: 8px 0;
+
     .cylon-dropdown-menu-item {
       padding: 16px 24px;
       font-family: 'Open Sans';
@@ -12,6 +14,7 @@
       line-height: 24px;
       color: #232F46;
     }
+
     .cylon-dropdown-menu-item-active {
       background: #E9F0FF;
       color: #2F54EB;

package/es/assets/less/modal.less

@@ -18,7 +18,7 @@
       .cylon-modal-body {
         padding: 16px 16px 12px 16px !important;
         max-height: 800px !important;
-        // overflow: scroll;
+        overflow: auto !important;
       }
     }
   }

package/es/composite-comp/common/components/MonpayProductItem/index.less

@@ -185,6 +185,7 @@
           font-size: 10px;
           font-weight: 800;
           width: 40px;
+          white-space: nowrap;
         }
       }
     }

package/es/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -29,6 +29,7 @@
   background-color: transparent;
   border: none;
   height: 100%;
+  width: 100%;
   box-shadow: none;
   font-family: 'Open Sans';
   font-style: normal;

package/es/composite-comp/dito/config-panels/MobileNavigationConfig/MobileNavigationConfigGroup/index.js

@@ -21,6 +21,8 @@ var _locale = require("../../../../../locale");
 
 var _decorator = require("../../../../../decorator");
 
+var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -98,6 +100,22 @@ function (_super) {
 
   ImageTextConfigGroup.prototype.render = function () {
     var source = this.props.source;
+    console.log('source', source);
+
+    var _renderCard = function renderCard(src) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "card_wrap"
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: src.image.content.h5ImgSrc || _defaultImg["default"]
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name",
+        dangerouslySetInnerHTML: {
+          __html: src.title.html || src.title.text
+        }
+      }));
+    };
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "banner_group"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,6 +124,9 @@ function (_super) {
       className: "notice"
     }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
       onClickItem: this.onClickItem,
+      renderCard: function renderCard(v) {
+        return _renderCard(v);
+      },
       reRender: this.reRender,
       source: source
     })), /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/monpay/components/InterestProducts/mobile/index.js

@@ -21,8 +21,6 @@ var _components = require("../../../../../meta-comp/components");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -270,9 +268,7 @@ function (_super) {
 
     _this.state = {
       interest: {},
-      list: (0, _coreUtil.isDesignMode)() ? defaultData : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
-      }, [])
+      list: (0, _coreUtil.isDesignMode)() ? defaultData : []
     };
 
     _this.getMacy = function () {
@@ -295,8 +291,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var maxProdNum, res, list;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               maxProdNum = this.props.panelProps.content.maxProdNum;
               return [4
@@ -308,14 +307,13 @@ function (_super) {
               }, 'POST')];
 
             case 1:
-              res = _a.sent();
-              list = res.pageInfo.list;
+              res = _b.sent();
+              list = ((_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list) || [];
               this.setState({
                 interest: res.interest || {},
                 list: list
               });
               if (list.length > 0) this.getMacy();
-              (0, _storeUtil.setMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, list);
               return [2
               /*return*/
               ];

package/es/composite-comp/monpay/components/MonpaySignBoard/mobile/index.js

@@ -238,7 +238,7 @@ function (_super) {
               storeDetailInfo = _a.sent();
               this.setState({
                 storeInfo: storeDetailInfo,
-                isFollow: storeDetailInfo.userHasFollowed == 'Y'
+                isFollow: storeDetailInfo.collected == 'Y'
               });
               _a.label = 2;
 
@@ -320,13 +320,14 @@ function (_super) {
       }
     };
 
-    _this.onShare = function () {};
+    _this.onShare = function () {
+      if (window.magicDesign.socialShare) window.magicDesign.socialShare('store', window.magicDesign.storeId);
+    };
 
     return _this;
   }
 
   SignBoardMobile.prototype.componentDidMount = function () {
-    window.magicDesign.storeId = 2;
     this.getStoreInfo();
   };
 

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

@@ -113,7 +113,7 @@ function (_super) {
     };
 
     _this.isShowPublish = function () {
-      return (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
     }; // 审核失败和未审核状态展示 To Review 按钮
 
 
@@ -130,11 +130,10 @@ function (_super) {
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
     }; // 拒绝审核 和 草稿状态展示保存按钮
-    // isShowSave = () => [pageStateMap.REJECTED, pageStateMap.DRAFT].includes(this.props.pageState)
 
 
     _this.isShowSave = function () {
-      return true;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState) || localStorage.getItem('DEV_MODE') === 'Y';
     };
 
     return _this;

package/lib/assets/less/menu.less

@@ -1,8 +1,10 @@
 .cylon-dropdown {
-  .cylon-dropdown-menu{
+  .cylon-dropdown-menu {
     border-radius: 10px;
-    width: 200px;
+    max-width: 300px;
+    min-width: 200px;
     padding: 8px 0;
+
     .cylon-dropdown-menu-item {
       padding: 16px 24px;
       font-family: 'Open Sans';
@@ -12,6 +14,7 @@
       line-height: 24px;
       color: #232F46;
     }
+
     .cylon-dropdown-menu-item-active {
       background: #E9F0FF;
       color: #2F54EB;

package/lib/assets/less/modal.less

@@ -18,7 +18,7 @@
       .cylon-modal-body {
         padding: 16px 16px 12px 16px !important;
         max-height: 800px !important;
-        // overflow: scroll;
+        overflow: auto !important;
       }
     }
   }

package/lib/composite-comp/common/components/MonpayProductItem/index.less

@@ -185,6 +185,7 @@
           font-size: 10px;
           font-weight: 800;
           width: 40px;
+          white-space: nowrap;
         }
       }
     }

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

@@ -29,6 +29,7 @@
   background-color: transparent;
   border: none;
   height: 100%;
+  width: 100%;
   box-shadow: none;
   font-family: 'Open Sans';
   font-style: normal;

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

@@ -21,6 +21,8 @@ var _locale = require("../../../../../locale");
 
 var _decorator = require("../../../../../decorator");
 
+var _defaultImg = _interopRequireDefault(require("../../../../../common/GroupList/defaultImg.png"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -98,6 +100,22 @@ function (_super) {
 
   ImageTextConfigGroup.prototype.render = function () {
     var source = this.props.source;
+    console.log('source', source);
+
+    var _renderCard = function renderCard(src) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "card_wrap"
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: src.image.content.h5ImgSrc || _defaultImg["default"]
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name",
+        dangerouslySetInnerHTML: {
+          __html: src.title.html || src.title.text
+        }
+      }));
+    };
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "banner_group"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -106,6 +124,9 @@ function (_super) {
       className: "notice"
     }, notice) : /*#__PURE__*/_react["default"].createElement(_GroupList["default"], {
       onClickItem: this.onClickItem,
+      renderCard: function renderCard(v) {
+        return _renderCard(v);
+      },
       reRender: this.reRender,
       source: source
     })), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/monpay/components/InterestProducts/mobile/index.js

@@ -21,8 +21,6 @@ var _components = require("../../../../../meta-comp/components");
 
 var _commonUtil = require("../../../../../utils/commonUtil");
 
-var _storeUtil = require("../../../../../utils/storeUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -270,9 +268,7 @@ function (_super) {
 
     _this.state = {
       interest: {},
-      list: (0, _coreUtil.isDesignMode)() ? defaultData : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
-      }, [])
+      list: (0, _coreUtil.isDesignMode)() ? defaultData : []
     };
 
     _this.getMacy = function () {
@@ -295,8 +291,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var maxProdNum, res, list;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               maxProdNum = this.props.panelProps.content.maxProdNum;
               return [4
@@ -308,14 +307,13 @@ function (_super) {
               }, 'POST')];
 
             case 1:
-              res = _a.sent();
-              list = res.pageInfo.list;
+              res = _b.sent();
+              list = ((_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list) || [];
               this.setState({
                 interest: res.interest || {},
                 list: list
               });
               if (list.length > 0) this.getMacy();
-              (0, _storeUtil.setMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, list);
               return [2
               /*return*/
               ];

package/lib/composite-comp/monpay/components/MonpaySignBoard/mobile/index.js

@@ -238,7 +238,7 @@ function (_super) {
               storeDetailInfo = _a.sent();
               this.setState({
                 storeInfo: storeDetailInfo,
-                isFollow: storeDetailInfo.userHasFollowed == 'Y'
+                isFollow: storeDetailInfo.collected == 'Y'
               });
               _a.label = 2;
 
@@ -320,13 +320,14 @@ function (_super) {
       }
     };
 
-    _this.onShare = function () {};
+    _this.onShare = function () {
+      if (window.magicDesign.socialShare) window.magicDesign.socialShare('store', window.magicDesign.storeId);
+    };
 
     return _this;
   }
 
   SignBoardMobile.prototype.componentDidMount = function () {
-    window.magicDesign.storeId = 2;
     this.getStoreInfo();
   };
 

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

@@ -113,7 +113,7 @@ function (_super) {
     };
 
     _this.isShowPublish = function () {
-      return (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
     }; // 审核失败和未审核状态展示 To Review 按钮
 
 
@@ -130,11 +130,10 @@ function (_super) {
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
     }; // 拒绝审核 和 草稿状态展示保存按钮
-    // isShowSave = () => [pageStateMap.REJECTED, pageStateMap.DRAFT].includes(this.props.pageState)
 
 
     _this.isShowSave = function () {
-      return true;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState) || localStorage.getItem('DEV_MODE') === 'Y';
     };
 
     return _this;

package/package.json

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