@fonixtree/magic-design 0.1.85 → 0.1.87

package/lib/common/Video/index.js

@@ -7,7 +7,9 @@ exports["default"] = exports.createVideoModal = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _components = _interopRequireDefault(require("./components"));
+var _index = _interopRequireDefault(require("./RateComponent/index"));
+
+var _index2 = _interopRequireDefault(require("./QualityComponent/index"));
 
 var _closeImg = _interopRequireDefault(require("./closeImg.png"));
 
@@ -267,95 +269,149 @@ var createAliVideo = function createAliVideo(domId, opts) {
   }
 
   return new Promise(function (resolve) {
-    var _window$Aliplayer;
-
-    var skinLayout = [{
-      name: 'H5Loading',
-      align: 'cc'
-    }, {
-      name: 'errorDisplay',
-      align: 'tlabs',
-      x: 0,
-      y: 0
-    }, {
-      name: 'tooltip',
-      align: 'blabs',
-      x: 0,
-      y: 56
-    }, {
-      name: 'thumbnail'
-    }];
-    var controlBar = {
-      name: 'controlBar',
-      align: 'blabs',
-      x: 0,
-      y: 0,
-      children: [{
-        name: 'playButton',
-        align: 'tl',
-        x: 15,
-        y: 12
-      }, {
-        name: 'timeDisplay',
-        align: 'tl',
-        x: 10,
-        y: 7
-      }, {
-        name: 'volume',
-        align: 'tr',
-        x: 5,
-        y: 10
-      }, {
-        name: 'fullScreenButton',
-        align: 'tr',
-        x: 10,
-        y: 12
-      }]
-    };
-    skinLayout.push(controlBar);
-
-    if (opts.progressBar) {
-      controlBar.children.push({
-        name: 'progress',
-        align: 'blabs',
-        x: 0,
-        y: 10
-      });
-    }
+    return __awaiter(void 0, void 0, void 0, function () {
+      var components, res, qualitySource, source, skinLayout, controlBar;
+      return __generator(this, function (_a) {
+        var _window$Aliplayer;
 
-    new window.Aliplayer((_window$Aliplayer = {
-      id: 'video' + domId,
-      source: opts.source,
-      cover: opts.cover,
-      width: '100%',
-      height: '100%',
-      autoplay: false,
-      isLive: false,
-      rePlay: false,
-      playsinline: true,
-      preload: true,
-      controlBarVisibility: 'hover',
-      useH5Prism: true,
-      skinLayout: skinLayout
-    }, _defineProperty(_window$Aliplayer, "autoplay", opts.autoplay), _defineProperty(_window$Aliplayer, "rePlay", opts.loop), _defineProperty(_window$Aliplayer, "components", [{
-      name: 'RateComponent',
-      type: _components["default"]
-    }]), _window$Aliplayer), function (player) {
-      if (!opts.videoSound) {
-        player.setVolume(0);
-      }
+        switch (_a.label) {
+          case 0:
+            components = [{
+              name: 'RateComponent',
+              type: _index["default"]
+            }];
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)('/designer/v1/content/' + opts.sourceId, {}, 'GET')];
 
-      if (opts.speed) {
-        var speed = Number(opts.speed).toFixed(1);
-        player.setSpeed(speed);
-        player._speed = speed;
-      }
+          case 1:
+            res = _a.sent();
+            qualitySource = {};
+            source = opts.source;
 
-      if (opts.startAt) {
-        player.seek(opts.startAt);
-      }
+            if (res.smallImgUrl) {
+              qualitySource['480P'] = res.smallImgUrl;
+            }
+
+            if (res.url) {
+              qualitySource['720P'] = res.url;
+            }
+
+            if (res.bigImgUrl) {
+              qualitySource['1080P'] = res.bigImgUrl;
+            }
 
-      resolve(player);
+            if (Object.keys(qualitySource).length) {
+              source = JSON.stringify(qualitySource);
+              components.push({
+                name: 'QualityComponent',
+                type: _index2["default"]
+              });
+            }
+
+            skinLayout = [{
+              name: 'H5Loading',
+              align: 'cc'
+            }, {
+              name: 'errorDisplay',
+              align: 'tlabs',
+              x: 0,
+              y: 0
+            }, {
+              name: 'tooltip',
+              align: 'blabs',
+              x: 0,
+              y: 56
+            }, {
+              name: 'thumbnail'
+            }];
+            controlBar = {
+              name: 'controlBar',
+              align: 'blabs',
+              x: 0,
+              y: 0,
+              children: [{
+                name: 'playButton',
+                align: 'tl',
+                x: 15,
+                y: 12
+              }, {
+                name: 'timeDisplay',
+                align: 'tl',
+                x: 10,
+                y: 7
+              }, {
+                name: 'volume',
+                align: 'tr',
+                x: 5,
+                y: 10
+              }, {
+                name: 'fullScreenButton',
+                align: 'tr',
+                x: 10,
+                y: 12
+              }]
+            };
+            skinLayout.push(controlBar);
+
+            if (opts.progressBar) {
+              controlBar.children.push({
+                name: 'progress',
+                align: 'blabs',
+                x: 0,
+                y: 10
+              });
+            }
+
+            console.log('source: ', source);
+            new window.Aliplayer((_window$Aliplayer = {
+              id: 'video' + domId,
+              source: source,
+              cover: opts.cover,
+              width: '100%',
+              height: '100%',
+              autoplay: false,
+              isLive: false,
+              rePlay: false,
+              playsinline: true,
+              preload: true,
+              controlBarVisibility: 'hover',
+              useH5Prism: true,
+              skinLayout: skinLayout
+            }, _defineProperty(_window$Aliplayer, "autoplay", opts.autoplay), _defineProperty(_window$Aliplayer, "rePlay", opts.loop), _defineProperty(_window$Aliplayer, "components", components), _window$Aliplayer), function (player) {
+              if (!opts.videoSound) {
+                player.setVolume(0);
+              }
+
+              if (opts.speed) {
+                var speed = Number(opts.speed).toFixed(1);
+                player.setSpeed(speed);
+                player._speed = speed;
+              }
+
+              if (opts.startAt) {
+                player.seek(opts.startAt);
+              }
+
+              if (Object.keys(qualitySource).length) {
+                var defaultKey = Object.keys(qualitySource)[0];
+
+                if (qualitySource['720P']) {
+                  defaultKey = '720P';
+                } else {
+                  defaultKey = '480P';
+                }
+
+                player.getComponent('QualityComponent').setCurrentQuality(defaultKey, defaultKey);
+              }
+
+              resolve(player);
+            });
+            return [2
+            /*return*/
+            ];
+        }
+      });
     });
   });
 };

package/lib/common/VideoUpload/index.js

@@ -67,7 +67,7 @@ function (_super) {
       });
 
       if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
-        _this.props.onChange(data[0].url, data[0].contentTitle);
+        _this.props.onChange(data[0].url, data[0].contentTitle, data[0].contentId);
       }
     };
 

package/lib/common/index.js

@@ -39,6 +39,12 @@ Object.defineProperty(exports, "ColorPickerInput", {
     return _ColorPickerInput["default"];
   }
 });
+Object.defineProperty(exports, "CropperModal", {
+  enumerable: true,
+  get: function get() {
+    return _CropperModal["default"];
+  }
+});
 Object.defineProperty(exports, "Field", {
   enumerable: true,
   get: function get() {
@@ -188,4 +194,6 @@ var _CardCarousel = _interopRequireDefault(require("./CardCarousel"));
 
 var _MyModal = _interopRequireDefault(require("./MyModal"));
 
+var _CropperModal = _interopRequireDefault(require("./CropperModal"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -13,6 +13,8 @@ var _antd = require("antd");
 
 require("./index.less");
 
+var _locale = require("../../../../../locale");
+
 var _mobx = require("../../../../../mobx");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -212,8 +214,8 @@ function (_super) {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {
             window.magicDesign.pushGA({}, 'select_promotion', {
-              event_label: (0, _ConfigPanel.getSecondConfigName)(data, item.id),
-              promotion_name: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
+              event_section: data.type,
+              promotion_name: item.image.content.h5ImgSrc ? item.image.content.h5Name : (0, _locale.i18n)('BANNER_GROUP_NAME')
             });
           }
         },

package/lib/composite-comp/bol/config-panels/BannerConfig/BannerConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
 var _defaultJSON = require("../../../components/Banner/defaultJSON");
@@ -65,7 +63,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = 'For best results, use an image at least 1920px wide';
+var notice = 'For best results, use an image at least 1920px wide'; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -152,7 +151,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
 var _defaultJSON = require("../../../components/Button/defaultJSON");
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = '';
+var notice = ''; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -135,7 +134,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

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

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page.";
+var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page."; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -140,7 +139,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/ImageGalleryConfig/ImageGalleryConfigImageGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page.";
+var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page."; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -140,7 +139,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/ImageTextConfig/ImageTextConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = 'For best results, use an image at least 1920px wide';
+var notice = 'For best results, use an image at least 1920px wide'; // @inject('store')
+// @observer
 
 var ImageTextConfigGroup =
 /** @class */
@@ -138,7 +137,7 @@ function (_super) {
   ImageTextConfigGroup.defaultProps = {
     source: []
   };
-  ImageTextConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], ImageTextConfigGroup);
+  ImageTextConfigGroup = __decorate([_decorator.updateConfigDecorator], ImageTextConfigGroup);
   return ImageTextConfigGroup;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/TagCompConfig/TagConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
 var _defaultJSON = require("../../../components/Tag/defaultJSON");
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = '';
+var notice = ''; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -135,7 +134,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/TextCompConfig/TextConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
@@ -63,7 +61,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = '';
+var notice = ''; // @inject('store')
+// @observer
 
 var default_1 =
 /** @class */
@@ -134,7 +133,7 @@ function (_super) {
   default_1.defaultProps = {
     source: []
   };
-  default_1 = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], default_1);
+  default_1 = __decorate([_decorator.updateConfigDecorator], default_1);
   return default_1;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/VideoConfig/VideoConfigGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
 var _defaultJSON = require("../../../components/Video/defaultJSON");
@@ -65,6 +63,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
 /* eslint-disable import/named */
 
 
+// @inject('store')
+// @observer
 var AComponent =
 /** @class */
 function (_super) {
@@ -129,7 +129,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/WalletConfig/WalletConfigImageGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
@@ -61,7 +59,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page.";
+var notice = "Looks like you don't have any images in your gallery. Choose images to feature on this page."; // @inject('store')
+// @observer
 
 var AComponent =
 /** @class */
@@ -137,7 +136,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
+  AComponent = __decorate([_decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/config-panels/WalletNuriConfig/WalletNuriConfigImageGroup/index.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _mobxReact = require("mobx-react");
-
 var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _decorator = require("../../../../../decorator");
@@ -55,7 +53,8 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
-var notice = 'error';
+var notice = 'error'; // @inject('store')
+// @observer
 
 var WalletNuriConfigImageGroup =
 /** @class */
@@ -115,7 +114,7 @@ function (_super) {
   WalletNuriConfigImageGroup.defaultProps = {
     source: []
   };
-  WalletNuriConfigImageGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], WalletNuriConfigImageGroup);
+  WalletNuriConfigImageGroup = __decorate([_decorator.updateConfigDecorator], WalletNuriConfigImageGroup);
   return WalletNuriConfigImageGroup;
 }(_react["default"].Component);
 

package/lib/composite-comp/bol/second-config-panels/VideoSecondConfig/index.js

@@ -219,8 +219,10 @@ function (_super) {
         size: "20px",
         type: "icon-delete1"
       })))), panelProps.video.sourceType === 'Upload' && /*#__PURE__*/_react["default"].createElement(_common.VideoUpload, {
-        onChange: function onChange(v) {
+        onChange: function onChange(v, n, id) {
           panelProps.video.sourceUrl = v;
+          panelProps.video.sourceName = n;
+          panelProps.video.sourceId = id;
 
           _this.reRender();
         },