@fonixtree/magic-design 2.0.131 → 2.0.134

package/es/common/LinkModal/MissionDetail/index.js

@@ -0,0 +1,318 @@
+"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"] = MissionDetail;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd4");
+
+var _locale = require("../../../locale");
+
+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 __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 __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+var paginationParams = {
+  pageSize: 20,
+  pageIndex: 1
+};
+
+function MissionDetail(props) {
+  var _this = this;
+
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
+
+  var _a = (0, _react.useState)([]),
+      list = _a[0],
+      setList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var _c = (0, _react.useState)(''),
+      taskName = _c[0],
+      setTaskName = _c[1];
+
+  var queryData = function queryData(params) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/task/unfinished/trans", __assign({}, params), 'GET')];
+
+          case 1:
+            res = _a.sent();
+            paginationParams.total = res.total;
+            setList(res.list);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryData(paginationParams);
+  }, []);
+  var columns = [{
+    title: 'Mission Name',
+    dataIndex: 'taskName'
+  }, {
+    title: 'EffDate',
+    dataIndex: 'effDate'
+  }, {
+    title: 'ExpDate',
+    dataIndex: 'expDate'
+  }];
+  var rowSelection = {
+    onChange: function onChange(selectedRowKeys, selectedRow) {
+      _onChange({
+        value: selectedRow[0].sfTaskId,
+        name: selectedRow[0].taskName
+      });
+    },
+    type: 'radio'
+  };
+
+  var reset = function reset() {
+    setTaskName('');
+    queryData(__assign({
+      taskName: ''
+    }, paginationParams));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
+    labelCol: {
+      span: 6
+    },
+    layout: "horizontal"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 24
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 16
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: (0, _locale.i18n)('MISSION_NAME')
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    onChange: function onChange(e) {
+      return setTaskName(e.target.value);
+    },
+    size: "small",
+    value: taskName
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 6
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      setLoading(true);
+      paginationParams.pageIndex = 1;
+      queryData(__assign({
+        taskName: taskName
+      }, paginationParams));
+    },
+    size: "small",
+    style: {
+      marginRight: 10
+    },
+    type: "primary"
+  }, (0, _locale.i18n)('QUERY')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      reset();
+    },
+    size: "small"
+  }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: list,
+    defaultExpandAllRows: true,
+    loading: loading,
+    pagination: __assign(__assign({}, paginationParams), {
+      onChange: function onChange(page) {
+        paginationParams.pageIndex = page;
+        queryData(__assign(__assign({}, paginationParams), {
+          taskName: taskName
+        }));
+      },
+      showSizeChanger: false
+    }),
+    rowKey: "sfTaskId",
+    rowSelection: rowSelection,
+    scroll: {
+      y: 400
+    }
+  }));
+}

package/es/common/LinkModal/index.js

@@ -49,6 +49,8 @@ var _InterestedProducts = _interopRequireDefault(require("./InterestedProducts")
 
 var _MerchantStory = _interopRequireDefault(require("./MerchantStory"));
 
+var _MissionDetail = _interopRequireDefault(require("./MissionDetail"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -424,6 +426,11 @@ var LinkModal = function LinkModal(props) {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
+    }), item.linkTypeCode === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
+      _fetch: _fetch,
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"

package/es/composite-comp/common/components/ProductItem/index.js

@@ -206,7 +206,9 @@ function (_super) {
         text: data.offerName
       }),
       readonly: true
-    }))), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (panelProps.activityPrice.open || panelProps.salesPrice.open) && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "price-info-wrap"
+    }, panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "price-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
@@ -234,7 +236,7 @@ function (_super) {
       }
     })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold")), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_d = panelProps.salesProgress) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"

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

@@ -85,6 +85,10 @@ var getDefaultJSON = function getDefaultJSON() {
           layout: 'right'
         },
         hover: null
+      },
+      countDown: {
+        id: (0, _uuid.v4)(),
+        open: true
       }
     },
     content: {

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
@@ -375,13 +377,16 @@ function (_super) {
   };
 
   FlashDealMobile.prototype.render = function () {
+    var _a;
+
     var panelProps = this.props.panelProps;
-    var _a = this.state,
-        list = _a.list,
-        effDate = _a.effDate,
-        expDate = _a.expDate,
-        now = _a.now,
-        isWill = _a.isWill;
+    console.log('flash deal panelProps: ', panelProps);
+    var _b = this.state,
+        list = _b.list,
+        effDate = _b.effDate,
+        expDate = _b.expDate,
+        now = _b.now,
+        isWill = _b.isWill;
 
     var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
@@ -400,7 +405,7 @@ function (_super) {
       data: panelProps.title.headline
     }), isWill && /*#__PURE__*/_react["default"].createElement("span", {
       className: "sub-title"
-    }, (0, _locale.i18n)('NEXT')), /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
+    }, (0, _locale.i18n)('NEXT')), ((_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.countDown.open) && /*#__PURE__*/_react["default"].createElement(_CountDown["default"], {
       effDate: effDate,
       expDate: expDate,
       now: now,
@@ -414,7 +419,10 @@ function (_super) {
       className: "btn",
       data: panelProps.title.button
     }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "flash-deal-list"
+      className: (0, _classnames["default"])('flash-deal-list', {
+        'flash-deal-list-vertical': panelProps.customize.layout === 'layout1',
+        'flash-deal-list-horizontal': panelProps.customize.layout === 'layout2'
+      })
     }, _list.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
         key: item.id,
@@ -422,6 +430,7 @@ function (_super) {
           salePercent: isWill ? 0 : item.salePercent
         }) // onItemClick={() => clickUrl(`/product/detail/${item.offerId}?productId=${item.sppProductId ?? ''}`)}
         ,
+        layout: panelProps.customize.layout === 'layout2' ? 'horizontal' : 'vertical',
         onItemClick: function onItemClick() {
           if (window.magicDesign.pushGA) {
             window.magicDesign.pushGA({}, 'select_promotion', {

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

@@ -53,12 +53,6 @@
 }
 .m-flash-deal-mobile .flash-deal-list {
   margin-top: 0.32rem;
-  overflow-x: auto;
-  overflow-y: hidden;
-  white-space: nowrap;
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
   position: relative;
 }
 .m-flash-deal-mobile .flash-deal-list .loading-wrap {
@@ -73,11 +67,49 @@
   right: 0;
   margin: auto;
 }
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap {
+.m-flash-deal-mobile .flash-deal-list-vertical {
+  overflow-x: auto;
+  overflow-y: hidden;
+  white-space: nowrap;
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
   width: 2.84rem;
   margin-right: 0.16rem;
 }
-.m-flash-deal-mobile .flash-deal-list .m-product-item-wrap .product-img {
+.m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
   height: 2.8rem;
   width: 2.8rem;
 }
+.m-flash-deal-mobile .flash-deal-list-horizontal {
+  display: flex;
+  flex-direction: column;
+  gap: 0.16rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
+  width: 100%;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap {
+  flex: 1;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .product-name-wrap {
+  white-space: nowrap;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap {
+  display: flex;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-wrap {
+  margin-bottom: 0;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap {
+  margin-left: 0.04rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .price-info-wrap .price-sold-wrap .discount {
+  display: none;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap .progress-wrap {
+  padding-right: 0.52rem;
+  margin-top: 0;
+}

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

@@ -74,13 +74,13 @@
   margin: auto;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap {
-  width: 2.8rem;
+  width: 3.44rem;
   margin-right: 0.24rem;
   border-radius: 0;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .product-img {
-  height: 2.76rem;
-  width: 2.76rem;
+  height: 3.4rem;
+  width: 3.4rem;
 }
 .m-group-buy-mobile .group-buy-list .m-product-item-wrap .content-wrap {
   padding: 0.24rem;

package/es/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigTitle/index.js

@@ -45,12 +45,12 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var AComponent =
+var FlashDealConfigTitle =
 /** @class */
 function (_super) {
-  __extends(AComponent, _super);
+  __extends(FlashDealConfigTitle, _super);
 
-  function AComponent() {
+  function FlashDealConfigTitle() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
@@ -64,7 +64,7 @@ function (_super) {
     return _this;
   }
 
-  AComponent.prototype.render = function () {
+  FlashDealConfigTitle.prototype.render = function () {
     var _this = this;
 
     var panelProps = this.props.panelProps;
@@ -86,41 +86,50 @@ function (_super) {
       headerSize: "middle",
       onRefresh: this.reRender,
       source: [{
-        key: '1',
+        key: 'iconConfig',
         name: (0, _locale.i18n)('ICON'),
         value: iconSetting,
         metaOption: panelProps.icon
       }, {
-        key: '2',
+        key: 'headlineConfig',
         name: (0, _locale.i18n)('HEADLINE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.headline
         }),
         metaOption: panelProps.headline
       }, {
-        key: '3',
+        key: 'buttonCOnfig',
         name: (0, _locale.i18n)('BUTTON'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.button
         }),
         metaOption: panelProps.button
+      }, {
+        key: 'countDownConfig',
+        name: (0, _locale.i18n)('COUNT_DOWN'),
+        value: null,
+        metaOption: panelProps === null || panelProps === void 0 ? void 0 : panelProps.countDown,
+        toggleType: 'switch'
       }],
       type: "switch"
     }));
   };
 
-  AComponent.defaultProps = {
+  FlashDealConfigTitle.defaultProps = {
     panelProps: {
       icon: {
         open: true,
         url: ''
       },
       headline: {},
-      button: {}
+      button: {},
+      countDown: {
+        open: true
+      }
     }
   };
-  return AComponent;
+  return FlashDealConfigTitle;
 }(_react["default"].Component);
 
-var _default = AComponent;
+var _default = FlashDealConfigTitle;
 exports["default"] = _default;

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

@@ -11,8 +11,6 @@ var _FlashDealConfigTitle = _interopRequireDefault(require("./FlashDealConfigTit
 
 var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigContent"));
 
-var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
-
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
@@ -23,6 +21,8 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _locale = require("../../../../locale");
 
+var _layout = require("../../../../constants/layout");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function FlashDealConfig(props) {
@@ -55,11 +55,7 @@ function FlashDealConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
-        layoutSource: [{
-          id: 'layout1',
-          name: 'layout1',
-          image: _layout["default"]
-        }]
+        layoutSource: _layout.flashDealLayout
       })
     }, {
       key: '5',