@fonixtree/magic-design 2.0.74 → 2.0.75

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

@@ -179,7 +179,7 @@ var BundleCampaign = function BundleCampaign(props) {
       campaignName = _b[0],
       setCampaignName = _b[1];
 
-  var _c = (0, _react.useState)(window.magicDesign.storeId ? window.magicDesign.storeId : ''),
+  var _c = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
       storeId = _c[0],
       setStoreId = _c[1];
 
@@ -241,7 +241,7 @@ var BundleCampaign = function BundleCampaign(props) {
 
   var reset = function reset() {
     setCampaignName('');
-    setStoreId(window.magicDesign.storeId ? window.magicDesign.storeId : '');
+    setStoreId(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : '');
     setCmpState('A,B');
   };
 

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

@@ -257,7 +257,7 @@ function CouponTable(props) {
               state: 'A',
               couponLocation: 'Promotion',
               pageTotal: false,
-              storeId: window.magicDesign.storeId ? window.magicDesign.storeId : ''
+              storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
             });
             return [4
             /*yield*/

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

@@ -213,7 +213,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       labelData = _f[0],
       setLabelData = _f[1];
 
-  var _g = (0, _react.useState)(window.magicDesign.storeId || ''),
+  var _g = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
       storeId = _g[0],
       setStoreId = _g[1];
 
@@ -277,7 +277,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
     settVal([]);
     settBrandId([]);
     settLabelId({});
-    setStoreId(window.magicDesign.storeId || '');
+    setStoreId(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : '');
     setProductName('');
     setMinimum('');
     setMaximum('');

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

@@ -17,8 +17,6 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _businessUtil = require("../../../utils/businessUtil");
 
-var _ProductModal = require("../../ProductModal");
-
 require("./index.less");
 
 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); }
@@ -187,7 +185,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 var Option = _antd.Select.Option;
 
 var ProductDetailPage = function ProductDetailPage(props) {
-  var _onChange = props.onChange;
+  var onChange = props.onChange;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -225,13 +223,21 @@ var ProductDetailPage = function ProductDetailPage(props) {
       proType = _j[0],
       setProType = _j[1];
 
-  var _k = (0, _react.useState)({
+  var _k = (0, _react.useState)(false),
+      flag = _k[0],
+      setFlag = _k[1];
+
+  var _l = (0, _react.useState)({}),
+      selectedPro = _l[0],
+      setSelectedPro = _l[1];
+
+  var _m = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _k[0],
-      setPaginationParams = _k[1];
+      paginationParams = _m[0],
+      setPaginationParams = _m[1];
 
   var columns = [{
     title: 'Image',
@@ -260,12 +266,14 @@ var ProductDetailPage = function ProductDetailPage(props) {
     ellipsis: true
   }];
   var rowSelection = {
+    selectedRowKeys: [(selectedPro === null || selectedPro === void 0 ? void 0 : selectedPro.productId) || ''],
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange({
+      var selected = {
         offerId: selectedRows[0].offerId,
         productId: selectedRows[0].productId,
         name: selectedRows[0].productName
-      });
+      };
+      setSelectedPro(selected);
     },
     type: 'radio'
   };
@@ -303,11 +311,11 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
           case 1:
             res_1 = _a.sent();
-            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+            _list = (0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
                 return __assign(__assign({}, m.products[0]), m);
               });
-            }, []), proType);
+            }, []);
             total = res_1.total;
             return [3
             /*break*/
@@ -317,12 +325,13 @@ var ProductDetailPage = function ProductDetailPage(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
           case 3:
             res = _a.sent();
-            _list = (0, _ProductModal.formatData)(res.list || []);
+            _list = res.list || [];
             total = res.total;
             _a.label = 4;
 
@@ -407,11 +416,19 @@ var ProductDetailPage = function ProductDetailPage(props) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    onChange(selectedPro);
+  }, [selectedPro]);
   (0, _react.useEffect)(function () {
     setLoading(true);
+    reset();
+    setSelectedPro({});
     paginationParams.current = 1;
-    queryGoods();
+    setFlag(!flag);
   }, [proType]);
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'
@@ -530,7 +547,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
       },
       showSizeChanger: false
     }),
-    rowKey: "id",
+    rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
       y: 300

package/lib/common/MagicLink/index.js

@@ -7,9 +7,9 @@ exports.onAClick = exports.getLinkUrl = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _businessUtil = require("src/components/utils/businessUtil");
+var _coreUtil = require("../../utils/coreUtil");
 
-var _coreUtil = require("src/components/utils/coreUtil");
+var _businessUtil = require("../../utils/businessUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/lib/common/ProductModal/index.js

@@ -302,17 +302,21 @@ var ProductModal = function ProductModal(props) {
       proType = _u[0],
       setProType = _u[1];
 
-  var _v = (0, _react.useState)(defaultList),
-      selectedList = _v[0],
-      setSelectedList = _v[1];
+  var _v = (0, _react.useState)(false),
+      flag = _v[0],
+      setFlag = _v[1];
 
-  var _w = (0, _react.useState)({
+  var _w = (0, _react.useState)(defaultList),
+      selectedList = _w[0],
+      setSelectedList = _w[1];
+
+  var _x = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _w[0],
-      setPaginationParams = _w[1];
+      paginationParams = _x[0],
+      setPaginationParams = _x[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -370,8 +374,7 @@ var ProductModal = function ProductModal(props) {
               brandIds: selBrandsList.join(','),
               labelIds: selLabelData.value || '',
               pageSize: paginationParams.pageSize,
-              pageIndex: paginationParams.current,
-              state: 'A'
+              pageIndex: paginationParams.current
             };
             if (!(proType === 'spu')) return [3
             /*break*/
@@ -402,6 +405,7 @@ var ProductModal = function ProductModal(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
@@ -513,6 +517,18 @@ var ProductModal = function ProductModal(props) {
     });
   };
 
+  var reset = function reset() {
+    setSelBrandsList([]);
+    setSelCatgsList([]);
+    setSelLabelData([]);
+    setProductName('');
+    setStoreId('');
+    setProductCode('');
+    setMinPrice('');
+    setMaxPrice('');
+    setPromotions(props.type === 'groupBuy' ? promType.GROUP_BUY : null);
+  };
+
   (0, _react.useEffect)(function () {
     queryOfferCatgs();
     queryBrands();
@@ -530,22 +546,13 @@ var ProductModal = function ProductModal(props) {
     }
   }, [visible]);
   (0, _react.useEffect)(function () {
+    reset();
     paginationParams.current = 1;
-    queryGoods();
+    setFlag(!flag);
   }, [proType]);
-
-  var reset = function reset() {
-    setSelBrandsList([]);
-    setSelCatgsList([]);
-    setSelLabelData([]);
-    setProductName('');
-    setStoreId('');
-    setProductCode('');
-    setMinPrice('');
-    setMaxPrice('');
-    setPromotions(props.type === 'groupBuy' ? promType.GROUP_BUY : null);
-  };
-
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var columns = [{
     title: (0, _locale.i18n)('IMAGE'),
     dataIndex: 'productImageUrl',

package/lib/common/ProductSource/index.js

@@ -238,7 +238,6 @@ function ProductSource(_a) {
             url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
               offers: value,
-              state: 'A',
               isDefaultCover: 'Y',
               onlyQryPublishSku: true,
               auditState: 'S',

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/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

@@ -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",