@fonixtree/magic-design 0.0.78 → 0.0.80

package/lib/meta-comp/config-panels/ImageConfig/AreaConfigModal/index.less

@@ -0,0 +1,26 @@
+
+.body_wrap {
+  display: flex;
+
+  .area_config_wrap {
+    margin-left: 23px;
+    width: 259px;
+    max-height: 480px;
+    padding-right: 10px;
+    .list_wrap {
+      height: calc(100% - 30px);
+      overflow: auto;
+      .add_item {
+        margin-top: 18px;
+      }
+    }
+
+    .btn_wrap {
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      color: #2F54EB;
+      margin-top: 10px;
+    }
+  }
+}

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

@@ -0,0 +1,133 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+require("./index.less");
+
+var _antd = require("antd");
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+var _locale = require("../../../../locale");
+
+var _common = require("../../../../common");
+
+var _AreaConfigModal = _interopRequireDefault(require("../AreaConfigModal"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+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; }
+
+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 HotAreaConfig =
+/** @class */
+function (_super) {
+  __extends(HotAreaConfig, _super);
+
+  function HotAreaConfig() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      visible: false
+    };
+
+    _this.onCheckboxChange = function (e) {
+      var _a = _this.props,
+          option = _a.option,
+          onChange = _a.onChange;
+      console.log(e.target.checked);
+      option.clickUrl = '';
+      option.openHotArea = e.target.checked; // this.setState({});
+
+      onChange();
+    };
+
+    _this.onAddArea = function () {
+      _this.setState({
+        visible: true
+      });
+    };
+
+    _this.onOk = function (data) {
+      if ((0, _coreUtil.isPc)()) {
+        _this.props.option.pcAreas = data;
+      } else {
+        _this.props.option.h5Areas = data;
+      }
+
+      _this.setState({
+        visible: false
+      });
+    };
+
+    _this.onCancel = function () {
+      _this.setState({
+        visible: false
+      });
+    };
+
+    return _this;
+  }
+
+  HotAreaConfig.prototype.render = function () {
+    var option = this.props.option;
+    var visible = this.state.visible;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "hot_area_wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "area_wrap mb14"
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('CLICKABLE_AREA')), /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+      checked: option.openHotArea,
+      onChange: this.onCheckboxChange
+    })), option.openHotArea && /*#__PURE__*/_react["default"].createElement(_common.Button, {
+      icon: "icon-add",
+      onClick: this.onAddArea,
+      type: "primary"
+    }, (0, _locale.i18n)('ADD_AREA')), /*#__PURE__*/_react["default"].createElement(_AreaConfigModal["default"], {
+      imgUrl: this.props.imgUrl,
+      onCancel: this.onCancel,
+      onOk: this.onOk,
+      value: (0, _coreUtil.isPc)() ? option.pcAreas : option.h5Areas,
+      visible: visible
+    }));
+  };
+
+  return HotAreaConfig;
+}(_react.Component);
+
+var _default = HotAreaConfig;
+exports["default"] = _default;

package/lib/meta-comp/config-panels/ImageConfig/HotAreaConfig/index.less

@@ -0,0 +1,17 @@
+
+.hot_area_wrap {
+  border-bottom: 1px dashed #D2D9E5;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  .area_wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 600;
+    font-size: 14px;
+    color: #232F46;
+  }
+}
+

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

@@ -11,6 +11,8 @@ var _antd = require("antd");
 
 require("./index.less");
 
+var _HotAreaConfig = _interopRequireDefault(require("./HotAreaConfig"));
+
 var _commonUtil = require("../../../utils/commonUtil");
 
 var _coreUtil = require("../../../utils/coreUtil");
@@ -200,8 +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 (event) {// console.log(event);
     };
 
     _this.getImg = function (v) {
@@ -291,6 +292,10 @@ function (_super) {
       _this.selfRender();
     };
 
+    _this.getSelectedImg = function (data) {
+      return (0, _coreUtil.isPc)() ? data.content.pcImgSrc : data.content.h5ImgSrc;
+    };
+
     return _this;
   }
 
@@ -299,16 +304,24 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        needHover = _a.needHover; // console.log('---image', this.props);
+        needHover = _a.needHover;
+    var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
       onChange: function onChange(v) {
         _this.getImg(v);
       },
-      value: (0, _coreUtil.isPc)() ? data.content.pcImgSrc : data.content.h5ImgSrc
+      value: selectImg
+    }), selectImg && /*#__PURE__*/_react["default"].createElement(_HotAreaConfig["default"], {
+      imgUrl: selectImg,
+      onChange: function onChange() {
+        return _this.setState({});
+      },
+      option: data.content
     }), /*#__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/lib/meta-comp/config-panels/TextConfig/index.js

@@ -147,6 +147,11 @@ 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;
   }
 
@@ -273,17 +278,22 @@ function (_super) {
         })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
           title: (0, _locale.i18n)('CONTENT_WIDTH')
         }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-          maxVal: 1760,
-          minVal: 0,
+          maxVal: 100,
+          minVal: 1,
           onChange: function onChange(_a) {
             var count = _a.count;
-            textData.width = count;
+
+            if (window.magicDesign.device == 'pc') {
+              textData.pcWidth = count;
+            } else {
+              textData.width = count;
+            }
 
             _this.selfRender();
           },
-          unit: "px",
+          unit: "%",
           value: {
-            count: textData.width
+            count: this.getContentWidth(textData)
           }
         })))
       }, {
@@ -291,7 +301,6 @@ function (_super) {
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           configCompSpace: false,
-          configPaddingLR: true,
           data: data.spacing
         })
       }, {

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', 'textSelection', 'MPageData'];
+
 var Store =
 /** @class */
 function () {
@@ -23,7 +26,7 @@ function () {
 
     this.clickedMeta = ''; // 点击的元组件Id
 
-    this.clickedGroup = ''; // 点击的元组件组Id
+    this.clickedGroup = ''; // 点击的元组的上一层Id,即groupSourceId(元组件在Group中)
 
     this.clickedFloor = ''; // 点击的楼层Id
 
@@ -34,6 +37,7 @@ function () {
     this.CarouselStore = {}; // 轮播组件暂存数据
 
     (0, _mobx.makeObservable)(this, {
+      MPageData: _mobx.observable,
       locale: _mobx.observable,
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
@@ -54,6 +58,7 @@ function () {
     propertyList.forEach(function (field) {
       _this[field] = data[field];
     });
+    (0, _storeUtil.persistence)(CACHE_KEY, this, whiteList);
   };
   /**
    *根据groupId 获取楼层Id
@@ -87,15 +92,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/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.78",
+  "version": "0.0.80",
   "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",