@fonixtree/magic-design 0.0.69 → 0.0.70

package/es/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
-       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
-       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1669616689172') format('woff2'),
+       url('magic-box-iconfont.woff?t=1669616689172') format('woff'),
+       url('magic-box-iconfont.ttf?t=1669616689172') format('truetype');
 }
 
 .magic-box-iconfont {

package/es/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
-       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
-       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1669616689172') format('woff2'),
+       url('magic-box-iconfont.woff?t=1669616689172') format('woff'),
+       url('magic-box-iconfont.ttf?t=1669616689172') format('truetype');
 }
 
 .magic-box-iconfont {

package/es/composite-comp/bol/config-panels/NewsletterConfig/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _NewsletterContentSetting = _interopRequireDefault(require("./NewsletterContentSetting"));
 
+var _locale = require("../../../../locale");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -28,26 +30,26 @@ function NewsletterConfig(props) {
     headerSize: "large",
     source: [{
       key: '1',
-      name: i18n('CONTENT'),
+      name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_NewsletterContentSetting["default"], {
         panelProps: data.content
       })
     }, {
       key: '2',
-      name: i18n('SPACING'),
+      name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
       key: '3',
-      name: i18n('CUSTOMIZE'),
+      name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         layoutSource: _layout.newsletterLayout
       })
     }, {
       key: '4',
-      name: i18n('BACKGROUND'),
+      name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })

package/es/composite-comp/dito/components/PcNavigation/defaultJSON.js

@@ -75,7 +75,6 @@ var getDefaultJSON = function getDefaultJSON() {
         specialContent: [],
         iconUrl: '',
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -89,7 +88,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -103,7 +101,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -117,7 +114,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,

package/es/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -418,7 +418,12 @@ function (_super) {
 
     _this.mouseLeaveBtn = function () {
       var data = _this.props.data;
+      var categList = _this.state.categList;
       document.querySelector('.all-category .m-meta-text').style.color = data.home.allCategory.content.color;
+
+      _this.setState({
+        list: [categList]
+      });
     };
 
     return _this;
@@ -434,32 +439,21 @@ function (_super) {
     var data = this.props.data; // const { ready } = this.state;
 
     console.log('----nav pc', data);
-    var _a = this.state,
-        list = _a.list,
-        categList = _a.categList;
+    var list = this.state.list;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('pc-navigation')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu-wrap",
-      onMouseLeave: function onMouseLeave() {
-        _this.setState({
-          list: [categList]
-        });
-      }
-    }, /*#__PURE__*/_react["default"].createElement("a", {
-      className: "menu-drop",
-      onClick: function onClick(e) {
-        return e.preventDefault();
-      },
       onMouseEnter: this.mouseEnterBtn,
       onMouseLeave: this.mouseLeaveBtn
+    }, /*#__PURE__*/_react["default"].createElement("a", {
+      className: "menu-drop"
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "icon",
       src: data.home.allCategory.iconUrl || _menuIcon["default"]
     }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "all-category",
-      data: data.home.allCategory,
-      readonly: true
+      data: data.home.allCategory
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "category"
     }, list.map(function (arrItem, index) {

package/es/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -39,12 +39,30 @@ var getDefaultJSON = function getDefaultJSON() {
     box: {
       id: (0, _uuid.v4)(),
       open: true,
-      color: '#D92929'
+      color: {
+        pc: '#D92929',
+        mobile: '#D92929'
+      }
     },
     icon: {
       id: (0, _uuid.v4)(),
       open: true,
-      color: '#D92929'
+      color: {
+        pc: '#D92929',
+        mobile: '#D92929'
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 20,
+        paddingBottom: 30,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 8,
+        paddingBottom: 8,
+        marginBottom: 0
+      }
     },
     customize: {
       layout: 'left',

package/es/composite-comp/dito/components/SearchBar/index.js

@@ -71,7 +71,8 @@ function (_super) {
   }
 
   SearchBar.prototype.render = function () {
-    var nodeData = this.props.nodeData;
+    var nodeData = this.props.nodeData; // console.log('search nodeData', nodeData);
+
     return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_index2["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_index["default"], {

package/es/composite-comp/dito/components/SearchBar/mobile/index.js

@@ -259,16 +259,16 @@ function (_super) {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
       style: {
-        borderColor: data.box.color
+        borderColor: data.box.color.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.box.color,
+      color: data.box.color.mobile,
       size: 24,
       type: "icon-search2"
     })), data.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.icon.color,
+      color: data.icon.color.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },

package/es/composite-comp/dito/components/SearchBar/pc/index.js

@@ -98,7 +98,7 @@ function (_super) {
     }, data.box.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       style: {
-        borderColor: data.box.color
+        borderColor: data.box.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       className: "search-input",
@@ -112,7 +112,7 @@ function (_super) {
       className: "search-icon",
       onClick: this.searchProduct,
       style: {
-        background: data.box.color
+        background: data.box.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: "#fff",
@@ -124,11 +124,11 @@ function (_super) {
         return (0, _coreUtil.clickUrl)('/cart');
       },
       style: {
-        borderColor: data.icon.color,
-        color: data.icon.color
+        borderColor: data.icon.color.pc,
+        color: data.icon.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.icon.color,
+      color: data.icon.color.pc,
       size: 16,
       type: "icon-ShoppingCartSimple"
     }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -136,7 +136,7 @@ function (_super) {
     }, (0, _locale.i18n)('SHOPPING_CART')))), data.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.logo,
       style: {
-        height: 64
+        height: 40
       }
     }));
   };

package/es/composite-comp/dito/components/SearchBar/pc/index.less

@@ -1,6 +1,6 @@
 .pc-search-bar {
   // height: 48px;
-  padding: 20px 100px 30px;
+  // padding: 20px 100px 30px;
   display: flex;
   flex-direction: row-reverse;
   align-items: flex-start;
@@ -9,6 +9,8 @@
 
   .right {
     display: flex;
+    flex: 1;
+    margin-left: 90px;
     align-items: center;
     justify-content: space-between;
 
@@ -17,7 +19,7 @@
       border-radius: 6px;
       height: 40px;
       display: flex;
-      width: 440px;
+      flex: 1;
       .search-input {
         border: none;
         height: 38px;

package/es/composite-comp/dito/config-panels/PcNavigationConfig/PcNavConfigCategory/index.js

@@ -73,7 +73,7 @@ function (_super) {
         key: 'category1',
         name: /*#__PURE__*/_react["default"].createElement("div", {
           onClick: function onClick() {
-            return (0, _coreUtil.clickUrl)('/#/PageCategoryManagement');
+            return window.open('/#/PageCategoryManagement');
           }
         }, (0, _locale.i18n)('ALL_CATEGORY'), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
           color: "#2F54EB",

package/es/composite-comp/dito/config-panels/PcNavigationConfig/PcNavigationConfigGroup/index.js

@@ -19,6 +19,8 @@ var _defaultJSON = require("../../../components/PcNavigation/defaultJSON");
 
 var _locale = require("../../../../../locale");
 
+var _decorator = require("../../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -118,7 +120,7 @@ function (_super) {
   PcNavigationConfigGroup.defaultProps = {
     source: []
   };
-  PcNavigationConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], PcNavigationConfigGroup);
+  PcNavigationConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], PcNavigationConfigGroup);
   return PcNavigationConfigGroup;
 }(_react["default"].Component);
 

package/es/composite-comp/dito/config-panels/SearchBarConfig/index.js

@@ -15,6 +15,8 @@ var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-
 
 var _common = require("../../../../common");
 
+var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
+
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -83,11 +85,15 @@ function (_super) {
           title: (0, _locale.i18n)('COLOR')
         }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
           onChange: function onChange(v) {
-            data.box.color = v;
+            if ((0, _coreUtil.isPc)()) {
+              data.box.color.pc = v;
+            } else {
+              data.box.color.mobile = v;
+            }
 
             _this.selfRender();
           },
-          value: data.box.color
+          value: (0, _coreUtil.isPc)() ? data.box.color.pc : data.box.color.mobile
         })),
         metaOption: data.box,
         toggleType: 'switch'
@@ -101,20 +107,23 @@ function (_super) {
           title: (0, _locale.i18n)('COLOR')
         }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
           onChange: function onChange(v) {
-            data.icon.color = v;
+            if ((0, _coreUtil.isPc)()) {
+              data.icon.color.pc = v;
+            } else {
+              data.icon.color.mobile = v;
+            }
 
             _this.selfRender();
           },
-          value: data.icon.color
+          value: (0, _coreUtil.isPc)() ? data.icon.color.pc : data.icon.color.mobile
         })),
         metaOption: data.icon,
         toggleType: 'switch'
       }];
       return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
         headerSize: "middle",
-        onRefresh: function onRefresh() {
-          return (0, _coreUtil.renderPreview)();
-        },
+        noChange: true,
+        onRefresh: _this.selfRender,
         showActiveColor: true,
         source: source,
         type: "switch"
@@ -133,6 +142,13 @@ function (_super) {
         key: 'searchBar1',
         name: (0, _locale.i18n)('CONTENT'),
         value: this.getContentPanel()
+      }, {
+        key: 'searchBar4',
+        name: (0, _locale.i18n)('SPACING'),
+        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
+          configCompSpace: true,
+          data: data.spacing
+        })
       }, {
         key: 'searchBar2',
         name: (0, _locale.i18n)('CUSTOMIZE'),

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
-       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
-       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1669616689172') format('woff2'),
+       url('magic-box-iconfont.woff?t=1669616689172') format('woff'),
+       url('magic-box-iconfont.ttf?t=1669616689172') format('truetype');
 }
 
 .magic-box-iconfont {

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1668396278684') format('woff2'),
-       url('magic-box-iconfont.woff?t=1668396278684') format('woff'),
-       url('magic-box-iconfont.ttf?t=1668396278684') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1669616689172') format('woff2'),
+       url('magic-box-iconfont.woff?t=1669616689172') format('woff'),
+       url('magic-box-iconfont.ttf?t=1669616689172') format('truetype');
 }
 
 .magic-box-iconfont {

package/lib/composite-comp/bol/config-panels/NewsletterConfig/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _NewsletterContentSetting = _interopRequireDefault(require("./NewsletterContentSetting"));
 
+var _locale = require("../../../../locale");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -28,26 +30,26 @@ function NewsletterConfig(props) {
     headerSize: "large",
     source: [{
       key: '1',
-      name: i18n('CONTENT'),
+      name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_NewsletterContentSetting["default"], {
         panelProps: data.content
       })
     }, {
       key: '2',
-      name: i18n('SPACING'),
+      name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
       key: '3',
-      name: i18n('CUSTOMIZE'),
+      name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         layoutSource: _layout.newsletterLayout
       })
     }, {
       key: '4',
-      name: i18n('BACKGROUND'),
+      name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })

package/lib/composite-comp/dito/components/PcNavigation/defaultJSON.js

@@ -75,7 +75,6 @@ var getDefaultJSON = function getDefaultJSON() {
         specialContent: [],
         iconUrl: '',
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -89,7 +88,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -103,7 +101,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
@@ -117,7 +114,6 @@ var getDefaultJSON = function getDefaultJSON() {
         id: (0, _uuid.v4)(),
         specialContent: [],
         content: {
-          backgroundColor: 'transparent',
           sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,

package/lib/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -418,7 +418,12 @@ function (_super) {
 
     _this.mouseLeaveBtn = function () {
       var data = _this.props.data;
+      var categList = _this.state.categList;
       document.querySelector('.all-category .m-meta-text').style.color = data.home.allCategory.content.color;
+
+      _this.setState({
+        list: [categList]
+      });
     };
 
     return _this;
@@ -434,32 +439,21 @@ function (_super) {
     var data = this.props.data; // const { ready } = this.state;
 
     console.log('----nav pc', data);
-    var _a = this.state,
-        list = _a.list,
-        categList = _a.categList;
+    var list = this.state.list;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('pc-navigation')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu-wrap",
-      onMouseLeave: function onMouseLeave() {
-        _this.setState({
-          list: [categList]
-        });
-      }
-    }, /*#__PURE__*/_react["default"].createElement("a", {
-      className: "menu-drop",
-      onClick: function onClick(e) {
-        return e.preventDefault();
-      },
       onMouseEnter: this.mouseEnterBtn,
       onMouseLeave: this.mouseLeaveBtn
+    }, /*#__PURE__*/_react["default"].createElement("a", {
+      className: "menu-drop"
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "icon",
       src: data.home.allCategory.iconUrl || _menuIcon["default"]
     }), /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "all-category",
-      data: data.home.allCategory,
-      readonly: true
+      data: data.home.allCategory
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "category"
     }, list.map(function (arrItem, index) {

package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -39,12 +39,30 @@ var getDefaultJSON = function getDefaultJSON() {
     box: {
       id: (0, _uuid.v4)(),
       open: true,
-      color: '#D92929'
+      color: {
+        pc: '#D92929',
+        mobile: '#D92929'
+      }
     },
     icon: {
       id: (0, _uuid.v4)(),
       open: true,
-      color: '#D92929'
+      color: {
+        pc: '#D92929',
+        mobile: '#D92929'
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 20,
+        paddingBottom: 30,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 8,
+        paddingBottom: 8,
+        marginBottom: 0
+      }
     },
     customize: {
       layout: 'left',

package/lib/composite-comp/dito/components/SearchBar/index.js

@@ -71,7 +71,8 @@ function (_super) {
   }
 
   SearchBar.prototype.render = function () {
-    var nodeData = this.props.nodeData;
+    var nodeData = this.props.nodeData; // console.log('search nodeData', nodeData);
+
     return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_index2["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_index["default"], {

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

@@ -259,16 +259,16 @@ function (_super) {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
       style: {
-        borderColor: data.box.color
+        borderColor: data.box.color.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.box.color,
+      color: data.box.color.mobile,
       size: 24,
       type: "icon-search2"
     })), data.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.icon.color,
+      color: data.icon.color.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },

package/lib/composite-comp/dito/components/SearchBar/pc/index.js

@@ -98,7 +98,7 @@ function (_super) {
     }, data.box.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       style: {
-        borderColor: data.box.color
+        borderColor: data.box.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       className: "search-input",
@@ -112,7 +112,7 @@ function (_super) {
       className: "search-icon",
       onClick: this.searchProduct,
       style: {
-        background: data.box.color
+        background: data.box.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: "#fff",
@@ -124,11 +124,11 @@ function (_super) {
         return (0, _coreUtil.clickUrl)('/cart');
       },
       style: {
-        borderColor: data.icon.color,
-        color: data.icon.color
+        borderColor: data.icon.color.pc,
+        color: data.icon.color.pc
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.icon.color,
+      color: data.icon.color.pc,
       size: 16,
       type: "icon-ShoppingCartSimple"
     }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -136,7 +136,7 @@ function (_super) {
     }, (0, _locale.i18n)('SHOPPING_CART')))), data.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.logo,
       style: {
-        height: 64
+        height: 40
       }
     }));
   };

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

@@ -1,6 +1,6 @@
 .pc-search-bar {
   // height: 48px;
-  padding: 20px 100px 30px;
+  // padding: 20px 100px 30px;
   display: flex;
   flex-direction: row-reverse;
   align-items: flex-start;
@@ -9,6 +9,8 @@
 
   .right {
     display: flex;
+    flex: 1;
+    margin-left: 90px;
     align-items: center;
     justify-content: space-between;
 
@@ -17,7 +19,7 @@
       border-radius: 6px;
       height: 40px;
       display: flex;
-      width: 440px;
+      flex: 1;
       .search-input {
         border: none;
         height: 38px;

package/lib/composite-comp/dito/config-panels/PcNavigationConfig/PcNavConfigCategory/index.js

@@ -73,7 +73,7 @@ function (_super) {
         key: 'category1',
         name: /*#__PURE__*/_react["default"].createElement("div", {
           onClick: function onClick() {
-            return (0, _coreUtil.clickUrl)('/#/PageCategoryManagement');
+            return window.open('/#/PageCategoryManagement');
           }
         }, (0, _locale.i18n)('ALL_CATEGORY'), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
           color: "#2F54EB",

package/lib/composite-comp/dito/config-panels/PcNavigationConfig/PcNavigationConfigGroup/index.js

@@ -19,6 +19,8 @@ var _defaultJSON = require("../../../components/PcNavigation/defaultJSON");
 
 var _locale = require("../../../../../locale");
 
+var _decorator = require("../../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -118,7 +120,7 @@ function (_super) {
   PcNavigationConfigGroup.defaultProps = {
     source: []
   };
-  PcNavigationConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], PcNavigationConfigGroup);
+  PcNavigationConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], PcNavigationConfigGroup);
   return PcNavigationConfigGroup;
 }(_react["default"].Component);
 

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

@@ -15,6 +15,8 @@ var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-
 
 var _common = require("../../../../common");
 
+var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
+
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -83,11 +85,15 @@ function (_super) {
           title: (0, _locale.i18n)('COLOR')
         }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
           onChange: function onChange(v) {
-            data.box.color = v;
+            if ((0, _coreUtil.isPc)()) {
+              data.box.color.pc = v;
+            } else {
+              data.box.color.mobile = v;
+            }
 
             _this.selfRender();
           },
-          value: data.box.color
+          value: (0, _coreUtil.isPc)() ? data.box.color.pc : data.box.color.mobile
         })),
         metaOption: data.box,
         toggleType: 'switch'
@@ -101,20 +107,23 @@ function (_super) {
           title: (0, _locale.i18n)('COLOR')
         }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
           onChange: function onChange(v) {
-            data.icon.color = v;
+            if ((0, _coreUtil.isPc)()) {
+              data.icon.color.pc = v;
+            } else {
+              data.icon.color.mobile = v;
+            }
 
             _this.selfRender();
           },
-          value: data.icon.color
+          value: (0, _coreUtil.isPc)() ? data.icon.color.pc : data.icon.color.mobile
         })),
         metaOption: data.icon,
         toggleType: 'switch'
       }];
       return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
         headerSize: "middle",
-        onRefresh: function onRefresh() {
-          return (0, _coreUtil.renderPreview)();
-        },
+        noChange: true,
+        onRefresh: _this.selfRender,
         showActiveColor: true,
         source: source,
         type: "switch"
@@ -133,6 +142,13 @@ function (_super) {
         key: 'searchBar1',
         name: (0, _locale.i18n)('CONTENT'),
         value: this.getContentPanel()
+      }, {
+        key: 'searchBar4',
+        name: (0, _locale.i18n)('SPACING'),
+        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
+          configCompSpace: true,
+          data: data.spacing
+        })
       }, {
         key: 'searchBar2',
         name: (0, _locale.i18n)('CUSTOMIZE'),

package/package.json

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