@fonixtree/magic-design 1.0.67 → 1.0.69

package/lib/decorator/compositeDecorator.js

@@ -87,7 +87,11 @@ function compositeDecorator(WrappedComponent) {
       }; // 复合组件点击事件
 
       _this.onCompositeCompClick = function (event) {
-        // 触发左侧楼层的滚动
+        if (window.magicDesign.mode === 'renderer') {
+          return;
+        } // 触发左侧楼层的滚动
+
+
         if (document.getElementById("card" + _this.props.nodeData.id)) {
           document.getElementById("card" + _this.props.nodeData.id).scrollIntoView({
             behavior: 'smooth'
@@ -115,19 +119,20 @@ function compositeDecorator(WrappedComponent) {
             device = _b.device,
             compWidth = _b.compWidth;
         var zIndex = '0';
+        var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 
 
-        if (nodeData.type === 'PC_NAVIGATION') {
+        if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
           zIndex = '2';
         }
 
         var wrapStyle = {
           border: 'none',
-          position: 'relative',
+          position: position,
           zIndex: zIndex,
           margin: '0 auto'
         }; // 复合组件内边距
@@ -153,6 +158,19 @@ function compositeDecorator(WrappedComponent) {
 
         if (device === _constants.deviceTypeMap.PC && compWidth && !((_a = spacing === null || spacing === void 0 ? void 0 : spacing.pc) === null || _a === void 0 ? void 0 : _a.fillUp)) {
           wrapStyle.width = compWidth;
+        } // 如果是菜单 则需要设为fixed
+
+
+        if (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION') {
+          wrapStyle.position = 'absolute';
+          wrapStyle.left = 0;
+          wrapStyle.width = '100%';
+
+          if (nodeData.type === 'HEAD_NAVIGATION') {
+            wrapStyle.top = 0;
+          } else {
+            wrapStyle.bottom = 0;
+          }
         }
 
         return wrapStyle;
@@ -192,8 +210,7 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.getWrapStyle = function () {
-        var mode = window.magicDesign.mode; // const { nodeData } = this.props;
-
+        var mode = window.magicDesign.mode;
         var style = {
           position: 'relative',
           zIndex: '1'
@@ -228,6 +245,15 @@ function compositeDecorator(WrappedComponent) {
         });
       };
 
+      _this.getOuterWrapStyle = function () {
+        var nodeData = _this.props.nodeData;
+
+        if (window.magicDesign.designMode && (nodeData.type === 'HEAD_NAVIGATION' || nodeData.type === 'MENU_NAVIGATION')) {
+          var element = document.querySelector('.phone_view_area .device_border') || document.querySelector('#root .render_wrap');
+          element.style.position = 'relative';
+        }
+      };
+
       return _this;
     }
 
@@ -240,6 +266,7 @@ function compositeDecorator(WrappedComponent) {
           hoveredFloor: _mobx.store.hoveredFloor
         });
       });
+      this.getOuterWrapStyle();
     };
 
     Wrapper.prototype.componentWillUnmount = function () {

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

@@ -1,4 +1,20 @@
 {
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
+  "TO_RECEIVE": "To Receive",
+  "TO_SHIP": "To ship",
+  "TO_PAY": "To Pay",
+  "VIEW_ALL_ORDERS": "View All Orders",
+  "ORDERS": "Orders",
+  "RECENTLY_VIEWED": "Recently Viewed",
+  "VOUCHERS": "Vouchers",
+  "STORES": "Stores",
+  "WISHLIST": "Wishlist",
+  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
+  "ADD": "Add",
+  "LOGIN_OR_REGISTER": "Login or Register",
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
@@ -17,7 +33,6 @@
   "DARK": "Dark",
   "LIGHT": "Light",
   "URL_IMAGE": "url image",
-  "AI_IMAGE": "AI Image",
   "IMAGE_URL": "Image URL",
   "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
@@ -62,7 +77,7 @@
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
   "CLICKABLE_AREA": "Clickable Area",
-  "VOUCHER_SUCCESS": "Voucher received successfully!",
+  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
@@ -114,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

package/lib/locale/es/es.json

@@ -1,4 +1,20 @@
 {
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Hecho",
+  "TO_RECEIVE": "To Receive",
+  "TO_SHIP": "To ship",
+  "TO_PAY": "To Pay",
+  "VIEW_ALL_ORDERS": "View All Orders",
+  "ORDERS": "Orders",
+  "RECENTLY_VIEWED": "Recently Viewed",
+  "VOUCHERS": "Vouchers",
+  "STORES": "Stores",
+  "WISHLIST": "Wishlist",
+  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
+  "ADD": "Add",
+  "LOGIN_OR_REGISTER": "Login or Register",
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
@@ -17,7 +33,6 @@
   "DARK": "Dark",
   "LIGHT": "Light",
   "URL_IMAGE": "url image",
-  "AI_IMAGE": "AI Image",
   "IMAGE_URL": "Image URL",
   "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
@@ -62,7 +77,7 @@
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
   "CLICKABLE_AREA": "Clickable Area",
-  "VOUCHER_SUCCESS": "Voucher received successfully!",
+  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Guardar",
@@ -114,7 +129,6 @@
   "MOVE_DOWN": "Mover hacia abajo",
   "COPY": "Copiar",
   "DELETE": "Eliminar",
-  "DONE": "Hecho",
   "ADD_COMPONENT": "Agregar Componente",
   "ALL": "TODO",
   "HOT": "Caliente",

package/lib/locale/id/id.json

@@ -1,4 +1,20 @@
 {
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
+  "TO_RECEIVE": "To Receive",
+  "TO_SHIP": "To ship",
+  "TO_PAY": "To Pay",
+  "VIEW_ALL_ORDERS": "View All Orders",
+  "ORDERS": "Orders",
+  "RECENTLY_VIEWED": "Recently Viewed",
+  "VOUCHERS": "Vouchers",
+  "STORES": "Stores",
+  "WISHLIST": "Wishlist",
+  "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
+  "ADD": "Add",
+  "LOGIN_OR_REGISTER": "Login or Register",
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
@@ -17,7 +33,6 @@
   "DARK": "Dark",
   "LIGHT": "Light",
   "URL_IMAGE": "url image",
-  "AI_IMAGE": "AI Image",
   "IMAGE_URL": "Image URL",
   "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
@@ -62,7 +77,7 @@
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
   "CLICKABLE_AREA": "Clickable Area",
-  "VOUCHER_SUCCESS": "Voucher received successfully!",
+  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
@@ -114,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

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

@@ -79,19 +79,21 @@ function (_super) {
     };
 
     _this.getStyle = function () {
-      var _a = _this.props,
-          data = _a.data,
-          hoverState = _a.hoverState,
-          maxHeight = _a.maxHeight,
-          maxWidth = _a.maxWidth,
-          minHeight = _a.minHeight,
-          minWidth = _a.minWidth,
-          limitWidthHeight = _a.limitWidthHeight,
-          scale = _a.scale;
+      var _a, _b;
+
+      var _c = _this.props,
+          data = _c.data,
+          hoverState = _c.hoverState,
+          maxHeight = _c.maxHeight,
+          maxWidth = _c.maxWidth,
+          minHeight = _c.minHeight,
+          minWidth = _c.minWidth,
+          limitWidthHeight = _c.limitWidthHeight,
+          scale = _c.scale;
       var hoverImgSrc = _this.state.hoverImgSrc;
       var obj = {};
 
-      if (data.hover.open && data.hover.backgroundType === 'enlarge' && (hoverState || hoverImgSrc)) {
+      if (((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) && ((_b = data === null || data === void 0 ? void 0 : data.hover) === null || _b === void 0 ? void 0 : _b.backgroundType) === 'enlarge' && (hoverState || hoverImgSrc)) {
         // return { transform: `scale(${data.hover.magnification})` };
         obj.transform = "scale(" + data.hover.magnification + ")";
         obj.zIndex = '1';
@@ -133,11 +135,13 @@ function (_super) {
     };
 
     _this.mouseEnterImg = function () {
-      var _a = _this.props,
-          data = _a.data,
-          isBackground = _a.isBackground;
+      var _a;
 
-      if (data.hover.open && !isBackground) {
+      var _b = _this.props,
+          data = _b.data,
+          isBackground = _b.isBackground;
+
+      if (((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) && !isBackground) {
         _this.setState({
           hoverImgSrc: true
         });
@@ -145,11 +149,13 @@ function (_super) {
     };
 
     _this.mouseLeaveImg = function () {
-      var _a = _this.props,
-          data = _a.data,
-          isBackground = _a.isBackground;
+      var _a;
+
+      var _b = _this.props,
+          data = _b.data,
+          isBackground = _b.isBackground;
 
-      if (data.hover.open && !isBackground) {
+      if (((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) && !isBackground) {
         _this.setState({
           hoverImgSrc: false
         });
@@ -162,19 +168,19 @@ function (_super) {
   Image.prototype.render = function () {
     var _this = this;
 
-    var _a, _b;
+    var _a, _b, _c, _d;
 
-    var _c = this.props,
-        data = _c.data,
-        isBackground = _c.isBackground,
-        hoverState = _c.hoverState,
-        notNeedLazy = _c.notNeedLazy;
+    var _e = this.props,
+        data = _e.data,
+        isBackground = _e.isBackground,
+        hoverState = _e.hoverState,
+        notNeedLazy = _e.notNeedLazy;
     var hoverImgSrc = this.state.hoverImgSrc; // const { hoverSrc } = this.state;
     // console.log('--metaImage ', this.props);
 
     var srcImg = (0, _coreUtil.isPc)() ? (_a = data.content) === null || _a === void 0 ? void 0 : _a.pcImgSrc : (_b = data.content) === null || _b === void 0 ? void 0 : _b.h5ImgSrc;
 
-    if (data.hover.open && data.hover.backgroundType === 'new' && (hoverState || hoverImgSrc)) {
+    if (((_c = data === null || data === void 0 ? void 0 : data.hover) === null || _c === void 0 ? void 0 : _c.open) && ((_d = data === null || data === void 0 ? void 0 : data.hover) === null || _d === void 0 ? void 0 : _d.backgroundType) === 'new' && (hoverState || hoverImgSrc)) {
       srcImg = (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl;
     } // if (window.magicDesign.isShop && srcImg?.includes('ecommerce/static')) {
     //   srcImg = srcImg.replace('ecommerce/static', 'static');

package/lib/meta-comp/components/Text/formats/textAlign.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TextAlignStyleAttributor = exports.TextAlignStyle = void 0;
+
+var _quill = _interopRequireDefault(require("quill"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var Parchment = _quill["default"]["import"]('parchment');
+
+var TextAlignStyleAttributor =
+/** @class */
+function (_super) {
+  __extends(TextAlignStyleAttributor, _super);
+
+  function TextAlignStyleAttributor() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  return TextAlignStyleAttributor;
+}(Parchment.Attributor.Style);
+
+exports.TextAlignStyleAttributor = TextAlignStyleAttributor;
+var TextAlignStyle = new TextAlignStyleAttributor('text-align', 'text-align', {
+  scope: Parchment.Scope.BLOCK_BLOT
+});
+exports.TextAlignStyle = TextAlignStyle;
+
+_quill["default"].register('formats/text-align', TextAlignStyle, true);

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

@@ -19,6 +19,8 @@ require("./formats/textDecorationColor");
 
 require("./formats/fontStyle");
 
+require("./formats/textAlign");
+
 require("./formats/listStyleTypeStyle");
 
 require("./formats/textDecorationStyle");
@@ -169,7 +171,8 @@ function (_super) {
         setTimeout(function () {
           _mobx.frameStore.setState({
             textModalState: {
-              quillRef: _this.quillRef
+              quillRef: _this.quillRef,
+              close: _this.onEditorClose
             }
           });
         }, 100);

package/lib/meta-comp/components/Text/index.less

@@ -35,6 +35,14 @@
     font-style: normal;
     font-weight: 600;
   }
+
+  .ql-align-center {
+    text-align: center;
+  }
+
+  .ql-align-right {
+    text-align: right;
+  }
 }
 
 .ql-clipboard {

package/lib/meta-comp/config-panels/ImageConfig/index.js

@@ -202,7 +202,7 @@ function (_super) {
   function ImageConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.onClick = function (event) {// console.log(event);
+    _this.onClick = function () {// console.log(event);
     };
 
     _this.getImg = function (v, way) {
@@ -320,7 +320,8 @@ function (_super) {
         needHover = _a.needHover,
         needClickArea = _a.needClickArea,
         needURL = _a.needURL,
-        recommendImgSize = _a.recommendImgSize;
+        recommendImgSize = _a.recommendImgSize,
+        onlySpecificCode = _a.onlySpecificCode;
     var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
@@ -348,51 +349,10 @@ function (_super) {
 
         _this.selfRender();
       },
+      onlySpecificCode: onlySpecificCode,
       value: data.content.clickUrl
     })));
 
-    var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      split: data.hover.backgroundType === 'new',
-      title: (0, _locale.i18n)('IMAGE')
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-      className: "hoverSelect",
-      onChange: function onChange(v) {
-        data.hover.backgroundType = v;
-
-        _this.selfRender();
-      },
-      size: "large",
-      value: data.hover.backgroundType
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "enlarge"
-    }, (0, _locale.i18n)('ENLARGE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "new"
-    }, (0, _locale.i18n)('NEW_IMAGE')))), data.hover.backgroundType === 'enlarge' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('MAGNIFICATION')
-    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-      inputType: "float",
-      maxVal: 3,
-      minVal: 1,
-      onChange: function onChange(v) {
-        data.hover.magnification = v.count;
-
-        _this.selfRender();
-      },
-      step: 0.25,
-      value: {
-        count: data.hover.magnification
-      }
-    })), data.hover.backgroundType === 'new' && /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
-      imageSelectedWay: data.hover.imageSelectedWay || {
-        pc: '',
-        mobile: ''
-      },
-      onChange: function onChange(v, way) {
-        return _this.getImgHoverUrl(v, way);
-      },
-      value: (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl
-    }));
-
     var imageSource = [{
       key: '1',
       name: (0, _locale.i18n)('CONTENT'),
@@ -400,6 +360,50 @@ function (_super) {
     }];
 
     if (needHover) {
+      console.log('needHover', needHover);
+
+      var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        split: data.hover.backgroundType === 'new',
+        title: (0, _locale.i18n)('IMAGE')
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+        className: "hoverSelect",
+        onChange: function onChange(v) {
+          data.hover.backgroundType = v;
+
+          _this.selfRender();
+        },
+        size: "large",
+        value: data.hover.backgroundType
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "enlarge"
+      }, (0, _locale.i18n)('ENLARGE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "new"
+      }, (0, _locale.i18n)('NEW_IMAGE')))), data.hover.backgroundType === 'enlarge' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        title: (0, _locale.i18n)('MAGNIFICATION')
+      }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+        inputType: "float",
+        maxVal: 3,
+        minVal: 1,
+        onChange: function onChange(v) {
+          data.hover.magnification = v.count;
+
+          _this.selfRender();
+        },
+        step: 0.25,
+        value: {
+          count: data.hover.magnification
+        }
+      })), data.hover.backgroundType === 'new' && /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
+        imageSelectedWay: data.hover.imageSelectedWay || {
+          pc: '',
+          mobile: ''
+        },
+        onChange: function onChange(v, way) {
+          return _this.getImgHoverUrl(v, way);
+        },
+        value: (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl
+      }));
+
       imageSource.push({
         key: '5',
         name: (0, _locale.i18n)('HOVER'),

package/lib/mobx/Frame.js

@@ -42,13 +42,28 @@ function () {
       onOk: function onOk() {},
       onCancel: function onCancel() {}
     };
+    /* 移动端 Modal弹窗 */
+
+    this.modalState = {
+      visible: false,
+      hideCancel: true,
+      title: '',
+      message: '',
+      messageImg: '',
+      confirmText: 'YES',
+      cancelText: 'NO',
+      onConfirm: function onConfirm() {},
+      onCancel: function onCancel() {}
+    };
     this.textModalState = {
       visible: false,
-      onOk: function onOk() {}
+      onOk: function onOk() {},
+      close: function close() {}
     };
     (0, _mobx.makeObservable)(this, {
       confirmState: _mobx.observable,
-      textModalState: _mobx.observable
+      textModalState: _mobx.observable,
+      modalState: _mobx.observable
     });
   }
   /** 修改状态 */