@fonixtree/magic-design 0.0.162 → 0.0.164

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

@@ -205,12 +205,14 @@ function (_super) {
       fontSize: data.setting.navigation.size,
       color: data.setting.navigation.color
     };
+    var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) * 1.25 + 20 + "px";
+    var sliderWidth = "calc(100% - " + (data.setting.navigation.size + 20) * 2 + "px)";
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-carousel-pc"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "content",
       style: {
-        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? '30px' : '0'
+        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? dotsSpace : '0'
       }
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       className: "carousel-icon-left",
@@ -225,7 +227,11 @@ function (_super) {
       ref: function ref(slider) {
         return _this.sliderRef = slider;
       }
-    }, settings), data.groupSource.map(function (item) {
+    }, settings, {
+      style: {
+        width: sliderWidth
+      }
+    }), data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.id,
         className: "img-wrap"

package/lib/composite-comp/bol/components/Carousel/pc/index.less

@@ -18,7 +18,7 @@
   }
 
   .slider-wrap {
-    width: calc(100% - 72px);
+    // width: calc(100% - 72px);
     margin: 0 auto;
     line-height: 1;
 
@@ -101,11 +101,16 @@
       border-radius: 50%;
       background: #FFF;
       cursor: inherit;
-      margin-right: 1.25em;
+      margin-right: 10px;
       transition: all .5s;
 
+      &:last-child {
+        margin-right: 0;
+      }
+
       &.active {
         width: 2.5em;
+        height: 1.25em;
         border-radius: 100px;
         opacity: 1;
       }

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

@@ -59,11 +59,6 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-// import './index.less';
-// less to css 在线地址 https://tool.oschina.net/less
-// css 压缩地址 https://www.runoob.com/csspack
-var style = '.m-text{display: flex;flex-direction: column;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{padding:10px 20px;}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}';
-
 var Text =
 /** @class */
 function (_super) {
@@ -80,6 +75,8 @@ function (_super) {
         nodeData = _b.nodeData,
         mode = _b.mode,
         outputType = _b.outputType;
+    var groupWrapContainerStyle = window.magicDesign.device === 'pc' ? 'padding: 16px 20px;' : 'padding: 12px 20px;';
+    var style = ".m-text{display: flex;flex-direction: column;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{" + groupWrapContainerStyle + "}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}";
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
       onClick: this.onComponentClick

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

@@ -1,7 +1,7 @@
 .m-text {
   display: flex;
   flex-direction: column;
-  
+
   .title-wrap {
     font-weight: 500;
     font-size: 20px;
@@ -17,7 +17,7 @@
     width: 100%;
 
     .group-wrap-container {
-      padding: 10px 20px;
+      padding: 16px 20px;
     }
 
     .group-wrap {

package/lib/composite-comp/bol/components/Video/components/VideoTag/index.less

@@ -13,6 +13,7 @@
     height: 100%;
     flex-shrink: 0;
     align-self: end;
+    min-height: 60px;
 
     .play-btn {
       position: absolute;

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

@@ -134,7 +134,7 @@ function (_super) {
             _this.setState({});
           }
         },
-        onPause: function onPause() {
+        onEnd: function onEnd() {
           _this.videoRefMap[group.id].playing = false;
 
           _this.setState({});

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

@@ -166,7 +166,7 @@ function (_super) {
             _this.setState({});
           }
         },
-        onPause: function onPause() {
+        onEnd: function onEnd() {
           _this.videoRefMap[group.id].playing = false;
 
           _this.setState({});

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

@@ -136,6 +136,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

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

@@ -133,6 +133,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

package/lib/composite-comp/bol/components/Video/pc/Layout1/index.less

@@ -4,6 +4,7 @@
 
   .video-tag-container .left-wrap {
     width: 120px;
+    min-height: 170px;
   }
 
   .video-tag-container .left-wrap+.right-wrap {

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

@@ -135,6 +135,11 @@ function (_super) {
           _this.setState({});
         }
       },
+      onEnd: function onEnd() {
+        _this.videoRefMap[firstGroup.id].playing = false;
+
+        _this.setState({});
+      },
       opts: __assign(__assign({}, firstGroup.video), {
         cover: (0, _coreUtil.isPc)() ? firstGroup.overilay.content.pcImgSrc : firstGroup.overilay.content.h5ImgSrc,
         source: firstGroup.video.sourceUrl
@@ -179,6 +184,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

package/lib/composite-comp/bol/components/Video/pc/Layout2/index.less

@@ -12,6 +12,7 @@
 
   .video-tag-container .left-wrap {
     width: 110px;
+    min-height: 110px;
   }
 
   .video-tag-container .left-wrap+.right-wrap {

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

@@ -142,6 +142,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

package/lib/composite-comp/bol/components/Video/pc/Layout3/index.less

@@ -4,6 +4,7 @@
 
   .video-tag-container .left-wrap {
     width: 90px;
+    min-height: 100px;
   }
 
   .video-tag-container .left-wrap+.right-wrap {

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

@@ -136,6 +136,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

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

@@ -136,6 +136,11 @@ function (_super) {
             _this.setState({});
           }
         },
+        onEnd: function onEnd() {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.setState({});
+        },
         opts: __assign(__assign({}, group.video), {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl

package/lib/composite-comp/bol/config-panels/CarouselConfig/CarouselConfigImageGroup/index.js

@@ -112,7 +112,7 @@ function (_super) {
         src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
       }), /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
-      }, (0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc));
+      }, (0, _coreUtil.isPc)() ? src.image.content.pcName : src.image.content.h5Name));
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/core/Designer/ConfigPanel/index.js

@@ -217,7 +217,7 @@ function (_super) {
     };
 
     _this.getSecondConfigName = function () {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 
       var selectedNode = _this.state.selectedNode;
 
@@ -237,6 +237,7 @@ function (_super) {
       }
 
       var groupName = '';
+      console.log('...', selectedNode.type, panelProps);
 
       switch (selectedNode.type) {
         case 'IMAGE_GALLERY':
@@ -250,11 +251,19 @@ function (_super) {
 
           break;
 
+        case 'CAROUSEL':
+          groupName = (0, _coreUtil.isPc)() ? (_g = (_f = panelProps.image) === null || _f === void 0 ? void 0 : _f.content) === null || _g === void 0 ? void 0 : _g.pcName : (_j = (_h = panelProps.image) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j.h5Name;
+          break;
+
         case 'MOBILE_NAVIGATION':
         case 'PC_NAVIGATION':
           groupName = (panelProps === null || panelProps === void 0 ? void 0 : panelProps.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
           break;
 
+        case 'TEXT':
+          groupName = panelProps.content.title.text;
+          break;
+
         case 'RECOMMEND':
           groupName = panelProps.groupName.text;
           break;

package/lib/meta-comp/components/Text/index.js

@@ -481,7 +481,8 @@ function (_super) {
       style = __assign(__assign({}, style), {
         textDecorationLine: data.underline.open ? 'underline' : 'none',
         textDecorationColor: data.underline.textDecorationColor,
-        textDecorationStyle: data.underline.textDecorationStyle
+        textDecorationStyle: data.underline.textDecorationStyle,
+        textUnderlineOffset: Math.ceil(style.fontSize * 0.2) + 'px'
       });
     }
 

package/lib/utils/commonUtil.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
-exports.checkFileName = exports.calcLastTime = void 0;
+exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -19,6 +19,7 @@ exports.pushGA = pushGA;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
+exports.sleep = sleep;
 exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
@@ -45,6 +46,149 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
+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
+    };
+  }
+};
+
 /**
  * 安全获取数据
  * @param {function} func 获取函数
@@ -499,4 +643,76 @@ var nextTick = function nextTick(func, interval, count) {
   }
 };
 
-exports.nextTick = nextTick;
+exports.nextTick = nextTick;
+
+function sleep(timeout) {
+  if (timeout === void 0) {
+    timeout = 3000;
+  }
+
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, timeout);
+  });
+}
+
+var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
+  if (interval === void 0) {
+    interval = 100;
+  }
+
+  if (count === void 0) {
+    count = 5;
+  }
+
+  return __awaiter(void 0, void 0, void 0, function () {
+    var error_1;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          _a.trys.push([0, 2,, 5]);
+
+          return [4
+          /*yield*/
+          , asyncFunc()];
+
+        case 1:
+          return [2
+          /*return*/
+          , _a.sent()];
+
+        case 2:
+          error_1 = _a.sent();
+
+          if (count == 0) {
+            console.error('nextTick 失败');
+            return [2
+            /*return*/
+            , null];
+          }
+
+          return [4
+          /*yield*/
+          , sleep(100)];
+
+        case 3:
+          _a.sent();
+
+          return [4
+          /*yield*/
+          , asyncNextTick(asyncFunc, interval, count - 1)];
+
+        case 4:
+          return [2
+          /*return*/
+          , _a.sent()];
+
+        case 5:
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+};
+
+exports.asyncNextTick = asyncNextTick;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.162",
+  "version": "0.0.164",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",