@fonixtree/magic-design 2.0.106 → 2.0.108

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

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 var _locale = require("../../../locale");
 
 var _currencyUtil = require("../../../utils/currencyUtil");
@@ -188,7 +186,8 @@ var paginationParams = {
 function AffiliateProductTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -213,7 +212,7 @@ function AffiliateProductTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list", __assign(__assign({}, params), {
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list", __assign(__assign({}, params), {
               state: 'Valid'
             }), 'GET')];
 

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

@@ -11,8 +11,6 @@ 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); }
@@ -186,7 +184,8 @@ var paginationParams = {
 function AffiliateStore(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       storeList = _a[0],
@@ -209,7 +208,7 @@ function AffiliateStore(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/affiliate/store/query/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/affiliate/store/query/page", params, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 var _businessUtil = require("../../../utils/businessUtil");
 
 var _dateUtil = require("../../../utils/dateUtil");
@@ -169,7 +167,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 var Option = _antd.Select.Option;
 
 var BundleCampaign = function BundleCampaign(props) {
-  var setUrl = props.setUrl;
+  var setUrl = props.setUrl,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       bundleList = _a[0],
@@ -253,7 +252,7 @@ var BundleCampaign = function BundleCampaign(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/bundle/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/bundle/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -286,7 +285,7 @@ var BundleCampaign = function BundleCampaign(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 var _businessUtil = require("../../../utils/businessUtil");
 
 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); }
@@ -165,7 +163,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 function CatgTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       catgList = _a[0],
@@ -184,7 +183,7 @@ function CatgTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -13,8 +13,6 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 var _currencyUtil = require("../../../utils/currencyUtil");
 
 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); }
@@ -198,7 +196,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 function CouponTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       data = _a[0],
@@ -261,7 +260,7 @@ function CouponTable(props) {
             });
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page", newParams, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page", newParams, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -11,8 +11,6 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 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; }
@@ -160,10 +158,12 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+// import { commonFetch } from '../../../utils/commonUtil';
 function CustomTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       cusPageList = _a[0],
@@ -182,7 +182,7 @@ function CustomTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/pages', params, 'GET')];
+            , _fetch('/designer/v1/pages', params, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -185,7 +185,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 };
 
 var FilteredProductModal = function FilteredProductModal(props) {
-  var onDataChange = props.onDataChange;
+  var onDataChange = props.onDataChange,
+      _fetch = props._fetch;
   var Option = _antd.Select.Option;
   var InputGroup = _antd.Input.Group;
 
@@ -335,7 +336,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/offercatgs/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -357,7 +358,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -379,7 +380,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -401,7 +402,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -451,7 +452,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
             };
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
+            , fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
 
           case 1:
             res = _a.sent();

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

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _antd = require("antd");
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 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; }
@@ -160,10 +158,12 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+// import { commonFetch } from '../../../utils/commonUtil';
 function FunctionTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       functions = _a[0],
@@ -197,7 +197,7 @@ function FunctionTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/pages/functions', {
+            , _fetch('/designer/v1/pages/functions', {
               partyType: window.magicDesign.partyType
             }, 'GET')];
 

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

@@ -11,8 +11,6 @@ var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _commonUtil = require("../../../utils/commonUtil");
-
 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; }
@@ -160,10 +158,12 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+// import { commonFetch } from '../../../utils/commonUtil';
 function CustomTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       miniAppList = _a[0],
@@ -182,7 +182,7 @@ function CustomTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/mini/app/list", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/mini/app/list", params, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -185,7 +185,8 @@ 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,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -301,7 +302,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
             , 2];
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
               offerCode: productCode,
               isDefaultCover: 'Y',
               onlyQryPublishSku: true,
@@ -324,7 +325,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 2:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
               state: 'A',
               productCode: productCode
             }), 'GET')];
@@ -358,7 +359,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list")];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/designer/resource/brand/list")];
 
           case 1:
             res = _a.sent();
@@ -380,7 +381,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

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

@@ -11,8 +11,6 @@ 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); }
@@ -186,7 +184,8 @@ var paginationParams = {
 function StoreTable(props) {
   var _this = this;
 
-  var _onChange = props.onChange;
+  var _onChange = props.onChange,
+      _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
       storeList = _a[0],
@@ -209,7 +208,7 @@ function StoreTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", __assign(__assign({}, params), {
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", __assign(__assign({}, params), {
               state: 'A'
             }), 'GET')];
 

package/es/common/LinkModal/index.js

@@ -53,6 +53,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -216,23 +218,28 @@ var LinkModal = function LinkModal(props) {
   var onConfirm = props.onConfirm,
       onClose = props.onClose,
       visible = props.visible,
-      onlySpecificCode = props.onlySpecificCode;
+      onlySpecificCode = props.onlySpecificCode,
+      selfFetch = props.selfFetch,
+      _a = props.modalConfig,
+      modalConfig = _a === void 0 ? {} : _a;
+
+  var _b = (0, _react.useState)(''),
+      linkUrl = _b[0],
+      setLinkUrl = _b[1];
 
-  var _a = (0, _react.useState)(''),
-      linkUrl = _a[0],
-      setLinkUrl = _a[1];
+  var _c = (0, _react.useState)('Category'),
+      selected = _c[0],
+      setSelected = _c[1];
 
-  var _b = (0, _react.useState)('Category'),
-      selected = _b[0],
-      setSelected = _b[1];
+  var _d = (0, _react.useState)([]),
+      linkTypes = _d[0],
+      setLinkTypes = _d[1];
 
-  var _c = (0, _react.useState)([]),
-      linkTypes = _c[0],
-      setLinkTypes = _c[1];
+  var _fetch = selfFetch || _commonUtil.commonFetch;
 
-  var _d = (0, _react.useState)(0),
-      total = _d[0],
-      setTotal = _d[1];
+  var _e = (0, _react.useState)(0),
+      total = _e[0],
+      setTotal = _e[1];
 
   var getLinkTypes = function getLinkTypes() {
     return __awaiter(void 0, void 0, void 0, function () {
@@ -242,7 +249,7 @@ var LinkModal = function LinkModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/linktypes', {
+            , _fetch('/designer/v1/linktypes', {
               partyType: window.magicDesign.partyType
             })];
 
@@ -295,18 +302,18 @@ var LinkModal = function LinkModal(props) {
     setSelected(type);
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({
     cancelText: (0, _locale.i18n)('CANCEL'),
     draggable: false,
     footer: null,
-    okText: "OK",
-    onCancel: onClose // onOk={onConfirm}
+    okText: "OK" // onOk={onConfirm}
     ,
+    onCancel: onClose,
     title: (0, _locale.i18n)('URL_SETUP'),
     visible: visible,
     width: "1000px",
     wrapClassName: "magicLinkModal"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
+  }, modalConfig), /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
     activeKey: selected,
     onChange: onTabsChange
   }, linkTypes.map(function (item) {
@@ -318,59 +325,73 @@ var LinkModal = function LinkModal(props) {
         setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+      _fetch: _fetch,
       onChange: function onChange(url) {
         return setLinkUrl(url);
       }
     }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+      _fetch: _fetch,
       onDataChange: function onDataChange(url, t) {
         setLinkUrl(url);
         setTotal(t);
       }
     }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
+      _fetch: _fetch,
       setUrl: function setUrl(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }

package/es/common/UrlPicker/index.js

@@ -82,7 +82,9 @@ function (_super) {
         value = _c.value,
         _onChange = _c.onChange,
         disabled = _c.disabled,
-        onlySpecificCode = _c.onlySpecificCode; // 弹框选择url不可编辑，需要先清除
+        onlySpecificCode = _c.onlySpecificCode,
+        selfFetch = _c.selfFetch,
+        modalConfig = _c.modalConfig; // 弹框选择url不可编辑，需要先清除
 
     var editable = !value || !value.type;
     var inputName = (value === null || value === void 0 ? void 0 : value.name) || '';
@@ -134,6 +136,7 @@ function (_super) {
       size: "20px",
       type: "icon-delete1"
     }))), visible && /*#__PURE__*/_react["default"].createElement(_LinkModal["default"], {
+      modalConfig: modalConfig,
       onClose: function onClose() {
         return _this.setState({
           visible: false
@@ -147,6 +150,7 @@ function (_super) {
         });
       },
       onlySpecificCode: onlySpecificCode,
+      selfFetch: selfFetch,
       visible: visible
     }), anchorModalVisible && /*#__PURE__*/_react["default"].createElement(_AnchorModal["default"], {
       initData: value,

package/es/composite-comp/common/components/MonpayProductItem/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.renderDiscount = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -84,6 +84,26 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
+var renderDiscount = function renderDiscount(data) {
+  var AMT = data.discountMethod === 'AMT'; // 金额扣减
+
+  var DISC = data.discountMethod === 'DISC'; // 百分比
+
+  var text = '';
+
+  if (AMT) {
+    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
+  } else if (DISC) {
+    var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
+
+    text = parseInt(temp, 10) + "%";
+  }
+
+  return text;
+};
+
+exports.renderDiscount = renderDiscount;
+
 var ProductItem =
 /** @class */
 function (_super) {
@@ -253,7 +273,18 @@ function (_super) {
         text: "Sold " + (soldNumber || 0) + "+"
       }),
       readonly: true
-    }))), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "coupons-list"
+    }, data.coupons.map(function (m) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: m.couponId,
+        className: (0, _classnames["default"])('item', m.discountMethod)
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name"
+      }, "DISCOUNT"), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "num"
+      }, renderDiscount(m)));
+    })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, ((_j = panelProps.salesProgress) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-container"