@fonixtree/magic-design 0.1.76 → 0.1.78

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

@@ -11,6 +11,8 @@ var _antd = require("antd");
 
 require("./index.less");
 
+var _lodash = require("lodash");
+
 var _locale = require("../../../locale");
 
 var _SpacingConfig = _interopRequireDefault(require("../../../composite-comp/common/config-panels/SpacingConfig"));
@@ -104,11 +106,11 @@ function (_super) {
 
       _this.updateAttr(data, 'hover', {
         open: true,
-        buttonBorder: data.buttonBorder,
-        buttonIcon: data.buttonIcon,
-        buttonText: data.buttonText,
+        buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
+        buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
+        buttonText: (0, _lodash.cloneDeep)(data.buttonText),
         content: {
-          backgroundColor: data.content.backgroundColor
+          backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
         }
       }); // console.log('--ffd, button hover first click', data);
 
@@ -162,7 +164,7 @@ function (_super) {
 
     var fontSizeKey = window.magicDesign.device == 'pc' ? 'pcFontSize' : 'fontSize';
 
-    var ButtonTextSetting = function ButtonTextSetting(data) {
+    var ButtonTextSetting = function ButtonTextSetting(_data) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_STYLE')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
@@ -171,24 +173,24 @@ function (_super) {
             return t.key == v;
           });
 
-          _extends(data, __assign(__assign({}, findOne), {
+          _extends(_data, __assign(__assign({}, findOne), {
             sizeType: findOne === null || findOne === void 0 ? void 0 : findOne.key
           }));
 
           _this.selfRender();
         },
-        value: data.sizeType
+        value: _data.sizeType
       }, _TextConfig.sizeTypeList.map(function (sizeType) {
         return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
           value: sizeType.key
         }, sizeType.key);
-      }))), data.sizeType == 'Customize font styles' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }))), _data.sizeType == 'Customize font styles' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_FAMILY')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
-          _this.updateAttr(data, 'fontFamily', v);
+          _this.updateAttr(_data, 'fontFamily', v);
         },
-        value: data.fontFamily
+        value: _data.fontFamily
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "Montserrat"
       }, "Montserrat"), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
@@ -197,9 +199,9 @@ function (_super) {
         title: (0, _locale.i18n)('FONT_WEIGHT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
-          _this.updateAttr(data, 'fontWeight', v);
+          _this.updateAttr(_data, 'fontWeight', v);
         },
-        value: data.fontWeight
+        value: _data.fontWeight
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: 400
       }, (0, _locale.i18n)('REGULAR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
@@ -210,34 +212,34 @@ function (_super) {
         onChange: function onChange(_a) {
           var count = _a.count;
 
-          _this.updateAttr(data, fontSizeKey, count);
+          _this.updateAttr(_data, fontSizeKey, count);
         },
         unit: "px",
         value: {
-          count: data[fontSizeKey]
+          count: _data[fontSizeKey]
         }
       }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: ""
       }, /*#__PURE__*/_react["default"].createElement(_common.FontStyles, {
         onChange: function onChange(value) {
-          _extends(data, value);
+          _extends(_data, value);
 
           _this.selfRender();
         },
-        value: data
+        value: _data
       })));
     };
 
-    var ButtonBorderSetting = function ButtonBorderSetting(data) {
+    var ButtonBorderSetting = function ButtonBorderSetting(_data) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         split: true,
         title: (0, _locale.i18n)('BORDER_COLOR')
       }, /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
         colorType: "rgba",
         onChange: function onChange(value) {
-          _this.updateAttr(data, 'borderColor', value);
+          _this.updateAttr(_data, 'borderColor', value);
         },
-        value: data.borderColor
+        value: _data.borderColor
       })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('BORDER_RADIUS')
       }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
@@ -245,15 +247,15 @@ function (_super) {
         onChange: function onChange(_a) {
           var count = _a.count;
 
-          _this.updateAttr(data, 'borderRadius', count);
+          _this.updateAttr(_data, 'borderRadius', count);
         },
         value: {
-          count: data.borderRadius
+          count: _data.borderRadius
         }
       })));
     };
 
-    var ButtonIconSetting = function ButtonIconSetting(data) {
+    var ButtonIconSetting = function ButtonIconSetting(_data) {
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('ICON')
       }, /*#__PURE__*/_react["default"].createElement(_common.IconPicker, {
@@ -262,18 +264,18 @@ function (_super) {
         },
         onClick: function onClick() {
           _this.setState({
-            isHover: data == _this.props.data.hover.buttonIcon
+            isHover: _data == _this.props._data.hover.buttonIcon
           });
         },
-        value: data.iconUrl
-      })), data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        value: _data.iconUrl
+      })), _data.iconUrl && /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('ICON_PLACEMENT')
       }, /*#__PURE__*/_react["default"].createElement(_common.ButtonIconLayout, {
-        icon: data.iconUrl,
+        icon: _data.iconUrl,
         onChange: function onChange(value) {
-          return _this.updateAttr(data, 'layout', value);
+          return _this.updateAttr(_data, 'layout', value);
         },
-        value: data.layout
+        value: _data.layout
       })));
     };
 

package/lib/meta-comp/config-panels/ImageConfig/index.js

@@ -319,7 +319,8 @@ function (_super) {
         data = _a.data,
         needHover = _a.needHover,
         needClickArea = _a.needClickArea,
-        needURL = _a.needURL;
+        needURL = _a.needURL,
+        recommendImgSize = _a.recommendImgSize;
     var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
@@ -330,6 +331,7 @@ function (_super) {
       onChange: function onChange(v, way) {
         _this.getImg(v, way);
       },
+      recommendImgSize: recommendImgSize,
       value: selectImg
     }), needClickArea && selectImg && /*#__PURE__*/_react["default"].createElement(_HotAreaConfig["default"], {
       imgUrl: selectImg,

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/UnderlineSelect/index.js

@@ -0,0 +1,108 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _antd = require("antd");
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+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 __());
+  };
+}();
+/* eslint-disable react/no-danger */
+
+
+var UnderlineSelect =
+/** @class */
+function (_super) {
+  __extends(UnderlineSelect, _super);
+
+  function UnderlineSelect() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.containerRef = /*#__PURE__*/_react["default"].createRef();
+    return _this;
+  }
+
+  UnderlineSelect.prototype.render = function () {
+    var _this = this;
+
+    var _a = this.props.repeatCount,
+        repeatCount = _a === void 0 ? 50 : _a;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      ref: this.containerRef,
+      className: "underline-select-wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, _extends({
+      getPopupContainer: function getPopupContainer() {
+        return _this.containerRef.current;
+      }
+    }, this.props), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "solid"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "line-config line-solid",
+      dangerouslySetInnerHTML: {
+        __html: '&nbsp;'.repeat(repeatCount)
+      }
+    })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "dashed"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "line-config dashed-line",
+      dangerouslySetInnerHTML: {
+        __html: '&nbsp;'.repeat(repeatCount)
+      }
+    })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "double"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "line-config double-line",
+      dangerouslySetInnerHTML: {
+        __html: '&nbsp;'.repeat(repeatCount)
+      }
+    })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "wavy"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "line-config wavy-line",
+      dangerouslySetInnerHTML: {
+        __html: '&nbsp;'.repeat(repeatCount)
+      }
+    }))));
+  };
+
+  UnderlineSelect.defaultProps = {
+    repeatCount: 50
+  };
+  return UnderlineSelect;
+}(_react["default"].Component);
+
+var _default = UnderlineSelect;
+exports["default"] = _default;

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

@@ -0,0 +1,26 @@
+.underline-select-wrap {
+  .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;
+    }
+  }
+
+
+}

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

@@ -13,6 +13,8 @@ var _antd = require("antd");
 
 var _TextLabel = _interopRequireDefault(require("./TextLabel"));
 
+var _UnderlineSelect = _interopRequireDefault(require("./UnderlineSelect"));
+
 var _coreUtil = require("../../../utils/coreUtil");
 
 var _locale = require("../../../locale");
@@ -146,6 +148,7 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+    _this.containerRef = /*#__PURE__*/_react["default"].createRef();
 
     _this.onSizeTypeChange = function (v, obj) {
       _extends(obj, sizeTypeMap[v]);
@@ -329,42 +332,17 @@ function (_super) {
         value: data.underline.textDecorationColor
       })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('UNDERLINE_STYLE')
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+      }, /*#__PURE__*/_react["default"].createElement(_UnderlineSelect["default"], {
         onChange: function onChange(v) {
           data.underline.textDecorationStyle = v;
 
           _this.selfRender();
         },
+        style: {
+          width: '100%'
+        },
         value: data.underline.textDecorationStyle
-      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "solid"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "line-config line-solid",
-        dangerouslySetInnerHTML: {
-          __html: ' '.repeat(50)
-        }
-      })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "dashed"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "line-config dashed-line",
-        dangerouslySetInnerHTML: {
-          __html: ' '.repeat(50)
-        }
-      })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "double"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "line-config double-line",
-        dangerouslySetInnerHTML: {
-          __html: ' '.repeat(50)
-        }
-      })), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "wavy"
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "line-config wavy-line",
-        dangerouslySetInnerHTML: {
-          __html: ' '.repeat(50)
-        }
-      }))))),
+      }))),
       metaOption: data.underline,
       toggleType: 'checkbox'
     }];
@@ -380,6 +358,7 @@ function (_super) {
     }
 
     return /*#__PURE__*/_react["default"].createElement("div", {
+      ref: this.containerRef,
       className: "m-text-config"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
     // headerSize="small"

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

@@ -3,22 +3,18 @@
   flex-direction: column;
   padding: 0 12px;
   background-color: #F5F6F7;
-  .line-config {
-    text-decoration-line: line-through;
-    text-decoration-color: #000;
+
+  .edit-text-btn {
+    margin: 8px auto;
+    padding: 6px 16px;
+    background-color: #2e54eb;
+    color: #fff;
     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;
+    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/androidUtil.js

@@ -117,6 +117,12 @@ var sendToApp = function sendToApp(params) {
   // 对接flutter版本
   if (window.flutter_inject_js_bridge && window.flutter_inject_js_bridge.postMessage) {
     window.flutter_inject_js_bridge.postMessage(JSON.stringify(params));
+  } // 对接Nuri App
+
+
+  if (window.WebViewJavascriptBridge) {
+    window.WebViewJavascriptBridge.callHandler('action', // 调用java的函数名字
+    params);
   } // 对接mpaas版本
 
 

package/lib/utils/commonUtil.js

@@ -7,7 +7,7 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -744,12 +744,12 @@ 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";
   }
 
   var baseFont = ensure(function () {
-    return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px');
+    return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px', '');
   }, 50);
   var pxValue = parseFloat(value);
   var remValue = pxValue / baseFont; // 假设1rem = 50px
@@ -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', 'fontWeight'].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
+          };
+        }
       }
     });
   }
@@ -870,4 +884,18 @@ var downloadBase64Image = function downloadBase64Image(base64String, filename) {
   link.click();
 };
 
-exports.downloadBase64Image = downloadBase64Image;
+exports.downloadBase64Image = downloadBase64Image;
+
+var convertCount = function convertCount(value) {
+  var newValue = value;
+
+  if (value >= 1000000) {
+    newValue = Number(value / 1000000).toFixed(1) + "M";
+  } else if (value >= 1000) {
+    newValue = Number(value / 1000).toFixed(1) + "K";
+  }
+
+  return newValue;
+};
+
+exports.convertCount = convertCount;