@fonixtree/magic-design 2.0.190 → 3.0.2

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

@@ -22,12 +22,12 @@
     }
 
     .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;

package/lib/composite-comp/dito/components/SearchBar/mobile/index.less

@@ -35,7 +35,6 @@
   font-style: normal;
   font-weight: 400;
   font-size: 0.28rem;
-  outline: none;
 }
 .m-search-bar .right .message-wrap {
   position: relative;

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
     }));
   };