@fonixtree/magic-design 2.0.190 → 2.0.192

package/es/composite-comp/public/components/Wallet/defaultJSON.js

@@ -28,7 +28,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',
+    type: 'WALLET_PRODUCT',
     groupSource: walletDataList.map(function (item) {
       var itemId = (0, _uuid.v4)();
       return {

package/es/composite-comp/public/components/Wallet/index.js

@@ -74,7 +74,7 @@ function (_super) {
   };
 
   Wallet.defaultProps = {};
-  Wallet.type = 'WALLET';
+  Wallet.type = 'WALLET_PRODUCT';
   Wallet.getDefaultJSON = _defaultJSON.getDefaultJSON;
   Wallet = __decorate([_compositeDecorator["default"]], Wallet);
   return Wallet;

package/es/composite-comp/public/components/Wallet/mobile/index.js

@@ -282,7 +282,6 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    console.log('data: ', data);
     var _a = this.state,
         balance = _a.balance,
         cenduit = _a.cenduit;
@@ -290,8 +289,6 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-wallet"
     }, data.groupSource.map(function (group, index) {
-      var _a;
-
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "wallet-item",
@@ -300,7 +297,7 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "item-head"
-      }, ((_a = group === null || group === void 0 ? void 0 : group.logo) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      }, group.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: group.logo,
         GAData: GAData,
         style: (0, _commonUtil.pxToRem)({

package/es/composite-comp/public/config-panels/StoresConfig/ConfigContent/index.js

@@ -127,7 +127,7 @@ function (_super) {
       }, {
         key: '8',
         name: (0, _locale.i18n)('DISTANCE'),
-        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.distance
         }),
         metaOption: panelProps.distance
@@ -145,14 +145,22 @@ function (_super) {
       value: panelProps.sourceType
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
       value: "1"
-    }, (0, _locale.i18n)('FREE_SHIPPING_STORES')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    }, (0, _locale.i18n)('ALL_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "2"
+    }, (0, _locale.i18n)('FREE_SHIPPING_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "3"
+    }, (0, _locale.i18n)('NEW_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "4"
+    }, (0, _locale.i18n)('HIGH_SALES_STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "5"
+    }, (0, _locale.i18n)('SELECT_STORES')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('PRODUCT_QUANTITY'),
       topSplit: true
     }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
       onChange: function onChange(e) {
         panelProps.maxProdNum = e.target.value;
 
-        _this.selfRender();
+        _this.reRender();
       },
       value: panelProps.maxProdNum
     }, /*#__PURE__*/_react["default"].createElement(_antd.Radio, {

package/es/constants/index.js

@@ -73,6 +73,9 @@ var fontFamilyList = [{
 }, {
   name: (0, _locale.i18n)('INTER'),
   value: 'Inter'
+}, {
+  name: (0, _locale.i18n)('ROBOTO'),
+  value: 'Roboto'
 }];
 exports.fontFamilyList = fontFamilyList;
 var fontWeightList = [{
@@ -109,7 +112,8 @@ exports.projectCodes = projectCodes;
 var projectFontFamily = {
   MN: 'Inter',
   Ashita: 'Montserrat',
-  pto: 'Open Sans'
+  pto: 'Open Sans',
+  ar: 'Roboto'
 };
 exports.projectFontFamily = projectFontFamily;
 var campaignTypes = {
@@ -323,7 +327,7 @@ var compInfoMap = {
     name: 'Wallet',
     icon: 'icon-Wallet'
   },
-  WALLET: {
+  WALLET_PRODUCT: {
     name: 'Wallet',
     icon: 'icon-Wallet'
   },

package/es/core/Designer/ToolBarModal/index.js

@@ -209,7 +209,7 @@ function (_super) {
 
     var quillFormat = this.state.quillFormat;
 
-    var _fontWeightList = quillFormat['font-family'] === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes(quillFormat['font-family']) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.toolBarRef,

package/es/locale/ar/ar.json

@@ -1,4 +1,13 @@
 {
+  "STORE_STATE": "Store State",
+  "BUSINESS_TYPE": "Business Type",
+  "STORE_SELECT": "Store Select",
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/es/locale/en/en.json

@@ -1,4 +1,13 @@
 {
+  "STORE_STATE": "Store State",
+  "BUSINESS_TYPE": "Business Type",
+  "STORE_SELECT": "Store Select",
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/es/locale/es/es.json

@@ -1,4 +1,13 @@
 {
+  "STORE_STATE": "Store State",
+  "BUSINESS_TYPE": "Business Type",
+  "STORE_SELECT": "Store Select",
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Gift",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/es/locale/mn/mn.json

@@ -1,4 +1,13 @@
 {
+  "STORE_STATE": "Store State",
+  "BUSINESS_TYPE": "Business Type",
+  "STORE_SELECT": "Store Select",
+  "SELECT_STORES": "Select stores",
+  "HIGH_SALES_STORES": "High sales stores",
+  "NEW_STORES": "New stores",
+  "ALL_STORES": "All stores",
+  "ROBOTO": "Roboto",
+  "POINTS": "Points",
   "CAN_BE_ADDED_AS_YOUR_ADDRESS": "Can be added as your address",
   "GIFT": "Бэлэгтэй",
   "SEARCH_FOR_PRODUCT_OR_SHOP": "Search for product or shop",

package/es/meta-comp/config-panels/ButtonConfig/index.js

@@ -171,7 +171,7 @@ function (_super) {
 
     var fontSizeKey = window.magicDesign.device == 'pc' ? 'pcFontSize' : 'fontSize';
 
-    var _fontWeightList = ((_a = data === null || data === void 0 ? void 0 : data.buttonText) === null || _a === void 0 ? void 0 : _a.fontFamily) === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes((_a = data === null || data === void 0 ? void 0 : data.buttonText) === null || _a === void 0 ? void 0 : _a.fontFamily) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     var ButtonTextSetting = function ButtonTextSetting(_data) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {

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

@@ -187,7 +187,7 @@ function (_super) {
       };
     }
 
-    var _fontWeightList = textData.fontFamily === 'Montserrat' ? _constants.fontWeightList : _constants.otherFontWeightList;
+    var _fontWeightList = ['Montserrat', 'Roboto'].includes(textData.fontFamily) ? _constants.fontWeightList : _constants.otherFontWeightList;
 
     var source = [{
       key: '1',

package/lib/assets/less/font.less

@@ -88,4 +88,34 @@
   src: url(../fonts/TruenoBd.otf);
   font-weight: 600;
   font-style: normal;
+}
+
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-Regular.ttf');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url(../fonts/Roboto-Medium.ttf);
+  font-weight: 500;
+  font-style: normal;
+}
+
+
+@font-face {
+  font-family: 'Roboto';
+  src: url('../fonts/Roboto-SemiBold.ttf');
+  font-weight: 600;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url(../fonts/Roboto-Bold.ttf);
+  font-weight: 700;
+  font-style: normal;
 }

package/lib/common/SelectStoreModal/SortableImageList/index.js

@@ -0,0 +1,118 @@
+"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"] = SortableImageList;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"));
+
+var _Iconfont = _interopRequireDefault(require("../../Iconfont"));
+
+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); }
+
+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; }
+
+function SortableImageList(_a) {
+  var selectedList = _a.selectedList,
+      setSelectedList = _a.setSelectedList;
+
+  var _b = (0, _react.useState)(''),
+      dragId = _b[0],
+      setDragId = _b[1];
+
+  var _c = (0, _react.useState)(selectedList || []),
+      list = _c[0],
+      setList = _c[1];
+
+  var ref = (0, _react.useRef)();
+
+  var onDragEnd = function onDragEnd() {
+    console.log('onDragEnd');
+    setDragId('');
+
+    if (ref.current) {
+      setSelectedList(ref.current);
+    }
+  };
+
+  (0, _react.useEffect)(function () {
+    setList(selectedList || []);
+  }, [selectedList]);
+
+  var delSelectedItem = function delSelectedItem(index) {
+    var rows = JSON.parse(JSON.stringify(selectedList));
+    rows.splice(index, 1);
+    setSelectedList(rows);
+  };
+
+  var moveCard = (0, _react.useCallback)(function (dragNodeId, hoverNodeId) {
+    var dragIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(dragNodeId);
+    });
+    var hoverIndex = list.findIndex(function (comp) {
+      return comp.productId === Number(hoverNodeId);
+    });
+    setList(function (prevCards) {
+      var newList = (0, _immutabilityHelper["default"])(prevCards, {
+        $splice: [[dragIndex, 1], [hoverIndex, 0, prevCards[dragIndex]]]
+      });
+      ref.current = newList;
+      return newList;
+    });
+  }, [list]);
+
+  var onDragEnter = function onDragEnter(e) {
+    console.log('onDragEnter');
+    var hoverNodeId = e.currentTarget.dataset.nodeid;
+
+    if (dragId === hoverNodeId) {
+      return;
+    }
+
+    moveCard(dragId, hoverNodeId);
+  };
+
+  var onDragStart = function onDragStart(e) {
+    setDragId(e.currentTarget.dataset.nodeid);
+    console.log('onDragStart');
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "imgListWrap"
+  }, list.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: index,
+      className: "selectedItem"
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
+      "data-nodeid": item.productId,
+      draggable: "true",
+      onDragEnd: onDragEnd,
+      onDragEnter: onDragEnter,
+      onDragOver: function onDragOver(e) {
+        e.preventDefault();
+      },
+      onDragStart: onDragStart,
+      src: item.productImageUrl,
+      title: item.productName
+    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      className: "selectedItemClose",
+      color: "#000",
+      onClick: function onClick() {
+        return delSelectedItem(index);
+      },
+      size: 12,
+      type: "icon-close"
+    }));
+  }));
+}

package/lib/common/SelectStoreModal/SortableImageList/index.less

@@ -0,0 +1,3 @@
+.imgListWrap {
+  display: flex;
+}