@fonixtree/magic-design 2.0.27 → 2.0.29

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

@@ -310,17 +310,21 @@ function (_super) {
 
     _this.toChat = function () {
       var storeInfo = _this.state.storeInfo; // 登录情况下，直接跳聊天页
-
-      if (localStorage.getItem('isLogin') === 'Y') {
-        (0, _commonUtil.navigateTo)("/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount));
-      } else {
-        window.magicDesign.history.push({
-          pathname: '/sign-in',
-          state: {
-            redirectUrl: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
-          }
-        });
-      }
+      // if (localStorage.getItem('isLogin') === 'Y') {
+      //   navigateTo(`/chat/${storeInfo?.sysAccount}`);
+      // } else {
+      //   window.magicDesign.history.push({ pathname: '/sign-in', state: { redirectUrl: `/chat/${storeInfo?.sysAccount}` } });
+      // }
+
+      var params = {
+        action: 'operation',
+        params: {
+          type: 'CHAT',
+          storeId: storeInfo.storeId,
+          sysAccount: storeInfo.sysAccount
+        }
+      };
+      window.magicDesign.handleAction(params);
     };
 
     return _this;
@@ -383,7 +387,7 @@ function (_super) {
       src: _star["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "number"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+', "  "), " ", (0, _locale.i18n)('FOLLOWERS')), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.userCollectionNum) || '1000+', "  "), " ", (0, _locale.i18n)('FOLLOWERS')), (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.hasCustomerService) === 'Y' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "chat-btn",
       onClick: this.toChat
     }, (0, _locale.i18n)('CHAT'))));

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

@@ -275,7 +275,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/contract/brands")];
+              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list")];
 
             case 3:
               res = _a.sent();

package/lib/constants/component-types.js

@@ -29,6 +29,8 @@ var _Wallet = _interopRequireDefault(require("../composite-comp/bol/components/W
 
 var _CustomCode = _interopRequireDefault(require("../composite-comp/bol/components/CustomCode"));
 
+var _Location = _interopRequireDefault(require("../composite-comp/bol/components/Location"));
+
 var _FlashDeal = _interopRequireDefault(require("../composite-comp/dito/components/FlashDeal"));
 
 var _SearchBar = _interopRequireDefault(require("../composite-comp/dito/components/SearchBar"));
@@ -63,6 +65,8 @@ var _VideoConfig = _interopRequireDefault(require("../composite-comp/bol/config-
 
 var _CustomCodeConfig = _interopRequireDefault(require("../composite-comp/bol/config-panels/CustomCodeConfig"));
 
+var _LocationConfig = _interopRequireDefault(require("../composite-comp/bol/config-panels/LocationConfig"));
+
 var _WalletConfig = _interopRequireDefault(require("../composite-comp/bol/config-panels/WalletConfig"));
 
 var _FlashDealConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/FlashDealConfig"));
@@ -109,13 +113,13 @@ var _a, _b, _c; // 组件
 /**
  * 渲染组件索引
  */
-var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a[_Wallet["default"].type] = _Wallet["default"], _a[_CustomCode["default"].type] = _CustomCode["default"], _a);
+var componentMap = (_a = {}, _a[_Banner["default"].type] = _Banner["default"], _a[_Video["default"].type] = _Video["default"], _a[_Text["default"].type] = _Text["default"], _a[_FlashDeal["default"].type] = _FlashDeal["default"], _a[_SearchBar["default"].type] = _SearchBar["default"], _a[_SignBoard["default"].type] = _SignBoard["default"], _a[_ImageText["default"].type] = _ImageText["default"], _a[_Recommend["default"].type] = _Recommend["default"], _a[_MobileNavigation["default"].type] = _MobileNavigation["default"], _a[_PcNavigation["default"].type] = _PcNavigation["default"], _a[_Divider["default"].type] = _Divider["default"], _a[_ImageGallery["default"].type] = _ImageGallery["default"], _a[_Newsletter["default"].type] = _Newsletter["default"], _a[_Carousel["default"].type] = _Carousel["default"], _a[_Button["default"].type] = _Button["default"], _a[_Tag["default"].type] = _Tag["default"], _a[_Wallet["default"].type] = _Wallet["default"], _a[_CustomCode["default"].type] = _CustomCode["default"], _a[_Location["default"].type] = _Location["default"], _a);
 /**
  * 一级配置面板索引
  */
 
 exports.componentMap = componentMap;
-var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b[_Wallet["default"].type] = _WalletConfig["default"], _b[_CustomCode["default"].type] = _CustomCodeConfig["default"], _b);
+var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["default"], _b[_Video["default"].type] = _VideoConfig["default"], _b[_Text["default"].type] = _TextCompConfig["default"], _b[_FlashDeal["default"].type] = _FlashDealConfig["default"], _b[_SearchBar["default"].type] = _SearchBarConfig["default"], _b[_SignBoard["default"].type] = _SignBoardConfig["default"], _b[_ImageText["default"].type] = _ImageTextConfig["default"], _b[_Recommend["default"].type] = _RecommendConfig["default"], _b[_MobileNavigation["default"].type] = _MobileNavigationConfig["default"], _b[_PcNavigation["default"].type] = _PcNavigationConfig["default"], _b[_Divider["default"].type] = _DividerConfig["default"], _b[_ImageGallery["default"].type] = _ImageGalleryConfig["default"], _b[_Newsletter["default"].type] = _NewsletterConfig["default"], _b[_Carousel["default"].type] = _CarouselConfig["default"], _b[_Button["default"].type] = _ButtonCompConfig["default"], _b[_Tag["default"].type] = _TagCompConfig["default"], _b[_Wallet["default"].type] = _WalletConfig["default"], _b[_CustomCode["default"].type] = _CustomCodeConfig["default"], _b[_Location["default"].type] = _LocationConfig["default"], _b);
 /**
  * 二级配置面板索引
  */

package/lib/constants/index.js

@@ -129,6 +129,10 @@ var compInfoMap = {
     name: 'Image and Text',
     icon: 'icon-filled-image'
   },
+  LOCATION: {
+    name: 'Location',
+    icon: 'icon-location'
+  },
   CUSTOM_CODE: {
     name: 'Custom Code',
     icon: 'icon-html'

package/lib/constants/layout.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.videoPCLayout = exports.videoH5Layout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.mobileNavigationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = exports.WalletLayout = void 0;
+exports.videoPCLayout = exports.videoH5Layout = exports.searchLayout = exports.recommendLayoutPc = exports.recommendLayoutMobile = exports.pcNavigationLayout = exports.newsletterLayout = exports.mobileNavigationLayout = exports.locationLayout = exports.imageTextLayoutPc = exports.imageTextLayoutMobile = exports.imageGalleryLayout = exports.dividerLayout = exports.carouselLayout = exports.WalletLayout = void 0;
 
 var _dividerLayout = _interopRequireDefault(require("../assets/images/layout-icon/dividerLayout.svg"));
 
@@ -43,6 +43,8 @@ var _imageTextRight = _interopRequireDefault(require("../assets/images/layout-ic
 
 var _newsletter = _interopRequireDefault(require("../assets/images/layout-icon/newsletter.svg"));
 
+var _locationLayout = _interopRequireDefault(require("../assets/images/layout-icon/locationLayout.png"));
+
 var _layoutRecommend = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-1.png"));
 
 var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-2.png"));
@@ -90,6 +92,12 @@ var searchLayout = [{
   image: _layoutSearch["default"]
 }];
 exports.searchLayout = searchLayout;
+var locationLayout = [{
+  id: 'top',
+  name: 'top',
+  image: _locationLayout["default"]
+}];
+exports.locationLayout = locationLayout;
 var imageGalleryLayout = [{
   id: 'layout1',
   name: 'layout1',

package/lib/core/Designer/TextEditModal/ToolBar/ToolBtn/components/LinkBtn/LinkInputPicker/index.js

@@ -89,7 +89,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "commit-btn",
       onClick: this.onCommit
-    }, "\u786E\u5B9A"))));
+    }, "Confirm"))));
   };
 
   return LinkInputPicker;

package/lib/core/Designer/ToolBarModal/ToolBtn/components/LinkBtn/LinkInputPicker/index.js

@@ -89,7 +89,7 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "commit-btn",
       onClick: this.onCommit
-    }, "\u786E\u5B9A"))));
+    }, "Confirm"))));
   };
 
   return LinkInputPicker;

package/lib/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "ADDRESS": "Address",
+  "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",
   "CART_ICON": "Cart icon",
   "RECOMMENDED_SIZE": "Recommended Size",

package/lib/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "ADDRESS": "Address",
+  "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",
   "CART_ICON": "Cart icon",
   "RECOMMENDED_SIZE": "Recommended Size",

package/lib/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "ADDRESS": "Address",
+  "LOCATION_LOGO": "Location Logo",
   "MESSAGE_ICON": "Message icon",
   "CART_ICON": "Cart icon",
   "RECOMMENDED_SIZE": "Recommended Size",

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

@@ -21,8 +21,6 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _decorator = require("../../../decorator");
 
-var _ImageLazy = _interopRequireDefault(require("../../../common/ImageLazy"));
-
 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); }
@@ -192,9 +190,10 @@ function (_super) {
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
       }
-    }, srcImg && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_ImageLazy["default"], {
-      onLoadFunc: function onLoadFunc(clientWidth) {
-        var scale = clientWidth / 600;
+    }, srcImg && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
+      ref: this.imgRef,
+      onLoad: function onLoad() {
+        var scale = _this.imgRef.current.clientWidth / 600;
 
         _this.setState({
           scale: scale

package/package.json

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

package/es/composite-comp/bol/config-panels/LocationConfig/MyEditor/index.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactAce = _interopRequireDefault(require("react-ace"));
-
-require("ace-builds/src-noconflict/mode-html");
-
-require("ace-builds/src-noconflict/mode-javascript");
-
-require("ace-builds/src-noconflict/theme-github");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-// 可选的主题样式
-var MyEditor = function MyEditor(props) {
-  var value = props.value,
-      changeVal = props.changeVal,
-      blurArea = props.blurArea;
-  return /*#__PURE__*/_react["default"].createElement(_reactAce["default"], {
-    editorProps: {
-      $blockScrolling: true
-    },
-    mode: "html",
-    name: "editor",
-    onBlur: blurArea,
-    onChange: changeVal,
-    style: {
-      width: '100%'
-    },
-    theme: "github",
-    value: value
-  });
-};
-
-var _default = MyEditor;
-exports["default"] = _default;

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

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactAce = _interopRequireDefault(require("react-ace"));
-
-require("ace-builds/src-noconflict/mode-html");
-
-require("ace-builds/src-noconflict/mode-javascript");
-
-require("ace-builds/src-noconflict/theme-github");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-// 可选的主题样式
-var MyEditor = function MyEditor(props) {
-  var value = props.value,
-      changeVal = props.changeVal,
-      blurArea = props.blurArea;
-  return /*#__PURE__*/_react["default"].createElement(_reactAce["default"], {
-    editorProps: {
-      $blockScrolling: true
-    },
-    mode: "html",
-    name: "editor",
-    onBlur: blurArea,
-    onChange: changeVal,
-    style: {
-      width: '100%'
-    },
-    theme: "github",
-    value: value
-  });
-};
-
-var _default = MyEditor;
-exports["default"] = _default;