@fonixtree/magic-design 2.0.73 → 2.0.75

package/lib/common/UrlPicker/AnchorModal/index.js

@@ -0,0 +1,170 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _locale = require("../../../locale");
+
+var _mobx = require("../../../mobx");
+
+var _constants = require("../../../constants");
+
+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 __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 AnchorModal =
+/** @class */
+function (_super) {
+  __extends(AnchorModal, _super);
+
+  function AnchorModal() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      selectedValue: ''
+    };
+
+    _this.onAnchorChange = function (e) {
+      var selectedAnchor = _mobx.store.MPageData.find(function (m) {
+        return m.id === e.target.value;
+      });
+
+      console.log('store.MPageData: ', JSON.parse(JSON.stringify(_mobx.store.MPageData)));
+
+      _this.setState({
+        selectedValue: selectedAnchor.id
+      });
+    };
+
+    _this.onOk = function () {
+      var initData = _this.props.initData;
+      var selectedValue = _this.state.selectedValue;
+
+      var selectedAnchorIndex = _mobx.store.MPageData.findIndex(function (m) {
+        return m.id === selectedValue;
+      });
+
+      var selectedAnchor = _mobx.store.MPageData[selectedAnchorIndex];
+
+      var value = __assign({}, initData.value);
+
+      if (selectedAnchor.activeTerminal === 'ALL') {
+        value.pcNodeId = selectedAnchor.id;
+        value.mobileNodeId = selectedAnchor.id;
+      } else if (selectedAnchor.activeTerminal === 'MOBILE') {
+        value.mobileNodeId = selectedAnchor.id;
+      } else if (selectedAnchor.activeTerminal === 'PC') {
+        value.pcNodeId = selectedAnchor.id;
+      }
+
+      var data = {
+        type: _constants.urlTypeMap.ANCHOR,
+        value: value
+      };
+
+      _this.props.onConfirm(data);
+    };
+
+    return _this;
+  }
+
+  AnchorModal.prototype.render = function () {
+    var _a = this.props,
+        visible = _a.visible,
+        onClose = _a.onClose;
+    var selectedValue = this.state.selectedValue;
+    return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+      cancelText: (0, _locale.i18n)('CANCEL'),
+      draggable: false,
+      footer: null,
+      okText: "OK",
+      onCancel: onClose,
+      title: (0, _locale.i18n)('ANCHOR'),
+      visible: visible,
+      width: "400px",
+      wrapClassName: "magicAnchorModal"
+    }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
+      onChange: this.onAnchorChange,
+      value: selectedValue
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Space, {
+      direction: "vertical"
+    }, _mobx.store.MPageData.map(function (page, i) {
+      var _a;
+
+      return /*#__PURE__*/_react["default"].createElement(_antd.Radio, {
+        value: page.id
+      }, i + 1, "\u3001", (_a = _constants.compInfoMap[page.type]) === null || _a === void 0 ? void 0 : _a.name);
+    })))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "footer"
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+      className: "btn-cancel",
+      onClick: function onClick() {
+        return onClose && onClose();
+      }
+    }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+      className: "btn-confirm",
+      onClick: this.onOk,
+      type: "primary"
+    }, (0, _locale.i18n)('OK'))));
+  };
+
+  AnchorModal.defaultProps = {
+    visible: false,
+    onClose: function onClose() {},
+    onConfirm: function onConfirm() {},
+    initData: null
+  };
+  return AnchorModal;
+}(_react["default"].Component);
+
+var _default = AnchorModal;
+exports["default"] = _default;

package/lib/common/UrlPicker/AnchorModal/index.less

@@ -0,0 +1,21 @@
+.magicAnchorModal {
+
+
+  .footer {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    padding-top: 20px;
+
+    .btn-cancel {
+      margin-right: 12px;
+    }
+
+    .btn-confirm {
+      background: #2F54EB;
+      border: none;
+      border-radius: 6px;
+      // margin-left: 20px;
+    }
+  }
+}

package/lib/common/UrlPicker/index.js

@@ -7,16 +7,24 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-require("./index.less");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _AnchorModal = _interopRequireDefault(require("./AnchorModal"));
+
+var _coreUtil = require("../../utils/coreUtil");
+
 var _locale = require("../../locale");
 
 var _LinkModal = _interopRequireDefault(require("../LinkModal"));
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
+var _constants = require("../../constants");
+
+var _mobx = require("../../mobx");
+
+require("./index.less");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -44,6 +52,8 @@ var __extends = void 0 && (void 0).__extends || function () {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
   };
 }();
+/* eslint-disable max-len */
+
 
 var UrlPicker =
 /** @class */
@@ -54,7 +64,8 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      visible: false
+      visible: false,
+      anchorModalVisible: false
     };
     return _this;
   }
@@ -62,14 +73,29 @@ function (_super) {
   UrlPicker.prototype.render = function () {
     var _this = this;
 
-    var visible = this.state.visible;
-    var _a = this.props,
-        value = _a.value,
-        _onChange = _a.onChange,
-        disabled = _a.disabled,
-        onlySpecificCode = _a.onlySpecificCode; // 弹框选择url不可编辑，需要先清除
+    var _a;
+
+    var _b = this.state,
+        visible = _b.visible,
+        anchorModalVisible = _b.anchorModalVisible;
+    var _c = this.props,
+        value = _c.value,
+        _onChange = _c.onChange,
+        disabled = _c.disabled,
+        onlySpecificCode = _c.onlySpecificCode; // 弹框选择url不可编辑，需要先清除
 
     var editable = !value || !value.type;
+    var inputName = (value === null || value === void 0 ? void 0 : value.name) || '';
+
+    if ((value === null || value === void 0 ? void 0 : value.type) === _constants.urlTypeMap.ANCHOR) {
+      var selectedAnchorIndex = _mobx.store.MPageData.findIndex(function (m) {
+        return m.id === ((0, _coreUtil.isPc)() ? value.value.pcNodeId : value.value.mobileNodeId);
+      });
+
+      var selectedAnchor = _mobx.store.MPageData[selectedAnchorIndex];
+      inputName = selectedAnchorIndex + 1 + "\u3001" + ((_a = _constants.compInfoMap[selectedAnchor.type]) === null || _a === void 0 ? void 0 : _a.name);
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-url-picker"
     }, disabled && /*#__PURE__*/_react["default"].createElement("div", {
@@ -88,10 +114,19 @@ function (_super) {
       },
       placeholder: (0, _locale.i18n)('PLEASE_ADD_A_LINK'),
       type: "text",
-      value: value.name || ''
+      value: inputName
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "icon-btns"
-    }, window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#000",
+      onClick: function onClick() {
+        return _this.setState({
+          anchorModalVisible: true
+        });
+      },
+      size: "20px",
+      type: "icon-anchor"
+    }), window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: "#000",
       onClick: function onClick() {
         return _this.setState({
@@ -122,6 +157,21 @@ function (_super) {
       },
       onlySpecificCode: onlySpecificCode,
       visible: visible
+    }), anchorModalVisible && /*#__PURE__*/_react["default"].createElement(_AnchorModal["default"], {
+      initData: value,
+      onClose: function onClose() {
+        return _this.setState({
+          anchorModalVisible: false
+        });
+      },
+      onConfirm: function onConfirm(value) {
+        _onChange(value);
+
+        _this.setState({
+          anchorModalVisible: false
+        });
+      },
+      visible: anchorModalVisible
     }));
   };
 

package/lib/composite-comp/bol/components/Wallet/mobile/index.js

@@ -290,7 +290,7 @@ function (_super) {
                   show: true
                 }, _b[_constants.walletType.CENDUIT] = {
                   amount: userPoint === null ? '****' : userPoint,
-                  btnText: userPoint ? 'Cenduit Mall' : '',
+                  btnText: userPoint ? 'CenDuit Mall' : '',
                   show: true
                 }, _b)
               }, function () {

package/lib/composite-comp/bol/second-config-panels/WalletSecondConfig/index.js

@@ -136,7 +136,7 @@ function (_super) {
         value: _constants.walletType.B2B
       }, (0, _locale.i18n)('B2B PayLater')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _constants.walletType.CENDUIT
-      }, (0, _locale.i18n)('Cenduit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      }, (0, _locale.i18n)('CenDuit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _constants.walletType.BNPL
       }, (0, _locale.i18n)('BNPL')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _constants.walletType.CREDIT

package/lib/composite-comp/dito/components/Recommend/mobile/index.js

@@ -389,7 +389,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

package/lib/composite-comp/dito/components/Recommend/pc/index.js

@@ -381,7 +381,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

package/lib/constants/index.js

@@ -42,7 +42,7 @@ var walletType = {
   BNPL: 'BNPL',
   B2B: 'B2B PayLater',
   BALANCE: 'Balance',
-  CENDUIT: 'Cenduit'
+  CENDUIT: 'CenDuit'
 };
 exports.walletType = walletType;
 var urlType = {
@@ -68,7 +68,8 @@ var urlTypeMap = {
   SHARE_URL: 'ShareURL',
   MINI_APP: 'MiniApp',
   STORE: 'Store',
-  AFFILIATE_PRODUCT: 'AffiliateProduct'
+  AFFILIATE_PRODUCT: 'AffiliateProduct',
+  ANCHOR: 'Anchor'
 };
 exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {

package/lib/core/Designer/QuickMenuBar/index.js

@@ -208,7 +208,7 @@ function (_super) {
       onClick: this.onBtnClick,
       tip: "The page is in use. Please copy or create a new page",
       type: "primary"
-    }, (0, _locale.i18n)('PUBLISH_NOW'), /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+    }, (0, _locale.i18n)('PUBLISH_NOW'), window.magicDesign.templateType === 'Page' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
       getPopupContainer: function getPopupContainer() {
         return document.querySelector('.publish_wrap');
       },

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",

package/lib/locale/id/id.json

@@ -1,4 +1,5 @@
 {
+  "ANCHOR": "Anchor",
   "PUSH": "Push",
   "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",

package/lib/utils/businessUtil.js

@@ -31,7 +31,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       productId = urlObj.productId;
 
   switch (type) {
+    // 锚点跳转
+    case _constants.urlTypeMap.ANCHOR:
+      params = {
+        action: 'operation',
+        params: {
+          type: 'ANCHOR',
+          data: value
+        }
+      };
+      break;
     // 商品详情
+
     case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
       if (offerId) {
         link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
@@ -87,7 +98,7 @@ var newParseUrl = function newParseUrl(urlObj) {
     // 商品列表
 
     case _constants.urlTypeMap.FILTERED_PRODUCT:
-      link = "/product/list?" + value;
+      link = "/product/list/?" + value;
       params = {
         action: 'jump',
         params: {
@@ -261,7 +272,7 @@ var parseUrl = function parseUrl(url) {
     // 商品列表
 
     case _constants.urlType.PROD_FILTER:
-      link = "/product/list?" + arg1;
+      link = "/product/list/?" + arg1;
       params = {
         action: 'jump',
         params: {

package/lib/utils/coreUtil.js

@@ -326,6 +326,17 @@ var clickUrl = function clickUrl(url) {
       url: params.link
     }
   });
+  /** 锚点跳转 */
+
+  if (params.type === 'ANCHOR') {
+    (0, _commonUtil.ensure)(function () {
+      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
+      document.querySelector("#node-" + nodeId).scrollIntoView({
+        behavior: 'smooth'
+      });
+    });
+    return;
+  }
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);

package/package.json

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