@fonixtree/magic-design 0.1.22 → 0.1.24

package/es/assets/less/input.less

@@ -20,3 +20,7 @@
     box-shadow: none
   }
 }
+
+[magic_design] .cylon-input-number{
+  height: 100%;
+}

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/Collapse/index.less

@@ -1,4 +1,7 @@
 .collapse_wrap {
+  .rc-collapse-extra{
+    display: flex;
+  }
   .rc-collapse {
     .rc-collapse-item {
       border-bottom: 1px solid #EDF0F4;

package/es/common/FontStyles/index.less

@@ -12,7 +12,8 @@
     border-radius: 6px;
     margin-right: 12px;
     cursor: pointer;
-
+    display: flex;
+    
     &.active {
       background: #E9F0FF;
     }

package/es/common/InputNumber/index.less

@@ -6,6 +6,9 @@
   border-radius: 8px;
   padding: 0 7px;
   position: relative;
+  display: flex;
+  align-items: center;
+  padding-top: 1px;
 
   .cylon-input-number-focused {
     box-shadow: none;
@@ -29,5 +32,7 @@
     position: absolute;
     top: 50%;
     transform: translateY(-50%);
+    font-size: 14px;
+    right: 4px;
   }
 }

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/mobile/index.less

@@ -1,54 +1,80 @@
 .m-banner-mobile {
   position: relative;
-}
-.m-banner-mobile .cylon-carousel .slick-track {
-  display: flex;
-  align-items: center;
-}
-.m-banner-mobile .carouselItem {
-  position: relative;
-  display: flex;
-}
-.m-banner-mobile .carouselItem .carouseContent {
-  padding: 1.6rem 0.56rem 0;
-  position: absolute;
-  z-index: 2;
-  display: flex;
-  flex-direction: column;
-  margin-bottom: auto;
-}
-.m-banner-mobile .carouselItem .title {
-  margin-bottom: 0.16rem;
-}
-.m-banner-mobile .carouselItem .sub-title {
-  margin-bottom: 0.4rem;
-}
-.m-banner-mobile .carouselItem .btn-wrap {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-.m-banner-mobile .carouselItem .btn-wrap .btn {
-  margin-right: 0.24rem;
-}
-.m-banner-mobile .swiper-ban {
-  position: absolute;
-  width: 100%;
-  bottom: 0.2rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.m-banner-mobile .swiper-ban .ban {
-  font-size: 0.32rem;
-  width: 1.5em;
-  height: 0.3em;
-  background: #FFF;
-  cursor: inherit;
-  margin-right: 0.3em;
-  transition: all 0.5s;
-}
-.m-banner-mobile .swiper-ban .ban.active {
-  width: 1.5em;
-  opacity: 1;
-}
+  // .turnPage {
+  //   position: absolute;
+  //   top: 50%;
+  //   transform: translateY(-50%);
+  //   z-index: 3;
+  //   cursor: pointer;
+  // }
+  // .leftBtn {
+  //   left: 20px;
+  // }
+  // .rightBtn {
+  //   right: 20px;
+  // }
+
+  .cylon-carousel {
+    .slick-track {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .carouselItem {
+    // height: 386px;
+    position: relative;
+    display: flex;
+
+    .carouseContent {
+      padding: 80px 28px 0;
+      position: absolute;
+      z-index: 2;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: auto;
+    }
+
+    .title {
+      margin-bottom: 8px;
+    }
+
+    .sub-title {
+      margin-bottom: 20px;
+    }
+
+    .btn-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+
+      .btn {
+        margin-right: 12px;
+      }
+    }
+  }
+
+  .swiper-ban {
+    position: absolute;
+    width: 100%;
+    bottom: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ban {
+      font-size: 16px;
+      width: 1.5em;
+      height: 0.3em;
+      background: #FFF;
+      cursor: inherit;
+      margin-right: 0.3em;
+      transition: all .5s;
+
+      &.active {
+        width: 1.5em;
+        opacity: 1;
+      }
+    }
+  }
+}

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", {