@fonixtree/magic-design 0.1.23 → 0.1.25

package/es/common/Collapse/index.js

@@ -137,6 +137,10 @@ function (_super) {
       var activeKey = _this.state.activeKey;
 
       if (checked) {
+        if (panelInfo.checkClick) {
+          panelInfo.checkClick();
+        }
+
         _this.setState({
           activeKey: [((_a = panelInfo.metaOption) === null || _a === void 0 ? void 0 : _a.id) || panelInfo.key]
         });

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

@@ -0,0 +1,250 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = CustomTable;
+
+var _antd = require("antd");
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _commonUtil = require("../../../utils/commonUtil");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+function CustomTable(props) {
+  var _this = this;
+
+  var _onChange = props.onChange;
+
+  var _a = (0, _react.useState)([]),
+      miniAppList = _a[0],
+      setMiniAppList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var queryMiniApp = function queryMiniApp(params) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/mini/app/list", params, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            setMiniAppList(res.list);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryMiniApp({
+      state: 'Valid',
+      pageSize: 100
+    });
+  }, []);
+  var columns = [{
+    title: 'Logo',
+    dataIndex: 'logo',
+    render: function render(value) {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: value.url,
+        style: {
+          width: 40,
+          height: 40
+        }
+      });
+    }
+  }, {
+    title: 'Store Name',
+    dataIndex: 'storeName'
+  }, {
+    title: 'App Name',
+    dataIndex: 'programName'
+  }];
+  var rowSelection = {
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      _onChange({
+        value: selectedRows[0].programLink,
+        name: selectedRows[0].programName + "(" + selectedRows[0].storeName + ")"
+      });
+    },
+    type: 'radio'
+  };
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: miniAppList,
+    loading: loading,
+    pagination: false,
+    rowKey: "storeMiniProgramId",
+    rowSelection: rowSelection,
+    scroll: {
+      y: 480
+    }
+  }));
+}

package/es/common/LinkModal/index.js

@@ -29,6 +29,8 @@ var _SelectVideoModal = _interopRequireDefault(require("./SelectVideoModal"));
 
 var _ShareUrl = _interopRequireDefault(require("./ShareUrl"));
 
+var _MiniAppTable = _interopRequireDefault(require("./MiniAppTable"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -321,6 +323,10 @@ var LinkModal = function LinkModal(props) {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
+    }), item.linkTypeCode === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"

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

@@ -192,7 +192,8 @@ function (_super) {
   BannerPc.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data;
+    var data = this.props.data; // console.log('--data banner', data);
+
     var _a = this.state,
         carouseIndex = _a.carouseIndex,
         hoverState = _a.hoverState;
@@ -233,6 +234,8 @@ function (_super) {
       autoplaySpeed: data.setting.autoplay.interval * 1000,
       dots: false
     }, data.groupSource.map(function (item, index) {
+      var _a, _b;
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.id
       }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -259,7 +262,8 @@ function (_super) {
       }), /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouseContent",
         style: {
-          alignItems: _AlignSelector.alignItemMap[item.customize.align]
+          alignItems: _AlignSelector.alignItemMap[item.customize.layout],
+          textAlign: item.customize.align
         }
       }, item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "title",
@@ -276,7 +280,11 @@ function (_super) {
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
         })
       }), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "btn-wrap"
+        className: "btn-wrap",
+        style: {
+          justifyContent: _AlignSelector.alignItemMap[item.customize.align],
+          width: Math.max((_a = item.title.content) === null || _a === void 0 ? void 0 : _a.pcWidth, (_b = item.text.content) === null || _b === void 0 ? void 0 : _b.pcWidth) + "%"
+        }
       }, item.button.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         className: "btn",
         data: item.button,

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

@@ -73,8 +73,8 @@
     .btn-wrap {
       display: flex;
       align-items: center;
-      justify-content: flex-start;
-
+      // justify-content: flex-start;
+      // width: 100%;
       .btn {
         margin-right: 12px;
         cursor: pointer;

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

@@ -192,10 +192,10 @@ function (_super) {
         rowNum = _a.rowNum;
     var colNum = 1;
 
-    if (layout === 'layout1') {
-      colNum = Math.min(rowNum, data.groupSource.length);
-    } else if (layout === 'layout3') {
+    if (layout === 'layout3') {
       colNum = Math.min(rowNum + 0.2, data.groupSource.length);
+    } else {
+      colNum = Math.min(rowNum, data.groupSource.length);
     }
 
     var floorColNum = Math.floor(colNum);
@@ -225,7 +225,7 @@ function (_super) {
           sliderIndex: newIndex
         });
       },
-      variableWidth: true
+      variableWidth: layout === 'layout3'
     };
     var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) + 12 + "px";
     return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -202,10 +202,10 @@ function (_super) {
         pcRowNum = _a.pcRowNum;
     var colNum = 1;
 
-    if (layout === 'layout1') {
-      colNum = Math.min(pcRowNum, data.groupSource.length);
-    } else if (layout === 'layout3') {
+    if (layout === 'layout3') {
       colNum = Math.min(pcRowNum + 0.2, data.groupSource.length);
+    } else {
+      colNum = Math.min(pcRowNum, data.groupSource.length);
     }
 
     var floorColNum = Math.floor(colNum);
@@ -221,6 +221,7 @@ function (_super) {
     }
 
     var settings = {
+      infinite: true,
       className: 'slider-wrap',
       arrows: false,
       dots: false,
@@ -235,7 +236,7 @@ function (_super) {
           sliderIndex: newIndex
         });
       },
-      variableWidth: true
+      variableWidth: layout === 'layout3'
     };
     var navStyle = {
       fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),

package/es/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -21,8 +21,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
 
 var _common = require("../../../../common");
 
-var _mobx = require("../../../../mobx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -53,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 __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
       r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
@@ -92,28 +74,18 @@ function (_super) {
     };
 
     _this.onInit = function (v) {
-      var _a;
-
-      var _b = _this.props,
-          component = _b.component,
-          id = _b.id; // 轮播组件特殊处理
-
-      if (component === 'carousel') {
-        if (v === 'layout2') {
-          _this.setState({
-            showRowNum: false
-          });
-        } else {
-          _this.setState({
-            showRowNum: true
-          });
-        }
-
-        _this.props.store.setState({
-          CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[id] = v, _a))
-        });
-      } // 图文组件，移动端，只有第3个组件可选列数
-
+      var _a = _this.props,
+          component = _a.component,
+          id = _a.id; // 轮播组件特殊处理
+      // if (component === 'carousel') {
+      //   if (v === 'layout2') {
+      //     this.setState({ showRowNum: false });
+      //   } else {
+      //     this.setState({ showRowNum: true });
+      //   }
+      //   this.props.store.setState({ CarouselStore: { ...store.CarouselStore, [id]: v } });
+      // }
+      // 图文组件，移动端，只有第3个组件可选列数
 
       if (component === 'imageText') {
         if (!(0, _coreUtil.isPc)()) {

package/es/composite-comp/dito/components/PcNavigation/pc/index.less

@@ -1,5 +1,6 @@
 .pc-navigation {
   display: flex;
+
   .menu-wrap {
     // margin-top: 26px;
     position: relative;
@@ -7,10 +8,11 @@
     display: flex;
     align-items: center;
     min-width: 130px;
+
     // padding: 40px 0;
     // margin: -40px 44px -40px 0;
     &:hover {
-      @keyframes show-active{
+      @keyframes show-active {
         0% {
           opacity: 0;
         }
@@ -19,12 +21,15 @@
           opacity: 1;
         }
       }
+
       .category {
         display: flex;
+
         &:local {
           animation: show-active .3s linear both;
         }
       }
+
       // 鼠标移上去，icon变色
       // .menu-drop {
       //   .all-category {
@@ -39,14 +44,18 @@
       //   }
       // }
     }
+
     .menu-drop {
       display: flex;
       align-items: center;
       flex-shrink: 0;
-      &> img {
+
+      &>img {
         width: 16px;
         margin-right: 10px;
+        font-size: 16px;
       }
+
       // &> span {
       //   color: #3A2E2E;
       //   font-family: NunitoSans-Bold;
@@ -54,6 +63,7 @@
       //   line-height: 22px;
       // }
     }
+
     .category {
       display: none;
       position: absolute;
@@ -61,33 +71,37 @@
       left: 0;
       bottom: 3px;
       transform: translateY(100%);
+
       // :global {
-        .cate-wrap {
-          width: 290px;
-          border: 1px solid #E6EAF0;
-          padding: 8px 0;
-          background-color: #fff;
-          .cate-item {
-            cursor: pointer;
-            font-family: 'Open Sans';
-            font-style: normal;
-            font-weight: 400;
-            font-size: 14px;
-            line-height: 38px;
-            color: #232F46;
-            display: flex;
-            width: 100%;
-            padding: 0 16px;
-            justify-content: space-between;
-          }
+      .cate-wrap {
+        width: 290px;
+        border: 1px solid #E6EAF0;
+        padding: 8px 0;
+        background-color: #fff;
+
+        .cate-item {
+          cursor: pointer;
+          font-family: 'Open Sans';
+          font-style: normal;
+          font-weight: 400;
+          font-size: 14px;
+          line-height: 38px;
+          color: #232F46;
+          display: flex;
+          width: 100%;
+          padding: 0 16px;
+          justify-content: space-between;
+        }
 
-          .cate-active {
-            background: #FCF1F2;
-            &> span {
-              color: #CE1126 !important;
-            }
+        .cate-active {
+          background: #FCF1F2;
+
+          &>span {
+            color: #CE1126 !important;
           }
         }
+      }
+
       // }
     }
   }
@@ -97,16 +111,17 @@
     overflow-x: auto;
     flex: 1;
     scroll-snap-type: x;
+
     .one-category {
       margin-right: 44px;
       scroll-snap-align: end;
       width: fit-content !important;
       cursor: pointer;
+
       &:last-of-type {
         margin-right: 0;
       }
     }
   }
 
-}
-
+}

package/es/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/es/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/es/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/es/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/es/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;