@fonixtree/magic-design 2.0.190 → 3.0.2

package/lib/utils/businessUtil.js

@@ -267,18 +267,6 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
-    case _constants.urlTypeMap.BUSINESS_TYPE:
-      // 业态列表
-      link = '';
-      params = {
-        action: 'jump',
-        params: {
-          type: 'SEARCH_STORE_LIST_PAGE',
-          storeBizTypeId: value
-        }
-      };
-      break;
-
     default:
       var map = {
         '/main/cart': 'CART',
@@ -297,8 +285,7 @@ var newParseUrl = function newParseUrl(urlObj) {
         '/account/wallet': 'WEBVIEW',
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
-        '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/commission': 'COMMISSION'
       };
       var typeTemp = map[link];
 
@@ -383,17 +370,6 @@ var parseUrl = function parseUrl(url) {
         }
       };
       break;
-
-    case _constants.urlType.STORE:
-      // 店铺详情
-      params = {
-        action: 'jump',
-        params: {
-          type: 'STORE',
-          storeId: arg1
-        }
-      };
-      break;
     // 海报页面
 
     case _constants.urlType.CUSTOMIZED:
@@ -475,8 +451,7 @@ var parseUrl = function parseUrl(url) {
         '/product/GroupBuy': 'GROUP',
         '/search-page': 'SEARCH_PAGE',
         '/main/my-commission': 'WALLET',
-        '/commission': 'COMMISSION',
-        '/location': 'ADD_ADDRESS_PAGE'
+        '/commission': 'COMMISSION'
       };
       link = url;
       params = {

package/lib/utils/commonUtil.js

@@ -21,9 +21,9 @@ exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
 exports.navigateBack = navigateBack;
-exports.onListenTouch = exports.nextTick = exports.needReverse = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
-exports.setDefaultAddressFromIP = exports.reverseStrArr = exports.pxToRem = void 0;
+exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
@@ -505,29 +505,13 @@ var getUrlParams = function getUrlParams(name) {
   if (r != null) return unescape(r[2]);
   return null;
 };
-
-exports.getUrlParams = getUrlParams;
-
-var needReverse = function needReverse() {
-  return ((0, _storeUtil.getStore)(_constants.STORAGE_KEY.FISHX_LOCALE) || (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE)) === 'ar';
-};
-
-exports.needReverse = needReverse;
-
-var reverseStrArr = function reverseStrArr(arr) {
-  if (needReverse()) {
-    return arr.reverse().join(' ').replace('+ ', '+').replace(': ', ':');
-  }
-
-  return arr.join(' ').replace(' +', '+').replace(' :', ':');
-};
 /**
  * 补0 函数
  * @param {*} num 数字
  */
 
 
-exports.reverseStrArr = reverseStrArr;
+exports.getUrlParams = getUrlParams;
 
 var addZero = function addZero(num) {
   return String(num).length === 1 ? "0" + String(num) : String(num);
@@ -954,16 +938,16 @@ var pxToRem = function pxToRem(styleObj) {
     if (styleObj.hasOwnProperty(key)) {
       var value = styleObj[key];
 
-      if ((key === 'padding' || key === 'margin' || key === 'borderRadius') && typeof value === 'string') {
-        var values = value.split(' ');
-        var remValues = values.map(function (value) {
-          return value.endsWith('px') ? convertToRem(value) : value;
-        });
-        remObj[key] = remValues.join(' ');
-      } else if (typeof value === 'string' && value.endsWith('px')) {
+      if (typeof value === 'string' && value.endsWith('px')) {
         remObj[key] = convertToRem(value.split('px')[0]);
       } else if (typeof value === 'number') {
         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) {
+          return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
+        });
+        remObj[key] = remPaddingValues.join(' ');
       } else {
         remObj[key] = value;
       }

package/lib/utils/coreUtil.js

@@ -335,9 +335,7 @@ var clickUrl = function clickUrl(url, state) {
     return;
   }
 
-  console.log('sendToApp', data);
-
-  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp || (0, _androidUtil.browserVersion)().isDelivistaApp) {
+  if ((0, _androidUtil.browserVersion)().isAshitaApp || (0, _androidUtil.browserVersion)().flutterApp) {
     (0, _androidUtil.sendToApp)(data);
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
     // 跳转链接是个绝对路径

package/package.json

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

package/es/common/LinkModal/BizType/index.js

@@ -1,274 +0,0 @@
-"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"] = AffiliatePlatform;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _antd = require("antd4");
-
-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: 50,
-  pageIndex: 1
-};
-
-function AffiliatePlatform(props) {
-  var _this = this;
-
-  var _onChange = props.onChange,
-      _fetch = props._fetch;
-
-  var _a = (0, _react.useState)([]),
-      list = _a[0],
-      setList = _a[1];
-
-  var _b = (0, _react.useState)(false),
-      loading = _b[0],
-      setLoading = _b[1];
-
-  var queryBizType = function queryBizType(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*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/biztype/list", params, 'GET')];
-
-          case 1:
-            res = _a.sent();
-            paginationParams.total = 50;
-            setList(res || []);
-            setLoading(false);
-            return [2
-            /*return*/
-            ];
-        }
-      });
-    });
-  };
-
-  (0, _react.useEffect)(function () {
-    queryBizType(paginationParams);
-  }, []);
-  var columns = [{
-    title: (0, _locale.i18n)('NAME'),
-    dataIndex: 'bizTypeName'
-  }, {
-    title: (0, _locale.i18n)('LOGO'),
-    dataIndex: 'logo',
-    render: function render(val) {
-      return /*#__PURE__*/_react["default"].createElement("img", {
-        alt: "",
-        src: (val === null || val === void 0 ? void 0 : val.url) || '',
-        style: {
-          maxWidth: '50px',
-          maxHeight: '50px'
-        }
-      });
-    }
-  }];
-  var rowSelection = {
-    onChange: function onChange(selectedRowKeys, selectedRow) {
-      _onChange({
-        value: selectedRow[0].storeBizTypeId,
-        name: selectedRow[0].bizTypeName
-      });
-    },
-    type: 'radio'
-  };
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      height: 450
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
-    bordered: false,
-    columns: columns,
-    dataSource: list,
-    defaultExpandAllRows: true,
-    loading: loading,
-    pagination: __assign(__assign({}, paginationParams), {
-      onChange: function onChange(page) {
-        paginationParams.pageIndex = page;
-        queryBizType(paginationParams);
-      },
-      showSizeChanger: false
-    }),
-    rowKey: "storeBizTypeId",
-    rowSelection: rowSelection,
-    scroll: {
-      y: 350
-    }
-  }));
-}

package/es/composite-comp/ashita/components/WalletAshita/index.js

@@ -1,84 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _mobile = _interopRequireDefault(require("./mobile"));
-
-var _defaultJSON = require("./defaultJSON");
-
-var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
-
-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; }
-
-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); }
-
-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 __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
-  var c = arguments.length,
-      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
-      d;
-  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
-    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  }
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-
-var Wallet =
-/** @class */
-function (_super) {
-  __extends(Wallet, _super);
-
-  function Wallet() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-
-  Wallet.prototype.render = function () {
-    var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
-      data: nodeData
-    }));
-  };
-
-  Wallet.defaultProps = {};
-  Wallet.type = 'WALLET_ASHITA';
-  Wallet.getDefaultJSON = _defaultJSON.getDefaultJSON;
-  Wallet = __decorate([_compositeDecorator["default"]], Wallet);
-  return Wallet;
-}(_react.Component);
-
-var _default = Wallet;
-exports["default"] = _default;

package/es/composite-comp/public/components/Location/defaultJSON.js

@@ -1,104 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDefaultJSON = void 0;
-
-var _uuid = require("uuid");
-
-var _constants = require("../../../../constants");
-
-var getDefaultJSON = function getDefaultJSON() {
-  var _a;
-
-  var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
-  var groupId = (0, _uuid.v4)();
-  return {
-    id: groupId,
-    type: 'LOCATION',
-    content: {
-      logo: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        color: '#8C52FF'
-      },
-      address: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        type: 'TEXT',
-        specialContent: [],
-        text: '',
-        content: {
-          sizeType: 'Customize font styles',
-          fontFamily: defaultFontFamily,
-          fontWeight: 600,
-          fontSize: 14,
-          color: '#000',
-          urlDisabled: true
-        },
-        underline: {
-          open: false,
-          textDecorationColor: '',
-          textDecorationStyle: 'solid'
-        },
-        vertical: {
-          open: false,
-          lineHeight: 18
-        }
-      },
-      customer: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        type: 'TEXT',
-        specialContent: [],
-        text: '',
-        content: {
-          sizeType: 'Customize font styles',
-          fontFamily: defaultFontFamily,
-          fontWeight: 400,
-          fontSize: 12,
-          color: '#848484',
-          urlDisabled: true
-        },
-        underline: {
-          open: false,
-          textDecorationColor: '',
-          textDecorationStyle: 'solid'
-        },
-        vertical: {
-          open: false,
-          lineHeight: 18
-        }
-      },
-      arrowIcon: {
-        id: (0, _uuid.v4)(),
-        open: true,
-        color: '#545454'
-      },
-      locationBg: {
-        open: true,
-        color: '#F2F2F2'
-      }
-    },
-    spacing: {
-      mobile: {
-        paddingTop: 0,
-        paddingBottom: 0,
-        paddingLeft: 0,
-        paddingRight: 0
-      }
-    },
-    customize: {
-      layout: 'layout1'
-    },
-    background: {
-      opacity: 100,
-      color: '#fff',
-      image: '',
-      bgType: 'color'
-    }
-  };
-};
-
-exports.getDefaultJSON = getDefaultJSON;