@fonixtree/magic-design 0.0.171 → 0.0.173

package/es/common/ColorPicker/index.less

@@ -1,7 +1,6 @@
 .m-color-picker-panel {
-  position: fixed;
-  bottom: 5px;
   z-index: 999;
+  position: absolute;
 
   .panel-bg {
     position: fixed;

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

@@ -14,6 +14,13 @@
   //   right: 20px;
   // }
 
+  .ant-carousel {
+    .slick-track {
+      display: flex;
+      align-items: center;
+    }
+  }
+
   .carouselItem {
     // height: 386px;
     position: relative;

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

@@ -1,6 +1,13 @@
 .m-banner-pc {
   position: relative;
 
+  .ant-carousel {
+    .slick-track {
+      display: flex;
+      align-items: center;
+    }
+  }
+
   .swiper-ban {
     position: absolute;
     width: 100%;

package/es/composite-comp/bol/components/Video/components/ShareBtn/index.js

@@ -73,7 +73,9 @@ function (_super) {
     var _a = this.props,
         pc = _a.pc,
         padding = _a.padding,
-        data = _a.data;
+        data = _a.data,
+        _b = _a.shareUrl,
+        shareUrl = _b === void 0 ? window.location.href : _b;
     var show = this.state.show;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('video-share-btn', {
@@ -125,7 +127,7 @@ function (_super) {
       className: "share-img",
       onClick: function onClick(e) {
         e.stopPropagation();
-        (0, _commonUtil.copy2ClipBoard)(data.url);
+        (0, _commonUtil.copy2ClipBoard)(shareUrl);
 
         _this.setState({
           show: false

package/es/composite-comp/bol/second-config-panels/TextSecondConfig/TextContentConfigContent/index.js

@@ -63,7 +63,9 @@ function (_super) {
   }
 
   AComponent.prototype.render = function () {
-    var source = this.props.source;
+    var _a = this.props,
+        source = _a.source,
+        outputType = _a.outputType;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "recommend_content"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
@@ -73,14 +75,16 @@ function (_super) {
         key: '1',
         name: (0, _locale.i18n)('TITLE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
-          data: source.title
+          data: source.title,
+          outputType: outputType
         }),
         metaOption: source.title
       }, {
         key: '2',
         name: (0, _locale.i18n)('TEXT'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
-          data: source.text
+          data: source.text,
+          outputType: outputType
         }),
         metaOption: source.text
       }],

package/es/composite-comp/bol/second-config-panels/TextSecondConfig/index.js

@@ -43,8 +43,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var debug = require('debug')('worker:TextSecondConfig');
-
 var TextSecondConfig =
 /** @class */
 function (_super) {
@@ -65,7 +63,9 @@ function (_super) {
   }
 
   TextSecondConfig.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+    var _a = this.props,
+        panelProps = _a.panelProps,
+        outputType = _a.outputType;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "recommend_second_conf_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
@@ -75,6 +75,7 @@ function (_super) {
         key: 'content',
         name: (0, _locale.i18n)('CONTENT'),
         value: /*#__PURE__*/_react["default"].createElement(_TextContentConfigContent["default"], {
+          outputType: outputType,
           source: panelProps.content
         })
       }],

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

@@ -199,6 +199,7 @@ function (_super) {
 
     _this.getSecondConfigInstance = function () {
       var selectedNode = _this.state.selectedNode;
+      var outputType = _this.props.outputType;
       var Clazz = _componentTypes.secondConfigPanelMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type];
       var panelProps = (0, _commonUtil.ensure)(function () {
         return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource.find(function (src) {
@@ -208,7 +209,8 @@ function (_super) {
 
       if (panelProps) {
         var instance = Clazz ? /*#__PURE__*/_react["default"].createElement(Clazz, {
-          panelProps: panelProps
+          panelProps: panelProps,
+          outputType: outputType
         }) : null;
         return instance;
       }
@@ -237,7 +239,6 @@ function (_super) {
       }
 
       var groupName = '';
-      console.log('...', selectedNode.type, panelProps);
 
       switch (selectedNode.type) {
         case 'IMAGE_GALLERY':

package/es/core/Designer/ConfigPanel/index.less

@@ -2,11 +2,11 @@
   width: 354px;
   background: #ffffff;
   height: 100vh;
-  overflow: scroll;
+  // overflow: scroll;
   transition-property: transform;
   transition-duration: .3s;
   transition-timing-function: ease;
-  left: -354px;
+  left: 0;
   z-index: 200;
   // position: fixed;
   position: absolute;
@@ -20,6 +20,8 @@
   .first_config_wrap {
     height: 100%;
     padding: 24px;
+    max-height: 100vh;
+    overflow: auto;
 
     .config_header {
       font-size: 26px;
@@ -48,9 +50,11 @@
 
   .sec_config_wrap {
     position: absolute;
+    max-height: 100vh;
+    overflow: auto;
     width: 354px;
-    left: -354px;
-    bottom: 0;
+    left: 0;
+    // bottom: 0;
     top: 0;
     background-color: #FFF;
     padding: 24px;

package/es/core/Designer/index.js

@@ -732,6 +732,7 @@ function (_super) {
       ref: this.configRef,
       device: device,
       onClose: this.onPropsPanelClose,
+      outputType: this.props.outputType,
       pageData: MPageData
     }), /*#__PURE__*/_react["default"].createElement(_ViewArea["default"] // ref={this.viewAreaRef}
     , {

package/es/meta-comp/components/Button/editable.js

@@ -73,6 +73,13 @@ function (_super) {
 
     _this.preData = '';
     _this.preDevice = '';
+
+    _this.triggerButtonConfigRender = function () {
+      window.document.dispatchEvent(new Event('button-render', {
+        bubbles: false
+      }));
+    };
+
     return _this;
   }
 
@@ -102,6 +109,8 @@ function (_super) {
         _this.preData = JSON.stringify(__assign(__assign({}, JSON.parse(_this.preData)), {
           text: text
         }));
+
+        _this.triggerButtonConfigRender();
       },
       suppressContentEditableWarning: true
     }, data.text);

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

@@ -162,6 +162,9 @@ var initSelectionEvent = function initSelectionEvent() {
 
       if (findSelectionTarget) {
         var range = window.getSelection().getRangeAt(0);
+        /** 记录当前选中的范围 给label使用 */
+
+        window._currentRange = window.getSelection().getRangeAt(0);
         var startOffset = range.startOffset,
             endOffset = range.endOffset,
             startContainer_1 = range.startContainer,

package/es/meta-comp/config-panels/ButtonConfig/index.js

@@ -101,6 +101,14 @@ function (_super) {
     return _this;
   }
 
+  ButtonConfig.prototype.componentDidMount = function () {
+    window.document.addEventListener('button-render', this.selfRender);
+  };
+
+  ButtonConfig.prototype.componentWillUnmount = function () {
+    window.document.removeEventListener('button-render', this.selfRender);
+  };
+
   ButtonConfig.prototype.render = function () {
     var _this = this;
 

package/es/meta-comp/config-panels/TextConfig/TextLabel/index.js

@@ -0,0 +1,92 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+require("./index.less");
+
+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 AComponent =
+/** @class */
+function (_super) {
+  __extends(AComponent, _super);
+
+  function AComponent() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+
+    _this.onLabelAdd = function (label) {
+      var startOffset = (window._currentRange || {}).startOffset;
+      var text = _this.props.data.text;
+
+      if (startOffset) {
+        _this.props.data.text = text.slice(0, startOffset) + label + text.slice(startOffset);
+      } else {
+        _this.props.data.text = text + label;
+      }
+
+      (0, _coreUtil.renderPreview)();
+    };
+
+    return _this;
+  }
+
+  AComponent.prototype.render = function () {
+    var _this = this;
+
+    var list = window.magicDesign.labelList || [];
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "text-label-content"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "label-wrap"
+    }, list.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        key: item.value,
+        className: "label-item",
+        onClick: function onClick() {
+          _this.onLabelAdd('${' + item.value + '}');
+        }
+      }, item.name);
+    })));
+  };
+
+  AComponent.defaultProps = {};
+  return AComponent;
+}(_react["default"].Component);
+
+var _default = AComponent;
+exports["default"] = _default;

package/es/meta-comp/config-panels/TextConfig/TextLabel/index.less

@@ -0,0 +1,25 @@
+.text-label-content {
+  background-color: #f5f6f7;
+
+  .label-wrap {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+
+    .label-item {
+      padding: 5px 11px;
+      font-size: 14px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 5px;
+      background-color: #fff;
+      margin: 8px;
+      cursor: pointer;
+
+      &:hover {
+        background-color: #f6f6f7;
+      }
+    }
+  }
+}