@fonixtree/magic-design 0.0.71 → 0.0.72

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

@@ -319,24 +319,24 @@ var BundleCampaign = function BundleCampaign(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign Name"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
-    className: "inputStyle",
+    value: campaignName,
     onChange: function onChange(e) {
       setCampaignName(e.target.value);
     },
-    value: campaignName
+    className: "inputStyle"
   })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 12
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Store"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+    showSearch: true,
+    optionFilterProp: "children",
     className: "inputStyle",
+    placeholder: "Please select",
+    value: storeId,
     onChange: function onChange(value) {
       return setStoreId(value);
-    },
-    optionFilterProp: "children",
-    placeholder: "Please select",
-    showSearch: true,
-    value: storeId
+    }
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: v.storeId,
@@ -352,10 +352,10 @@ var BundleCampaign = function BundleCampaign(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign State"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-    className: "inputStyle",
     defaultValue: "A,B",
+    value: cmpState,
     onChange: changeCamState,
-    value: cmpState
+    className: "inputStyle"
   }, stateMap && stateMap.length > 0 && stateMap.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: v.key,
@@ -365,24 +365,24 @@ var BundleCampaign = function BundleCampaign(props) {
     span: 12
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: queryFunc,
+    type: "primary",
     style: {
       marginRight: 10
-    },
-    type: "primary"
+    }
   }, "Query"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       reset();
     }
   }, "Cancel"))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
-    bordered: false,
-    columns: columns,
-    dataSource: bundleList,
+    scroll: {
+      y: 340
+    },
     loading: loading,
+    bordered: false,
     rowKey: "campaignId",
     rowSelection: rowSelection,
-    scroll: {
-      y: 340
-    }
+    columns: columns,
+    dataSource: bundleList
   }));
 };
 

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

@@ -199,8 +199,7 @@ function CustomTable(props) {
   (0, _react.useEffect)(function () {
     queryCus({
       pageType: 'Customized',
-      verType: 'Formal',
-      configVersion: 'V2'
+      verType: 'Formal'
     });
   }, []);
   var columns = [{

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

@@ -513,13 +513,13 @@ var FilteredProductModal = function FilteredProductModal(props) {
     queryStore();
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "mFilteredProductModal"
+    className: "filteredProductModal"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "proModalWrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "info"
   }, (0, _locale.i18n)('THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS')), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "mFilteredProductModalContent"
+    className: "filteredProductModalContent"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "leftCot"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {

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

@@ -1,4 +1,4 @@
-.mFilteredProductModal {
+.filteredProductModal {
   .proModalWrap {
     .info {
       background: #ecf1fd;
@@ -7,7 +7,6 @@
       padding: 5px 0 5px 16px;
       margin-bottom: 8px;
     }
-
     .prodImage {
       width: 36px;
       height: 36px;
@@ -16,7 +15,7 @@
       background-size: contain;
     }
 
-    .mFilteredProductModalContent {
+    .filteredProductModalContent {
       display: flex;
 
       .rightCot {
@@ -88,7 +87,6 @@
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;
         padding-right: 15px;
-
         .price {
           display: flex;
           width: calc(100% - 16px);
@@ -102,11 +100,9 @@
             border-radius: 2px;
           }
         }
-
         .ant-form-item {
           margin-bottom: 4px;
         }
-
         .buttonStyle {
           margin-top: 10px;
           text-align: right;

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

@@ -232,7 +232,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
   var _j = (0, _react.useState)({
     pageSize: 20,
-    pageIndex: 1
+    current: 1
   }),
       paginationParams = _j[0],
       setPaginationParams = _j[1];
@@ -399,7 +399,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
-      paginationParams.pageIndex = 1;
+      paginationParams.current = 1;
 
       var total = paginationParams.total,
           params = __rest(paginationParams, ["total"]);
@@ -468,7 +468,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         setLoading(true);
-        paginationParams.pageIndex = page;
+        paginationParams.current = page;
 
         var total = paginationParams.total,
             params = __rest(paginationParams, ["total"]);

package/lib/common/LinkModal/index.less

@@ -1,5 +1,5 @@
 .linkModal {
-  width: 1200px;
+  width: 1000px;
   right: unset !important;
   left: unset !important;
 

package/lib/common/ProductModal/index.js

@@ -745,7 +745,7 @@ var ProductModal = function ProductModal(props) {
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 500
+      y: 300
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"

package/lib/common/ProductModal/index.less

@@ -11,15 +11,13 @@
     .content {
       display: flex;
       margin-bottom: 8px;
-
       .rightCot {
         width: calc(100% - 260px);
         margin-left: 16px;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-
-        .prodImg {
+         .prodImg {
           display: inline-block;
           width: 36px;
           height: 36px;
@@ -27,18 +25,16 @@
           background-position: 50% 50%;
           background-repeat: no-repeat;
         }
-
         .selectedCot {
-          padding-right: 18px;
           margin-left: 4px;
-          height: 78px;
+          height: 148px;
           background: #f8f8f8;
           border: 1px solid #e0e0e0;
           border-radius: 2px;
           display: flex;
           flex-direction: row;
-          // flex-wrap: wrap;
-          overflow-x: auto;
+          flex-wrap: wrap;
+          overflow-y: auto;
 
           .selectedItem {
             box-sizing: border-box;
@@ -75,9 +71,9 @@
               cursor: pointer;
             }
 
-            // &:nth-child(n + 11) {
-            //   margin-top: 5px !important;
-            // }
+            &:nth-child(n + 11) {
+              margin-top: 5px !important;
+            }
 
             .selectedItemImg {
               height: 52px;
@@ -98,7 +94,6 @@
         padding-right: 14px;
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;
-
         .divider {
           width: 10%;
           display: inline-block;

package/lib/common/UrlPicker/index.js

@@ -63,13 +63,10 @@ function (_super) {
     var visible = this.state.visible;
     var _a = this.props,
         value = _a.value,
-        _onChange = _a.onChange,
-        disabled = _a.disabled;
+        _onChange = _a.onChange;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-url-picker"
-    }, disabled && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "disabled"
-    }), /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "input-url"
     }, /*#__PURE__*/_react["default"].createElement("input", {
       onChange: function onChange(e) {
@@ -115,7 +112,6 @@ function (_super) {
 
   UrlPicker.defaultProps = {
     value: '',
-    disabled: false,
     onChange: function onChange() {}
   };
   return UrlPicker;

package/lib/common/UrlPicker/index.less

@@ -1,16 +1,5 @@
 .m-url-picker {
-  position: relative;
-  .disabled {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    top: 0;
-    background-color: #D2D9E5;
-    z-index: 1;
-    opacity: 0.5;
-    border-radius: 8px;
-  }
+
   .input-url {
     width: 100%;
     height: 40px;

package/lib/common/index.js

@@ -63,12 +63,6 @@ Object.defineProperty(exports, "ImagePicker", {
     return _ImagePicker["default"];
   }
 });
-Object.defineProperty(exports, "ImgArea", {
-  enumerable: true,
-  get: function get() {
-    return _ImgArea["default"];
-  }
-});
 Object.defineProperty(exports, "LayoutSelector", {
   enumerable: true,
   get: function get() {
@@ -130,6 +124,4 @@ var _ButtonIconLayout = _interopRequireDefault(require("./ButtonIconLayout"));
 
 var _ProductSource = _interopRequireDefault(require("./ProductSource"));
 
-var _ImgArea = _interopRequireDefault(require("./ImgArea"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/lib/composite-comp/bol/components/Banner/defaultJSON.js

@@ -43,12 +43,12 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       text: 'Title use, click modify text.',
       specialContent: [],
       content: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 700,
         fontSize: 28,
         color: '#FFFFFF',
-        width: 319
+        width: 400
       },
       underline: {
         open: false,
@@ -65,12 +65,12 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       specialContent: [],
       text: 'For the text area, you can enter a subtitle or description, the default width is the same as title.',
       content: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 18,
         color: '#FFFFFF',
-        width: 319
+        width: 500
       },
       underline: {},
       vertical: {}
@@ -86,7 +86,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#2F54EB'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -122,7 +122,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#0d39ed'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          // sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -151,7 +151,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#fff'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        // sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -187,7 +187,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#E9F0FF'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          // sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -254,12 +254,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: window.magicDesign.compSpacing * 1.5
+        marginBottom: 0
       },
       mobile: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: window.magicDesign.compSpacing
+        marginBottom: 0
       }
     }
   };

package/lib/composite-comp/bol/components/Banner/mobile/index.js

@@ -21,6 +21,8 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
 
+var _businessUtil = require("../../../../../utils/businessUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -59,7 +61,8 @@ function (_super) {
 
     _this.state = {
       carouseIndex: 0,
-      hoverState: false
+      hoverState: false,
+      clickedGroup: ''
     };
     _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
     _this.destroy = null;
@@ -119,16 +122,19 @@ function (_super) {
     var data = this.props.data;
     var _a = this.state,
         carouseIndex = _a.carouseIndex,
-        hoverState = _a.hoverState;
+        hoverState = _a.hoverState,
+        clickedGroup = _a.clickedGroup;
     var autoplay = data.setting.autoplay.open;
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 
-    if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {
+    if ((0, _coreUtil.isDesignMode)() && clickedGroup) {
       autoplay = false;
     }
 
+    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-banner-mobile"
+      className: "m-banner-mobile",
+      style: wrapStyle
     }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel, {
       ref: this.carouselRef,
       afterChange: function afterChange(n) {

package/lib/composite-comp/bol/components/Banner/pc/index.js

@@ -23,7 +23,7 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _common = require("../../../../../common");
 
-var _commonUtil = require("../../../../../utils/commonUtil");
+var _businessUtil = require("../../../../../utils/businessUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -127,7 +127,8 @@ function (_super) {
       };
 
       if (item.background.bgType === 'color') {
-        bgStyle.backgroundColor = (0, _commonUtil.getColorRgba)(item.background.color || '#fff', item.background.opacity / 100 || 1);
+        bgStyle.opacity = item.background.opacity ? item.background.opacity / 100 : 1;
+        bgStyle.backgroundColor = item.background.color;
       } else {
         bgStyle.backgroundImage = "url(" + item.background.image + ")";
       }
@@ -173,8 +174,10 @@ function (_super) {
       autoplay = false;
     }
 
+    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-banner-pc"
+      className: "m-banner-pc",
+      style: wrapStyle
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       className: "turnPage leftBtn",
       onClick: function onClick() {

package/lib/composite-comp/bol/components/Button/defaultJSON.js

@@ -3,69 +3,99 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = exports.buttonGroupSourceJSON = void 0;
+exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 /**
  * 获取 text 元组件json
  */
-var buttonGroupSourceJSON = function buttonGroupSourceJSON() {
-  var groupId = (0, _uuid.v4)();
+var getDefaultMetaButtonJson = function getDefaultMetaButtonJson() {
   return {
-    id: groupId,
-    button: {
-      parentId: groupId,
-      id: (0, _uuid.v4)(),
+    id: (0, _uuid.v4)(),
+    open: true,
+    content: {
+      backgroundColor: '#2F54EB'
+    },
+    buttonText: {
+      sizeType: 'Customize font styles',
+      fontFamily: 'Open Sans',
+      fontWeight: 400,
+      fontSize: 14,
+      fontStyle: 'normal',
+      color: '#fff',
+      padding: '10px 26px'
+    },
+    buttonBorder: {
       open: true,
-      content: {
-        backgroundColor: '#2F54EB'
-      },
-      buttonText: {
-        sizeType: 'Customize font styles',
-        fontFamily: 'Open Sans',
-        fontWeight: 400,
-        fontSize: 14,
-        fontStyle: 'normal',
-        color: '#fff',
-        padding: '10px 26px'
-      },
-      buttonBorder: {
-        open: true,
-        borderColor: '',
-        borderRadius: 6
-      },
-      buttonIcon: {
-        iconUrl: '',
-        layout: 'right'
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
-      },
-      text: 'Button',
-      hover: null
-    }
+      borderColor: '',
+      borderRadius: 6
+    },
+    buttonIcon: {
+      iconUrl: '',
+      layout: 'right'
+    },
+    spacing: {
+      pc: {},
+      mobile: {}
+    },
+    text: 'Button',
+    hover: null
   };
 };
 
-exports.buttonGroupSourceJSON = buttonGroupSourceJSON;
-
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'BUTTON',
-    groupSource: [buttonGroupSourceJSON()],
+    content: {
+      button: __assign({}, getDefaultMetaButtonJson()),
+      secondaryButton: __assign(__assign({}, getDefaultMetaButtonJson()), {
+        content: {
+          backgroundColor: '#fff'
+        },
+        buttonText: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Open Sans',
+          fontWeight: 400,
+          fontSize: 14,
+          fontStyle: 'normal',
+          color: '#2F54EB',
+          padding: '10px 26px'
+        },
+        buttonBorder: {
+          open: true,
+          borderColor: '#2F54EB',
+          borderRadius: 6
+        }
+      })
+    },
     spacing: {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: window.magicDesign.compSpacing * 1.5
+        marginBottom: 0
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: window.magicDesign.compSpacing
+        marginBottom: 0
       }
     },
     customize: {

package/lib/composite-comp/bol/components/Button/index.js

@@ -15,6 +15,8 @@ var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+var _businessUtil = require("../../../../utils/businessUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -74,16 +76,20 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
+    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('button-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
-      onClick: this.onComponentClick
-    }, nodeData.groupSource && nodeData.groupSource.map(function (m) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "secondary-button"
-      }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
-        data: m.button
-      }));
-    }));
+      onClick: this.onComponentClick,
+      style: wrapStyle
+    }, nodeData.content.button.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "first-button"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      data: nodeData.content.button
+    })), nodeData.content.secondaryButton.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "secondary-button"
+    }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      data: nodeData.content.secondaryButton
+    })));
   };
 
   Button.defaultProps = {};

package/lib/composite-comp/bol/components/Button/index.less

@@ -2,7 +2,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  flex-wrap: wrap;
 
   .first-button {
     margin: 5px;