@fonixtree/magic-design 2.0.14 → 2.0.16

package/lib/meta-comp/config-panels/TextConfig/TextEditModal/index.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactQuill = _interopRequireDefault(require("react-quill"));
+
+require("react-quill/dist/quill.snow.css");
+
+var _antd = require("antd");
+
+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 TextEditModal =
+/** @class */
+function (_super) {
+  __extends(TextEditModal, _super);
+
+  function TextEditModal() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      value: ''
+    };
+    _this.reactQuillRef = null;
+    _this.quillRef = null;
+
+    _this.getHtml = function () {
+      return _this.quillRef.root.innerHTML;
+    };
+
+    return _this;
+  }
+
+  TextEditModal.prototype.componentDidMount = function () {
+    this.quillRef = this.reactQuillRef.getEditor();
+  };
+
+  TextEditModal.prototype.render = function () {
+    var _this = this;
+
+    var _a = this.props,
+        onCancel = _a.onCancel,
+        onOk = _a.onOk;
+    var value = this.state.value;
+    return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+      closable: false,
+      onCancel: onCancel,
+      onOk: onOk,
+      visible: true,
+      width: 1000
+    }, /*#__PURE__*/_react["default"].createElement(_reactQuill["default"], {
+      ref: function ref(el) {
+        _this.reactQuillRef = el;
+      },
+      style: {
+        height: 600
+      },
+      value: value
+    }));
+  };
+
+  TextEditModal.defaultProps = {};
+  return TextEditModal;
+}(_react["default"].Component);
+
+var _default = TextEditModal;
+exports["default"] = _default;

package/lib/meta-comp/config-panels/TextConfig/TextEditModal/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;
+      }
+    }
+  }
+}

package/lib/meta-comp/config-panels/TextConfig/index.less

@@ -3,22 +3,41 @@
   flex-direction: column;
   padding: 0 12px;
   background-color: #F5F6F7;
+
   .line-config {
     text-decoration-line: line-through;
     text-decoration-color: #000;
     font-size: 14px;
     font-weight: 600;
   }
+
   .line-solid {
     text-decoration-style: solid;
   }
+
   .dashed-line {
     text-decoration-style: dashed;
   }
+
   .double-line {
     text-decoration-style: double;
   }
+
   .wavy-line {
     text-decoration-style: wavy;
   }
+
+  .edit-text-btn {
+    margin: 8px auto;
+    padding: 6px 16px;
+    background-color: #2e54eb;
+    color: #fff;
+    font-size: 14px;
+    border-radius: 8px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: #0837f4;
+    }
+  }
 }

package/lib/mobx/Frame.js

@@ -38,11 +38,17 @@ function () {
       content: '',
       okText: 'Ok',
       cancelText: 'Cancel',
+      quillRef: null,
       onOk: function onOk() {},
       onCancel: function onCancel() {}
     };
+    this.textModalState = {
+      visible: false,
+      onOk: function onOk() {}
+    };
     (0, _mobx.makeObservable)(this, {
-      confirmState: _mobx.observable
+      confirmState: _mobx.observable,
+      textModalState: _mobx.observable
     });
   }
   /** 修改状态 */

package/lib/utils/commonUtil.js

@@ -744,7 +744,7 @@ exports.asyncNextTick = asyncNextTick;
 
 var convertToRem = function convertToRem(value) {
   // return value; // PTO项目 解开注释
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+  if (window.magicDesign.device === 'pc') {
     return value + "px";
   }
 
@@ -763,7 +763,7 @@ exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
   // return styleObj; // PTO项目 解开注释
-  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+  if (window.magicDesign.device === 'pc') {
     return styleObj;
   }
 
@@ -774,9 +774,9 @@ var pxToRem = function pxToRem(styleObj) {
       var value = styleObj[key];
 
       if (typeof value === 'string' && value.endsWith('px')) {
-        remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
+        remObj[key] = convertToRem(value.split('px')[0]);
       } else if (typeof value === 'number') {
-        remObj[key] = convertToRem(value);
+        remObj[key] = ['opacity', 'lineHeight', 'zIndex'].includes(key) ? value : convertToRem(value);
       } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
         var paddingValues = value.split(' ');
         var remPaddingValues = paddingValues.map(function (paddingValue) {
@@ -843,6 +843,20 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
             };
           }
         }); // console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
+      } // 兼容新功能：SEARCH 新增控制购物车和消息图标的开关
+
+
+      if (child.type === 'SEARCH') {
+        if (!child.content.icon.cartIcon || !child.content.icon.messageIcon) {
+          child.content.icon.cartIcon = {
+            pc: true,
+            mobile: false
+          };
+          child.content.icon.messageIcon = {
+            pc: false,
+            mobile: true
+          };
+        }
       }
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -20,6 +20,7 @@
     "push:biz": "cp -r ./pub-dist/es ../bizme/node_modules/@fonixtree/magic-design/"
   },
   "dependencies": {
+    "@types/quill": "^2.0.10",
     "antd": "4.24.8",
     "axios": "0.27.2",
     "immutability-helper": "3.1.1",
@@ -31,6 +32,7 @@
     "mobx-react": "7.5.2",
     "moment": "2.29.3",
     "postcss-pxtorem": "^6.0.0",
+    "quill": "^1.3.7",
     "ramda": "^0.28.0",
     "react-ace": "^10.1.0",
     "react-color": "2.17.0",