@fonixtree/magic-design 0.0.102 → 0.0.104

package/lib/mobx/Frame.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Frame = void 0;
+
+var _mobx = require("mobx");
+
+var _storeUtil = require("../utils/storeUtil");
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var CACHE_KEY = 'FRAME';
+var whiteList = [];
+
+var Frame =
+/** @class */
+function () {
+  function Frame() {
+    this.confirmState = {
+      visible: false,
+      title: '',
+      content: '',
+      okText: 'Ok',
+      cancelText: 'Cancel',
+      onOk: function onOk() {},
+      onCancel: function onCancel() {}
+    };
+    (0, _mobx.makeObservable)(this, {
+      confirmState: _mobx.observable
+    });
+  }
+  /** 修改状态 */
+
+
+  Frame.prototype.setState = function (data) {
+    var _this = this;
+
+    var propertyList = Object.getOwnPropertyNames(data);
+    propertyList.forEach(function (field) {
+      _this[field] = __assign(__assign({}, _this[field]), data[field]);
+    });
+    (0, _storeUtil.persistence)(CACHE_KEY, this, whiteList);
+  };
+
+  return Frame;
+}();
+
+exports.Frame = Frame;

package/lib/mobx/Store.js

@@ -13,6 +13,9 @@ 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 () {
@@ -23,10 +26,12 @@ function () {
 
     this.clickedMeta = ''; // 点击的元组件Id
 
-    this.clickedGroup = ''; // 点击的元组件组Id
+    this.clickedGroup = ''; // 点击的元组的上一层Id,即groupSourceId(元组件在Group中)
 
     this.clickedFloor = ''; // 点击的楼层Id
 
+    this.hoveredFloor = ''; // hover的复合组件Id
+
     this.textSelection = null; // 文本元组件选中区域
 
     this.MPageData = []; // 楼层数据
@@ -34,11 +39,13 @@ 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
     });
@@ -54,6 +61,7 @@ function () {
     propertyList.forEach(function (field) {
       _this[field] = data[field];
     });
+    (0, _storeUtil.persistence)(CACHE_KEY, this, whiteList);
   };
   /**
    *根据groupId 获取楼层Id
@@ -87,15 +95,6 @@ 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/lib/mobx/index.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  store: true
+  store: true,
+  frameStore: true
 };
-exports.store = exports["default"] = void 0;
+exports.store = exports.frameStore = exports["default"] = void 0;
 
 var _mobx = require("mobx");
 
@@ -24,13 +25,18 @@ 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
+  store: store,
+  frameStore: frameStore
 };
 exports["default"] = _default;

package/lib/utils/businessUtil.js

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

package/lib/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -184,6 +184,13 @@ 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';
 };
@@ -204,10 +211,15 @@ var setMagicDesign = function setMagicDesign(magicDesignObj) {
 
 exports.setMagicDesign = setMagicDesign;
 
-var renderPreview = function renderPreview() {
+var renderPreview = function renderPreview(changeHistory) {
+  if (changeHistory === void 0) {
+    changeHistory = true;
+  }
+
   var evt = new Event('render-view', {
     bubbles: false
   });
+  evt.changeHistory = changeHistory;
   window.document.dispatchEvent(evt);
 }; // 领取优惠券
 
@@ -291,6 +303,7 @@ 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -23,6 +23,7 @@
     "antd": "4.20.6",
     "axios": "0.27.2",
     "immutability-helper": "3.1.1",
+    "interactjs": "1.10.17",
     "lodash": "4.17.21",
     "macy": "2.5.1",
     "mobx": "6.6.1",
@@ -32,11 +33,12 @@
     "react-router-dom": "5.3.0",
     "react-slick": "^0.29.0",
     "replace": "^1.2.1",
+    "shortid": "^2.2.16",
     "slick-carousel": "^1.8.1"
   },
   "peerDependencies": {
-    "react-dom": ">=16.11.0",
-    "react": ">=16.11.0"
+    "react": ">=16.11.0",
+    "react-dom": ">=16.11.0"
   },
   "files": [
     "es",