@fonixtree/magic-design 2.0.134 → 2.0.136

package/es/common/LinkModal/AffiliatePlatform/index.js

@@ -262,7 +262,7 @@ function AffiliatePlatform(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function AffiliatePlatform(props) {
     rowKey: "distributionPlatformId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/AffiliateProductTable/index.js

@@ -286,7 +286,7 @@ function AffiliateProductTable(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     form: form,

package/es/common/LinkModal/AffiliateStore/index.js

@@ -268,7 +268,7 @@ function AffiliateStore(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -325,7 +325,7 @@ function AffiliateStore(props) {
     rowKey: "affiliateStoreId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/BundleCampaign/index.js

@@ -404,7 +404,7 @@ var BundleCampaign = function BundleCampaign(props) {
     rowKey: "campaignId",
     rowSelection: rowSelection,
     scroll: {
-      y: 340
+      y: 300
     }
   }));
 };

package/es/common/LinkModal/BundleCampaign/index.less

@@ -1,18 +1,21 @@
-.bundleCampaign{
+.bundleCampaign {
     // padding-top: 12px;
     // border-top: 1px solid #f0f0f0;
-    height: 550px;
+    height: 450px;
+
     .inputStyle {
         width: 280px;
         height: 32px;
         margin-left: 10px;
-      }
+    }
+
     .labelStyle {
         display: inline-block;
         width: 110px;
         text-align: right;
         line-height: 2;
     }
+
     .mb12 {
         margin-bottom: 12px;
     }

package/es/common/LinkModal/CatgTable/index.js

@@ -223,7 +223,7 @@ function CatgTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -237,7 +237,7 @@ function CatgTable(props) {
     },
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/CouponTable/index.js

@@ -294,7 +294,7 @@ function CouponTable(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
@@ -308,7 +308,7 @@ function CouponTable(props) {
     }),
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/CustomTable/index.js

@@ -221,7 +221,7 @@ function CustomTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -232,7 +232,7 @@ function CustomTable(props) {
     rowKey: "bdPageId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/FilteredProductModal/index.js

@@ -674,7 +674,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       }
     }),
     scroll: {
-      y: 400
+      y: 350
     }
   })))));
 };

package/es/common/LinkModal/FilteredProductModal/index.less

@@ -1,5 +1,5 @@
 .mFilteredProductModal {
-  height: 550px;
+  height: 450px;
 
   .proModalWrap {
     .info {
@@ -86,7 +86,8 @@
 
       .leftCot {
         width: 280px;
-        // height: 400px;
+        height: 400px;
+        overflow-y: auto;
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;
         padding-right: 15px;

package/es/common/LinkModal/FunctionTable/index.js

@@ -218,7 +218,7 @@ function FunctionTable(props) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
@@ -228,7 +228,7 @@ function FunctionTable(props) {
     rowKey: "funcUrlLibId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/InterestedMerchants/index.js

@@ -262,7 +262,7 @@ function InterestedMerchants(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function InterestedMerchants(props) {
     rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/InterestedProducts/index.js

@@ -262,7 +262,7 @@ function InterestedMerchants(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -319,7 +319,7 @@ function InterestedMerchants(props) {
     rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/MerchantStory/index.js

@@ -264,7 +264,7 @@ function MerchantStory(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -321,7 +321,7 @@ function MerchantStory(props) {
     rowKey: "storeId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/MiniAppApi/index.js

@@ -55,7 +55,7 @@ function MiniAppApi(_a) {
     rowKey: "title",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/MiniAppTable/index.js

@@ -233,7 +233,7 @@ function CustomTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -244,7 +244,7 @@ function CustomTable(props) {
     rowKey: "storeMiniProgramId",
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/MissionDetail/index.js

@@ -255,7 +255,7 @@ function MissionDetail(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -312,7 +312,7 @@ function MissionDetail(props) {
     rowKey: "sfTaskId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/ProductDetailPage/index.js

@@ -557,7 +557,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 300
+      y: 250
     }
   }));
 };

package/es/common/LinkModal/ProductDetailPage/index.less

@@ -1,5 +1,5 @@
 .productDetailPage {
-  height: 550px;
+  height: 450px;
 
   .btn-select-type {
     margin-bottom: 10px;

package/es/common/LinkModal/SelectVideoModal/index.less

@@ -2,7 +2,8 @@
   display: flex;
   // padding: 20px 80px;
   // border-top: 1px solid #f0f0f0;
-  height: 550px;
+  height: 450px;
+
   .video-left-wrap {
     display: flex;
     flex-direction: column;

package/es/common/LinkModal/ShareUrl/index.less

@@ -1,3 +1,3 @@
 .shareWrap {
-  height: 550px;
+  height: 450px;
 }

package/es/common/LinkModal/StoreCatgTable/index.js

@@ -223,7 +223,7 @@ function StoreCatgTable(props) {
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
@@ -237,7 +237,7 @@ function StoreCatgTable(props) {
     },
     rowSelection: rowSelection,
     scroll: {
-      y: 480
+      y: 380
     }
   }));
 }

package/es/common/LinkModal/StoreTable/index.js

@@ -264,7 +264,7 @@ function StoreTable(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      height: 550
+      height: 450
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
     labelCol: {
@@ -321,7 +321,7 @@ function StoreTable(props) {
     rowKey: "storeId",
     rowSelection: rowSelection,
     scroll: {
-      y: 400
+      y: 350
     }
   }));
 }

package/es/common/LinkModal/index.js

@@ -11,6 +11,8 @@ var _antd = require("antd4");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _CouponTable = _interopRequireDefault(require("./CouponTable"));
 
 var _FilteredProductModal = _interopRequireDefault(require("./FilteredProductModal"));
@@ -323,116 +325,124 @@ var LinkModal = function LinkModal(props) {
     visible: visible,
     width: "1000px",
     wrapClassName: "magicLinkModal"
-  }, modalConfig), /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
-    activeKey: selected,
-    onChange: onTabsChange
+  }, modalConfig), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "wrap"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "types-list"
   }, linkTypes.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_antd.Tabs.TabPane, {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       key: item.linkTypeCode,
-      tab: item.linkTypeName
-    }, item.linkTypeCode === 'StoreCategory' && /*#__PURE__*/_react["default"].createElement(_StoreCatgTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(url) {
-        return setLinkUrl(url);
-      }
-    }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
-      _fetch: _fetch,
-      onDataChange: function onDataChange(url, t) {
-        setLinkUrl(url);
-        setTotal(t);
-      }
-    }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
-      _fetch: _fetch,
-      setUrl: function setUrl(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliatePlatform' && /*#__PURE__*/_react["default"].createElement(_AffiliatePlatform["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'InterestedMerchants' && /*#__PURE__*/_react["default"].createElement(_InterestedMerchants["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'InterestedProducts' && /*#__PURE__*/_react["default"].createElement(_InterestedProducts["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'MerchantStory' && /*#__PURE__*/_react["default"].createElement(_MerchantStory["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
-      _fetch: _fetch,
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
+      className: (0, _classnames["default"])('tag', {
+        active: selected === item.linkTypeCode
+      }),
+      onClick: function onClick() {
+        return onTabsChange(item.linkTypeCode);
       }
-    }));
+    }, item.linkTypeName);
   })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "form-content"
+  }, selected === 'StoreCategory' && /*#__PURE__*/_react["default"].createElement(_StoreCatgTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      setLinkUrl(value);
+    }
+  }), selected === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(url) {
+      return setLinkUrl(url);
+    }
+  }), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+    _fetch: _fetch,
+    onDataChange: function onDataChange(url, t) {
+      setLinkUrl(url);
+      setTotal(t);
+    }
+  }), selected === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
+    _fetch: _fetch,
+    setUrl: function setUrl(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliatePlatform' && /*#__PURE__*/_react["default"].createElement(_AffiliatePlatform["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'InterestedMerchants' && /*#__PURE__*/_react["default"].createElement(_InterestedMerchants["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'InterestedProducts' && /*#__PURE__*/_react["default"].createElement(_InterestedProducts["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'MerchantStory' && /*#__PURE__*/_react["default"].createElement(_MerchantStory["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }), selected === 'AffiliateMissionDetail' && /*#__PURE__*/_react["default"].createElement(_MissionDetail["default"], {
+    _fetch: _fetch,
+    onChange: function onChange(value) {
+      return setLinkUrl(value);
+    }
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, selected === 'FilteredProduct' ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "total"

package/es/common/LinkModal/index.less

@@ -4,9 +4,10 @@
   left: unset !important;
 
   .cylon-modal .cylon-modal-content .cylon-modal-body {
-      padding-bottom: 60px !important;
-      padding-top: 0 !important;
+    padding-bottom: 60px !important;
+    padding-top: 0 !important;
   }
+
   .urlModalWrap {
     font-family: 'Open Sans';
     font-style: normal;
@@ -69,10 +70,40 @@
       }
     }
   }
+
   .shareUrlWrap {
     height: 500px;
   }
 
+  .types-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 12px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+
+    .tag {
+      display: inline-block;
+      width: 145px;
+      height: 36px;
+      background-color: #F5F6F7;
+      border-radius: 4px;
+      line-height: 36px;
+      text-align: center;
+      color: #232F46;
+      font-weight: 400;
+      font-size: 14px;
+      border: 1px solid #F5F6F7;
+      cursor: pointer;
+
+      &.active {
+        border: 1px solid #2F54EB;
+        color: #2F54EB;
+      }
+    }
+  }
+
   .footer {
     padding: 10px 0;
     display: flex;
@@ -91,11 +122,13 @@
       border: none;
       margin-right: 12px;
     }
+
     .btn-confirm {
       background: #2F54EB;
       border: none;
       border-radius: 6px;
     }
+
     .total {
       font-size: 13px;
       color: #2d3040;