@fonixtree/magic-design 2.0.97 → 2.0.99

package/es/composite-comp/dito/components/SearchBar/pc/index.js

@@ -19,6 +19,10 @@ var _common = require("../../../../../common");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
+var _Text = require("../../../../../meta-comp/components/Text");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -47,6 +51,22 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+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 SearchPc =
 /** @class */
 function (_super) {
@@ -56,17 +76,43 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      // messageNum: '',
-      inputVal: ''
+      inputVal: '',
+      editing: false
     };
 
     _this.onChangeVal = function (val) {
-      // console.log('--onChangeVal', val);
       _this.setState({
-        inputVal: val
+        inputVal: val,
+        editing: true
       });
     };
 
+    _this.onFocus = function () {
+      var _a;
+
+      var inputVal = _this.state.inputVal;
+
+      if (inputVal === ((_a = _this.props.data.content.keyword) === null || _a === void 0 ? void 0 : _a.placeholder)) {
+        _this.setState({
+          inputVal: '',
+          editing: true
+        });
+      }
+    };
+
+    _this.onBlur = function () {
+      var _a, _b, _c;
+
+      var inputVal = _this.state.inputVal;
+
+      if (!inputVal) {
+        _this.setState({
+          inputVal: (_c = (_b = (_a = _this.props.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder,
+          editing: false
+        });
+      }
+    };
+
     _this.searchProduct = function () {
       (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal);
     };
@@ -80,13 +126,35 @@ function (_super) {
     return _this;
   }
 
-  SearchPc.prototype.componentDidMount = function () {};
+  SearchPc.prototype.componentDidMount = function () {
+    var _a, _b, _c;
+
+    this.setState({
+      inputVal: (_c = (_b = (_a = this.props.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder
+    });
+  };
+
+  SearchPc.prototype.componentWillReceiveProps = function (nextProps) {
+    var _a, _b, _c;
+
+    if (!this.state.editing) {
+      this.setState({
+        inputVal: (_c = (_b = (_a = nextProps.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.keyword) === null || _c === void 0 ? void 0 : _c.placeholder
+      });
+    }
+  };
 
   SearchPc.prototype.render = function () {
     var _this = this;
 
+    var _a, _b, _c;
+
     var data = this.props.data;
     var inputVal = this.state.inputVal;
+
+    var style = __assign({}, (0, _Text.contentStyle)((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content));
+
+    Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "pc-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -94,15 +162,19 @@ function (_super) {
     }, data.content && data.content.box.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       style: {
-        borderColor: data.content.box.color.pc
+        borderColor: data.content.box.color.pc,
+        backgroundColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.backgroundColor) === null || _c === void 0 ? void 0 : _c.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       className: "search-input",
+      onBlur: this.onBlur,
       onChange: function onChange(e) {
         return _this.onChangeVal(e.target.value);
       },
+      onFocus: this.onFocus,
       onKeyUp: this.keyUp,
       placeholder: (0, _locale.i18n)('PLEASE_INPUT_KEYWORDS'),
+      style: (0, _commonUtil.pxToRem)(style),
       value: inputVal
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-icon",

package/es/composite-comp/dito/components/SearchBar/pc/index.less

@@ -23,6 +23,7 @@
       flex: 1;
 
       .search-input {
+        background-color: transparent;
         border: none;
         height: 38px;
         box-shadow: none;

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

@@ -13,8 +13,6 @@ var _antd = require("antd");
 
 var _common = require("../../../../../common");
 
-var _coreUtil = require("../../../../../utils/coreUtil");
-
 var _star = _interopRequireDefault(require("../imgs/star.svg"));
 
 var _commonUtil = require("../../../../../utils/commonUtil");
@@ -241,7 +239,10 @@ function (_super) {
 
     _this.searchProduct = function () {
       var storeId = window.magicDesign.storeId;
-      (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal + "&storeId=" + storeId);
+      (0, _commonUtil.navigateTo)('/product/list', {
+        q: _this.state.inputVal,
+        storeId: storeId
+      }); // clickUrl(`/product/list?q=${this.state.inputVal}&storeId=${storeId}`);
     };
 
     _this.clickCollect = function () {

package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.js

@@ -71,7 +71,7 @@ function (_super) {
   AComponent.prototype.render = function () {
     var _this = this;
 
-    var _a, _b;
+    var _a, _b, _c;
 
     var panelProps = this.props.panelProps;
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -131,26 +131,22 @@ function (_super) {
     }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
       checked: (_a = panelProps.salesProgress) === null || _a === void 0 ? void 0 : _a.open,
       onChange: function onChange(v) {
-        panelProps.salesProgress = {
-          open: v
-        };
+        panelProps.salesProgress.open = v;
 
         _this.reRender();
       }
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    })), ((_b = panelProps.salesProgress) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "content"
     }, /*#__PURE__*/_react["default"].createElement("p", {
       className: "name"
     }, (0, _locale.i18n)('PROGRESS_BAR_COLOR')), /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
       colorType: "rgba",
       onChange: function onChange(v) {
-        panelProps.salesProgress = {
-          color: v
-        };
+        panelProps.salesProgress.color = v;
 
         _this.reRender();
       },
-      value: (_b = panelProps.salesProgress) === null || _b === void 0 ? void 0 : _b.color
+      value: (_c = panelProps.salesProgress) === null || _c === void 0 ? void 0 : _c.color
     }))));
   };
 

package/es/composite-comp/dito/config-panels/GroupBuyConfig/GroupBuyConfigContent/index.less

@@ -22,6 +22,8 @@
 
     .content {
       position: relative;
+      background-color: #F5F6F7;
+      padding: 12px;
 
       .name {
         font-size: 14px;

package/es/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js

@@ -19,6 +19,10 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _locale = require("../../../../../locale");
 
+var _InputField = _interopRequireDefault(require("../../../../common/config-panels/InputField"));
+
+require("./index.less");
+
 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); }
@@ -71,6 +75,8 @@ function (_super) {
   SearchBarConfigContent.prototype.render = function () {
     var _this = this;
 
+    var _a, _b, _c, _d;
+
     var panelProps = this.props.panelProps;
     var source = [{
       key: 'search1',
@@ -83,10 +89,9 @@ function (_super) {
     }, {
       key: 'search2',
       name: (0, _locale.i18n)('SEARCH_BOX'),
-      value: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-        style: {
-          marginTop: 20
-        },
+      value: /*#__PURE__*/_react["default"].createElement("div", {
+        className: "search_bar_config_box"
+      }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('BOX_COLOR')
       }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
         colorType: "rgba",
@@ -102,12 +107,37 @@ function (_super) {
         value: (0, _coreUtil.isPc)() ? panelProps.box.color.pc : panelProps.box.color.mobile
       })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         style: {
-          marginTop: 20
+          marginTop: 16
         },
         title: (0, _locale.i18n)('BOX_BACKGROUND')
-      })),
+      }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+        colorType: "rgba",
+        onChange: function onChange(v) {
+          if ((0, _coreUtil.isPc)()) {
+            panelProps.box.backgroundColor.pc = v;
+          } else {
+            panelProps.box.backgroundColor.mobile = v;
+          }
+
+          _this.selfRender();
+        },
+        value: (0, _coreUtil.isPc)() ? (_b = (_a = panelProps.box) === null || _a === void 0 ? void 0 : _a.backgroundColor) === null || _b === void 0 ? void 0 : _b.pc : (_d = (_c = panelProps.box) === null || _c === void 0 ? void 0 : _c.backgroundColor) === null || _d === void 0 ? void 0 : _d.mobile
+      }))),
       metaOption: panelProps.box,
       toggleType: 'switch'
+    }, {
+      key: panelProps.keyword.id,
+      name: (0, _locale.i18n)('SEARCH_BAR_KEYWORD'),
+      toggleType: 'switch',
+      value: /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          marginTop: 10
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_InputField["default"], {
+        data: panelProps.keyword,
+        inputLabel: "Input Keyword"
+      })),
+      metaOption: panelProps.keyword
     }, {
       key: panelProps.icon.id,
       name: (0, _locale.i18n)('ICON'),

package/es/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.less

@@ -0,0 +1,7 @@
+.search_bar_config_box {
+  padding: 12px;
+  background-color: #F5F6F7;
+  margin-top: 16px;
+  padding-bottom: 1px;
+  border-radius: 6px;
+}

package/es/composite-comp/monpay/components/Bundle/defaultJSON.js

@@ -0,0 +1,77 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var _headerImage = _interopRequireDefault(require("./mobile/img/headerImage.jpg"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var getDefaultJSON = function getDefaultJSON() {
+  var contentId = (0, _uuid.v4)();
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'BUNDLE',
+    title: {
+      headerImage: {
+        id: contentId,
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: '',
+          pcName: '',
+          h5ImgSrc: _headerImage["default"],
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      }
+    },
+    content: {
+      id: contentId,
+      sourceType: '1',
+      maxProdNum: 1
+    },
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing * 1.5
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
+    customize: {
+      layout: 'layout1',
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/monpay/components/Bundle/index.js

@@ -0,0 +1,86 @@
+"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 _coreUtil = require("../../../../utils/coreUtil");
+
+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 FlashDeal =
+/** @class */
+function (_super) {
+  __extends(FlashDeal, _super);
+
+  function FlashDeal() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  FlashDeal.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      panelProps: nodeData
+    }));
+  };
+
+  FlashDeal.defaultProps = {};
+  FlashDeal.type = 'BUNDLE';
+  FlashDeal.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  FlashDeal = __decorate([_compositeDecorator["default"]], FlashDeal);
+  return FlashDeal;
+}(_react.Component);
+
+var _default = FlashDeal;
+exports["default"] = _default;

package/es/composite-comp/monpay/components/Bundle/mobile/BundleItem/index.less

@@ -0,0 +1,107 @@
+.BundleItemWrap {
+  background-color: #FFF;
+  border-radius: 0.16rem;
+  border: 0.02rem solid #E4E4E4;
+  margin-bottom: 0.48rem;
+  transition: 0.2s all linear;
+}
+.BundleItemWrap .header {
+  height: 0.92rem;
+  padding: 0.16rem 0.24rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 0.3rem;
+  font-weight: 600;
+  line-height: 0.6rem;
+  border-bottom: 0.02rem solid #E4E4E4;
+}
+.BundleItemWrap .header .openIcon {
+  transition: 0.2s all linear;
+}
+.BundleItemWrap .prodList {
+  display: flex;
+  align-items: center;
+  overflow: scroll;
+}
+.BundleItemWrap .prodList img {
+  height: 2.08rem;
+  width: 1.9rem;
+}
+.BundleItemWrap .bottomWrap {
+  border-top: 0.02rem solid #E4E4E4;
+  background-color: #F6F6F6;
+  height: 1.16rem;
+  padding: 0.16rem 0.3rem;
+  border-radius: 0 0 0.16rem 0.16rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.BundleItemWrap .bottomWrap .totalWrap {
+  display: flex;
+}
+.BundleItemWrap .bottomWrap .totalWrap .total {
+  line-height: 0.48rem;
+}
+.BundleItemWrap .bottomWrap .totalWrap .priceWrap {
+  margin-left: 0.08rem;
+}
+.BundleItemWrap .bottomWrap .totalWrap .priceWrap .salesPrice {
+  font-size: 0.32rem;
+  font-weight: 600;
+  line-height: 0.48rem;
+  color: #000;
+}
+.BundleItemWrap .bottomWrap .totalWrap .priceWrap .marketPrice {
+  font-size: 0.28rem;
+  font-weight: 400;
+  line-height: 0.34rem;
+  color: #545454;
+  text-decoration: line-through;
+}
+.BundleItemWrap .bottomWrap .btnWrap .btnBuy {
+  height: 0.78rem;
+  background-color: #FF8650;
+  padding: 0.16rem 0.4rem;
+  border-radius: 0.16rem;
+  color: #fff;
+  font-weight: 600;
+  font-size: 0.28rem;
+}
+.BundleItemWrap.itemOpen .header .openIcon {
+  transform: rotate(180deg);
+}
+.BundleItemWrap.itemOpen .prodList {
+  height: auto;
+  flex-direction: column;
+}
+.BundleItemWrap.itemOpen .bottomWrap {
+  height: 2.22rem;
+  flex-direction: column;
+  display: flex;
+  align-items: unset;
+  justify-content: center;
+}
+.BundleItemWrap.itemOpen .bottomWrap .totalWrap {
+  justify-content: space-between;
+}
+.BundleItemWrap.itemOpen .bottomWrap .totalWrap .priceWrap {
+  margin-left: 0;
+  text-align: right;
+}
+.BundleItemWrap.itemOpen .bottomWrap .btnWrap {
+  margin-top: 0.24rem;
+}
+.BundleItemWrap.itemOpen .bottomWrap .btnWrap .btnBuy {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 0.78rem;
+  width: 100%;
+  background-color: #FF8650;
+  border-radius: 0.16rem;
+  color: #fff;
+  font-weight: 600;
+  font-size: 0.28rem;
+}

package/es/composite-comp/monpay/components/Bundle/mobile/BundleProdItem/index.less

@@ -0,0 +1,61 @@
+.bundleItemDetailWrap {
+  display: flex;
+  height: 2.08rem;
+  align-items: center;
+  border-bottom: 0.02rem solid #E4E4E4;
+  width: 100%;
+}
+.bundleItemDetailWrap:last-child {
+  border-bottom: none;
+}
+.bundleItemDetailWrap .checkWrap {
+  width: 0.7rem;
+  height: 1.76rem;
+  border-right: 0.02rem solid #E4E4E4;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+}
+.bundleItemDetailWrap .imgWrap {
+  margin-left: 0.24rem;
+  width: 1.92rem;
+  height: 1.92rem;
+  flex: 0 0 auto;
+}
+.bundleItemDetailWrap .prodInfoWrap {
+  width: 3.4rem;
+  padding: 0.16rem;
+  flex: 1 0 auto;
+}
+.bundleItemDetailWrap .prodInfoWrap .offerName {
+  font-size: 0.28rem;
+  font-weight: 400;
+  line-height: 0.44rem;
+  color: #000;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  max-height: 0.92rem;
+  white-space: wrap;
+}
+.bundleItemDetailWrap .prodInfoWrap .price {
+  margin-top: 0.12rem;
+  display: flex;
+  justify-content: space-between;
+  font-size: 0.32rem;
+  font-weight: 600;
+  line-height: 0.48rem;
+  color: #000;
+}
+.itemWrap {
+  display: flex;
+}
+.itemWrap .iconPlus {
+  padding: 0.02rem;
+}
+.itemWrap:last-child .iconPlus {
+  display: none;
+}