@fonixtree/magic-design 0.0.78 → 0.0.80

package/es/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, {
-    value: campaignName,
+    className: "inputStyle",
     onChange: function onChange(e) {
       setCampaignName(e.target.value);
     },
-    className: "inputStyle"
+    value: campaignName
   })), /*#__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,
-    className: "inputStyle"
+    value: cmpState
   }, 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, {
-    scroll: {
-      y: 340
-    },
-    loading: loading,
     bordered: false,
+    columns: columns,
+    dataSource: bundleList,
+    loading: loading,
     rowKey: "campaignId",
     rowSelection: rowSelection,
-    columns: columns,
-    dataSource: bundleList
+    scroll: {
+      y: 340
+    }
   }));
 };
 

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

@@ -200,6 +200,7 @@ function CustomTable(props) {
     queryCus({
       pageType: 'Customized',
       verType: 'Formal',
+      configVersion: 'V2',
       state: 'Using'
     });
   }, []);

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

@@ -485,7 +485,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
                     minPrice: minimum * precision || '',
                     maxPrice: maximum * precision || '',
                     storeName: storeName || '',
-                    cmpTypeId: promotions.key || '',
+                    campaignType: promotions.key || '',
                     state: 'A'
                   }),
                   total: res.total
@@ -513,13 +513,13 @@ var FilteredProductModal = function FilteredProductModal(props) {
     queryStore();
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "filteredProductModal"
+    className: "mFilteredProductModal"
   }, /*#__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: "filteredProductModalContent"
+    className: "mFilteredProductModalContent"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "leftCot"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {

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

@@ -1,5 +1,4 @@
-.filteredProductModal {
-
+.mFilteredProductModal {
   .proModalWrap {
     .info {
       background: #ecf1fd;
@@ -17,7 +16,7 @@
       background-size: contain;
     }
 
-    .filteredProductModalContent {
+    .mFilteredProductModalContent {
       display: flex;
 
       .rightCot {

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

@@ -232,7 +232,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
   var _j = (0, _react.useState)({
     pageSize: 20,
-    current: 1
+    pageIndex: 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.current = 1;
+      paginationParams.pageIndex = 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.current = page;
+        paginationParams.pageIndex = page;
 
         var total = paginationParams.total,
             params = __rest(paginationParams, ["total"]);

package/es/common/LinkModal/index.less

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

package/es/common/MagicLink/index.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.onAClick = exports.getLinkUrl = exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _businessUtil = require("src/components/utils/businessUtil");
+
+var _coreUtil = require("src/components/utils/coreUtil");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var onAClick = function onAClick(e, url) {
+  e.preventDefault();
+
+  if (window.magicDesign.mode === 'renderer') {
+    (0, _coreUtil.clickUrl)(url);
+  }
+};
+
+exports.onAClick = onAClick;
+
+var getLinkUrl = function getLinkUrl(url) {
+  var h5Link = (0, _businessUtil.parseUrl)(url).h5Link;
+  return h5Link;
+};
+
+exports.getLinkUrl = getLinkUrl;
+
+var MagicLink =
+/** @class */
+function (_super) {
+  __extends(MagicLink, _super);
+
+  function MagicLink() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  MagicLink.prototype.render = function () {
+    var _a = this.props,
+        url = _a.url,
+        children = _a.children;
+    var href = getLinkUrl(url);
+    return /*#__PURE__*/_react["default"].createElement("a", {
+      href: href,
+      onClick: function onClick(e) {
+        return onAClick(e, url);
+      }
+    }, children);
+  };
+
+  MagicLink.defaultProps = {};
+  return MagicLink;
+}(_react["default"].Component);
+
+var _default = MagicLink;
+exports["default"] = _default;

package/es/common/ProductModal/index.js

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

package/es/common/ProductModal/index.less

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

package/es/common/UrlPicker/index.js

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

package/es/common/UrlPicker/index.less

@@ -1,5 +1,16 @@
 .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/es/common/index.js

@@ -63,6 +63,12 @@ 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() {
@@ -124,4 +130,6 @@ 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/es/composite-comp/bol/components/Banner/defaultJSON.js

@@ -43,12 +43,12 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       text: 'Title use, click modify text.',
       specialContent: [],
       content: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 700,
         fontSize: 28,
         color: '#FFFFFF',
-        width: 400
+        width: 319
       },
       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: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 18,
         color: '#FFFFFF',
-        width: 500
+        width: 319
       },
       underline: {},
       vertical: {}
@@ -86,7 +86,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#2F54EB'
       },
       buttonText: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -122,7 +122,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#0d39ed'
         },
         buttonText: {
-          // sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -151,7 +151,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
         backgroundColor: '#fff'
       },
       buttonText: {
-        // sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 14,
@@ -187,7 +187,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
           backgroundColor: '#E9F0FF'
         },
         buttonText: {
-          // sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -254,12 +254,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 0,
         paddingBottom: 0,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     }
   };

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

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

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

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

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

@@ -3,99 +3,69 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultJSON = void 0;
+exports.getDefaultJSON = exports.buttonGroupSourceJSON = 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 getDefaultMetaButtonJson = function getDefaultMetaButtonJson() {
+var buttonGroupSourceJSON = function buttonGroupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
   return {
-    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: {
+    id: groupId,
+    button: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
       open: true,
-      borderColor: '',
-      borderRadius: 6
-    },
-    buttonIcon: {
-      iconUrl: '',
-      layout: 'right'
-    },
-    spacing: {
-      pc: {},
-      mobile: {}
-    },
-    text: 'Button',
-    hover: null
+      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
+    }
   };
 };
 
+exports.buttonGroupSourceJSON = buttonGroupSourceJSON;
+
 var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'BUTTON',
-    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
-        }
-      })
-    },
+    groupSource: [buttonGroupSourceJSON()],
     spacing: {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {