@fonixtree/magic-design 2.0.189 → 3.0.2

package/lib/composite-comp/bol/components/Location/defaultJSON.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'LOCATION',
+    logo: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      color: '#fff'
+    },
+    address: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true
+    },
+    icon: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      color: '#fff'
+    },
+    spacing: {
+      pc: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 12,
+        paddingBottom: 12,
+        paddingLeft: 12,
+        marginBottom: 0
+      }
+    },
+    customize: {
+      layout: {
+        pcLayout: 'top',
+        h5Layout: 'top'
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#597EF7',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/{es/composite-comp/public → lib/composite-comp/bol}/components/Location/index.js

@@ -9,10 +9,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _defaultJSON = require("./defaultJSON");
 
-var _mobile = _interopRequireDefault(require("./mobile"));
+var _common = require("../../../../common");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+var _locale = require("../../../../locale");
+
+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); }
@@ -70,9 +74,21 @@ function (_super) {
 
   CustomCode.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, window.magicDesign.device === 'pc' ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
-      panelProps: nodeData
-    }));
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null) : /*#__PURE__*/_react["default"].createElement("div", {
+      className: "location-mobile"
+    }, nodeData.logo.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      className: "logo",
+      color: nodeData.logo.color,
+      size: 20,
+      type: "icon-MapPin"
+    }), nodeData.address.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "address"
+    }, (0, _locale.i18n)('DISPLAY_LOCATION_ADDRESS')), nodeData.icon.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      className: "logo",
+      color: nodeData.icon.color,
+      size: 16,
+      type: "icon-outlined-right"
+    })));
   };
 
   CustomCode.defaultProps = {};

package/lib/composite-comp/bol/components/Location/index.less

@@ -0,0 +1,15 @@
+.location-mobile {
+  display: flex;
+  align-items: center;
+  .logo {
+    margin-right: 6px;
+  }
+  .address {
+    font-family: Open Sans;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 18px;
+    color: #fff;
+  }
+  
+}

package/{es/composite-comp/ashita/components/WalletAshita → lib/composite-comp/bol/components/Wallet}/defaultJSON.js

@@ -166,7 +166,7 @@ var getDefaultJSON = function getDefaultJSON() {
   var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
   return {
     id: groupId,
-    type: 'WALLET_ASHITA',
+    type: 'WALLET',
     title: {
       headline: {
         id: (0, _uuid.v4)(),

package/{es/composite-comp/public → lib/composite-comp/bol}/config-panels/LocationConfig/index.js

@@ -7,7 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ConfigContent = _interopRequireDefault(require("./ConfigContent"));
+var _common = require("../../../../common");
+
+var _coreUtil = require("../../../../utils/coreUtil");
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
@@ -23,8 +25,6 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -59,22 +59,64 @@ function (_super) {
   __extends(LocationConfig, _super);
 
   function LocationConfig() {
-    return _super !== null && _super.apply(this, arguments) || this;
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.getContentPanel = function () {
+      var data = _this.props.data;
+      var source = [{
+        key: data.logo.id,
+        name: (0, _locale.i18n)('LOCATION_LOGO'),
+        value: /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          colorType: "rgba",
+          onChange: function onChange(v) {
+            data.logo.color = v;
+
+            _this.selfRender();
+          },
+          value: data.logo.color
+        })),
+        metaOption: data.logo
+      }, {
+        key: data.address.id,
+        name: (0, _locale.i18n)('ADDRESS'),
+        metaOption: data.address
+      }, {
+        key: data.icon.id,
+        name: (0, _locale.i18n)('ICON'),
+        value: /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          colorType: "rgba",
+          onChange: function onChange(v) {
+            data.icon.color = v;
+
+            _this.selfRender();
+          },
+          value: data.icon.color
+        })),
+        metaOption: data.icon
+      }];
+      return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: source,
+        type: "switch"
+      });
+    };
+
+    return _this;
   }
 
   LocationConfig.prototype.render = function () {
     var data = this.props.data;
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "location_config"
-    }, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       divider: "bold",
       headerSize: "large",
       source: [{
         key: 'content',
         name: (0, _locale.i18n)('CONTENT'),
-        value: /*#__PURE__*/_react["default"].createElement(_ConfigContent["default"], {
-          panelProps: data.content
-        })
+        value: this.getContentPanel()
       }, {
         key: 'spacing',
         name: (0, _locale.i18n)('SPACING'),

package/{es/composite-comp/ashita/config-panels/WalletAshitaConfig → lib/composite-comp/bol/config-panels/WalletConfig}/WalletConfigImageGroup/index.js

@@ -15,7 +15,7 @@ var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList
 
 var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
-var _defaultJSON = require("../../../components/WalletAshita/defaultJSON");
+var _defaultJSON = require("../../../components/Wallet/defaultJSON");
 
 var _locale = require("../../../../../locale");
 

package/lib/composite-comp/common/components/MonpayProductItem/index.js

@@ -164,7 +164,7 @@ function (_super) {
       }
     }
 
-    var _discountPercent = isRecommend ? data.sppDiscountPercent || data.discountPercent : data.discountPercent;
+    var _discountPercent = isRecommend ? data.sppDiscountPercent : data.discountPercent;
 
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-product-item-wrap', {
@@ -246,10 +246,10 @@ function (_super) {
     })), ((_b = panelProps.evaluationScore) === null || _b === void 0 ? void 0 : _b.open) && ((_c = panelProps.sold) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "line"
     }), ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sold no-reversed"
+      className: "sold"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       data: __assign(__assign({}, panelProps.sold), {
-        text: (0, _commonUtil.reverseStrArr)([(0, _locale.i18n)('SOLD'), soldNumber, '+'])
+        text: (0, _locale.i18n)('SOLD') + " " + soldNumber
       }),
       readonly: true
     }))), intelligentType === 'Coupon' && data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/common/components/MonpayProductItem/index.less

@@ -7,30 +7,32 @@
   position: relative;
   margin-right: 16px;
   border-radius: 8px;
+  border: 1px solid #E4E4E4;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
+    border-radius: 8px 8px 0 0;
     // overflow: hidden;
 
     .product-img {
       width: 140px;
       height: 140px;
-      border-radius: 8px;
+      border-radius: 8px 8px 0 0;
       object-fit: cover;
     }
 
     .discount-tag {
-      // font-size: 12px;
-      // font-weight: 700;
-      // color: #fff;
-      // background-color: #ff8650;
-      // padding: 5px;
-      // border-radius: 0 5px 5px 0;
+      font-size: 12px;
+      font-weight: 700;
+      color: #fff;
+      background-color: #ff8650;
+      padding: 5px;
+      border-radius: 0 5px 5px 0;
       position: absolute;
       top: 15px;
       left: 0;
     }
+
     .giftL-tag {
       font-size: 12px;
       font-weight: 700;
@@ -40,6 +42,7 @@
       border-radius: 0 5px 5px 0;
       display: flex;
       align-items: center;
+
       .icon {
         margin-right: 4px;
       }
@@ -47,6 +50,7 @@
   }
 
   .content-wrap {
+    padding: 0 0 8px 10px;
 
     .promotions-wrap {
       display: flex;

package/lib/composite-comp/dito/config-panels/BargainConfig/FlashDealConfigContent/index.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _antd = require("antd4");
+var _antd = require("antd");
 
 var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
 

package/lib/composite-comp/monpay/components/MonpayFlashDeal/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
 
+var _pc = _interopRequireDefault(require("./pc"));
+
 var _defaultJSON = require("./defaultJSON");
 
 var _coreUtil = require("../../../../utils/coreUtil");
@@ -70,7 +72,9 @@ function (_super) {
 
   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"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      panelProps: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       panelProps: nodeData
     }));
   };

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

@@ -11,8 +11,6 @@ require("./index.less");
 
 var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
-var _locale = require("../../../../../locale");
-
 var _MonpayProductItem = _interopRequireDefault(require("../../../../common/components/MonpayProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -23,6 +21,8 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _storeUtil = require("../../../../../utils/storeUtil");
 
+var _constants = require("../../../../../constants");
+
 var _dateUtil = require("../../../../../utils/dateUtil");
 
 var _MonpayCountDown = _interopRequireDefault(require("../MonpayCountDown"));
@@ -364,6 +364,31 @@ function (_super) {
       });
     };
 
+    _this.toLocale = function (value) {
+      var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+
+      if (locale == 'mn') {
+        // const time = newDate('2024-10-13 10:11:00');
+        var time = (0, _dateUtil.newDate)(value);
+
+        var _hour = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
+
+        var _minutes = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
+
+        if ((0, _dateUtil.isTomorrow)(time)) {
+          return "\u041C\u0430\u0440\u0433\u0430\u0430\u0448, " + _hour + ":" + _minutes;
+        }
+
+        if ((0, _dateUtil.isToday)(time)) {
+          return "\u04E8\u043D\u04E9\u04E9\u0434\u04E9\u0440, " + _hour + ":" + _minutes;
+        } else {
+          return time.getMonth() + 1 + " \u0441\u0430\u0440\u044B\u043D " + time.getDate() + "-\u043D\u044B " + _hour + ":" + _minutes;
+        }
+      } else {
+        return (0, _dateUtil.formatDayMonthTime)(value);
+      }
+    };
+
     return _this;
   }
 
@@ -380,6 +405,8 @@ function (_super) {
   };
 
   FlashDealMobile.prototype.render = function () {
+    var _this = this;
+
     var panelProps = this.props.panelProps;
     var _a = this.state,
         times = _a.times,
@@ -426,9 +453,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "time"
-      }, (0, _dateUtil.formatDayMonthTime)(item.effDate)), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "status"
-      }, item.cmpState === 'A' ? (0, _locale.i18n)('COMING_SOON') : (0, _locale.i18n)('ON_GOING')));
+      }, _this.toLocale(item.effDate)));
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-list"
     }, _list.map(function (item) {