@fonixtree/magic-design 0.1.78 → 1.0.2-0.1

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

@@ -1,76 +1,89 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-}
-.m-recommend-mobile .cylon-tabs-nav-operations {
-  display: none !important;
-}
-.m-recommend-mobile ::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  display: none;
-}
-.m-recommend-mobile .tab-select-wrap {
-  display: flex;
-  align-items: center;
-  height: 1rem;
-  background: #ffffff;
-  overflow: auto;
-  position: relative;
-  margin-bottom: 0.3rem;
-}
-.m-recommend-mobile .tab-select-wrap .tabTitle {
-  display: flex;
-  align-items: center;
-  text-align: center;
-  padding: 0 0.32rem;
-  width: fit-content;
-  height: 100%;
-  justify-content: center;
-  white-space: nowrap;
-  flex-direction: column;
-}
-.m-recommend-mobile .tab-select-wrap .tabTitle img {
-  height: 0.4rem;
-  width: 0.4rem;
-  margin-bottom: 0.04rem;
-}
-.m-recommend-mobile .tab-select-wrap .active-line {
-  position: absolute;
-  bottom: 0;
-  width: 4rem;
-  height: 0.06rem;
-  background-color: #fff;
-  transition: 0.2s all linear;
-  border-radius: 0.03rem;
-}
-.m-recommend-mobile .macyContainer {
-  display: flex;
-  margin: 0 0.32rem;
-}
-.m-recommend-mobile .scrollContainer {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin: 0 0.32rem;
-  overflow-x: auto;
-  padding-bottom: 0.3rem;
-}
-.m-recommend-mobile .scrollContainer.pl_100 {
-  padding-left: 2rem;
-}
-.m-recommend-mobile .scrollContainer .scrollProductList {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-}
-.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
-}
-.m-recommend-mobile .btnSeeAll {
-  display: block;
-  width: fit-content;
-  min-width: 1.6rem;
-  margin: 0 auto;
-  flex: none;
-}
+
+  .cylon-tabs-nav-operations {
+    display: none !important;
+  }
+
+  ::-webkit-scrollbar {
+    width: 0;
+    height: 0;
+    display: none;
+  }
+
+
+  .tab-select-wrap {
+    display: flex;
+    align-items: center;
+    height: 50px;
+    background: rgb(255 255 255);
+    overflow: auto;
+    position: relative;
+    margin-bottom: 15px;
+
+    .tabTitle {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      padding: 0 16px;
+      width: fit-content;
+      height: 100%;
+      justify-content: center;
+      white-space: nowrap;
+      flex-direction: column;
+
+      img {
+        height: 20px;
+        width: 20px;
+        margin-bottom: 2px;
+      }
+    }
+
+    .active-line {
+      position: absolute;
+      bottom: 0;
+      width: 200px;
+      height: 3px;
+      background-color: #fff;
+      transition: .2s all linear;
+      border-radius: 1.5px;
+    }
+  }
+
+  .macyContainer {
+    display: flex;
+    margin: 0 16px;
+  }
+
+  .scrollContainer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin: 0 16px;
+    overflow-x: auto;
+    padding-bottom: 15px;
+
+    &.pl_100 {
+      padding-left: 100px;
+    }
+
+    .scrollProductList {
+      display: flex;
+      flex-direction: row;
+      align-items: flex-start;
+
+      .productCard {
+        margin-right: 12px;
+      }
+    }
+  }
+
+  .btnSeeAll {
+    display: block;
+    width: fit-content;
+    min-width: 80px;
+    margin: 0 auto;
+    flex: none;
+  }
+}

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

@@ -13,9 +13,9 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = require("lodash");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
-var _lodash2 = _interopRequireDefault(require("lodash.throttle"));
+var _lodash = _interopRequireDefault(require("lodash.throttle"));
 
 var _mobx = require("../../../../../mobx");
 
@@ -479,7 +479,7 @@ function (_super) {
         if (scrollDom) {
           _this.setScrollDisabled(scrollDom);
 
-          scrollDom.onscroll = (0, _lodash2["default"])(function () {
+          scrollDom.onscroll = (0, _lodash["default"])(function () {
             _this.setScrollDisabled(scrollDom);
           }, 500);
         }
@@ -527,13 +527,13 @@ function (_super) {
       if (scrollDom) {
         _this.setScrollDisabled(scrollDom);
 
-        scrollDom.onscroll = (0, _lodash2["default"])(function () {
+        scrollDom.onscroll = (0, _lodash["default"])(function () {
           _this.setScrollDisabled(scrollDom);
         }, 500);
       }
     }, 0);
     this.listenWidth();
-    window.addEventListener('resize', (0, _lodash.debounce)(this.listenWidth));
+    window.addEventListener('resize', (0, _debounce["default"])(this.listenWidth));
   };
 
   RecommendMobile.prototype.componentWillUnmount = function () {
@@ -589,7 +589,7 @@ function (_super) {
         if (scrollDom) {
           _this.setScrollDisabled(scrollDom);
 
-          scrollDom.onscroll = (0, _lodash2["default"])(function () {
+          scrollDom.onscroll = (0, _lodash["default"])(function () {
             _this.setScrollDisabled(scrollDom);
           }, 500);
         }

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

@@ -1,51 +1,58 @@
 .m-search-bar {
-  height: 0.96rem;
-  padding: 0.16rem 0;
+  height: 48px;
+  padding: 8px 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-}
-.m-search-bar .right {
-  display: flex;
-  flex: 1;
-  margin-left: 0.3rem;
-  align-items: center;
-  justify-content: space-between;
-}
-.m-search-bar .right .search-input-wrap {
-  flex: 1;
-  background: #fff;
-  border-radius: 0.08rem;
-  border: 0.02rem solid #D2D9E5;
-  padding: 0.08rem 0.24rem;
-  height: 0.64rem;
-  text-align: right;
-  display: flex;
-  justify-content: flex-end;
-}
-.m-search-bar .right .message-wrap {
-  position: relative;
-  margin-left: 0.2rem;
-}
-.m-search-bar .right .message-wrap .num {
-  position: absolute;
-  top: -0.12rem;
-  right: -0.12rem;
-  display: inline-block;
-  padding: 0.02rem 0.04rem;
-  min-width: 0.34rem;
-  text-align: center;
-  background-color: #CE1126;
-  border: 0.02rem solid #fff;
-  border-radius: 0.16rem;
-  font-family: 'Montserrat';
-  font-style: normal;
-  font-weight: 600;
-  font-size: 0.16rem;
-  color: #FFFFFF;
-}
-.m-search-bar .logo img {
-  width: auto;
-}
+
+  .right {
+    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;
+      display: flex;
+      justify-content: flex-end;
+    }
+
+    .message-wrap {
+      position: relative;
+      margin-left: 10px;
+
+      .num {
+        position: absolute;
+        top: -6px;
+        right: -6px;
+        display: inline-block;
+        padding: 1px 2px;
+        min-width: 17px;
+        text-align: center;
+        background-color: #CE1126;
+        border: 1px solid #fff;
+        border-radius: 8px;
+        font-family: 'Montserrat';
+        font-style: normal;
+        font-weight: 600;
+        font-size: 8px;
+        color: #FFFFFF;
+      }
+    }
+  }
+
+  .logo {
+    img {
+      width: auto;
+    }
+  }
+}

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

@@ -380,14 +380,14 @@ function (_super) {
     }), /*#__PURE__*/_react["default"].createElement("div", {
       onClick: this.clickCollect
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: isFollow ? '#F1600F' : '#333333',
+      color: isFollow ? '#fe1559' : '#333333',
       size: (0, _commonUtil.convertToRem)(24),
       type: isFollow ? 'icon-HeartStraight_fill' : 'icon-HeartStraight'
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-info-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "number"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeEvalValue) ? Number(storeInfo.storeEvalValue / 100).toFixed(1) : '5。0', "  "), /*#__PURE__*/_react["default"].createElement("img", {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.storeEvalValue) ? Number(storeInfo.storeEvalValue / 100).toFixed(1) : '5.0', "  "), /*#__PURE__*/_react["default"].createElement("img", {
       alt: "star",
       src: _star["default"]
     })), /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -1,64 +1,68 @@
 .m-sign-board-bar {
   width: 100%;
-}
-.m-sign-board-bar .search {
-  width: 100%;
-  background: #EEEEEE;
-  border-radius: 0.16rem;
-  padding: 0.16rem 0.24rem;
-  height: 0.72rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.08rem;
-}
-.m-sign-board-bar .search .search-input {
-  height: 0.4rem;
-  font-weight: 400;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  padding: 0;
-  background-color: transparent;
-  border: none;
-}
-.m-sign-board-bar .store-info-wrap {
-  display: flex;
-  align-items: center;
-  margin-top: 0.4rem;
-}
-.m-sign-board-bar .store-info-wrap .number {
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  color: #696973;
-  display: flex;
-  align-items: center;
-}
-.m-sign-board-bar .store-info-wrap .number > img {
-  width: 0.28rem;
-}
-.m-sign-board-bar .store-info-wrap .number > span {
-  font-weight: 700;
-  font-size: 0.28rem;
-  line-height: 0.36rem;
-  color: #333333;
-  margin: 0 0.08rem;
-}
-.m-sign-board-bar .store-info-wrap .number:nth-child(2) {
-  margin-left: 0.48rem;
-  flex: 1;
-}
-.m-sign-board-bar .store-info-wrap .chat-btn {
-  padding: 0.1rem 0.24rem;
-  background: #FFFFFF;
-  border: 0.02rem solid #333333;
-  border-radius: 0.08rem;
-  width: fit-content;
-  font-family: 'Montserrat';
-  font-weight: 400;
-  font-size: 0.24rem;
-  line-height: 0.32rem;
-  text-transform: uppercase;
-  color: #333333;
-}
+
+  .search {
+    width: 100%;
+    background: #EEEEEE;
+    border-radius: 8px;
+    padding: 8px 12px;
+    height: 36px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 4px;
+    .search-input {
+      height: 20px;
+      font-weight: 400;
+      font-size: 16px;
+      line-height: 20px;
+      padding: 0;
+      background-color: transparent;
+      border: none;
+    }
+  }
+
+  .store-info-wrap {
+    display: flex;
+    align-items: center;
+    margin-top: 20px;
+    .number {
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      color: #696973;
+      display: flex;
+      align-items: center;
+      &> img {
+        width: 14px;
+      }
+      &> span {
+        font-weight: 700;
+        font-size: 14px;
+        line-height: 18px;
+        color: #333333;
+        margin: 0 4px;
+      }
+      &:nth-child(2) {
+        margin-left: 24px;
+        flex: 1;
+      }
+    }
+    .chat-btn {
+      padding: 5px 12px;
+      // height: 26px;
+      background: #FFFFFF;
+      border: 1px solid #333333;
+      border-radius: 4px;
+      width: fit-content;
+      font-family: 'Montserrat';
+      font-weight: 400;
+      font-size: 12px;
+      line-height: 16px;
+      text-transform: uppercase;
+      color: #333333;
+    }
+  }
+
+}

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

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var _lodash = require("lodash");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -79,7 +79,7 @@ function () {
       _this.doAction(callback);
     };
 
-    this.doAction = (0, _lodash.debounce)(function (callback) {
+    this.doAction = (0, _debounce["default"])(function (callback) {
       var newCursor = _this.cursor + _this.step;
       _this.cursor = newCursor;
       var newData = (0, _cloneDeep["default"])(_this.list[newCursor]);

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

@@ -15,7 +15,9 @@ var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"))
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _lodash = require("lodash");
+var _findLastIndex = _interopRequireDefault(require("lodash/findLastIndex"));
+
+var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
 
 var _common = require("../../../common");
 
@@ -139,7 +141,7 @@ function PageCompList(_a) {
 
   var getLastSameIndex = function getLastSameIndex(comps, index) {
     var lastComps = comps.slice(0, index);
-    var newIndex = (0, _lodash.findLastIndex)(lastComps, function (comp) {
+    var newIndex = (0, _findLastIndex["default"])(lastComps, function (comp) {
       return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
     });
     return newIndex;
@@ -147,7 +149,7 @@ function PageCompList(_a) {
 
   var getNextSameIndex = function getNextSameIndex(comps, index) {
     var nextComps = comps.slice(index + 1);
-    var newIndex = (0, _lodash.findIndex)(nextComps, function (comp) {
+    var newIndex = (0, _findIndex["default"])(nextComps, function (comp) {
       return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
     });
     return newIndex + index + 1;

package/lib/core/Designer/index.js

@@ -510,9 +510,6 @@ function (_super) {
           break;
 
         case _constants.quickMenuCode.SAVE:
-          /** 如果保存则重置为mobile，同一移动端截图 #10504010 */
-          _this.onSwitchDevice(_constants.deviceTypeMap.PHONE);
-
           onSave(handleParams);
           break;
 

package/lib/core/Renderer/index.js

@@ -58,36 +58,38 @@ var Renderer = function Renderer(props) {
       outputType = props.outputType,
       noSetWindow = props.noSetWindow;
 
-  var _a = (0, _react.useState)([]),
-      floors = _a[0],
-      setFloors = _a[1];
-
   if (!noSetWindow) {
     setDesignConfig(props);
   }
 
   window.magicDesignPageData = pageData;
-  var pageBackground = window.magicDesign.pageBackground;
-  (0, _react.useEffect)(function () {
-    console.log('----pageData change', pageData);
-    var filterData = [];
+  var pageBackground = window.magicDesign.pageBackground; // 根据楼层展示设备进行过滤
+
+  var filterCompFloor = function filterCompFloor() {
+    var source = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
-      filterData = pageData.childNodes.filter(function (node) {
+      source = pageData.childNodes.filter(function (node) {
         return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
       });
-    } // 首页组建分批渲染按5个一组
+    }
 
+    return source;
+  };
 
-    setFloors(filterData.slice(0, 5));
-    setTimeout(function () {
-      setFloors(filterData.slice(0, 10));
-      setTimeout(function () {
-        setFloors(filterData);
-      }, 200);
-    }, 200);
-  }, [pageData]);
   (0, _react.useEffect)(function () {
+    // const data = await fishFetch('/h5/ga/mediaid', {}, 'GET');
+    (0, _commonUtil.importAsync)('https://www.googletagmanager.com/gtag/js?id=G-7B9GSSLVX3', 'js').then(function () {
+      window.dataLayer = window.dataLayer || [];
+
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+
+      gtag('js', new Date());
+      gtag('config', 'G-7B9GSSLVX3');
+      window.gtag = gtag;
+    });
     setTimeout(function () {
       var _a;
 
@@ -101,11 +103,10 @@ var Renderer = function Renderer(props) {
     className: "render_wrap",
     magic_design: "",
     style: {
-      height: '100%',
       background: pageBackground,
       overflow: 'auto'
     }
-  }, floors.length > 0 && floors.map(function (nodeData, moduleIndex) {
+  }, filterCompFloor().map(function (nodeData, moduleIndex) {
     var Clazz = _componentTypes.componentMap[nodeData.type];
 
     if (!Clazz) {

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

@@ -11,7 +11,7 @@ var _antd = require("antd");
 
 require("./index.less");
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _locale = require("../../../locale");
 
@@ -106,11 +106,11 @@ function (_super) {
 
       _this.updateAttr(data, 'hover', {
         open: true,
-        buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
-        buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
-        buttonText: (0, _lodash.cloneDeep)(data.buttonText),
+        buttonBorder: (0, _cloneDeep["default"])(data.buttonBorder),
+        buttonIcon: (0, _cloneDeep["default"])(data.buttonIcon),
+        buttonText: (0, _cloneDeep["default"])(data.buttonText),
         content: {
-          backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
+          backgroundColor: (0, _cloneDeep["default"])(data.content.backgroundColor)
         }
       }); // console.log('--ffd, button hover first click', data);
 

package/lib/utils/businessUtil.js

@@ -7,7 +7,7 @@ exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToT
 
 var _qs = _interopRequireDefault(require("qs"));
 
-var _lodash = require("lodash");
+var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
 var _commonUtil = require("./commonUtil");
 
@@ -87,7 +87,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(value), function (value) {
             return value;
           })
         }
@@ -256,7 +256,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(arg1), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(arg1), function (value) {
             return value;
           })
         }