@fonixtree/magic-design 0.0.99 → 0.0.101

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.99",
+  "version": "0.0.101",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -23,7 +23,6 @@
     "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",
@@ -33,12 +32,11 @@
     "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": ">=16.11.0",
-    "react-dom": ">=16.11.0"
+    "react-dom": ">=16.11.0",
+    "react": ">=16.11.0"
   },
   "files": [
     "es",

package/es/assets/less/datepicker.less

@@ -1,11 +0,0 @@
-.ant-picker {
-  &:hover {
-    border-color: #2F54EB !important;
-  }
-  &.ant-picker-focused {
-    border-color: #2F54EB !important;
-  }
-}
-.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
-  background-color: #E9F0FF !important;
-}

package/es/common/ImgArea/components/Crop.js

@@ -1,267 +0,0 @@
-"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"] = exports.coordinateType = void 0;
-
-var _interactjs = _interopRequireDefault(require("interactjs"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _ramda = require("ramda");
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _Icons = require("./Icons");
-
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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 __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 Crop =
-/** @class */
-function (_super) {
-  __extends(Crop, _super);
-
-  function Crop() {
-    var _this = _super !== null && _super.apply(this, arguments) || this; // shouldComponentUpdate(nextProps) {
-    //   // reduce uncessary update
-    //   return !equals(nextProps.coordinate.inputVal, this.state.inputVal)||!equals(nextProps.coordinate, this.props.coordinate)
-    //     || (nextProps.index !== this.props.index)
-    // }
-
-
-    _this.handleResizeMove = function (e) {
-      var _a = _this.props,
-          index = _a.index,
-          coordinate = _a.coordinate,
-          _b = _a.coordinate,
-          x = _b.x,
-          y = _b.y,
-          coordinates = _a.coordinates,
-          onResize = _a.onResize,
-          onChange = _a.onChange,
-          onSave = _a.onSave;
-      var _c = e.rect,
-          width = _c.width,
-          height = _c.height;
-      var _d = e.deltaRect,
-          left = _d.left,
-          top = _d.top; // console.log(x, left, y, top);
-      // if (x + left < 0 || y + top < 0 || x + left + width > 500 || y + top + height > 500) {
-      //   return;
-      // }
-
-      var nextCoordinate = __assign(__assign({}, coordinate), {
-        x: x + left,
-        y: y + top,
-        width: width,
-        height: height
-      });
-
-      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
-
-      if ((0, _ramda.is)(Function, onResize)) {
-        onResize(nextCoordinate, index, nextCoordinates);
-      }
-
-      if ((0, _ramda.is)(Function, onChange)) {
-        onChange(nextCoordinate, index, nextCoordinates);
-      }
-    };
-
-    _this.handleDragMove = function (e) {
-      var _a = _this.props,
-          index = _a.index,
-          coordinate = _a.coordinate,
-          _b = _a.coordinate,
-          x = _b.x,
-          y = _b.y,
-          coordinates = _a.coordinates,
-          onDrag = _a.onDrag,
-          onChange = _a.onChange;
-      var dx = e.dx,
-          dy = e.dy;
-
-      var nextCoordinate = __assign(__assign({}, coordinate), {
-        x: x + dx,
-        y: y + dy
-      });
-
-      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
-
-      if ((0, _ramda.is)(Function, onDrag)) {
-        onDrag(nextCoordinate, index, nextCoordinates);
-      }
-
-      if ((0, _ramda.is)(Function, onChange)) {
-        onChange(nextCoordinate, index, nextCoordinates);
-      }
-    };
-
-    _this.handleDelete = function () {
-      var _a = _this.props,
-          index = _a.index,
-          coordinate = _a.coordinate,
-          onDelete = _a.onDelete,
-          coordinates = _a.coordinates;
-      var nextCoordinates = (0, _ramda.remove)(index, 1)(coordinates);
-
-      if ((0, _ramda.is)(Function, onDelete)) {
-        onDelete(coordinate, index, nextCoordinates);
-      }
-    };
-
-    _this.state = {
-      inputVal: _this.props.coordinate && _this.props.coordinate.inputVal || ''
-    };
-
-    _this.handleSave = function () {
-      var _a = _this.props,
-          coordinate = _a.coordinate,
-          _b = _a.coordinate,
-          x = _b.x,
-          y = _b.y,
-          coordinates = _a.coordinates,
-          index = _a.index,
-          onSave = _a.onSave;
-
-      var nextCoordinate = __assign(__assign({}, coordinate), {
-        x: x,
-        y: y,
-        inputVal: _this.state.inputVal
-      });
-
-      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
-      onSave && onSave(coordinate, index, nextCoordinates);
-      (0, _interactjs["default"])(_this.crop).unset();
-    };
-
-    return _this;
-  }
-
-  Crop.prototype.componentDidMount = function () {
-    (0, _interactjs["default"])(this.crop).draggable({
-      modifiers: [_interactjs["default"].modifiers.restrictRect({
-        restriction: 'parent'
-      })]
-    }).resizable({
-      edges: {
-        left: true,
-        right: true,
-        bottom: true,
-        top: true
-      }
-    }).on('dragmove', this.handleDragMove).on('resizemove', this.handleResizeMove);
-  };
-
-  Crop.prototype.componentWillUnmount = function () {
-    (0, _interactjs["default"])(this.crop).unset();
-  };
-
-  Crop.prototype.render = function () {
-    var _this = this;
-
-    var _a = this.props,
-        coordinate = _a.coordinate,
-        index = _a.index,
-        onSave = _a.onSave;
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      ref: function ref(crop) {
-        return _this.crop = crop;
-      },
-      style: Crop.cropStyle(coordinate)
-    }, /*#__PURE__*/_react["default"].createElement(_Icons.NumberIcon, {
-      number: index + 1
-    }), /*#__PURE__*/_react["default"].createElement(_Icons.DeleteIcon, {
-      onClick: this.handleDelete
-    }));
-  };
-
-  Crop.cropStyle = function (coordinate) {
-    var x = coordinate.x,
-        y = coordinate.y,
-        width = coordinate.width,
-        height = coordinate.height;
-    return {
-      display: 'inline-block',
-      position: 'absolute',
-      width: width,
-      height: height,
-      top: y,
-      left: x,
-      border: '1px dashed #2F54EB',
-      background: 'rgba(47, 84, 235, 0.15)'
-    };
-  };
-
-  return Crop;
-}(_react.Component);
-
-var coordinateType = _propTypes["default"].shape({
-  x: _propTypes["default"].number.isRequired,
-  y: _propTypes["default"].number.isRequired,
-  width: _propTypes["default"].number.isRequired,
-  height: _propTypes["default"].number.isRequired
-});
-
-exports.coordinateType = coordinateType;
-Crop.propTypes = {
-  coordinate: coordinateType.isRequired,
-  index: _propTypes["default"].number.isRequired,
-  onResize: _propTypes["default"].func,
-  onDrag: _propTypes["default"].func,
-  onDelete: _propTypes["default"].func,
-  onChange: _propTypes["default"].func,
-  coordinates: _propTypes["default"].array,
-  onSave: _propTypes["default"].func
-};
-var _default = Crop;
-exports["default"] = _default;

package/es/common/ImgArea/components/Icons.js

@@ -1,44 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NumberIcon = exports.DeleteIcon = void 0;
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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 DeleteIcon = function DeleteIcon(props) {
-  return /*#__PURE__*/_react["default"].createElement("div", _extends({
-    className: "rmc-icon-container"
-  }, props), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "rmc-remove"
-  }), /*#__PURE__*/_react["default"].createElement("style", {
-    jsx: "true"
-  }, "\n      .rmc-icon-container {\n        width: 15px;\n        height: 15px;\n        cursor: pointer;\n        float: right;\n        background:#2F54EB;\n        opacity: 0.8;\n      }\n      .rmc-remove {\n        color: white;\n        position: absolute;\n        margin-top: 6px;\n      }\n\n      .rmc-remove:hover {\n        cursor: pointer;\n      }\n\n      .rmc-remove:before {\n        content: '';\n        position: absolute;\n        width: 15px;\n        height: 1px;\n        background-color: currentColor;\n        -webkit-transform: rotate(45deg);\n                transform: rotate(45deg);\n      }\n\n      .rmc-remove:after {\n        content: '';\n        position: absolute;\n        width: 15px;\n        height: 1px;\n        background-color: currentColor;\n        -webkit-transform: rotate(-45deg);\n                transform: rotate(-45deg);\n      }\n    "));
-};
-
-exports.DeleteIcon = DeleteIcon;
-
-var NumberIcon = function NumberIcon(_a) {
-  var number = _a.number;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "rmc-number"
-  }, number, /*#__PURE__*/_react["default"].createElement("style", {
-    jsx: "true"
-  }, "\n      .rmc-number {\n        height: 15px;\n        width: 15px;\n        float: left;\n        font-size: 12px;\n        background:#2F54EB;\n        text-align: center;\n        line-height: 15px;\n        color: white;\n        opacity: 0.8;\n      }\n    "));
-};
-
-exports.NumberIcon = NumberIcon;
-var number = _propTypes["default"].number;
-NumberIcon.propTypes = {
-  number: number
-};
-NumberIcon.defaultProps = {
-  number: ''
-};