@fonixtree/magic-design 2.0.97 → 2.0.98

package/es/assets/images/layout-icon/banner-slide-layout1.svg

@@ -0,0 +1,6 @@
+<svg width="96" height="72" viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="94" height="70" rx="8" fill="#F5F6F7" stroke="#D2D9E5"/>
+<circle cx="48" cy="36" r="6" fill="#C1C9D7"/>
+<circle cx="28" cy="36" r="4" fill="#E6EAF0"/>
+<circle cx="68" cy="36" r="4" fill="#E6EAF0"/>
+</svg>

package/es/common/Collapse/index.js

@@ -160,14 +160,16 @@ function (_super) {
 
       panelInfo.metaOption.open = checked;
 
-      if (checked) {
-        _this.setState({
-          activeKey: [((_a = panelInfo.metaOption) === null || _a === void 0 ? void 0 : _a.id) || panelInfo.key]
-        });
-      } else {
-        _this.setState({
-          activeKey: []
-        });
+      if (panelInfo.value) {
+        if (checked) {
+          _this.setState({
+            activeKey: [((_a = panelInfo.metaOption) === null || _a === void 0 ? void 0 : _a.id) || panelInfo.key]
+          });
+        } else {
+          _this.setState({
+            activeKey: []
+          });
+        }
       }
 
       _this.props.onRefresh();

package/es/common/FontStyles/index.less

@@ -1,6 +1,7 @@
 .m-font-styles {
   display: flex;
   align-items: center;
+  position: relative;
 
   .item {
     display: inline-block;
@@ -13,7 +14,7 @@
     margin-right: 12px;
     cursor: pointer;
     display: flex;
-    
+
     &.active {
       background: #E9F0FF;
     }
@@ -40,6 +41,7 @@
     margin-right: 0;
     cursor: default;
     flex: 0 0 95px;
+
     .item-icon {
       display: inline-flex;
       align-items: center;

package/es/common/MonpayCountDown/index.js

@@ -0,0 +1,160 @@
+"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"));
+
+var _commonUtil = require("../../../../../utils/commonUtil");
+
+require("./index.less");
+
+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 debug = require('debug')('worker:count-down');
+
+var CountDown =
+/** @class */
+function (_super) {
+  __extends(CountDown, _super);
+
+  function CountDown() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      hour: '00',
+      min: '00',
+      second: '00',
+      nowTime: Number(_this.props.now),
+      now: _this.props.now
+    };
+    _this.timer = null;
+    _this.preTime = '';
+
+    _this.componentWillUnmount = function () {
+      _this.clearTimer();
+    };
+
+    _this.calcLastTime = function () {
+      try {
+        var _a = _this.props,
+            effDate = _a.effDate,
+            expDate = _a.expDate,
+            refresh = _a.refresh;
+        var nowTime = _this.state.nowTime;
+        var lastTime = 0;
+
+        if (nowTime > effDate && nowTime < expDate) {
+          lastTime = expDate - nowTime;
+        } else if (nowTime < effDate) {
+          lastTime = effDate - nowTime;
+        }
+
+        if (lastTime === 0) {
+          refresh();
+
+          _this.clearTimer();
+        }
+
+        var _b = (0, _commonUtil.calcLastTime)(lastTime).split(':'),
+            hour = _b[0],
+            min = _b[1],
+            second = _b[2];
+
+        _this.setState({
+          hour: hour,
+          min: min,
+          second: second,
+          nowTime: nowTime + 1000
+        });
+      } catch (error) {
+        debug(error);
+      }
+    };
+
+    _this.clearTimer = function () {
+      if (_this.timer) {
+        clearInterval(_this.timer);
+        _this.timer = null;
+      }
+    };
+
+    return _this;
+  }
+
+  CountDown.getDerivedStateFromProps = function (nextProps, prevState) {
+    // 检查是否需要更新sortType
+    if (nextProps.now !== prevState.now) {
+      return {
+        now: nextProps.now,
+        nowTime: nextProps.now
+      };
+    }
+
+    return null;
+  };
+
+  CountDown.prototype.componentDidUpdate = function () {
+    var now = this.state.now;
+
+    if (this.preTime != now) {
+      this.preTime = now;
+      this.clearTimer();
+      this.calcLastTime();
+      this.timer = setInterval(this.calcLastTime, 1000);
+    }
+  };
+
+  CountDown.prototype.render = function () {
+    var _a = this.state,
+        hour = _a.hour,
+        min = _a.min,
+        second = _a.second;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "count-down-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", null, hour), /*#__PURE__*/_react["default"].createElement("span", null, min), /*#__PURE__*/_react["default"].createElement("span", null, second));
+  };
+
+  CountDown.defaultProps = {
+    effDate: '',
+    expDate: '',
+    now: '',
+    refresh: function refresh() {}
+  };
+  return CountDown;
+}(_react.Component);
+
+var _default = CountDown;
+exports["default"] = _default;

package/es/common/RatingText/index.js

@@ -0,0 +1,105 @@
+"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"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+require("./index.less");
+
+var _Iconfont = _interopRequireDefault(require("../Iconfont"));
+
+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 _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 __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 __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var AComponent =
+/** @class */
+function (_super) {
+  __extends(AComponent, _super);
+
+  function AComponent() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  AComponent.prototype.render = function () {
+    var _a = this.props,
+        _b = _a.text,
+        text = _b === void 0 ? 5 : _b,
+        rest = __rest(_a, ["text"]);
+
+    return /*#__PURE__*/_react["default"].createElement("div", _extends({
+      className: "ratingText"
+    }, rest), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#FF8650",
+      size: 12,
+      type: "icon-star"
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "rate-text"
+    }, text));
+  };
+
+  return AComponent;
+}(_react.Component);
+
+AComponent.propTypes = {
+  /** text */
+  text: _propTypes["default"].string
+};
+AComponent.defaultProps = {
+  text: '4.0'
+};
+var _default = AComponent;
+exports["default"] = _default;

package/es/common/RatingText/index.less

@@ -0,0 +1,12 @@
+.ratingText {
+  display: flex;
+  position: relative;
+  align-items: center;
+
+  .rate-text {
+    color: #545454;
+    font-size: 12px;
+    margin-left: 4px;
+    font-weight: 400;
+  }
+}

package/es/common/index.js

@@ -111,6 +111,12 @@ Object.defineProperty(exports, "ProductSource", {
     return _ProductSource["default"];
   }
 });
+Object.defineProperty(exports, "RatingText", {
+  enumerable: true,
+  get: function get() {
+    return _RatingText["default"];
+  }
+});
 Object.defineProperty(exports, "Slider", {
   enumerable: true,
   get: function get() {
@@ -162,6 +168,8 @@ var _UrlPicker = _interopRequireDefault(require("./UrlPicker"));
 
 var _Iconfont = _interopRequireDefault(require("./Iconfont"));
 
+var _RatingText = _interopRequireDefault(require("./RatingText"));
+
 var _Button = _interopRequireDefault(require("./Button"));
 
 var _AlignSelector = _interopRequireDefault(require("./AlignSelector"));

package/es/composite-comp/bol/components/Banner/defaultJSON.js

@@ -239,6 +239,7 @@ var getDefaultJSON = function getDefaultJSON() {
       // 面板指示点
       dots: {
         open: true,
+        layout: 'layout1',
         color: {
           pc: '#fff',
           mobile: '#fff'

package/es/composite-comp/bol/components/Banner/mobile/index.js

@@ -276,7 +276,8 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: (item === null || item === void 0 ? void 0 : item.id) || i,
         className: (0, _classnames["default"])('ban', {
-          active: i == carouseIndex
+          active: i == carouseIndex,
+          isCircle: data.setting.dots.layout === 'layout1'
         }),
         onClick: function onClick() {
           var _a;

package/es/composite-comp/bol/components/Banner/mobile/index.less

@@ -41,14 +41,18 @@
 }
 .m-banner-mobile .swiper-ban .ban {
   font-size: 0.32rem;
-  width: 1.5em;
-  height: 0.3em;
+  width: 1em;
+  height: 0.25em;
   background: #FFF;
   cursor: inherit;
-  margin-right: 0.3em;
+  margin-right: 0.16rem;
   transition: all 0.5s;
 }
 .m-banner-mobile .swiper-ban .ban.active {
-  width: 1.5em;
   opacity: 1;
 }
+.m-banner-mobile .swiper-ban .ban.isCircle {
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+}

package/es/composite-comp/bol/components/Banner/pc/index.js

@@ -319,7 +319,8 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: i,
         className: (0, _classnames["default"])('ban', {
-          active: i == carouseIndex
+          active: i == carouseIndex,
+          isCircle: data.setting.dots.layout === 'layout1'
         }),
         onClick: function onClick() {
           var _a;

package/es/composite-comp/bol/components/Banner/pc/index.less

@@ -17,18 +17,23 @@
     justify-content: center;
 
     .ban {
-      font-size: 16px;
+      font-size: 20px;
       width: 1em;
       height: 0.3em;
       background: #FFF;
       cursor: inherit;
-      margin-right: 0.3em;
+      margin-right: 10px;
       transition: all .5s;
 
       &.active {
-        width: 1.5em;
         opacity: 1;
       }
+
+      &.isCircle {
+        width: 1em;
+        height: 1em;
+        border-radius: 50%;
+      }
     }
   }
 
@@ -73,6 +78,7 @@
     .btn-wrap {
       display: flex;
       align-items: center;
+
       // justify-content: flex-start;
       // width: 100%;
       .btn {

package/es/composite-comp/bol/config-panels/BannerConfig/BannerConfigSetting/index.js

@@ -13,6 +13,10 @@ require("./index.less");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _layout = require("../../../../../constants/layout");
+
+var _CustomizeConfig = _interopRequireDefault(require("../../../../common/config-panels/CustomizeConfig"));
+
 var _locale = require("../../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -58,16 +62,7 @@ function (_super) {
     };
 
     return _this;
-  } // onChangeHeight = v => {
-  //   const { setting } = this.props;
-  //   if (isPc()) {
-  //     setting.pcHeight = v;
-  //   } else {
-  //     setting.mobileHeight = v;
-  //   }
-  //   this.reRender();
-  // }
-
+  }
 
   BannerConfigSetting.prototype.render = function () {
     var _this = this;
@@ -122,7 +117,11 @@ function (_super) {
       }
     })));
 
-    var dotsSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    var dotsSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
+      data: setting.dots,
+      isHideAlign: true,
+      layoutSource: _layout.bannerSlideLayout
+    }), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('SLIDE_BUTTON')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
       needColor: true,
@@ -208,6 +207,7 @@ function (_super) {
       },
       dots: {
         open: false,
+        layout: 'circle',
         size: {
           pc: 16,
           mobile: 8

package/es/composite-comp/bol/config-panels/NewsletterConfig/NewsletterContentSetting/index.js

@@ -15,7 +15,7 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _common = require("../../../../../common");
 
-var _InputField = _interopRequireDefault(require("../InputField"));
+var _InputField = _interopRequireDefault(require("../../../../common/config-panels/InputField"));
 
 var _locale = require("../../../../../locale");