@fonixtree/magic-design 0.1.22 → 0.1.24

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/constants/index.js

@@ -54,7 +54,8 @@ var urlTypeMap = {
   COUPONS: 'Coupons',
   BUNDLE_CAMPAIGN: 'BundleCampaign',
   VIDEO: 'Video',
-  SHARE_URL: 'ShareURL'
+  SHARE_URL: 'ShareURL',
+  MINI_APP: 'MiniApp'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/lib/core/Designer/CompListPanel/CompCard/index.js

@@ -26,7 +26,11 @@ function CompCard(_a) {
     className: "compCard"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "comp-info"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "comp-icon",
     type: icon || ((_b = _constants.compInfoMap[type]) === null || _b === void 0 ? void 0 : _b.icon)
   }), /*#__PURE__*/_react["default"].createElement("span", {

package/lib/meta-comp/components/Image/index.js

@@ -121,7 +121,7 @@ function (_super) {
         } else {
           if (data.content.h5ImgWidth) obj.width = data.content.h5ImgWidth * scale; // if (data.content.h5ImgHeight) obj.height = data.content.h5ImgHeight * scale;
 
-          if (data.content.h5ImgWidth > data.content.h5ImgHeight) {
+          if (data.content.h5ImgWidth > data.content.h5ImgHeight || data.content.h5ImgHeight > maxHeight) {
             obj.height = 'auto';
           } else if (data.content.h5ImgHeight) obj.height = data.content.h5ImgHeight * scale;
         }

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

@@ -96,6 +96,22 @@ function (_super) {
       data[key] = value;
 
       _this.selfRender();
+    }; // button 的hover打开时，继承上方的配置内容
+
+
+    _this.hoverClickEvent = function () {
+      var data = _this.props.data;
+
+      _this.updateAttr(data, 'hover', {
+        open: true,
+        buttonBorder: data.buttonBorder,
+        buttonIcon: data.buttonIcon,
+        buttonText: data.buttonText,
+        content: {
+          backgroundColor: data.content.backgroundColor
+        }
+      }); // console.log('--ffd, button hover first click', data);
+
     };
 
     return _this;
@@ -322,7 +338,8 @@ function (_super) {
         name: (0, _locale.i18n)('HOVER'),
         value: hoverSetting,
         toggleType: 'checkbox',
-        metaOption: data.hover
+        metaOption: data.hover,
+        checkClick: this.hoverClickEvent
       });
     }
 

package/lib/utils/businessUtil.js

@@ -111,6 +111,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.MINI_APP:
+      // 跳转小程序
+      link = '';
+      params = {
+        action: 'jump',
+        params: {
+          type: 'MINI_APP',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',

package/lib/utils/commonUtil.js

@@ -266,6 +266,10 @@ function commonFetch(url, data, method) {
 }
 
 var navigateTo = function navigateTo(url) {
+  if (!url) {
+    return;
+  }
+
   if (!window.magicDesign || !window.magicDesign.history) {
     window.location.href = url;
     return;

package/lib/utils/coreUtil.js

@@ -292,7 +292,6 @@ var clickUrl = function clickUrl(url) {
   }
 
   console.log('clickUrl...', url);
-  if (!url) return;
 
   if (window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;

package/package.json

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