@fonixtree/magic-design 0.1.78 → 0.1.80

package/lib/meta-comp/components/Text/formats/textAlign.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TextAlignStyleAttributor = exports.TextAlignStyle = void 0;
+
+var _quill = _interopRequireDefault(require("quill"));
+
+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 Parchment = _quill["default"]["import"]('parchment');
+
+var TextAlignStyleAttributor =
+/** @class */
+function (_super) {
+  __extends(TextAlignStyleAttributor, _super);
+
+  function TextAlignStyleAttributor() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  return TextAlignStyleAttributor;
+}(Parchment.Attributor.Style);
+
+exports.TextAlignStyleAttributor = TextAlignStyleAttributor;
+var TextAlignStyle = new TextAlignStyleAttributor('text-align', 'text-align', {
+  scope: Parchment.Scope.BLOCK_BLOT
+});
+exports.TextAlignStyle = TextAlignStyle;
+
+_quill["default"].register('formats/text-align', TextAlignStyle, true);

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

@@ -19,6 +19,8 @@ require("./formats/textDecorationColor");
 
 require("./formats/fontStyle");
 
+require("./formats/textAlign");
+
 require("./formats/listStyleTypeStyle");
 
 require("./formats/textDecorationStyle");
@@ -102,6 +104,8 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 
   return r;
 };
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
 /* eslint-disable react/no-danger */
 
 
@@ -148,6 +152,16 @@ function (_super) {
           placeholder: '请输入内容...'
         });
 
+        var onInputChange = function onInputChange() {
+          _this.props.onTextInput(_this.quillRef.root.innerHTML);
+        };
+
+        _this.quillRef.on('text-change', onInputChange);
+
+        _this.destroy = function () {
+          _this.quillRef.off('text-change', onInputChange);
+        };
+
         _mobx.frameStore.setState({
           textModalState: {
             quillRef: null
@@ -157,7 +171,8 @@ function (_super) {
         setTimeout(function () {
           _mobx.frameStore.setState({
             textModalState: {
-              quillRef: _this.quillRef
+              quillRef: _this.quillRef,
+              close: _this.onEditorClose
             }
           });
         }, 100);
@@ -209,6 +224,10 @@ function (_super) {
     return true;
   };
 
+  Text.prototype.componentWillUnmount = function () {
+    this.destroy && this.destroy();
+  };
+
   Text.prototype.render = function () {
     var _a = this.props,
         data = _a.data,

package/lib/meta-comp/components/Text/index.less

@@ -35,6 +35,14 @@
     font-style: normal;
     font-weight: 600;
   }
+
+  .ql-align-center {
+    text-align: center;
+  }
+
+  .ql-align-right {
+    text-align: right;
+  }
 }
 
 .ql-clipboard {

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

@@ -11,7 +11,7 @@ var _antd = require("antd");
 
 require("./index.less");
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _locale = require("../../../locale");
 
@@ -106,11 +106,11 @@ function (_super) {
 
       _this.updateAttr(data, 'hover', {
         open: true,
-        buttonBorder: (0, _lodash.cloneDeep)(data.buttonBorder),
-        buttonIcon: (0, _lodash.cloneDeep)(data.buttonIcon),
-        buttonText: (0, _lodash.cloneDeep)(data.buttonText),
+        buttonBorder: (0, _cloneDeep["default"])(data.buttonBorder),
+        buttonIcon: (0, _cloneDeep["default"])(data.buttonIcon),
+        buttonText: (0, _cloneDeep["default"])(data.buttonText),
         content: {
-          backgroundColor: (0, _lodash.cloneDeep)(data.content.backgroundColor)
+          backgroundColor: (0, _cloneDeep["default"])(data.content.backgroundColor)
         }
       }); // console.log('--ffd, button hover first click', data);
 

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

@@ -202,7 +202,7 @@ function (_super) {
   function ImageConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
-    _this.onClick = function (event) {// console.log(event);
+    _this.onClick = function () {// console.log(event);
     };
 
     _this.getImg = function (v, way) {
@@ -320,7 +320,8 @@ function (_super) {
         needHover = _a.needHover,
         needClickArea = _a.needClickArea,
         needURL = _a.needURL,
-        recommendImgSize = _a.recommendImgSize;
+        recommendImgSize = _a.recommendImgSize,
+        onlySpecificCode = _a.onlySpecificCode;
     var selectImg = this.getSelectedImg(data);
 
     var ContentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
@@ -348,51 +349,10 @@ function (_super) {
 
         _this.selfRender();
       },
+      onlySpecificCode: onlySpecificCode,
       value: data.content.clickUrl
     })));
 
-    var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      split: data.hover.backgroundType === 'new',
-      title: (0, _locale.i18n)('IMAGE')
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-      className: "hoverSelect",
-      onChange: function onChange(v) {
-        data.hover.backgroundType = v;
-
-        _this.selfRender();
-      },
-      size: "large",
-      value: data.hover.backgroundType
-    }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "enlarge"
-    }, (0, _locale.i18n)('ENLARGE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-      value: "new"
-    }, (0, _locale.i18n)('NEW_IMAGE')))), data.hover.backgroundType === 'enlarge' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('MAGNIFICATION')
-    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-      inputType: "float",
-      maxVal: 3,
-      minVal: 1,
-      onChange: function onChange(v) {
-        data.hover.magnification = v.count;
-
-        _this.selfRender();
-      },
-      step: 0.25,
-      value: {
-        count: data.hover.magnification
-      }
-    })), data.hover.backgroundType === 'new' && /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
-      imageSelectedWay: data.hover.imageSelectedWay || {
-        pc: '',
-        mobile: ''
-      },
-      onChange: function onChange(v, way) {
-        return _this.getImgHoverUrl(v, way);
-      },
-      value: (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl
-    }));
-
     var imageSource = [{
       key: '1',
       name: (0, _locale.i18n)('CONTENT'),
@@ -400,6 +360,50 @@ function (_super) {
     }];
 
     if (needHover) {
+      console.log('needHover', needHover);
+
+      var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        split: data.hover.backgroundType === 'new',
+        title: (0, _locale.i18n)('IMAGE')
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+        className: "hoverSelect",
+        onChange: function onChange(v) {
+          data.hover.backgroundType = v;
+
+          _this.selfRender();
+        },
+        size: "large",
+        value: data.hover.backgroundType
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "enlarge"
+      }, (0, _locale.i18n)('ENLARGE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "new"
+      }, (0, _locale.i18n)('NEW_IMAGE')))), data.hover.backgroundType === 'enlarge' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        title: (0, _locale.i18n)('MAGNIFICATION')
+      }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+        inputType: "float",
+        maxVal: 3,
+        minVal: 1,
+        onChange: function onChange(v) {
+          data.hover.magnification = v.count;
+
+          _this.selfRender();
+        },
+        step: 0.25,
+        value: {
+          count: data.hover.magnification
+        }
+      })), data.hover.backgroundType === 'new' && /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
+        imageSelectedWay: data.hover.imageSelectedWay || {
+          pc: '',
+          mobile: ''
+        },
+        onChange: function onChange(v, way) {
+          return _this.getImgHoverUrl(v, way);
+        },
+        value: (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl
+      }));
+
       imageSource.push({
         key: '5',
         name: (0, _locale.i18n)('HOVER'),

package/lib/mobx/Frame.js

@@ -42,13 +42,28 @@ function () {
       onOk: function onOk() {},
       onCancel: function onCancel() {}
     };
+    /* 移动端 Modal弹窗 */
+
+    this.modalState = {
+      visible: false,
+      hideCancel: true,
+      title: '',
+      message: '',
+      messageImg: '',
+      confirmText: 'YES',
+      cancelText: 'NO',
+      onConfirm: function onConfirm() {},
+      onCancel: function onCancel() {}
+    };
     this.textModalState = {
       visible: false,
-      onOk: function onOk() {}
+      onOk: function onOk() {},
+      close: function close() {}
     };
     (0, _mobx.makeObservable)(this, {
       confirmState: _mobx.observable,
-      textModalState: _mobx.observable
+      textModalState: _mobx.observable,
+      modalState: _mobx.observable
     });
   }
   /** 修改状态 */

package/lib/utils/businessUtil.js

@@ -7,7 +7,7 @@ exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToT
 
 var _qs = _interopRequireDefault(require("qs"));
 
-var _lodash = require("lodash");
+var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
 var _commonUtil = require("./commonUtil");
 
@@ -33,7 +33,12 @@ var newParseUrl = function newParseUrl(urlObj) {
   switch (type) {
     // 商品详情
     case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
-      link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
+      if (offerId) {
+        link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
+      } else {
+        link = "/product/detail/" + productId;
+      }
+
       params = {
         action: 'jump',
         params: {
@@ -87,7 +92,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(value), function (value) {
             return value;
           })
         }
@@ -214,7 +219,12 @@ var parseUrl = function parseUrl(url) {
   switch (type) {
     // 商品详情
     case _constants.urlType.PRODUCT_DETAIL:
-      link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
+      if (arg1 && arg1 !== 'undefined') {
+        link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
+      } else {
+        link = "/product/detail/" + arg2;
+      }
+
       params = {
         action: 'jump',
         params: {
@@ -256,7 +266,7 @@ var parseUrl = function parseUrl(url) {
         action: 'jump',
         params: {
           type: 'PRODUCT_LIST',
-          params: (0, _lodash.pickBy)(_qs["default"].parse(arg1), function (value) {
+          params: (0, _pickBy["default"])(_qs["default"].parse(arg1), function (value) {
             return value;
           })
         }
@@ -315,7 +325,8 @@ var parseUrl = function parseUrl(url) {
         '/social-commerce/my-cashback': 'CASHBACK',
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
-        '/search-page': 'SEARCH_PAGE'
+        '/search-page': 'SEARCH_PAGE',
+        '/main/my-commission': 'WALLET'
       };
       link = url;
       params = {

package/lib/utils/commonUtil.js

@@ -16,7 +16,7 @@ exports.dragSource = exports.downloadBase64Image = void 0;
 exports.ensure = ensure;
 exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
-exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
 exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
@@ -27,7 +27,7 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _uuid = require("uuid");
 
@@ -640,7 +640,7 @@ function pushGA(data, eventName) {
 
 
 function covertKey(data, func) {
-  var newData = (0, _lodash.cloneDeep)(data);
+  var newData = (0, _cloneDeep["default"])(data);
   func(newData);
   return JSON.stringify(newData);
 }
@@ -898,4 +898,54 @@ var convertCount = function convertCount(value) {
   return newValue;
 };
 
-exports.convertCount = convertCount;
+exports.convertCount = convertCount;
+
+var onListenTouch = function onListenTouch(cls, leftFunc, rightFunc) {
+  var box = document.querySelector(cls); // 监听对象
+
+  var startTime = ''; // 触摸开始时间
+
+  var startDistanceX = ''; // 触摸开始X轴位置
+
+  var startDistanceY = ''; // 触摸开始Y轴位置
+
+  var endTime = ''; // 触摸结束时间
+
+  var endDistanceX = ''; // 触摸结束X轴位置
+
+  var endDistanceY = ''; // 触摸结束Y轴位置
+
+  var moveTime = ''; // 触摸时间
+
+  var moveDistanceX = ''; // 触摸移动X轴距离
+
+  var moveDistanceY = ''; // 触摸移动Y轴距离
+
+  box.addEventListener('touchstart', function (e) {
+    startTime = new Date().getTime();
+    startDistanceX = e.touches[0].screenX;
+    startDistanceY = e.touches[0].screenY;
+  });
+  box.addEventListener('touchend', function (e) {
+    endTime = new Date().getTime();
+    endDistanceX = e.changedTouches[0].screenX;
+    endDistanceY = e.changedTouches[0].screenY;
+    moveTime = endTime - startTime;
+    moveDistanceX = startDistanceX - endDistanceX;
+    moveDistanceY = startDistanceY - endDistanceY; // 判断滑动距离超过40 且 时间小于500毫秒
+
+    if ((Math.abs(moveDistanceX) > 40 || Math.abs(moveDistanceY) > 40) && moveTime < 500) {
+      // 判断X轴移动的距离是否大于Y轴移动的距离
+      if (Math.abs(moveDistanceX) > Math.abs(moveDistanceY)) {
+        // 左右
+        if (moveDistanceX > 0) leftFunc();else rightFunc();
+      } else {
+        // 上下
+        return moveDistanceY > 0 ? 'top' : 'bottom';
+      }
+    }
+  });
+  return null;
+};
+
+exports.onListenTouch = onListenTouch;

package/lib/utils/currencyUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
+exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbolNotSpace = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
 
 var _divide = _interopRequireDefault(require("lodash/divide"));
 
@@ -105,6 +105,13 @@ var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
   var ret = formatCurrency(num);
   return getPricePrefix() + " " + ret;
 };
+
+exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
+
+var formatCurrencyWithSymbolNotSpace = function formatCurrencyWithSymbolNotSpace(num) {
+  var ret = formatCurrency(num);
+  return "" + getPricePrefix() + ret;
+};
 /**
  * TODO 未兼容科学计数法（小数点后7位）
  * 计算浮点位数
@@ -113,7 +120,7 @@ var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
  */
 
 
-exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
+exports.formatCurrencyWithSymbolNotSpace = formatCurrencyWithSymbolNotSpace;
 
 var calcFloatCount = function calcFloatCount(number) {
   var numbString = String(number);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.78",
+  "version": "0.1.80",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",