@fonixtree/magic-design 2.0.100 → 2.0.102

package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -362,9 +362,9 @@ function (_super) {
       }, '#CE1126') : '#CE1126';
     };
 
-    _this.getProductList = function (index) {
+    _this.getProductList = function (index, filterParams) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, _h, pageInfo, brandIds, catgIds, offerAttrValues, serviceIds, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, _h, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, e_1, _cache;
 
         var _j, _k, _l;
 
@@ -468,7 +468,7 @@ function (_super) {
             case 7:
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
                 pageIndex: 1,
                 pageSize: maxProdNum,
                 sortType: '1',
@@ -476,16 +476,16 @@ function (_super) {
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
                 storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
-              }, 'POST')];
+              }, filterParams), 'POST')];
 
             case 8:
-              _h = _m.sent(), pageInfo = _h.pageInfo, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues, serviceIds = _h.serviceIds;
+              _h = _m.sent(), pageInfo = _h.pageInfo, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
               this.setState({
                 filterObj: {
+                  serviceIds: serviceIds,
                   brandIds: brandIds,
                   catgIds: catgIds,
-                  offerAttrValues: offerAttrValues,
-                  serviceIds: serviceIds
+                  offerAttrValues: offerAttrValues
                 }
               });
               newData = __spreadArrays(pageInfo.list);
@@ -592,8 +592,11 @@ function (_super) {
     _this.onSearchCondChange = function (cond) {
       _this.setState({
         searchParams: cond
-      }); // initProduct({ pageIndex: 1/, pageSize: 10, q: searchValue, ...linkParams, ...cond });
+      });
+
+      var tabIndex = _this.state.tabIndex;
 
+      _this.getProductList(tabIndex, cond);
     };
 
     return _this;

package/lib/constants/index.js

@@ -183,7 +183,7 @@ var compInfoMap = {
     icon: 'icon-forms'
   },
   MONPAY_RECOMMEND: {
-    name: 'Monpay Recommend',
+    name: 'Recommend',
     icon: 'icon-forms'
   },
   INTEREST_PRODUCTS: {

package/lib/locale/en/en.json

@@ -1,4 +1,11 @@
 {
+  "OK": "OK",
+  "BRANDS": "Brands",
+  "CATEGORY": "Category",
+  "SERVICE": "Service",
+  "RATINGS": "Ratings",
+  "STAR": "Star",
+  "APPLY": "Apply",
   "SORT_BY": "Sort by",
   "PROMOTION": "Promotion",
   "HIGHEST_RATED": "Highest rated",
@@ -158,7 +165,6 @@
   "ALL": "ALL",
   "HOT": "Hot",
   "GUESS_YOU_LIKE": "Guess you like",
-  "CATEGORY": "Category",
   "LABEL": "Label",
   "UNDERLINE_STYLE": "Underline Style",
   "UNDERLINE_COLOR": "Underline Color",
@@ -214,7 +220,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "OK": "OK",
   "CANCEL": "Cancel",
   "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",

package/lib/locale/es/es.json

@@ -1,4 +1,11 @@
 {
+  "OK": "OK",
+  "BRANDS": "Brands",
+  "CATEGORY": "Categoría",
+  "SERVICE": "Service",
+  "RATINGS": "Ratings",
+  "STAR": "Star",
+  "APPLY": "Apply",
   "SORT_BY": "Sort by",
   "PROMOTION": "Promotion",
   "HIGHEST_RATED": "Highest rated",
@@ -158,7 +165,6 @@
   "ALL": "TODO",
   "HOT": "Caliente",
   "GUESS_YOU_LIKE": "Supongo que te gusta",
-  "CATEGORY": "Categoría",
   "LABEL": "Etiqueta",
   "UNDERLINE_STYLE": "Estilo de subrayado",
   "UNDERLINE_COLOR": "Color de subrayado",
@@ -214,7 +220,6 @@
   "GROUP_BY": "Agrupar por",
   "FLASH_SALE": "Oferta relámpago",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "La cantidad del producto se actualizará automáticamente con los artículos que cumplan con las condiciones de la categoría",
-  "OK": "OK",
   "CANCEL": "Cancelar",
   "LINK_TYPE": "Tipo de enlace",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Parece que no tiene ninguna imagen en su galería. Elija imágenes para mostrar en esta página.",

package/lib/locale/id/id.json

@@ -1,4 +1,11 @@
 {
+  "OK": "OK",
+  "BRANDS": "Brands",
+  "CATEGORY": "Category",
+  "SERVICE": "Service",
+  "RATINGS": "Ratings",
+  "STAR": "Star",
+  "APPLY": "Apply",
   "SORT_BY": "Sort by",
   "PROMOTION": "Promotion",
   "HIGHEST_RATED": "Highest rated",
@@ -158,7 +165,6 @@
   "ALL": "ALL",
   "HOT": "Hot",
   "GUESS_YOU_LIKE": "Guess you like",
-  "CATEGORY": "Category",
   "LABEL": "Label",
   "UNDERLINE_STYLE": "Underline Style",
   "UNDERLINE_COLOR": "Underline Color",
@@ -214,7 +220,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "OK": "OK",
   "CANCEL": "Cancel",
   "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",

package/lib/meta-comp/components/Button/editable.js

@@ -99,7 +99,7 @@ function (_super) {
     this.preData = JSON.stringify(data);
     this.preDevice = window.magicDesign.device;
     return /*#__PURE__*/_react["default"].createElement("span", {
-      className: "item",
+      className: "editable-item",
       contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
       onInput: function onInput(e) {
         var text = e.target.textContent;

package/lib/meta-comp/components/Button/editable.less

@@ -1,4 +1,4 @@
-.item {
+.editable-item {
   width: 100%;
   display: flex;
   align-items: center;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.100",
+  "version": "2.0.102",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",

package/es/common/PopUpModal1/index.js

@@ -1,164 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _antd = require("antd");
-
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _style = _interopRequireDefault(require("./style.less"));
-
-var _Button = _interopRequireDefault(require("../Button"));
-
-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 __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 __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;
-};
-/* eslint-disable max-len */
-
-/* eslint-disable react/prefer-stateless-function */
-
-
-var MyModal =
-/** @class */
-function (_super) {
-  __extends(MyModal, _super);
-
-  function MyModal() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-
-  MyModal.prototype.render = function () {
-    var _a = this.props,
-        onOk = _a.onOk,
-        okText = _a.okText,
-        hideCloseBtn = _a.hideCloseBtn,
-        title = _a.title,
-        visible = _a.visible,
-        onCloseText = _a.onCloseText,
-        onClose = _a.onClose,
-        children = _a.children,
-        rest = __rest(_a, ["onOk", "okText", "hideCloseBtn", "title", "visible", "onCloseText", "onClose", "children"]);
-
-    var style = rest.style;
-    Reflect.deleteProperty(rest, 'style');
-    var showCloseBtn = !hideCloseBtn && onClose;
-    return /*#__PURE__*/_react["default"].createElement(_antd.Popup, _extends({
-      className: _style["default"].container,
-      closeOnMaskClick: true,
-      onClose: onClose,
-      visible: visible
-    }, rest), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "modal-content-wrap",
-      style: __assign({}, style)
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "topLineWrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "topLine",
-      onClick: onClose
-    })), title && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "modal-title"
-    }, title), children, (onOk || showCloseBtn) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "btn-wrap"
-    }, onOk && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      onClick: onOk
-    }, okText), showCloseBtn && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      onClick: onClose,
-      plain: true
-    }, onCloseText))));
-  };
-
-  return MyModal;
-}(_react["default"].Component);
-
-MyModal.propTypes = {
-  /** title */
-  title: _propTypes["default"].string,
-
-  /** visible */
-  visible: _propTypes["default"].bool,
-
-  /** onClose */
-  onClose: _propTypes["default"].func,
-
-  /** 确认按钮事件 */
-  onOk: _propTypes["default"].func,
-
-  /** 确认按钮文案 */
-  okText: _propTypes["default"].string,
-
-  /** 取消按钮文案 */
-  onCloseText: _propTypes["default"].string,
-
-  /** 取消按钮文案 */
-  hideCloseBtn: _propTypes["default"].bool
-};
-MyModal.defaultProps = {
-  title: '',
-  visible: false,
-  onClose: function onClose() {},
-  okText: 'Ok',
-  onCloseText: 'Cancel',
-  hideCloseBtn: false
-};
-var _default = MyModal;
-exports["default"] = _default;

package/es/common/PopUpModal1/style.less

@@ -1,56 +0,0 @@
-.container {
-  :global {
-    .topLineWrap {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 24px;
-
-      .topLine {
-        width: 42px;
-        height: 4px;
-        background: rgba(233, 233, 233, 1);
-        border-radius: 2px;
-      }
-    }
-
-    .btn-wrap {
-      padding: 12px 24px;
-
-      &>div+div {
-        margin-top: 12px;
-      }
-    }
-
-
-    .adm-popup-body {
-      border-radius: 10px 10px 0px 0px;
-      background: #FFF;
-      box-shadow: 0px -10px 5px 0px rgba(0, 0, 0, 0.05);
-    }
-
-    .am-modal-content {
-      text-align: left;
-    }
-
-    .am-modal-content {
-      border-radius: 0;
-    }
-
-    .modal-content-wrap {
-      padding: 0;
-      position: relative;
-
-      .modal-title {
-        font-size: 16px;
-        font-weight: 600;
-        color: #000;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 48px;
-        padding: 12px 16px 0 16px;
-      }
-    }
-  }
-}

package/lib/common/PopUpModal1/index.js

@@ -1,164 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _antd = require("antd");
-
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _style = _interopRequireDefault(require("./style.less"));
-
-var _Button = _interopRequireDefault(require("../Button"));
-
-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 __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 __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;
-};
-/* eslint-disable max-len */
-
-/* eslint-disable react/prefer-stateless-function */
-
-
-var MyModal =
-/** @class */
-function (_super) {
-  __extends(MyModal, _super);
-
-  function MyModal() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-
-  MyModal.prototype.render = function () {
-    var _a = this.props,
-        onOk = _a.onOk,
-        okText = _a.okText,
-        hideCloseBtn = _a.hideCloseBtn,
-        title = _a.title,
-        visible = _a.visible,
-        onCloseText = _a.onCloseText,
-        onClose = _a.onClose,
-        children = _a.children,
-        rest = __rest(_a, ["onOk", "okText", "hideCloseBtn", "title", "visible", "onCloseText", "onClose", "children"]);
-
-    var style = rest.style;
-    Reflect.deleteProperty(rest, 'style');
-    var showCloseBtn = !hideCloseBtn && onClose;
-    return /*#__PURE__*/_react["default"].createElement(_antd.Popup, _extends({
-      className: _style["default"].container,
-      closeOnMaskClick: true,
-      onClose: onClose,
-      visible: visible
-    }, rest), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "modal-content-wrap",
-      style: __assign({}, style)
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "topLineWrap"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "topLine",
-      onClick: onClose
-    })), title && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "modal-title"
-    }, title), children, (onOk || showCloseBtn) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "btn-wrap"
-    }, onOk && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      onClick: onOk
-    }, okText), showCloseBtn && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      onClick: onClose,
-      plain: true
-    }, onCloseText))));
-  };
-
-  return MyModal;
-}(_react["default"].Component);
-
-MyModal.propTypes = {
-  /** title */
-  title: _propTypes["default"].string,
-
-  /** visible */
-  visible: _propTypes["default"].bool,
-
-  /** onClose */
-  onClose: _propTypes["default"].func,
-
-  /** 确认按钮事件 */
-  onOk: _propTypes["default"].func,
-
-  /** 确认按钮文案 */
-  okText: _propTypes["default"].string,
-
-  /** 取消按钮文案 */
-  onCloseText: _propTypes["default"].string,
-
-  /** 取消按钮文案 */
-  hideCloseBtn: _propTypes["default"].bool
-};
-MyModal.defaultProps = {
-  title: '',
-  visible: false,
-  onClose: function onClose() {},
-  okText: 'Ok',
-  onCloseText: 'Cancel',
-  hideCloseBtn: false
-};
-var _default = MyModal;
-exports["default"] = _default;

package/lib/common/PopUpModal1/style.less

@@ -1,56 +0,0 @@
-.container {
-  :global {
-    .topLineWrap {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 24px;
-
-      .topLine {
-        width: 42px;
-        height: 4px;
-        background: rgba(233, 233, 233, 1);
-        border-radius: 2px;
-      }
-    }
-
-    .btn-wrap {
-      padding: 12px 24px;
-
-      &>div+div {
-        margin-top: 12px;
-      }
-    }
-
-
-    .adm-popup-body {
-      border-radius: 10px 10px 0px 0px;
-      background: #FFF;
-      box-shadow: 0px -10px 5px 0px rgba(0, 0, 0, 0.05);
-    }
-
-    .am-modal-content {
-      text-align: left;
-    }
-
-    .am-modal-content {
-      border-radius: 0;
-    }
-
-    .modal-content-wrap {
-      padding: 0;
-      position: relative;
-
-      .modal-title {
-        font-size: 16px;
-        font-weight: 600;
-        color: #000;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 48px;
-        padding: 12px 16px 0 16px;
-      }
-    }
-  }
-}