@fonixtree/magic-design 0.0.37 → 0.0.39

package/es/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -121,7 +121,22 @@ function (_super) {
         _this.props.store.setState({
           CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[id] = v, _a))
         });
-      } // this.setState({});
+      } // 移动端导航特殊处理
+
+
+      if (component == 'mobileNavigation') {
+        if (v === 'tile') {
+          _this.setState({
+            showRowNum: false
+          });
+        } else {
+          _this.setState({
+            showRowNum: true
+          });
+        }
+      }
+
+      _this.selfRender(); // this.setState({});
 
     };
 
@@ -163,7 +178,6 @@ function (_super) {
         layoutSource = _a.layoutSource,
         selectedLayoutFun = _a.selectedLayoutFun;
     var showRowNum = this.state.showRowNum;
-    console.log('customize', data);
     var layoutVal = data.layout;
 
     if (selectedLayoutFun) {
@@ -171,12 +185,15 @@ function (_super) {
     }
 
     var maxRowNum = ((0, _coreUtil.isPc)() ? data === null || data === void 0 ? void 0 : data.pcMaxRowNum : data === null || data === void 0 ? void 0 : data.mobileMaxRowNum) || 3;
+    var minRowNum = ((0, _coreUtil.isPc)() ? data === null || data === void 0 ? void 0 : data.pcMinRowNum : data === null || data === void 0 ? void 0 : data.mobileMinRowNum) || 1;
     var rowNumArr = [];
 
-    for (var i = 1; i <= maxRowNum; i += 1) {
+    for (var i = minRowNum; i <= maxRowNum; i += 1) {
       rowNumArr.push(i);
     }
 
+    var _showRowNum = showRowNum && ((0, _coreUtil.isPc)() && this.props.data.pcRowNum || !(0, _coreUtil.isPc)() && this.props.data.rowNum);
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-customize-config"
     }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
@@ -197,7 +214,7 @@ function (_super) {
         _this.selfRender();
       },
       value: data.align
-    })), showRowNum && (data === null || data === void 0 ? void 0 : data.rowNum) && /*#__PURE__*/_react["default"].createElement("div", {
+    })), _showRowNum && /*#__PURE__*/_react["default"].createElement("div", {
       className: "selectWrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "iconNum",

package/es/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -84,8 +84,14 @@
 
     // 秒杀特有样式
     .m-product-item-wrap {
+      width: 142px;
       margin-right: 8px;
 
+      .product-img {
+        height: 140px;
+        width: 140px;
+      }
+
       .product-name {
         height: 36px;
       }

package/es/composite-comp/dito/components/MobileNavigation/defaultJSON.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = exports.MobileNavGroupSourceJSON = void 0;
+
+var _uuid = require("uuid");
+
+var _locale = require("../../../../locale");
+
+var MobileNavGroupSourceJSON = function MobileNavGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
+    title: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: (0, _locale.i18n)('NAVIGATION_NAME'),
+      content: {
+        sizeType: 'Headline 1',
+        fontFamily: 'Open Sans',
+        fontWeight: 600,
+        fontSize: 12,
+        color: '#232F46',
+        width: 0
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    }
+  };
+};
+
+exports.MobileNavGroupSourceJSON = MobileNavGroupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'MOBILE_NAVIGATION',
+    spacing: {
+      pc: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      }
+    },
+    customize: {
+      layout: 'newline',
+      rowNum: 4,
+      mobileMaxRowNum: 5
+    },
+    background: {
+      opacity: 100,
+      color: '#FFFFFF',
+      image: '',
+      bgType: 'color'
+    },
+    groupSource: [MobileNavGroupSourceJSON()]
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/MobileNavigation/index.js

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+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; }
+
+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); }
+
+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 __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var MobileNavigation =
+/** @class */
+function (_super) {
+  __extends(MobileNavigation, _super);
+
+  function MobileNavigation() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  MobileNavigation.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      data: nodeData
+    }));
+  };
+
+  MobileNavigation.defaultProps = {};
+  MobileNavigation.type = 'MOBILE_NAVIGATION';
+  MobileNavigation.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  MobileNavigation = __decorate([_compositeDecorator["default"]], MobileNavigation);
+  return MobileNavigation;
+}(_react.Component);
+
+var _default = MobileNavigation;
+exports["default"] = _default;

package/es/composite-comp/dito/components/MobileNavigation/mobile/index.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+require("./index.less");
+
+var _AlignSelector = require("../../../../../common/AlignSelector");
+
+var _businessUtil = require("../../../../../utils/businessUtil");
+
+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 NavigationMobile =
+/** @class */
+function (_super) {
+  __extends(NavigationMobile, _super);
+
+  function NavigationMobile() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.calcWidth = function (num) {
+      return (100 - (num - 1) * 2) / num + "%";
+    };
+
+    _this.getCardStyle = function (source, i) {
+      var data = _this.props.data;
+      var cardStyle = {
+        textAlign: data.customize.align
+      };
+
+      if (data.customize.layout.h5Layout !== 'centerM' && data.customize.layout.h5Layout !== 'normal1') {
+        cardStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
+      }
+
+      if (data.customize.layout.h5Layout === 'normal3') {
+        cardStyle.width = _this.calcWidth(data.customize.rowNum);
+        cardStyle.marginRight = (1 + i) % data.customize.rowNum !== 0 ? '2%' : 0;
+      }
+
+      if (source.background.bgType == 'color') {
+        cardStyle.backgroundColor = source.background.color;
+        cardStyle.opacity = source.background.opacity ? source.background.opacity : 1;
+      } else {
+        cardStyle.backgroundImage = "url(" + source.background.image + ")";
+        cardStyle.backgroundPosition = 'center';
+      }
+
+      return cardStyle;
+    };
+
+    return _this;
+  }
+
+  NavigationMobile.prototype.render = function () {
+    var data = this.props.data; // const { ready } = this.state;
+    // console.log('----imagetext mobile', data);
+
+    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
+    //   wrapStyle.backgroundColor = data.background.color;
+    //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;
+    // } else {
+    //   wrapStyle.backgroundImage = `url(${data.background.image})`;
+    //   wrapStyle.backgroundPosition = 'center';
+    // }
+
+    var cardBtnStyle = {};
+
+    if (data.customize.layout.h5Layout === 'normal3') {
+      cardBtnStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
+    }
+
+    if (data.customize.layout.h5Layout === 'normal2' || data.customize.layout.h5Layout === 'normal1' || data.customize.layout.h5Layout === 'outsideM') {
+      cardBtnStyle.justifyContent = _AlignSelector.alignItemMap[data.customize.align];
+    }
+
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('mobile-navigation-mobile', data.customize.layout.h5Layout)
+    }, (data === null || data === void 0 ? void 0 : data.groupSource.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "group-wrap"
+    }, data.groupSource.map(function (source, i) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: source.id,
+        className: data.groupSource.length > data.customize.rowNum ? 'one-card card-margin-bottom' : 'one-card'
+      }, "11");
+    })));
+  };
+
+  NavigationMobile.defaultProps = {
+    data: {}
+  };
+  return NavigationMobile;
+}(_react["default"].Component);
+
+var _default = NavigationMobile;
+exports["default"] = _default;

package/es/composite-comp/dito/components/MobileNavigation/mobile/index.less

@@ -0,0 +1,292 @@
+.image-text-mobile {
+  // display: flex;
+  // flex-direction: column;
+  padding: 17px 0;
+  .headline {
+    margin-bottom: 8px;
+  }
+  .subtitle {
+    margin-bottom: 36px;
+  }
+  .group-wrap .one-card .card-btn-wrap {
+    .card-first-btn, .card-second-btn {
+      width: fit-content;
+    }
+  }
+
+  .btn-wrap {
+    display: flex;
+    width: 100%;
+    justify-content: center;
+
+    .first-btn {
+      margin-top: 36px;
+    }
+    .second-btn {
+      margin-top: 36px;
+      margin-left: 12px;
+    }
+  }
+}
+.normal1 {
+  .group-wrap {
+    padding: 0 15px;
+    width: 100%;
+    .one-card {
+      display: flex;
+      align-items: stretch;
+      padding: 18px;
+      margin-bottom: 8px;
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+      .card-image-wrap {
+        flex-shrink: 0;
+        margin-right: 12px;
+      }
+      .card-content-wrap {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        .card-title {
+          margin-bottom: 6px;
+          text-align: left !important;
+        }
+        .card-text {
+          margin-bottom: 12px;
+          text-align: left !important;
+        }
+        .card-btn-wrap {
+          display: flex;
+          .card-first-btn {
+            margin-right: 12px;
+          }
+        }
+      }
+    }
+  }
+}
+
+.normal2 {
+  .group-wrap {
+    width: 100%;
+    padding: 0 15px;
+    .one-card {
+      width: 100%;
+      padding: 20px 16px;
+      margin-bottom: 36px;
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+      .card-image-wrap {
+        .card-image {
+          width: fit-content;
+          margin: 0 auto;
+        }
+      }
+      .card-content-wrap {
+        .card-title {
+          margin-bottom: 8px;
+        }
+        .card-text {
+          margin-bottom: 16px;
+        }
+        .card-btn-wrap {
+          display: flex;
+          .card-first-btn {
+            margin-right: 12px;
+          }
+        }
+      }
+    }
+  }
+}
+.normal3 {
+  .group-wrap {
+    display: flex;
+    // margin-bottom: 36px;
+    // margin-top: 36px;
+    flex-wrap: wrap;
+    width: 100%;
+    padding: 0 15px;
+
+    .one-card {
+      display: flex;
+      flex-direction: column;
+      .card-image-wrap {
+        width: 100%;
+        .card-image {
+          // max-height: 107px;
+          width: fit-content;
+          margin: 0 auto 7px;
+        }
+      }
+
+      .card-title {
+        margin-bottom: 4px;
+      }
+
+      .card-text {
+        margin-bottom: 7px;
+      }
+      .card-btn-wrap {
+        display: flex;
+        flex-direction: column;
+      }
+
+      .card-second-btn {
+        margin-top: 8px;
+      }
+    }
+    .card-margin-bottom {
+      margin-bottom: 10px;
+    }
+  }
+}
+
+.outsideM {
+  .group-wrap {
+    padding: 0 15px;
+    width: 100%;
+    .one-card {
+      margin-top: 35px;
+      position: relative;
+      padding: 30px 10px 20px 36px;
+      .card-image-wrap  {
+        position: absolute;
+        left: 18px;
+        top: 0;
+        transform: translateY(-50%);
+      }
+      .card-content-wrap {
+        .card-title {
+          margin-bottom: 4px;
+          text-align: left !important;
+        }
+        .card-text {
+          margin-bottom: 12px;
+          text-align: left !important;
+        }
+        .card-btn-wrap {
+          display: flex;
+          .card-first-btn {
+            margin-right: 12px;
+          }
+        }
+      }
+    }
+  }
+}
+
+.centerM {
+  .group-wrap {
+    position: relative;
+    width: 100%;
+    &::before {
+      content: '';
+      position: absolute;
+      width: 1px;
+      height: 100%;
+      border-right: 1px dashed #D2D9E5;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+    .one-card {
+      width: calc((100% - 1px)/2);
+      position: relative;
+      padding: 0 14px 16px;
+      &::before {
+        content: '';
+        position: absolute;
+        border-radius: 50%;
+        background: #2F54EB;
+        width: 10px;
+        height: 10px;
+        z-index: 10;
+        border: 2px solid #CCE3FF;
+      }
+      // &::before {
+      //   opacity: 0.2;
+      //   width: 10px;
+      //   height: 10px;
+      // }
+      &:nth-of-type(2n-1) {
+        left: 0;
+        &::before {
+          right: -5px;
+          top: 5px;
+        }
+        // &::after {
+        //   right: -3px;
+        //   top: 7px;
+        // }
+        .card-content-wrap {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-end;
+          .card-title, .card-text {
+            text-align: right !important;
+          }
+          .image-subtext-wrap {
+            flex-direction: row-reverse;
+            .card-image-wrap {
+              margin-left: 8px;
+            }
+            // .card-text {
+            //   .m-meta-text {
+            //     text-align: right !important;
+            //   }
+            // }
+          }
+          .card-btn-wrap {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
+          }
+        }
+      }
+      &:nth-of-type(2n) {
+        left: 50%;
+        &::before {
+          left: -5px;
+          top: 5px;
+        }
+        // &::after {
+        //   left: -3px;
+        //   top: 7px;
+        // }
+        .card-content-wrap {
+          .card-title, .card-text {
+            text-align: left !important;
+          }
+          .image-subtext-wrap {
+            .card-image-wrap {
+              margin-right: 8px;
+            }
+            // .card-text {
+            //   .m-meta-text {
+            //     text-align: left !important;
+            //   }
+            // }
+          }
+        }
+      }
+      .card-content-wrap {
+        .card-title {
+          margin-bottom: 10px;
+        }
+        .image-subtext-wrap {
+          display: flex;
+          margin-bottom: 20px;
+          align-items: center;
+        }
+        .card-btn-wrap {
+          .card-second-btn {
+            margin-top: 12px;
+          }
+        }
+      }
+    }
+  }
+}