@fonixtree/magic-design 2.0.49 → 2.0.51

package/lib/core/Renderer/index.js

@@ -15,10 +15,16 @@ var _componentTypes = require("../../constants/component-types");
 
 var _coreUtil = require("../../utils/coreUtil");
 
+var _mobx = require("../../mobx");
+
+var _common = require("../../common");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -56,12 +62,17 @@ var setDesignConfig = function setDesignConfig(props) {
 var Renderer = function Renderer(props) {
   var pageData = props.pageData,
       outputType = props.outputType,
-      noSetWindow = props.noSetWindow;
+      noSetWindow = props.noSetWindow,
+      isPreview = props.isPreview;
 
   var _a = (0, _react.useState)([]),
       floors = _a[0],
       setFloors = _a[1];
 
+  var _b = (0, _react.useState)(_mobx.frameStore.modalState),
+      modalState = _b[0],
+      setModalState = _b[1];
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
@@ -97,13 +108,41 @@ var Renderer = function Renderer(props) {
       });
     }, 300);
   });
+  (0, _react.useEffect)(function () {
+    var disposer = (0, _mobx.autorun)(function () {
+      setModalState(_mobx.frameStore.modalState);
+    });
+    return function () {
+      disposer();
+    };
+  }, []); // 传入空数组表示仅在组件挂载和卸载时执行
+
+  /** 弹窗关闭 */
+
+  var onCloseModal = function onCloseModal() {
+    setModalState(__assign(__assign({}, modalState), {
+      visible: false
+    }));
+  };
+
+  var getRestStyle = function getRestStyle() {
+    if (modalState.visible) {
+      return {
+        position: 'relative',
+        overflow: 'hidden'
+      };
+    }
+
+    return {};
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "render_wrap",
     magic_design: "",
-    style: {
+    style: __assign({
       height: '100%',
       background: pageBackground
-    }
+    }, getRestStyle())
   }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {
     var Clazz = _componentTypes.componentMap[nodeData.type];
 
@@ -126,13 +165,18 @@ var Renderer = function Renderer(props) {
       key: nodeData.id,
       id: 'node-' + nodeData.id
     }, /*#__PURE__*/_react["default"].createElement(Clazz, __assign({}, newInstanceProps), null));
-  }));
+  }), modalState.visible && /*#__PURE__*/_react["default"].createElement(_common.MyModal, _extends({
+    isPreview: isPreview
+  }, modalState, {
+    onClose: onCloseModal
+  })));
 };
 
 Renderer.defaultProps = {
   pageData: {},
   device: 'pc',
-  config: {}
+  config: {},
+  isPreview: false
 };
 var _default = Renderer;
 exports["default"] = _default;

package/lib/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "TIPS": "Tips",
+  "AL": "AL",
   "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
@@ -10,7 +12,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)",

package/lib/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "TIPS": "Tips",
+  "AL": "AL",
   "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
@@ -10,7 +12,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)",

package/lib/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "TIPS": "Tips",
+  "AL": "AL",
   "PEEK": "Peek",
   "ADDRESS": "Address",
   "LOCATION_LOGO": "Location Logo",
@@ -10,7 +12,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)",

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/config-panels/ImageConfig/index.js

@@ -351,48 +351,6 @@ function (_super) {
       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 +358,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,27 @@ 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() {}
     };
     (0, _mobx.makeObservable)(this, {
       confirmState: _mobx.observable,
-      textModalState: _mobx.observable
+      textModalState: _mobx.observable,
+      modalState: _mobx.observable
     });
   }
   /** 修改状态 */

package/lib/utils/businessUtil.js

@@ -325,7 +325,8 @@ var parseUrl = function parseUrl(url) {
         '/social-commerce/my-cashback': 'CASHBACK',
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
-        '/search-page': 'SEARCH_PAGE'
+        '/search-page': 'SEARCH_PAGE',
+        '/main/my-commission': 'WALLET'
       };
       link = url;
       params = {

package/package.json

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