@fonixtree/magic-design 0.0.100 → 0.0.101

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

@@ -232,56 +232,51 @@ function (_super) {
   };
 
   SearchMobile.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-
     var data = this.props.data;
-    console.log('----search ', data);
-    var messageNum = this.state.messageNum; // let styleWrap = {};
-    // if (data.content.background.bgType === 'color') {
-    //   styleWrap = {
-    //     backgroundColor: data.content.background.color,
-    //     opacity: data.content.background.opacity,
-    //   };
-    // } else {
-    //   styleWrap = {
-    //     backgroundImage: `url(${data.content.background.image})`,
-    //     backgroundPosition: 'center',
-    //     backgroundRepeat: 'no-repeat',
-    //     backgroundSize: '100%',
-    //   };
-    // }
+    var messageNum = this.state.messageNum;
+    var styleWrap = {};
+
+    if (data.background.bgType === 'color') {
+      styleWrap = {
+        backgroundColor: data.background.color,
+        opacity: data.background.opacity
+      };
+    } else {
+      styleWrap = {
+        backgroundImage: "url(" + data.background.image + ")",
+        backgroundPosition: 'center',
+        backgroundRepeat: 'no-repeat',
+        backgroundSize: '100%'
+      };
+    }
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-search-bar"
+      className: "m-search-bar",
+      style: styleWrap
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "right"
-    }, data.content && ((_a = data.content.box) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "search-input-wrap",
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: "#2C2C2C",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
-      style: {
-        borderColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.mobile
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
       size: 24,
       type: "icon-search2"
-    })), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.mobile,
+      color: "#2C2C2C",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
       size: 24,
-      type: "icon-ChatDots"
+      type: "icon-message"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
-      data: data.content.logo,
+    }, messageNum))), data.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      data: data.logo,
       style: {
-        height: 30
+        height: 20
       }
     }));
   };

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

@@ -1,6 +1,6 @@
 .m-search-bar {
-  height: 48px;
-  padding: 8px 0;
+  height: 44px;
+  padding: 10px 16px;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -8,25 +8,13 @@
   width: 100%;
 
   .right {
+    width: 60px;
     display: flex;
-    flex: 1;
-    margin-left: 15px;
     align-items: center;
     justify-content: space-between;
 
-    .search-input-wrap {
-      flex: 1;
-      background: #fff;
-      border-radius: 4px;
-      border: 1px solid #D2D9E5;
-      padding: 4px 12px;
-      height: 32px;
-      text-align: right;
-    }
-
     .message-wrap {
       position: relative;
-      margin-left: 10px;
 
       .num {
         position: absolute;

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

@@ -19,8 +19,6 @@ var _common = require("../../../../../common");
 
 var _locale = require("../../../../../locale");
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -118,22 +116,14 @@ function (_super) {
           data: panelProps.salesPrice
         }),
         metaOption: panelProps.salesPrice
+      }, {
+        key: '5',
+        name: (0, _locale.i18n)('SALES_PROGRESS'),
+        value: null,
+        metaOption: panelProps.salesProgressVisible
       }],
       type: "switch"
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "sales_progress_wrap"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: "label"
-    }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
-      checked: panelProps.salesProgressVisible.open,
-      onChange: function onChange(v) {
-        panelProps.salesProgressVisible = {
-          open: v
-        };
-
-        _this.reRender();
-      }
-    })));
+    }));
   };
 
   AComponent.defaultProps = {

package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.less

@@ -1,20 +0,0 @@
-.flash_sale_content {
-
-  .sales_progress_wrap {
-    border-top: 1px solid #EDF0F4;
-    padding-top: 20px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-
-    .label {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      height: 24px !important;
-      font-weight: 600 !important;
-      color: #232F46;
-      font-family: 'Open Sans';
-      font-style: normal;
-    }
-  }
-}

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

@@ -13,8 +13,6 @@ var _FlashDealConfigContent = _interopRequireDefault(require("./FlashDealConfigC
 
 var _layout = _interopRequireDefault(require("./imgs/layout1.png"));
 
-var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
-
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -44,25 +42,18 @@ function FlashDealConfig(props) {
       })
     }, {
       key: '3',
-      name: (0, _locale.i18n)('SPACING'),
-      value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
-        configCompSpace: true,
-        data: data.spacing
-      })
-    }, {
-      key: '4',
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         isHideAlign: true,
         layoutSource: [{
           id: 'layout1',
-          name: 'layout1',
+          name: 'left',
           image: _layout["default"]
         }]
       })
     }, {
-      key: '5',
+      key: '4',
       name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background

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

@@ -19,8 +19,6 @@ var _defaultJSON = require("../../../components/MobileNavigation/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); }
@@ -120,7 +118,7 @@ function (_super) {
   ImageTextConfigGroup.defaultProps = {
     source: []
   };
-  ImageTextConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], ImageTextConfigGroup);
+  ImageTextConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], ImageTextConfigGroup);
   return ImageTextConfigGroup;
 }(_react["default"].Component);
 

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

@@ -82,7 +82,7 @@ function (_super) {
     };
 
     _this.onAddClick = function () {
-      var json = (0, _defaultJSON.recommendGroupSourceJSON)(_this.props.id, '', 'Tab');
+      var json = (0, _defaultJSON.recommendGroupSourceJSON)('', 'Tab');
 
       _this.props.source.push(json);
 

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

@@ -15,8 +15,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
 
 var _layout = require("../../../../constants/layout");
 
-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,10 +81,7 @@ function (_super) {
   }
 
   RecommendConfig.prototype.render = function () {
-    var _this = this;
-
     var data = this.props.data;
-    console.log('data', data);
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       divider: "bold",
       headerSize: "large",
@@ -94,7 +89,6 @@ function (_super) {
         key: '1',
         name: (0, _locale.i18n)('GROUP'),
         value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigGroup["default"], {
-          id: data.id,
           source: data.groupSource
         })
       }, {
@@ -103,23 +97,14 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigContent["default"], {
           panelProps: data.content
         })
-      }, {
-        key: '3',
-        name: (0, _locale.i18n)('SPACING'),
-        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
-          configCompSpace: true,
-          data: data.spacing
-        })
-      }, {
+      }, // { key: '3', name: i18n('SPACING'), value: <SpacingConfig configCompSpace configPaddingLR data={data.spacing} /> },
+      {
         key: '4',
         name: (0, _locale.i18n)('CUSTOMIZE'),
         value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
           data: data.customize,
           isHideAlign: true,
-          layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile,
-          selectedLayoutFun: function selectedLayoutFun(v) {
-            _this.getLayout(v);
-          }
+          layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile
         })
       }, {
         key: '5',

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

@@ -7,20 +7,20 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _SearchBarConfigContent = _interopRequireDefault(require("./SearchBarConfigContent"));
-
 var _locale = require("../../../../locale");
 
 var _layout = require("../../../../constants/layout");
 
-var _common = require("../../../../common");
+var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
 
-var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
+var _common = require("../../../../common");
 
 var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
 
+var _coreUtil = require("../../../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -55,7 +55,52 @@ function (_super) {
   __extends(SearchBarConfig, _super);
 
   function SearchBarConfig() {
-    return _super !== null && _super.apply(this, arguments) || this;
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.selfRender = function () {
+      (0, _coreUtil.renderPreview)();
+
+      _this.setState({});
+    };
+
+    _this.getContentPanel = function () {
+      var data = _this.props.data;
+      var source = [{
+        key: 'search1',
+        name: (0, _locale.i18n)('LOGO'),
+        value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
+          data: data.logo
+        }),
+        metaOption: data.logo,
+        toggleType: 'switch'
+      }, {
+        key: 'search2',
+        name: (0, _locale.i18n)('ICON'),
+        value: /*#__PURE__*/_react["default"].createElement(_common.Field, {
+          title: (0, _locale.i18n)('COLOR')
+        }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          onChange: function onChange(v) {
+            data.icon.color = v;
+
+            _this.selfRender();
+          },
+          value: data.icon.color
+        })),
+        metaOption: data.icon,
+        toggleType: 'switch'
+      }];
+      return /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: source,
+        type: "switch"
+      });
+    };
+
+    return _this;
   }
 
   SearchBarConfig.prototype.render = function () {
@@ -66,17 +111,7 @@ function (_super) {
       source: [{
         key: 'searchBar1',
         name: (0, _locale.i18n)('CONTENT'),
-        value: /*#__PURE__*/_react["default"].createElement(_SearchBarConfigContent["default"], {
-          panelProps: data.content
-        })
-      }, {
-        key: 'searchBar4',
-        name: (0, _locale.i18n)('SPACING'),
-        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
-          configCompSpace: true,
-          data: data.spacing,
-          fillUpWidth: true
-        })
+        value: this.getContentPanel()
       }, {
         key: 'searchBar2',
         name: (0, _locale.i18n)('CUSTOMIZE'),

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js

@@ -215,32 +215,17 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      intelligentType: 'ALL',
-      intelligentValue: [],
+      intelligentType: (0, _commonUtil.ensure)(function () {
+        return _this.props.value.intelligentType;
+      }, 'ALL'),
+      intelligentValue: (0, _commonUtil.ensure)(function () {
+        return _this.props.value.intelligentValue;
+      }, []),
       categoryData: [],
       brandData: [],
       labelData: []
     };
 
-    _this.onChangeIntelligentType = function (type) {
-      return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-          this.setState({
-            intelligentType: type,
-            intelligentValue: []
-          });
-          this.getTypeData(type);
-          this.props.onChange({
-            intelligentType: type,
-            intelligentValue: []
-          });
-          return [2
-          /*return*/
-          ];
-        });
-      });
-    };
-
     _this.getTypeData = function (type) {
       return __awaiter(_this, void 0, void 0, function () {
         var res, res, res;
@@ -313,29 +298,34 @@ function (_super) {
       });
     };
 
+    _this.onChangeIntelligentType = function (type) {
+      return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+          this.setState({
+            intelligentType: type,
+            intelligentValue: []
+          });
+          this.props.onChange({
+            intelligentType: type,
+            intelligentValue: []
+          });
+          this.getTypeData(type);
+          return [2
+          /*return*/
+          ];
+        });
+      });
+    };
+
     return _this;
   }
 
   AIRecommendation.prototype.componentDidMount = function () {
-    var _a = this.props.value,
-        intelligentType = _a.intelligentType,
-        intelligentValue = _a.intelligentValue;
-    this.getTypeData(intelligentType);
-    this.setState({
-      intelligentType: intelligentType,
-      intelligentValue: intelligentValue
-    });
-  };
-
-  AIRecommendation.prototype.componentWillReceiveProps = function (nextProps) {
-    var _a = nextProps.value,
-        intelligentType = _a.intelligentType,
-        intelligentValue = _a.intelligentValue;
-    this.getTypeData(intelligentType);
-    this.setState({
-      intelligentType: intelligentType,
-      intelligentValue: intelligentValue
+    this.props.onChange({
+      intelligentType: this.state.intelligentType,
+      intelligentValue: this.state.intelligentValue
     });
+    this.getTypeData(this.state.intelligentType);
   };
 
   AIRecommendation.prototype.render = function () {