@fonixtree/magic-design 2.0.106 → 2.0.108

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

@@ -238,9 +238,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -249,9 +247,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -260,9 +256,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -271,9 +265,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }];
 var LAYOUT_IMAGE_SIZE = {
   'layout1-2': {
@@ -364,14 +356,14 @@ function (_super) {
 
     _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, serviceIds, brandIds, catgIds, offerAttrValues, 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, _h, list, serviceIds, brandIds, catgIds, offerAttrValues, _j, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, _k, pageInfo, serviceIds, brandIds, catgIds, offerAttrValues, e_1, _cache;
 
-        var _j, _k, _l;
+        var _l, _m, _o;
 
         var _this = this;
 
-        return __generator(this, function (_m) {
-          switch (_m.label) {
+        return __generator(this, function (_p) {
+          switch (_p.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -383,7 +375,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_j = {}, _j["products" + index] = cache["products" + index], _j), function () {
+                    this.setState((_l = {}, _l["products" + index] = cache["products" + index], _l), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -397,14 +389,14 @@ function (_super) {
 
               _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _m.label = 1;
+              _p.label = 1;
 
             case 1:
-              _m.trys.push([1, 14,, 15]);
+              _p.trys.push([1, 18,, 19]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
-              , 12];
+              , 16];
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
@@ -426,16 +418,16 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _m.sent();
+              res = _p.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
-              , 11];
+              , 15];
 
             case 3:
               if (!(sourceType === 'recommend')) return [3
               /*break*/
-              , 10];
+              , 14];
               if (!(intelligentType === 'Recently')) return [3
               /*break*/
               , 7];
@@ -444,28 +436,75 @@ function (_super) {
               , 5];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/viewlog/recent/list', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/viewlog/recent/list', __assign({
                 pageIndex: 1,
                 pageSize: maxProdNum
-              }, 'GET')];
+              }, filterParams), 'GET')];
 
             case 4:
-              res = _m.sent();
-              newData = __spreadArrays(res.list);
+              _h = _p.sent(), list = _h.list, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
+              this.setState({
+                filterObj: {
+                  serviceIds: serviceIds,
+                  brandIds: brandIds,
+                  catgIds: catgIds,
+                  offerAttrValues: offerAttrValues
+                }
+              });
+              newData = __spreadArrays(list);
               return [3
               /*break*/
               , 6];
 
             case 5:
               newData = defaultData;
-              _m.label = 6;
+              _p.label = 6;
 
             case 6:
               return [3
               /*break*/
-              , 9];
+              , 13];
 
             case 7:
+              if (!(intelligentType === 'Coupon')) return [3
+              /*break*/
+              , 11];
+              if (!!(0, _coreUtil.isDesignMode)()) return [3
+              /*break*/
+              , 9];
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
+                pageIndex: 1,
+                pageSize: maxProdNum,
+                qryUserCoupon: true
+              }, filterParams), 'POST')];
+
+            case 8:
+              _j = _p.sent(), pageInfo = _j.pageInfo, serviceIds = _j.serviceIds, brandIds = _j.brandIds, catgIds = _j.catgIds, offerAttrValues = _j.offerAttrValues;
+              this.setState({
+                filterObj: {
+                  serviceIds: serviceIds,
+                  brandIds: brandIds,
+                  catgIds: catgIds,
+                  offerAttrValues: offerAttrValues
+                }
+              });
+              newData = __spreadArrays(pageInfo.list);
+              return [3
+              /*break*/
+              , 10];
+
+            case 9:
+              newData = defaultData;
+              _p.label = 10;
+
+            case 10:
+              return [3
+              /*break*/
+              , 13];
+
+            case 11:
               return [4
               /*yield*/
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', __assign({
@@ -478,8 +517,8 @@ function (_super) {
                 storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, filterParams), 'POST')];
 
-            case 8:
-              _h = _m.sent(), pageInfo = _h.pageInfo, serviceIds = _h.serviceIds, brandIds = _h.brandIds, catgIds = _h.catgIds, offerAttrValues = _h.offerAttrValues;
+            case 12:
+              _k = _p.sent(), pageInfo = _k.pageInfo, serviceIds = _k.serviceIds, brandIds = _k.brandIds, catgIds = _k.catgIds, offerAttrValues = _k.offerAttrValues;
               this.setState({
                 filterObj: {
                   serviceIds: serviceIds,
@@ -489,45 +528,45 @@ function (_super) {
                 }
               });
               newData = __spreadArrays(pageInfo.list);
-              _m.label = 9;
+              _p.label = 13;
 
-            case 9:
+            case 13:
               return [3
               /*break*/
-              , 11];
+              , 15];
 
-            case 10:
+            case 14:
               newData = [];
-              _m.label = 11;
+              _p.label = 15;
 
-            case 11:
+            case 15:
               return [3
               /*break*/
-              , 13];
+              , 17];
 
-            case 12:
+            case 16:
               newData = [];
-              _m.label = 13;
+              _p.label = 17;
 
-            case 13:
+            case 17:
               return [3
               /*break*/
-              , 15];
+              , 19];
 
-            case 14:
-              e_1 = _m.sent();
+            case 18:
+              e_1 = _p.sent();
               newData = [];
               return [3
               /*break*/
-              , 15];
+              , 19];
 
-            case 15:
+            case 19:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_m = {}, _m["products" + index] = newData, _m.endTime = Date.now() + 3 * 60 * 1000, _m)));
               }
 
-              this.setState((_l = {}, _l["products" + index] = newData, _l), function () {
+              this.setState((_o = {}, _o["products" + index] = newData, _o), function () {
                 _this.resetLayout();
               });
               return [2
@@ -676,16 +715,18 @@ function (_super) {
   RecommendMobile.prototype.render = function () {
     var _this = this;
 
+    var _a;
+
     var panelProps = this.props.panelProps;
-    var _a = this.state,
-        tabIndex = _a.tabIndex,
-        tabLeft = _a.tabLeft,
-        tabWidth = _a.tabWidth,
-        groupSource = _a.groupSource,
-        hideTabs = _a.hideTabs,
-        contentWidth = _a.contentWidth,
-        filterObj = _a.filterObj,
-        searchParams = _a.searchParams;
+    var _b = this.state,
+        tabIndex = _b.tabIndex,
+        tabLeft = _b.tabLeft,
+        tabWidth = _b.tabWidth,
+        groupSource = _b.groupSource,
+        hideTabs = _b.hideTabs,
+        contentWidth = _b.contentWidth,
+        filterObj = _b.filterObj,
+        searchParams = _b.searchParams;
     var products = this.state["products" + tabIndex] || [];
 
     var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
@@ -751,7 +792,7 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
+    })), ((_a = panelProps.content.filter) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_SearchCondition["default"], {
       filterObj: filterObj,
       onChange: this.onSearchCondChange,
       value: searchParams

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

@@ -242,9 +242,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -253,9 +251,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -264,9 +260,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }, {
   imgUrlContent: {
     url: _card["default"]
@@ -275,9 +269,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
-  discountPercent: 10,
-  salePercent: 500,
-  sppType: '2'
+  salePercent: 500
 }];
 
 var RecommendMobile =

package/lib/composite-comp/monpay/config-panels/BundleConfig/ConfigTitle/index.js

@@ -73,7 +73,7 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('HEADLINE'),
+        name: (0, _locale.i18n)('HEADER_IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.headerImage
         }),

package/lib/composite-comp/monpay/config-panels/MerchantSalesConfig/ConfigContent/index.js

@@ -84,6 +84,7 @@ function (_super) {
     }, "Sales"))), /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "middle",
+      onRefresh: this.reRender,
       source: [{
         key: '1',
         name: 'Merchant Name',

package/lib/composite-comp/monpay/config-panels/MerchantSalesConfig/ConfigTitle/index.js

@@ -73,7 +73,7 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('HEADLINE'),
+        name: (0, _locale.i18n)('HEADER_IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.headerImage
         }),

package/lib/composite-comp/monpay/config-panels/MonpayFlashDealConfig/FlashDealConfigContent/index.js

@@ -93,40 +93,41 @@ function (_super) {
       headerSize: "middle",
       onRefresh: this.reRender,
       source: [{
-        key: '0',
+        key: 'title1',
         name: (0, _locale.i18n)('DISCOUNT_LABEL'),
         metaOption: panelProps.discount
       }, {
-        key: '1',
+        key: 'title2',
         name: (0, _locale.i18n)('ACTIVITY_LABEL'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.label
         }),
         metaOption: panelProps.label
       }, {
-        key: '2',
+        key: 'title3',
         name: (0, _locale.i18n)('PRODUCT_NAME'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.productName
         }),
         metaOption: panelProps.productName
       }, {
-        key: '3',
+        key: 'title4',
         name: (0, _locale.i18n)('ACTIVITY_PRICE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.activityPrice
         }),
         metaOption: panelProps.activityPrice
       }, {
-        key: '4',
+        key: 'title5',
         name: (0, _locale.i18n)('SALES_PRICE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.salesPrice
         }),
         metaOption: panelProps.salesPrice
       }, {
-        key: '5',
+        key: 'title6',
         name: (0, _locale.i18n)('STOCK'),
+        value: null,
         metaOption: panelProps.stock
       }],
       type: "switch"

package/lib/composite-comp/monpay/config-panels/MonpayFlashDealConfig/FlashDealConfigTitle/index.js

@@ -122,31 +122,31 @@ function (_super) {
       headerSize: "middle",
       onRefresh: this.reRender,
       source: [{
-        key: '1',
+        key: 'title1',
         name: (0, _locale.i18n)('ICON'),
         value: iconSetting,
         metaOption: panelProps.icon
       }, {
-        key: '2',
+        key: 'title2',
         name: (0, _locale.i18n)('HEADLINE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.headline
         }),
         metaOption: panelProps.headline
       }, {
-        key: '3',
+        key: 'title3',
         name: (0, _locale.i18n)('COUNTDOWN'),
         value: countDownSetting,
         metaOption: panelProps.countdown
       }, {
-        key: '4',
+        key: 'title4',
         name: (0, _locale.i18n)('BUTTON'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.button
         }),
         metaOption: panelProps.button
       }, {
-        key: '5',
+        key: 'title5',
         name: (0, _locale.i18n)('SESSION_TIME'),
         metaOption: panelProps.sessionTime
       }],

package/lib/composite-comp/monpay/config-panels/MonpayRecommendConfig/RecommendConfigContent/index.js

@@ -74,9 +74,7 @@ function (_super) {
       source: [{
         key: '0',
         name: (0, _locale.i18n)('FILTER'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.filter
-        }),
+        value: null,
         metaOption: panelProps.filter
       }, {
         key: '1',

package/lib/composite-comp/monpay/second-config-panels/MonpayRecommendSecondConfig/AIRecommendation/index.js

@@ -368,7 +368,7 @@ function (_super) {
     }, (0, _locale.i18n)('LABEL')), /*#__PURE__*/_react["default"].createElement(Option, {
       value: "Recently"
     }, (0, _locale.i18n)('RECENTLY')), /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "coupon"
+      value: "Coupon"
     }, (0, _locale.i18n)('COUPON')))), intelligentType === 'Category' && /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_antd.TreeSelect, {
       allowClear: true,
       dropdownStyle: {

package/lib/core/SelectUrl/index.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _UrlPicker = _interopRequireDefault(require("../../common/UrlPicker"));
+
+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 SelectUrl = function SelectUrl(props) {
+  console.log(props, 'props');
+  var fishFetch = props.fishFetch,
+      config = props.config,
+      modalConfig = props.modalConfig;
+  window.magicDesign.MBaseUrl = config.MBaseUrl;
+  window.magicDesign.partyType = config.partyType;
+  return /*#__PURE__*/_react["default"].createElement(_UrlPicker["default"], _extends({
+    selfFetch: fishFetch
+  }, props, {
+    modalConfig: modalConfig
+  }));
+};
+
+SelectUrl.defaultProps = {
+  value: '',
+  disabled: false,
+  onChange: function onChange() {}
+};
+var _default = SelectUrl;
+exports["default"] = _default;

package/lib/index.js

@@ -15,9 +15,23 @@ Object.defineProperty(exports, "Renderer", {
     return _Renderer["default"];
   }
 });
+Object.defineProperty(exports, "SelectUrl", {
+  enumerable: true,
+  get: function get() {
+    return _SelectUrl["default"];
+  }
+});
+Object.defineProperty(exports, "clickUrl", {
+  enumerable: true,
+  get: function get() {
+    return _coreUtil.clickUrl;
+  }
+});
 
 require("./assets/fonts/magic-box-iconfont.css");
 
+var _coreUtil = require("./utils/coreUtil");
+
 require("./assets/less/index.less");
 
 require("./assets/less/cylon-antd.less");
@@ -26,4 +40,6 @@ var _Designer = _interopRequireDefault(require("./core/Designer"));
 
 var _Renderer = _interopRequireDefault(require("./core/Renderer"));
 
+var _SelectUrl = _interopRequireDefault(require("./core/SelectUrl"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/locale/en/en.json

@@ -176,7 +176,7 @@
   "SOURCE_OF_PRODUCT": "Source Of Product",
   "AI_RECOMMENDATION": "AI Recommendation",
   "SELECT_PRODUCT": "Select Product",
-  "PRODUCT_QUANTITY": "Product quantity",
+  "PRODUCT_QUANTITY": "Product Quantity",
   "COLOR": "Color",
   "AUTOPLAYS": "Autoplays",
   "SHOW_NAVIGATION_ARROW": "Show navigation arrow",

package/lib/locale/id/id.json

@@ -176,7 +176,7 @@
   "SOURCE_OF_PRODUCT": "Source Of Product",
   "AI_RECOMMENDATION": "AI Recommendation",
   "SELECT_PRODUCT": "Select Product",
-  "PRODUCT_QUANTITY": "Product quantity",
+  "PRODUCT_QUANTITY": "Product Quantity",
   "COLOR": "Color",
   "AUTOPLAYS": "Autoplays",
   "SHOW_NAVIGATION_ARROW": "Show navigation arrow",

package/lib/meta-comp/config-panels/TextConfig/index.js

@@ -282,6 +282,7 @@ function (_super) {
         split: true,
         title: "URL"
       }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
+        disabled: textData.urlDisabled,
         onChange: function onChange(v) {
           textData.clickUrl = v;
 

package/package.json

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