@fonixtree/magic-design 0.1.57 → 1.0.2

package/es/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/es/composite-comp/dito/components/SearchBar/pc/index.js

@@ -68,7 +68,6 @@ function (_super) {
     };
 
     _this.searchProduct = function () {
-      console.log('--input', _this.state.inputVal);
       (0, _coreUtil.clickUrl)("/product/list?q=" + _this.state.inputVal);
     };
 
@@ -88,7 +87,6 @@ function (_super) {
 
     var data = this.props.data;
     var inputVal = this.state.inputVal;
-    console.log('--pc data', data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "pc-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -1,78 +1,82 @@
 .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;
-}
-.m-sign-board-bar .store-info-wrap .store-logo {
-  width: 0.88rem;
-  height: 0.88rem;
-  border-radius: 50%;
-}
-.m-sign-board-bar .store-info-wrap .store-name {
-  flex: 1;
-  margin-left: 0.24rem;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.4rem;
-  color: #070707;
-  font-family: 'Montserrat';
-}
+
+  .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;
+    }
+    .store-logo {
+      width: 44px;
+      height: 44px;
+      border-radius: 50%;
+    }
+    .store-name {
+      flex: 1;
+      margin-left: 12px;
+      font-weight: 500;
+      font-size: 16px;
+      line-height: 20px;
+      color: #070707;
+      font-family: 'Montserrat';
+    }
+  }
+
+}

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

@@ -68,7 +68,6 @@ function (_super) {
     var _this = this;
 
     var panelProps = this.props.panelProps;
-    console.log('panelProps', panelProps);
 
     var iconSetting = /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: ""

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

@@ -139,7 +139,6 @@ function (_super) {
 
   PcNavigationConfig.prototype.render = function () {
     var data = this.props.data;
-    console.log('-----pc', data);
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "large",

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

@@ -86,7 +86,6 @@ function (_super) {
     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",

package/es/core/Renderer/index.js

@@ -79,7 +79,7 @@ var Renderer = function Renderer(props) {
 
   (0, _react.useEffect)(function () {
     // const data = await fishFetch('/h5/ga/mediaid', {}, 'GET');
-    importAsync('https://www.googletagmanager.com/gtag/js?id=G-7B9GSSLVX3', 'js').then(function () {
+    (0, _commonUtil.importAsync)('https://www.googletagmanager.com/gtag/js?id=G-7B9GSSLVX3', 'js').then(function () {
       window.dataLayer = window.dataLayer || [];
 
       function gtag() {

package/es/locale/en/en.json

@@ -1,4 +1,7 @@
 {
+  "AI_IMAGE": "AI Image",
+  "IMAGE_URL": "Image URL",
+  "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
   "CHAT": "Chat",
   "FOLLOW": "Follow",

package/es/locale/es/es.json

@@ -1,4 +1,7 @@
 {
+  "AI_IMAGE": "AI Image",
+  "IMAGE_URL": "Image URL",
+  "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
   "CHAT": "Chat",
   "FOLLOW": "Follow",

package/es/locale/id/id.json

@@ -1,4 +1,7 @@
 {
+  "AI_IMAGE": "AI Image",
+  "IMAGE_URL": "Image URL",
+  "UPLOAD": "Upload",
   "HOW_LONG_BETWEEN_SLIDES_(SECS)": "How long between slides (secs)",
   "CHAT": "Chat",
   "FOLLOW": "Follow",

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

@@ -212,7 +212,7 @@ function (_super) {
             lineHeight: '1.1em',
             fontFamily: sizeType.fontFamily,
             fontWeight: sizeType.fontWeight,
-            fontSize: (0, _coreUtil.isPc)() ? sizeType.fontSize : sizeType.fontSize
+            fontSize: (0, _coreUtil.isPc)() ? sizeType.pcFontSize : sizeType.fontSize
           },
           value: sizeType.key
         }, sizeType.key);
@@ -249,7 +249,7 @@ function (_super) {
           var count = _a.count;
 
           if (window.magicDesign.device == 'pc') {
-            textData.fontSize = count;
+            textData.pcFontSize = count;
           } else {
             textData.fontSize = count;
           }
@@ -258,7 +258,7 @@ function (_super) {
         },
         unit: "px",
         value: {
-          count: window.magicDesign.device == 'pc' ? textData.fontSize : textData.fontSize
+          count: window.magicDesign.device == 'pc' ? textData.pcFontSize : textData.fontSize
         }
       }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: ""

package/es/utils/commonUtil.js

@@ -721,15 +721,13 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
 exports.asyncNextTick = asyncNextTick;
 
 var convertToRem = function convertToRem(value) {
-  // return value; // PTO项目 解开注释
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-    return value;
-  }
-
-  var pxValue = parseFloat(value);
-  var remValue = pxValue / 50; // 假设1rem = 50px
-
-  return remValue + "rem";
+  return value; // PTO项目 解开注释
+  // if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+  //   return value;
+  // }
+  // const pxValue = parseFloat(value);
+  // const remValue = pxValue / 50; // 假设1rem = 50px
+  // return `${remValue}rem`;
 };
 /** px to rem */
 
@@ -737,34 +735,30 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  // return styleObj; // PTO项目 解开注释
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-    return styleObj;
-  }
-
-  var remObj = {};
-
-  for (var key in styleObj) {
-    if (styleObj.hasOwnProperty(key)) {
-      var value = styleObj[key];
-
-      if (typeof value === 'string' && value.endsWith('px')) {
-        remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
-      } else if (typeof value === 'number') {
-        remObj[key] = convertToRem(value);
-      } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
-        var paddingValues = value.split(' ');
-        var remPaddingValues = paddingValues.map(function (paddingValue) {
-          return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
-        });
-        remObj[key] = remPaddingValues.join(' ');
-      } else {
-        remObj[key] = value;
-      }
-    }
-  }
-
-  return remObj;
+  return styleObj; // PTO项目 解开注释
+  // if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+  //   return styleObj;
+  // }
+  // const remObj = {};
+  // for (const key in styleObj) {
+  //   if (styleObj.hasOwnProperty(key)) {
+  //     const value = styleObj[key];
+  //     if (typeof value === 'string' && value.endsWith('px')) {
+  //       remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
+  //     } else if (typeof value === 'number') {
+  //       remObj[key] = convertToRem(value);
+  //     } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
+  //       const paddingValues = value.split(' ');
+  //       const remPaddingValues = paddingValues.map((paddingValue) => {
+  //         return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
+  //       });
+  //       remObj[key] = remPaddingValues.join(' ');
+  //     } else {
+  //       remObj[key] = value;
+  //     }
+  //   }
+  // }
+  // return remObj;
 };
 
 exports.pxToRem = pxToRem;