@fonixtree/magic-design 2.0.48 → 2.0.50

package/es/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/es/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/es/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/es/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/lib/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,9 @@
 @font-face {
-  font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
-       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
-       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
+  font-family: "magic-box-iconfont";
+  /* Project id 3317752 */
+  src: url('magic-box-iconfont.woff2?t=1699520254143') format('woff2'),
+    url('magic-box-iconfont.woff?t=1699520254143') format('woff'),
+    url('magic-box-iconfont.ttf?t=1699520254143') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +14,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-text-align-center:before {
+  content: "\e682";
+}
+
+.magic-box-icon-text-align-left:before {
+  content: "\e683";
+}
+
+.magic-box-icon-text-align-right:before {
+  content: "\e684";
+}
+
+.magic-box-icon-Wallet:before {
+  content: "\e681";
+}
+
 .magic-box-icon-ShoppingCartSimple1:before {
   content: "\e680";
 }
@@ -487,5 +504,4 @@
 
 .magic-box-icon-image:before {
   content: "\e608";
-}
-
+}

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,14 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
-       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
-       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
+<<<<<<< HEAD
+  src: url('magic-box-iconfont.woff2?t=1699520254143') format('woff2'),
+       url('magic-box-iconfont.woff?t=1699520254143') format('woff'),
+       url('magic-box-iconfont.ttf?t=1699520254143') format('truetype');
+=======
+  src: url('magic-box-iconfont.woff2?t=1698821773295') format('woff2'),
+       url('magic-box-iconfont.woff?t=1698821773295') format('woff'),
+       url('magic-box-iconfont.ttf?t=1698821773295') format('truetype');
+>>>>>>> 86531b2d2d408d9c7659ae4abbc8532b5abc431d
 }
 
 .magic-box-iconfont {
@@ -13,6 +19,25 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+<<<<<<< HEAD
+.icon-text-align-center:before {
+  content: "\e682";
+}
+
+.icon-text-align-left:before {
+  content: "\e683";
+}
+
+.icon-text-align-right:before {
+  content: "\e684";
+}
+
+=======
+>>>>>>> 86531b2d2d408d9c7659ae4abbc8532b5abc431d
+.icon-Wallet:before {
+  content: "\e681";
+}
+
 .icon-ShoppingCartSimple1:before {
   content: "\e680";
 }