@fonixtree/magic-design 2.0.84 → 2.0.86

package/es/locale/es/es.json

@@ -1,13 +1,14 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Hecho",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Mover hacia abajo",
   "COPY": "Copiar",
   "DELETE": "Eliminar",
-  "DONE": "Hecho",
   "ADD_COMPONENT": "Agregar Componente",
   "ALL": "TODO",
   "HOT": "Caliente",

package/es/locale/id/id.json

@@ -1,13 +1,14 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

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

@@ -278,7 +278,7 @@ function (_super) {
         showBgColor: true,
         showTextAlign: true,
         value: textData
-      })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      })), window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
         split: true,
         title: "URL"
       }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {

package/es/utils/commonUtil.js

@@ -296,7 +296,7 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
+var navigateTo = function navigateTo(url, state) {
   console.log(url);
 
   if (!url) {
@@ -305,13 +305,20 @@ var navigateTo = function navigateTo(url) {
 
   var _a = url.split(';'),
       h5Url = _a[0],
-      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+      appUrl = _a[1];
+
+  if (appUrl && (0, _androidUtil.browserVersion)().isApp) {
+    window.location.href = appUrl;
+  } // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
 
 
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push({
+      pathname: h5Url,
+      state: state
+    });
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -349,7 +356,7 @@ function goLogin(state, replaceFlag) {
   var signUrl = isFromSf === 'Y' ? '/sign-in-opt' : '/sign-in';
 
   if (replaceFlag) {
-    Fishx.history.replace({
+    window.magicDesign.history.replace({
       pathname: signUrl,
       state: state
     });
@@ -752,7 +759,7 @@ function pushGA(data, eventName) {
         elementName: data.elementName
       };
       console.log('GA push', eventName, eventData);
-      window.gtag('event', eventName, eventData);
+      if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);

package/es/utils/coreUtil.js

@@ -341,11 +341,12 @@ var clickUrl = function clickUrl(url) {
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    // 兼容Nuri的 绝对路径跳转
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || ''); // 兼容Nuri的 绝对路径跳转
+
     (0, _androidUtil.sendToAndroid)({
       type: 'jumpBrowser',
       params: {
-        url: params.link
+        url: urlTemp
       }
     });
   } else {

package/lib/common/CountDown/index.js

@@ -57,9 +57,11 @@ function (_super) {
       hour: '00',
       min: '00',
       second: '00',
-      nowTime: _this.props.now
+      nowTime: Number(_this.props.now),
+      now: _this.props.now
     };
     _this.timer = null;
+    _this.preTime = '';
 
     _this.componentWillUnmount = function () {
       _this.clearTimer();
@@ -112,19 +114,26 @@ function (_super) {
     return _this;
   }
 
-  CountDown.prototype.componentWillReceiveProps = function (nextProps) {
-    var _this = this;
-
-    if (nextProps.now !== this.props.now) {
-      this.setState({
+  CountDown.getDerivedStateFromProps = function (nextProps, prevState) {
+    // 检查是否需要更新sortType
+    if (nextProps.now !== prevState.now) {
+      return {
+        now: nextProps.now,
         nowTime: nextProps.now
-      }, function () {
-        _this.clearTimer();
+      };
+    }
+
+    return null;
+  };
 
-        _this.calcLastTime();
+  CountDown.prototype.componentDidUpdate = function () {
+    var now = this.state.now;
 
-        _this.timer = setInterval(_this.calcLastTime, 1000);
-      });
+    if (this.preTime != now) {
+      this.preTime = now;
+      this.clearTimer();
+      this.calcLastTime();
+      this.timer = setInterval(this.calcLastTime, 1000);
     }
   };
 

package/lib/common/CropperModal/index.js

@@ -0,0 +1,126 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactCropper = _interopRequireDefault(require("react-cropper"));
+
+require("cropperjs/dist/cropper.css");
+
+require("./index.less");
+
+var _locale = require("../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 = {
+      src: ''
+    };
+
+    _this.onSubmit = function () {
+      _this.cropper.getCroppedCanvas().toBlob(function (blob) {
+        var fileName = _this.props.uploadedImageFile.name; // Vovi手机没有图片后缀
+
+        if (fileName && fileName.lastIndexOf('.') === -1) {
+          fileName = "file_" + new Date().getTime() + ".jpg";
+        }
+
+        var formData = new FormData();
+        formData.append('file', blob, fileName);
+
+        _this.props.onSubmit(formData);
+      });
+    };
+
+    return _this;
+  }
+
+  AComponent.prototype.componentDidMount = function () {
+    var _this = this;
+
+    var fileReader = new FileReader();
+
+    fileReader.onload = function (e) {
+      var dataURL = e.target.result;
+
+      _this.setState({
+        src: dataURL
+      });
+    };
+
+    fileReader.readAsDataURL(this.props.uploadedImageFile);
+  };
+
+  AComponent.prototype.render = function () {
+    var _this = this;
+
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "cropperModalWrap"
+    }, /*#__PURE__*/_react["default"].createElement(_reactCropper["default"], {
+      aspectRatio: 1,
+      className: "company-logo-cropper",
+      guides: false,
+      onInitialized: function onInitialized(cop) {
+        _this.cropper = cop;
+      },
+      src: this.state.src,
+      viewMode: 1,
+      zoomable: false
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "btnWrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      onClick: this.props.onClose
+    }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement("span", {
+      onClick: this.onSubmit
+    }, (0, _locale.i18n)('SUBMIT'))));
+  };
+
+  return AComponent;
+}(_react.Component);
+
+var _default = AComponent;
+exports["default"] = _default;

package/lib/common/CropperModal/index.less

@@ -0,0 +1,29 @@
+.cropperModalWrap {
+  background: #000;
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .btnWrap {
+    span {
+      color: #fff;
+      font-size: 18px;
+      position: absolute;
+      bottom: 10px;
+
+      &:first-child {
+        left: 12px;
+      }
+
+      &:last-child {
+        right: 12px;
+      }
+    }
+  }
+}

package/lib/common/GroupList/index.js

@@ -121,6 +121,8 @@ function (_super) {
       _this.setState({});
 
       (0, _coreUtil.renderPreview)();
+
+      _this.props.reRender();
     };
 
     _this.deleteItem = function (e, item) {

package/lib/common/LinkModal/AffiliateStore/index.js

@@ -0,0 +1,332 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = AffiliateStore;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _commonUtil = require("../../../utils/commonUtil");
+
+var _locale = require("../../../locale");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+var paginationParams = {
+  pageSize: 20,
+  pageIndex: 1
+};
+
+function AffiliateStore(props) {
+  var _this = this;
+
+  var _onChange = props.onChange;
+
+  var _a = (0, _react.useState)([]),
+      storeList = _a[0],
+      setStoreList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var _c = (0, _react.useState)(''),
+      storeName = _c[0],
+      setStoreName = _c[1];
+
+  var queryStore = function queryStore(params) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/affiliate/store/query/page", params, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            paginationParams.total = res.total;
+            setStoreList(res.list);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryStore(paginationParams);
+  }, []);
+  var columns = [{
+    title: 'Store ID',
+    dataIndex: 'affiliateStoreId'
+  }, {
+    title: 'Store Name',
+    dataIndex: 'storeName'
+  }, {
+    title: 'Logo',
+    dataIndex: 'logo',
+    render: function render(val) {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: val,
+        style: {
+          maxWidth: '50px',
+          maxHeight: '50px'
+        }
+      });
+    }
+  }, {
+    title: 'Channel',
+    dataIndex: 'bindChannel'
+  }];
+  var rowSelection = {
+    onChange: function onChange(selectedRowKeys, selectedRow) {
+      _onChange({
+        value: selectedRow[0].affiliateStoreId,
+        name: selectedRow[0].storeName
+      });
+    },
+    type: 'radio'
+  };
+
+  var reset = function reset() {
+    setStoreName('');
+    queryStore(__assign({
+      storeName: ''
+    }, paginationParams));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
+    labelCol: {
+      span: 6
+    },
+    layout: "horizontal"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 24
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 12
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Store Name"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    onChange: function onChange(e) {
+      return setStoreName(e.target.value);
+    },
+    size: "small",
+    value: storeName
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 6
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      setLoading(true);
+      paginationParams.pageIndex = 1;
+      queryStore(__assign({
+        storeName: storeName
+      }, paginationParams));
+    },
+    size: "small",
+    style: {
+      marginRight: 10
+    },
+    type: "primary"
+  }, (0, _locale.i18n)('QUERY')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      reset();
+    },
+    size: "small"
+  }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: storeList,
+    defaultExpandAllRows: true,
+    loading: loading,
+    pagination: __assign(__assign({}, paginationParams), {
+      onChange: function onChange(page) {
+        paginationParams.pageIndex = page;
+        queryStore(__assign(__assign({}, paginationParams), {
+          storeName: storeName
+        }));
+      },
+      showSizeChanger: false
+    }),
+    rowKey: "affiliateStoreId",
+    rowSelection: rowSelection,
+    scroll: {
+      y: 400
+    }
+  }));
+}