@fonixtree/magic-design 0.0.69 → 0.0.71

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/lib/core/Designer/PageCompList/index.js

@@ -121,9 +121,11 @@ function PageCompList(_a) {
     }
   };
 
-  var onMenuClick = function onMenuClick(index, operType) {
+  var onMenuClick = function onMenuClick(activeComp, operType) {
     var newComponents = __spreadArrays(components);
 
+    var index = newComponents.indexOf(activeComp);
+
     if (operType === operTypeMap.MOVE_UP) {
       var temp = newComponents[index - 1];
       newComponents[index - 1] = newComponents[index];
@@ -178,7 +180,7 @@ function PageCompList(_a) {
     var menu = /*#__PURE__*/_react["default"].createElement(_antd.Menu, {
       onClick: function onClick(_a) {
         var item = _a.item;
-        return onMenuClick(index, item.props.value);
+        return onMenuClick(comp, item.props.value);
       }
     }, index !== 0 && /*#__PURE__*/_react["default"].createElement(_antd.Menu.Item, {
       className: "menu_item",

package/package.json

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