@fonixtree/magic-design 0.0.99 → 0.0.101

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

@@ -11,8 +11,6 @@ var _antd = require("antd");
 
 require("./index.less");
 
-var _HotAreaConfig = _interopRequireDefault(require("./HotAreaConfig"));
-
 var _commonUtil = require("../../../utils/commonUtil");
 
 var _coreUtil = require("../../../utils/coreUtil");
@@ -202,7 +200,8 @@ function (_super) {
   function ImageConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.onClick = function (event) {// console.log(event);
+    _this.onClick = function (event) {
+      console.log(event);
     };
 
     _this.getImg = function (v) {
@@ -292,10 +291,6 @@ function (_super) {
       _this.selfRender();
     };
 
-    _this.getSelectedImg = function (data) {
-      return (0, _coreUtil.isPc)() ? data.content.pcImgSrc : data.content.h5ImgSrc;
-    };
-
     return _this;
   }
 
@@ -304,24 +299,16 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        needHover = _a.needHover;
-    var selectImg = this.getSelectedImg(data);
+        needHover = _a.needHover; // console.log('---image', this.props);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
       onChange: function onChange(v) {
         _this.getImg(v);
       },
-      value: selectImg
-    }), selectImg && /*#__PURE__*/_react["default"].createElement(_HotAreaConfig["default"], {
-      imgUrl: selectImg,
-      onChange: function onChange() {
-        return _this.setState({});
-      },
-      option: data.content
+      value: (0, _coreUtil.isPc)() ? data.content.pcImgSrc : data.content.h5ImgSrc
     }), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: "URL"
     }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
-      disabled: data.content.openHotArea,
       onChange: function onChange(v) {
         data.content.clickUrl = v;
 

package/es/meta-comp/config-panels/TextConfig/index.js

@@ -147,11 +147,6 @@ function (_super) {
       _extends(obj, sizeTypeMap[v]);
     };
 
-    _this.getContentWidth = function (textData) {
-      var baseWidth = (window.magicDesign.device == 'pc' ? textData.pcWidth : textData.width) || 100;
-      return Math.min(baseWidth, 100);
-    };
-
     return _this;
   }
 
@@ -274,26 +269,21 @@ function (_super) {
 
             _this.selfRender();
           },
-          value: textData.clickUrl
+          value: data.content.clickUrl
         })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
           title: (0, _locale.i18n)('CONTENT_WIDTH')
         }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-          maxVal: 100,
-          minVal: 1,
+          maxVal: 1760,
+          minVal: 0,
           onChange: function onChange(_a) {
             var count = _a.count;
-
-            if (window.magicDesign.device == 'pc') {
-              textData.pcWidth = count;
-            } else {
-              textData.width = count;
-            }
+            textData.width = count;
 
             _this.selfRender();
           },
-          unit: "%",
+          unit: "px",
           value: {
-            count: this.getContentWidth(textData)
+            count: textData.width
           }
         })))
       }, {
@@ -301,6 +291,7 @@ function (_super) {
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           configCompSpace: false,
+          configPaddingLR: true,
           data: data.spacing
         })
       }, {

package/es/mobx/Store.js

@@ -13,9 +13,6 @@ var _storeUtil = require("../utils/storeUtil");
 
 var debug = require('debug')('worker:mobx');
 
-var CACHE_KEY = 'STORE';
-var whiteList = ['hoveredMeta', 'clickedMeta', 'clickedGroup', 'clickedFloor', 'hoveredFloor', 'textSelection', 'MPageData'];
-
 var Store =
 /** @class */
 function () {
@@ -26,12 +23,10 @@ function () {
 
     this.clickedMeta = ''; // 点击的元组件Id
 
-    this.clickedGroup = ''; // 点击的元组的上一层Id,即groupSourceId(元组件在Group中)
+    this.clickedGroup = ''; // 点击的元组件组Id
 
     this.clickedFloor = ''; // 点击的楼层Id
 
-    this.hoveredFloor = ''; // hover的复合组件Id
-
     this.textSelection = null; // 文本元组件选中区域
 
     this.MPageData = []; // 楼层数据
@@ -39,13 +34,11 @@ function () {
     this.CarouselStore = {}; // 轮播组件暂存数据
 
     (0, _mobx.makeObservable)(this, {
-      MPageData: _mobx.observable,
       locale: _mobx.observable,
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
       clickedGroup: _mobx.observable,
       clickedFloor: _mobx.observable,
-      hoveredFloor: _mobx.observable,
       CarouselStore: _mobx.observable,
       setState: _mobx.action.bound
     });
@@ -61,7 +54,6 @@ function () {
     propertyList.forEach(function (field) {
       _this[field] = data[field];
     });
-    (0, _storeUtil.persistence)(CACHE_KEY, this, whiteList);
   };
   /**
    *根据groupId 获取楼层Id
@@ -95,6 +87,15 @@ function () {
     return componentFloor.id;
   };
 
+  Store.prototype.getFloorInfo = function () {
+    var _this = this;
+
+    var componentFloor = this.MPageData.find(function (floor) {
+      return floor.id === _this.clickedFloor;
+    });
+    return componentFloor;
+  };
+
   return Store;
 }();
 

package/es/mobx/index.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  store: true,
-  frameStore: true
+  store: true
 };
-exports.store = exports.frameStore = exports["default"] = void 0;
+exports.store = exports["default"] = void 0;
 
 var _mobx = require("mobx");
 
@@ -25,18 +24,13 @@ Object.keys(_mobx).forEach(function (key) {
 
 var _Store = require("./Store");
 
-var _Frame = require("./Frame");
-
 /* 开启严格模式 */
 (0, _mobx.configure)({
   enforceActions: 'observed'
 });
 var store = new _Store.Store();
 exports.store = store;
-var frameStore = new _Frame.Frame();
-exports.frameStore = frameStore;
 var _default = {
-  store: store,
-  frameStore: frameStore
+  store: store
 };
 exports["default"] = _default;

package/es/utils/businessUtil.js

@@ -20,7 +20,7 @@ var parseUrl = function parseUrl(url) {
   switch (type) {
     // 商品详情
     case _constants.urlType.PRODUCT_DETAIL:
-      pcLink = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
+      pcLink = "/offer-detail/" + arg1;
       h5Link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
       params = {
         type: 'PROD_DETAIL',
@@ -33,7 +33,7 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CATG_PROD_LIST:
       // 商品列表
-      pcLink = "/product/list/" + arg1;
+      pcLink = "/offer-list/catg/" + arg1;
       h5Link = "/product/list/" + arg1;
       params = {
         type: 'PROD_LIST',
@@ -57,7 +57,7 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CUSTOMIZED:
       // 自定义页面
-      pcLink = "/group/" + arg1;
+      pcLink = "/promotion/" + arg1;
       h5Link = "/group/" + arg1;
       params = {
         type: 'CUSTOMIZED',

package/es/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -184,13 +184,6 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 
 var _this = void 0;
 
-/** 根据楼层设置的终端类型，判断是否展示该楼层 */
-var isActiveFloor = function isActiveFloor(activeTerminal) {
-  return !activeTerminal || activeTerminal === 'ALL' || activeTerminal === window.magicDesign.device.toUpperCase();
-};
-
-exports.isActiveFloor = isActiveFloor;
-
 var isDesignMode = function isDesignMode() {
   return window.magicDesign.mode === 'designer';
 };
@@ -211,15 +204,10 @@ var setMagicDesign = function setMagicDesign(magicDesignObj) {
 
 exports.setMagicDesign = setMagicDesign;
 
-var renderPreview = function renderPreview(changeHistory) {
-  if (changeHistory === void 0) {
-    changeHistory = true;
-  }
-
+var renderPreview = function renderPreview() {
   var evt = new Event('render-view', {
     bubbles: false
   });
-  evt.changeHistory = changeHistory;
   window.document.dispatchEvent(evt);
 }; // 领取优惠券
 
@@ -303,7 +291,6 @@ var clickUrl = function clickUrl(url) {
     if (url.startsWith('/')) {
       (0, _commonUtil.navigateTo)(url);
     } else {
-      // location.href = url;
       var newUrl = isPc() ? pcLink : h5Link;
       (0, _commonUtil.navigateTo)(newUrl);
     }

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1673341981314') format('woff2'),
-       url('magic-box-iconfont.woff?t=1673341981314') format('woff'),
-       url('magic-box-iconfont.ttf?t=1673341981314') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1663899948530') format('woff2'),
+       url('magic-box-iconfont.woff?t=1663899948530') format('woff'),
+       url('magic-box-iconfont.ttf?t=1663899948530') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,35 +13,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.magic-box-icon-notice1:before {
-  content: "\e61a";
-}
-
-.magic-box-icon-edit:before {
-  content: "\e72e";
-}
-
-.magic-box-icon-ChatDots:before {
-  content: "\e641";
-}
-
-.magic-box-icon-ShoppingCartSimple:before {
-  content: "\e640";
-}
-
-.magic-box-icon-select:before {
-  content: "\e65b";
-}
-
-.magic-box-icon-message:before {
-  content: "\e7b0";
-}
-
 .magic-box-icon-bg-color:before {
   content: "\e63f";
 }
 
-.magic-box-icon-mobile:before {
+.magic-box-icon-Mobile:before {
   content: "\e63e";
 }
 
@@ -133,6 +109,10 @@
   content: "\e7a0";
 }
 
+.magic-box-icon-message:before {
+  content: "\e7a1";
+}
+
 .magic-box-icon-flash-deal:before {
   content: "\e7a2";
 }
@@ -253,6 +233,10 @@
   content: "\e609";
 }
 
+.magic-box-icon-mobile:before {
+  content: "\e60a";
+}
+
 .magic-box-icon-menu:before {
   content: "\e60b";
 }

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

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1673341981314') format('woff2'),
-       url('magic-box-iconfont.woff?t=1673341981314') format('woff'),
-       url('magic-box-iconfont.ttf?t=1673341981314') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1663899948530') format('woff2'),
+       url('magic-box-iconfont.woff?t=1663899948530') format('woff'),
+       url('magic-box-iconfont.ttf?t=1663899948530') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,35 +13,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-notice1:before {
-  content: "\e61a";
-}
-
-.icon-edit:before {
-  content: "\e72e";
-}
-
-.icon-ChatDots:before {
-  content: "\e641";
-}
-
-.icon-ShoppingCartSimple:before {
-  content: "\e640";
-}
-
-.icon-select:before {
-  content: "\e65b";
-}
-
-.icon-message:before {
-  content: "\e7b0";
-}
-
 .icon-bg-color:before {
   content: "\e63f";
 }
 
-.icon-mobile:before {
+.icon-Mobile:before {
   content: "\e63e";
 }
 
@@ -133,6 +109,10 @@
   content: "\e7a0";
 }
 
+.icon-message:before {
+  content: "\e7a1";
+}
+
 .icon-flash-deal:before {
   content: "\e7a2";
 }
@@ -253,6 +233,10 @@
   content: "\e609";
 }
 
+.icon-mobile:before {
+  content: "\e60a";
+}
+
 .icon-menu:before {
   content: "\e60b";
 }