@fonixtree/magic-design 0.0.100 → 0.0.102

package/es/common/ImageModal/index.js

@@ -219,6 +219,7 @@ var modalSize = _const.size;
 var Search = _antd.Input.Search;
 var picAccept = '.gif,.jpg,.png';
 var videoAccept = '.AVI,.mov,.rmvb,.rm,.FLV,.mp4,.3GP';
+var pageSize = 24;
 
 function ImageModal(_a) {
   var _this = this;
@@ -255,33 +256,29 @@ function ImageModal(_a) {
       pageIndex = _j[0],
       setPageIndex = _j[1];
 
-  var _k = (0, _react.useState)(20),
-      pageSize = _k[0],
-      setPageSize = _k[1];
+  var _k = (0, _react.useState)(false),
+      spinning = _k[0],
+      setSpinning = _k[1];
 
-  var _l = (0, _react.useState)(false),
-      spinning = _l[0],
-      setSpinning = _l[1];
+  var _l = (0, _react.useState)(''),
+      name = _l[0],
+      setName = _l[1];
 
-  var _m = (0, _react.useState)(''),
-      name = _m[0],
-      setName = _m[1];
+  var _m = (0, _react.useState)([]),
+      contentcatgsList = _m[0],
+      setContentcatgsList = _m[1];
 
-  var _o = (0, _react.useState)([]),
-      contentcatgsList = _o[0],
-      setContentcatgsList = _o[1];
+  var _o = (0, _react.useState)(''),
+      searchValue = _o[0],
+      setSearchValue = _o[1];
 
-  var _p = (0, _react.useState)(''),
-      searchValue = _p[0],
-      setSearchValue = _p[1];
+  var _p = (0, _react.useState)([]),
+      expandedKeys = _p[0],
+      setExpandedKeys = _p[1];
 
-  var _q = (0, _react.useState)([]),
-      expandedKeys = _q[0],
-      setExpandedKeys = _q[1];
-
-  var _r = (0, _react.useState)(true),
-      autoExpandParent = _r[0],
-      setAutoExpandParent = _r[1]; // const currentUser = sessionUtil.getUser() || {};
+  var _q = (0, _react.useState)(true),
+      autoExpandParent = _q[0],
+      setAutoExpandParent = _q[1]; // const currentUser = sessionUtil.getUser() || {};
   // const { _csrf } = currentUser;
   // const headers = {};
   // if (_csrf && _csrf.headerName) {
@@ -290,8 +287,8 @@ function ImageModal(_a) {
 
 
   var headers = {};
-  headers['X-CSRF-TOKEN'] = localStorage.getItem('X-CSRF-TOKEN') || '';
-  headers.accessToken = localStorage.getItem('X-CSRF-TOKEN') || ''; // 查询图片库类目下的图片列表
+  headers['X-CSRF-TOKEN'] = localStorage.getItem('X-CSRF-TOKEN') || sessionStorage.getItem('X-CSRF-TOKEN') || '';
+  headers.accessToken = localStorage.getItem('X-CSRF-TOKEN') || sessionStorage.getItem('X-CSRF-TOKEN') || ''; // 查询图片库类目下的图片列表
 
   var qryImageContents = function qryImageContents(data) {
     return __awaiter(_this, void 0, void 0, function () {
@@ -577,13 +574,11 @@ function ImageModal(_a) {
     current: pageIndex,
     pageSize: pageSize,
     total: total,
-    onChange: function onChange(pageIndex, pageSize) {
-      setPageIndex(pageIndex);
-      setPageSize(pageSize);
+    onChange: function onChange(page) {
+      setPageIndex(page);
       qryImageContents({
         contentCatgId: selectedKeys[0],
-        pageIndex: pageIndex,
-        pageSize: pageSize
+        pageIndex: page
       });
     }
   };
@@ -723,7 +718,7 @@ function ImageModal(_a) {
     className: "catg_img"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Card, {
     bodyStyle: {
-      height: 410,
+      height: 380,
       overflowX: 'auto'
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Spin, {
@@ -744,7 +739,7 @@ function ImageModal(_a) {
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       "float": 'right',
-      marginTop: '16px'
+      margin: '16px 0'
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Pagination, _extends({
     size: "small"

package/es/common/ImageModal/index.less

@@ -1,8 +1,4 @@
 .catg_tree_container {
-  .search_container {
-    margin-bottom: 15px;
-  }
-
   .ant-tree-title {
     max-width: 200px;
     overflow: hidden;
@@ -17,10 +13,9 @@
     display: flex;
     flex-wrap: wrap;
   }
-
   .ant-upload-list-item-thumbnail {
     img {
       object-fit: contain;
     }
   }
-}
+}

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, {
-    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/es/common/LinkModal/CustomTable/index.js

@@ -200,7 +200,6 @@ function CustomTable(props) {
     queryCus({
       pageType: 'Customized',
       verType: 'Formal',
-      configVersion: 'V2',
       state: 'Using'
     });
   }, []);
@@ -209,8 +208,8 @@ function CustomTable(props) {
     dataIndex: 'pageName'
   }];
   var rowSelection = {
-    onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
+    onChange: function onChange(selectedRowKeys) {
+      _onChange("customized-" + selectedRowKeys[0]);
     },
     type: 'radio'
   };

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

@@ -517,13 +517,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/es/common/LinkModal/FilteredProductModal/index.less

@@ -1,4 +1,5 @@
-.mFilteredProductModal {
+.filteredProductModal {
+
   .proModalWrap {
     .info {
       background: #ecf1fd;
@@ -16,7 +17,7 @@
       background-size: contain;
     }
 
-    .mFilteredProductModalContent {
+    .filteredProductModalContent {
       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,
-    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/es/common/LinkModal/index.less

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

package/es/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/es/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/es/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/es/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/es/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() {
@@ -93,12 +87,6 @@ Object.defineProperty(exports, "SwitchCollapse", {
     return _SwitchCollapse["default"];
   }
 });
-Object.defineProperty(exports, "SystemNotification", {
-  enumerable: true,
-  get: function get() {
-    return _SystemNotification["default"];
-  }
-});
 Object.defineProperty(exports, "UrlPicker", {
   enumerable: true,
   get: function get() {
@@ -136,8 +124,4 @@ var _ButtonIconLayout = _interopRequireDefault(require("./ButtonIconLayout"));
 
 var _ProductSource = _interopRequireDefault(require("./ProductSource"));
 
-var _ImgArea = _interopRequireDefault(require("./ImgArea"));
-
-var _SystemNotification = _interopRequireDefault(require("./SystemNotification"));
-
 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: '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/es/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 () {
@@ -49,22 +51,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-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);
-};
-
 var BannerMobile =
 /** @class */
 function (_super) {
@@ -75,7 +61,8 @@ function (_super) {
 
     _this.state = {
       carouseIndex: 0,
-      hoverState: false
+      hoverState: false,
+      clickedGroup: ''
     };
     _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
     _this.destroy = null;
@@ -88,31 +75,6 @@ function (_super) {
       if (nextIndex != -1 && nextIndex != _this.state.carouseIndex) {
         _this.carouselRef.current.goTo(nextIndex);
       }
-    }; // padding用统一设置
-
-
-    _this.getBackgroundStyle = function (item) {
-      // const { data: { spacing }  } = this.props;
-      // const { spacing, background } = data;
-      // const { device } = window.magicDesign;
-      var wrapStyle = {}; // 边距
-      // if (spacing && spacing[device]) {
-      //   wrapStyle = { ...wrapStyle, ...spacing[device] };
-      // }
-      // 背景
-
-      if (item.background) {
-        if (item.background.bgType === 'color') {
-          wrapStyle.backgroundColor = item.background.color;
-          wrapStyle.opacity = item.background.opacity ? item.background.opacity : 1;
-        } else {
-          wrapStyle.backgroundImage = "url(" + item.background.image + ")";
-          wrapStyle.backgroundPosition = 'center';
-          wrapStyle.backgroundSize = 'cover';
-        }
-      }
-
-      return __assign({}, wrapStyle);
     };
 
     _this.getItemStyle = function (item) {
@@ -160,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) {
@@ -183,8 +148,6 @@ function (_super) {
     }, data.groupSource.map(function (item, index) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.id
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
         onMouseEnter: _this.mouseEnterWrap,
@@ -219,7 +182,7 @@ function (_super) {
       }), item.secondButton.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         className: "btn",
         data: item.secondButton
-      }))))));
+      })))));
     })), data.setting.dots.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {