@fonixtree/magic-design 1.0.166 → 1.0.168

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fontWeightList = exports.fontSizeList = exports.fontFamilyList = exports["default"] = exports.OpenSansFontWeightList = void 0;
+exports.fontSizeList = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -13,6 +13,8 @@ var _ToolBtn = _interopRequireDefault(require("./ToolBtn"));
 
 var _coreUtil = require("../../../utils/coreUtil");
 
+var _constants = require("../../../constants");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,39 +47,6 @@ var __extends = void 0 && (void 0).__extends || function () {
 
 var fontSizeList = [12, 13, 14, 15, 16, 19, 22, 24, 29, 32, 40, 48];
 exports.fontSizeList = fontSizeList;
-var fontFamilyList = [{
-  name: 'Montserrat',
-  value: 'Montserrat'
-}, {
-  name: 'Open Sans',
-  value: 'OpenSans'
-}];
-exports.fontFamilyList = fontFamilyList;
-var fontWeightList = [{
-  name: 'Regular',
-  value: '400'
-}, {
-  name: 'Medium',
-  value: '500'
-}, {
-  name: 'Semibold',
-  value: '600'
-}, {
-  name: 'Bold',
-  value: '700'
-}];
-exports.fontWeightList = fontWeightList;
-var OpenSansFontWeightList = [{
-  name: 'Regular',
-  value: '400'
-}, {
-  name: 'Semibold',
-  value: '600'
-}, {
-  name: 'Bold',
-  value: '700'
-}];
-exports.OpenSansFontWeightList = OpenSansFontWeightList;
 
 var ToolBarModal =
 /** @class */
@@ -237,9 +206,6 @@ function (_super) {
     var _this = this;
 
     var quillFormat = this.state.quillFormat;
-
-    var _fontWeightList = quillFormat['font-family'] === 'OpenSans' ? OpenSansFontWeightList : fontWeightList;
-
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.toolBarRef,
       className: "toolbar-wrap"
@@ -257,7 +223,7 @@ function (_super) {
         width: '150px'
       },
       value: quillFormat['font-family']
-    }, fontFamilyList.map(function (v) {
+    }, _constants.fontFamilyList.map(function (v) {
       return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         label: v.name,
         value: v.value
@@ -274,7 +240,7 @@ function (_super) {
         width: '150px'
       },
       value: quillFormat['font-weight']
-    }, _fontWeightList.map(function (v) {
+    }, _constants.fontWeightList.map(function (v) {
       return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         label: v.name,
         value: v.value

package/lib/decorator/compositeDecorator.js

@@ -144,7 +144,7 @@ function compositeDecorator(WrappedComponent) {
         var zIndex = '0';
         var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'SEARCH_DITO') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 
@@ -196,7 +196,10 @@ function compositeDecorator(WrappedComponent) {
           }
         }
 
-        wrapStyle.overflow = 'hidden';
+        if (nodeData.type === 'SLIDE_IMAGE') {
+          wrapStyle.overflow = 'hidden';
+        }
+
         return wrapStyle;
       };
 

package/lib/locale/en/en.json

@@ -1,5 +1,11 @@
 {
+  "FLASH_SALE": "Flash Sale",
   "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",
@@ -288,7 +294,6 @@
   "QUERY": "Query",
   "SEARCH": "Search",
   "GROUP_BY": "Group By",
-  "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
   "OK": "OK",
   "CANCEL": "Cancel",

package/lib/locale/es/es.json

@@ -1,5 +1,11 @@
 {
+  "FLASH_SALE": "Oferta relámpago",
   "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",
@@ -288,7 +294,6 @@
   "QUERY": "Consulta",
   "SEARCH": "Buscar",
   "GROUP_BY": "Agrupar por",
-  "FLASH_SALE": "Oferta relámpago",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "La cantidad del producto se actualizará automáticamente con los artículos que cumplan con las condiciones de la categoría",
   "OK": "OK",
   "CANCEL": "Cancelar",

package/lib/locale/id/id.json

@@ -1,5 +1,11 @@
 {
+  "FLASH_SALE": "Flash Sale",
   "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",
@@ -288,7 +294,6 @@
   "QUERY": "Query",
   "SEARCH": "Search",
   "GROUP_BY": "Group By",
-  "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
   "OK": "OK",
   "CANCEL": "Cancel",

package/lib/meta-comp/components/Button/index.js

@@ -163,7 +163,10 @@ function (_super) {
       })
     }, (iconLayout === 'right' || iconLayout === 'bottom') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props), iconUrl && /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
-      className: "icon",
+      className: (0, _classnames["default"])('icon', {
+        ml: iconLayout === 'right',
+        mr: iconLayout === 'left'
+      }),
       src: iconUrl,
       style: {
         height: iconHeight + "px"

package/lib/meta-comp/components/Button/index.less

@@ -15,7 +15,14 @@
 
     img {
       height: 20px;
-      margin: 0 5px;
+
+      &.ml {
+        margin-left: 5px;
+      }
+
+      &.mr {
+        margin-right: 5px;
+      }
     }
   }
 }

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

@@ -21,6 +21,8 @@ var _common = require("../../../common");
 
 var _TextConfig = require("../TextConfig");
 
+var _constants = require("../../../constants");
+
 var _BaseConfig = _interopRequireDefault(require("../BaseConfig"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -191,22 +193,24 @@ function (_super) {
           _this.updateAttr(_data, 'fontFamily', v);
         },
         value: _data.fontFamily
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "Montserrat"
-      }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "Open Sans"
-      }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, _constants.fontFamilyList.map(function (v) {
+        return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+          label: v.name,
+          value: v.value
+        }, v.name);
+      }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_WEIGHT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
           _this.updateAttr(_data, 'fontWeight', v);
         },
         value: _data.fontWeight
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 400
-      }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 600
-      }, (0, _locale.i18n)('MEDIUM')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, _constants.fontWeightList.map(function (v) {
+        return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+          label: v.name,
+          value: v.value
+        }, v.name);
+      }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_SIZE')
       }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
         onChange: function onChange(_a) {
@@ -243,7 +247,7 @@ function (_super) {
       })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('BORDER_RADIUS')
       }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-        maxVal: 20,
+        maxVal: 30,
         onChange: function onChange(_a) {
           var count = _a.count;
 

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

@@ -25,6 +25,8 @@ var _SpacingConfig = _interopRequireDefault(require("../../../composite-comp/com
 
 var _mobx = require("../../../mobx");
 
+var _constants = require("../../../constants");
+
 var _BaseConfig = _interopRequireDefault(require("../BaseConfig"));
 
 require("./index.less");
@@ -228,11 +230,12 @@ function (_super) {
           _this.selfRender();
         },
         value: textData.fontFamily
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "Montserrat"
-      }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "Open Sans"
-      }, "Open Sans"))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, _constants.fontFamilyList.map(function (v) {
+        return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+          label: v.name,
+          value: v.value
+        }, v.name);
+      }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_WEIGHT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
@@ -241,15 +244,12 @@ function (_super) {
           _this.selfRender();
         },
         value: textData.fontWeight
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 400
-      }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 500
-      }, (0, _locale.i18n)('MEDIUM')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 600
-      }, (0, _locale.i18n)('SEMIBOLD')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: 700
-      }, (0, _locale.i18n)('BOLD')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, _constants.fontWeightList.map(function (v) {
+        return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+          label: v.name,
+          value: v.value
+        }, v.name);
+      }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_SIZE')
       }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
         onChange: function onChange(_a) {
@@ -360,7 +360,23 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.containerRef,
       className: "m-text-config"
-    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      split: "solid",
+      style: {
+        marginTop: '20px',
+        marginBottom: '0',
+        paddingBottom: '24px',
+        borderColor: '#EDF0F4'
+      },
+      title: (0, _locale.i18n)('TEXT')
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+      onChange: function onChange(e) {
+        data.text = e.target.value;
+
+        _this.selfRender();
+      },
+      value: data.text
+    })), /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
     // headerSize="small"
     , {
       onRefresh: this.selfRender,
@@ -370,7 +386,8 @@ function (_super) {
   };
 
   TextConfig.defaultProps = {
-    data: null
+    data: null,
+    editText: false
   };
   return TextConfig;
 }(_BaseConfig["default"]);

package/package.json

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