@fonixtree/magic-design 2.0.19 → 2.0.21

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

@@ -11,6 +11,14 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _quill = _interopRequireDefault(require("quill"));
 
+require("./formats/fontWeight");
+
+require("./formats/fontFamily");
+
+require("./formats/textDecorationColor");
+
+require("./formats/textDecorationStyle");
+
 var _decorator = require("../../../decorator");
 
 var _coreUtil = require("../../../utils/coreUtil");
@@ -19,8 +27,6 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _mobx = require("../../../mobx");
 
-var _ToolBarModal = require("../../../core/Designer/ToolBarModal");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -78,6 +84,20 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   }
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+
+var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
+  for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
+    s += arguments[i].length;
+  }
+
+  for (var r = Array(s), k = 0, i = 0; i < il; i++) {
+    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
+      r[k] = a[j];
+    }
+  }
+
+  return r;
+};
 /* eslint-disable react/no-danger */
 
 
@@ -87,14 +107,6 @@ sizeStyle.whitelist = null;
 
 _quill["default"].register(sizeStyle, true);
 
-var fonts = _quill["default"]["import"]('formats/font');
-
-fonts.whitelist = _ToolBarModal.fontFamilyList.map(function (item) {
-  return item.value;
-});
-
-_quill["default"].register(fonts, true);
-
 var contentStyle = function contentStyle(content) {
   return {
     fontSize: window.magicDesign.device == 'pc' ? content.pcFontSize : content.fontSize,
@@ -176,16 +188,16 @@ function (_super) {
   }
 
   Text.prototype.componentDidMount = function () {
-    var _a;
-
-    (_a = this.textRef.current.querySelector('.quill-text-content-wrap a')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', function (event) {
-      event.preventDefault();
-      var target = event.target;
-      var href = target.getAttribute('href'); // 在这里执行你想要的操作
-
-      console.log('链接点击事件:', href);
-      var data = JSON.parse(href);
-      (0, _coreUtil.clickUrl)(data);
+    __spreadArrays(this.textRef.current.querySelectorAll('a')).forEach(function (dom) {
+      dom.addEventListener('click', function (event) {
+        event.preventDefault();
+        var target = event.currentTarget;
+        var href = target.getAttribute('href'); // 在这里执行你想要的操作
+
+        console.log('链接点击事件:', href);
+        var data = JSON.parse(href);
+        (0, _coreUtil.clickUrl)(data);
+      });
     });
   };
 

package/es/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/es/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/es/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/es/meta-comp/config-panels/TextConfig/index.less

@@ -4,29 +4,6 @@
   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;

package/es/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/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1690178450777') format('woff2'),
-       url('magic-box-iconfont.woff?t=1690178450777') format('woff'),
-       url('magic-box-iconfont.ttf?t=1690178450777') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
+       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
+       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
 }
 
 .magic-box-iconfont {

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1690178450777') format('woff2'),
-       url('magic-box-iconfont.woff?t=1690178450777') format('woff'),
-       url('magic-box-iconfont.ttf?t=1690178450777') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
+       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
+       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
 }
 
 .magic-box-iconfont {