@fonixtree/magic-design 1.0.5 → 1.0.7

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

@@ -11,8 +11,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _common = require("../../../../../../common");
 
-var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
-
 var _commonUtil = require("../../../../../../utils/commonUtil");
 
 var _VideoTag = _interopRequireDefault(require("../../components/VideoTag"));
@@ -25,6 +23,8 @@ var _ShareBtn = _interopRequireDefault(require("../../components/ShareBtn"));
 
 require("./index.less");
 
+var _PlaySvg = _interopRequireDefault(require("../../../../../../meta-comp/config-panels/PlayIconConfig/PlaySvg"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -111,10 +111,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-layout5-wrap"
     }, data.groupSource.map(function (group) {
@@ -153,7 +150,7 @@ function (_super) {
         }),
         play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
-      }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
+      }), !isPlaying && group.playIcon.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])('play-btn', {
           middle: group.video.playButton == 'Middle',
           bottomLeft: group.video.playButton == 'Bottom Left'
@@ -161,9 +158,9 @@ function (_super) {
         onClick: function onClick() {
           _this.playOrPause(group);
         }
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        alt: "",
-        src: _playCircle["default"]
+      }, /*#__PURE__*/_react["default"].createElement(_PlaySvg["default"], {
+        imgName: group.playIcon.iconType,
+        imgWidth: group.playIcon.pcSize
       })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
         data: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {
@@ -175,7 +172,7 @@ function (_super) {
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: "video-tag-wrap"
       }, /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
-        align: data.customize.align,
+        customize: data.customize,
         data: group,
         GAData: __assign(__assign({}, GAData), {
           groupId: group.id,
@@ -186,7 +183,7 @@ function (_super) {
         onPlayClick: function onPlayClick() {
           return _this.playOrPause(group);
         },
-        position: "relative"
+        position: "absolute"
       })));
     }));
   };

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

@@ -5,27 +5,28 @@
   .video-container-wrap {
     display: flex;
     flex-direction: row-reverse;
-    align-items: center;
-    padding: 40px;
+    padding: 0 40px;
+    margin-bottom: 40px;
+    align-items: stretch;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
   }
 
   .video-item-wrap {
     height: 212px;
     position: relative;
-    margin-bottom: 10px;
+    // margin-bottom: 10px;
     width: 440px;
 
-    &:last-child {
-      margin-bottom: 0;
-    }
-
     .play-btn {
       position: absolute;
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 60px;
-      height: 60px;
+      // width: 60px;
+      // height: 60px;
       z-index: 1;
       cursor: pointer;
 
@@ -44,7 +45,8 @@
   }
 
   .video-tag-wrap {
-    padding: 40px;
+    padding: 0 20px;
+    position: relative;
     flex: 1;
   }
 }

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

@@ -286,10 +286,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var colNum = data.customize.rowNum;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-Wallet-mobile"

package/lib/composite-comp/bol/components/Wallet/mobile/index.less

@@ -1,40 +1,27 @@
-.m-Wallet-mobile {
-
-  .headline {
-    margin-bottom: 7px;
-  }
-
-  .content {
-    display: flex;
-    flex-wrap: wrap;
-
-    &.column_3 {
-      .item-wrap {
-        .title {
-          top: 13%;
-        }
-
-        .amount {
-          bottom: 13%;
-        }
-      }
-    }
-
-    .item-wrap {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      position: relative;
-      border-radius: 10px;
-
-      .image {
-        border-radius: 10px;
-        overflow: hidden;
-      }
-
-      .text-content {
-        position: absolute;
-      }
-    }
-  }
-}
+.m-Wallet-mobile .headline {
+  margin-bottom: 0.14rem;
+}
+.m-Wallet-mobile .content {
+  display: flex;
+  flex-wrap: wrap;
+}
+.m-Wallet-mobile .content.column_3 .item-wrap .title {
+  top: 13%;
+}
+.m-Wallet-mobile .content.column_3 .item-wrap .amount {
+  bottom: 13%;
+}
+.m-Wallet-mobile .content .item-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  border-radius: 0.2rem;
+}
+.m-Wallet-mobile .content .item-wrap .image {
+  border-radius: 0.2rem;
+  overflow: hidden;
+}
+.m-Wallet-mobile .content .item-wrap .text-content {
+  position: absolute;
+}

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

@@ -286,10 +286,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     var colNum = data.customize.pcRowNum;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-Wallet-pc"

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

@@ -106,6 +106,10 @@ function (_super) {
         name = src.image.content.h5ImgSrc ? src.image.content.h5Name : (0, _locale.i18n)('BANNER_GROUP_NAME');
       }
 
+      if (!name) {
+        name = (0, _locale.i18n)('URL_IMAGE');
+      }
+
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "card_wrap"
       }, /*#__PURE__*/_react["default"].createElement("img", {

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.pcName : src.image.content.h5Name));
+      }, ((0, _coreUtil.isPc)() ? src.image.content.pcName : src.image.content.h5Name) || (0, _locale.i18n)('URL_IMAGE')));
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/bol/config-panels/CustomCodeConfig/MyEditor/index.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactAce = _interopRequireDefault(require("react-ace"));
+
+require("ace-builds/src-noconflict/mode-html");
+
+require("ace-builds/src-noconflict/mode-javascript");
+
+require("ace-builds/src-noconflict/theme-github");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+// 可选的主题样式
+var MyEditor = function MyEditor(props) {
+  var value = props.value,
+      changeVal = props.changeVal,
+      blurArea = props.blurArea;
+  return /*#__PURE__*/_react["default"].createElement(_reactAce["default"], {
+    editorProps: {
+      $blockScrolling: true
+    },
+    mode: "html",
+    name: "editor",
+    onBlur: blurArea,
+    onChange: changeVal,
+    style: {
+      width: '100%'
+    },
+    theme: "github",
+    value: value
+  });
+};
+
+var _default = MyEditor;
+exports["default"] = _default;

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

@@ -0,0 +1,111 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _MyEditor = _interopRequireDefault(require("./MyEditor"));
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
+
+var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
+
+var _locale = require("../../../../locale");
+
+var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
+
+var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var CustomCodeConfig =
+/** @class */
+function (_super) {
+  __extends(CustomCodeConfig, _super);
+
+  function CustomCodeConfig() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.changeVal = function (v) {
+      var data = _this.props.data;
+
+      if ((0, _coreUtil.isPc)()) {
+        data.content.pcHtml = v;
+      } else {
+        data.content.h5Html = v;
+      }
+    };
+
+    _this.blurArea = function () {
+      _this.selfRender();
+    };
+
+    return _this;
+  }
+
+  CustomCodeConfig.prototype.render = function () {
+    var data = this.props.data;
+    return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+      divider: "bold",
+      headerSize: "large",
+      source: [{
+        key: 'content',
+        name: (0, _locale.i18n)('CONTENT'),
+        value: /*#__PURE__*/_react["default"].createElement(_MyEditor["default"], {
+          blurArea: this.blurArea,
+          changeVal: this.changeVal,
+          value: (0, _coreUtil.isPc)() ? data.content.pcHtml : data.content.h5Html
+        })
+      }, {
+        key: 'spacing',
+        name: (0, _locale.i18n)('SPACING'),
+        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
+          data: data.spacing
+        })
+      }, {
+        key: 'background',
+        name: (0, _locale.i18n)('BACKGROUND'),
+        value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
+          data: data.background
+        })
+      }],
+      type: "triangle"
+    }));
+  };
+
+  return CustomCodeConfig;
+}(_BaseConfig["default"]);
+
+var _default = CustomCodeConfig;
+exports["default"] = _default;

package/lib/composite-comp/bol/config-panels/ImageGalleryConfig/ImageGalleryConfigImageGroup/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.pcName : src.image.content.h5Name));
+      }, ((0, _coreUtil.isPc)() ? src.image.content.pcName : src.image.content.h5Name) || (0, _locale.i18n)('URL_IMAGE')));
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -0,0 +1,149 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _common = require("../../../../common");
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
+
+var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
+
+var _locale = require("../../../../locale");
+
+var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
+
+var _layout = require("../../../../constants/layout");
+
+var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
+
+var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var LocationConfig =
+/** @class */
+function (_super) {
+  __extends(LocationConfig, _super);
+
+  function LocationConfig() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.getContentPanel = function () {
+      var data = _this.props.data;
+      var source = [{
+        key: data.logo.id,
+        name: (0, _locale.i18n)('LOCATION_LOGO'),
+        value: /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          colorType: "rgba",
+          onChange: function onChange(v) {
+            data.logo.color = v;
+
+            _this.selfRender();
+          },
+          value: data.logo.color
+        })),
+        metaOption: data.logo
+      }, {
+        key: data.address.id,
+        name: (0, _locale.i18n)('ADDRESS'),
+        metaOption: data.address
+      }, {
+        key: data.icon.id,
+        name: (0, _locale.i18n)('ICON'),
+        value: /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+          colorType: "rgba",
+          onChange: function onChange(v) {
+            data.icon.color = v;
+
+            _this.selfRender();
+          },
+          value: data.icon.color
+        })),
+        metaOption: data.icon
+      }];
+      return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: source,
+        type: "switch"
+      });
+    };
+
+    return _this;
+  }
+
+  LocationConfig.prototype.render = function () {
+    var data = this.props.data;
+    return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+      divider: "bold",
+      headerSize: "large",
+      source: [{
+        key: 'content',
+        name: (0, _locale.i18n)('CONTENT'),
+        value: this.getContentPanel()
+      }, {
+        key: 'spacing',
+        name: (0, _locale.i18n)('SPACING'),
+        value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
+          data: data.spacing
+        })
+      }, {
+        key: 'customize',
+        name: (0, _locale.i18n)('CUSTOMIZE'),
+        value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
+          data: data.customize,
+          isHideAlign: true,
+          layoutSource: _layout.locationLayout
+        })
+      }, {
+        key: 'background',
+        name: (0, _locale.i18n)('BACKGROUND'),
+        value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
+          data: data.background
+        })
+      }],
+      type: "triangle"
+    }));
+  };
+
+  return LocationConfig;
+}(_BaseConfig["default"]);
+
+var _default = LocationConfig;
+exports["default"] = _default;

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

@@ -70,8 +70,18 @@ function (_super) {
     var ShareSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('SOCIAL_IMAGE')
     }, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
-      onChange: function onChange(v) {
-        data.image = v.url;
+      imageSelectedWay: data.imageSelectedWay || {
+        pc: '',
+        mobile: ''
+      },
+      onChange: function onChange(v, way) {
+        if (v) {
+          data.image = v.url;
+        }
+
+        if (way) {
+          data.imageSelectedWay = way;
+        }
 
         _this.reRender();
       },

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

@@ -140,10 +140,12 @@ function (_super) {
         name: (0, _locale.i18n)('CUSTOMIZE'),
         value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
           data: data.customize,
+          defaultVertical: "bottom",
           layoutSource: (0, _coreUtil.isPc)() ? _layout.videoPCLayout : _layout.videoH5Layout,
           selectedLayoutFun: function selectedLayoutFun(v) {
             _this.getLayout(v);
-          }
+          },
+          showVertical: true
         })
       }, {
         key: 'Background',