@fonixtree/magic-design 0.1.7 → 0.1.8

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

@@ -315,7 +315,10 @@ var BundleCampaign = function BundleCampaign(props) {
       width: '100%'
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
-    span: 12
+    span: 12,
+    style: {
+      display: 'flex'
+    }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign Name"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
@@ -323,9 +326,13 @@ var BundleCampaign = function BundleCampaign(props) {
     onChange: function onChange(e) {
       setCampaignName(e.target.value);
     },
+    size: "small",
     value: campaignName
   })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
-    span: 12
+    span: 12,
+    style: {
+      display: 'flex'
+    }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Store"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
@@ -336,6 +343,7 @@ var BundleCampaign = function BundleCampaign(props) {
     optionFilterProp: "children",
     placeholder: "Please select",
     showSearch: true,
+    size: "small",
     value: storeId
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
@@ -348,13 +356,17 @@ var BundleCampaign = function BundleCampaign(props) {
       width: '100%'
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
-    span: 12
+    span: 12,
+    style: {
+      display: 'flex'
+    }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign State"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
     className: "inputStyle",
     defaultValue: "A,B",
     onChange: changeCamState,
+    size: "small",
     value: cmpState
   }, stateMap && stateMap.length > 0 && stateMap.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
@@ -362,9 +374,13 @@ var BundleCampaign = function BundleCampaign(props) {
       value: v.key
     }, v.value);
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
-    span: 12
+    span: 12,
+    style: {
+      paddingLeft: '120px'
+    }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: queryFunc,
+    size: "small",
     style: {
       marginRight: 10
     },
@@ -372,7 +388,8 @@ var BundleCampaign = function BundleCampaign(props) {
   }, "Query"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       reset();
-    }
+    },
+    size: "small"
   }, "Cancel"))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,

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

@@ -1,15 +1,17 @@
 .bundleCampaign{
-    padding-top: 12px;
-    border-top: 1px solid #f0f0f0;
-
+    // padding-top: 12px;
+    // border-top: 1px solid #f0f0f0;
+    height: 550px;
     .inputStyle {
-        width: 320px;
+        width: 280px;
         height: 32px;
         margin-left: 10px;
       }
     .labelStyle {
         display: inline-block;
         width: 110px;
+        text-align: right;
+        line-height: 2;
     }
     .mb12 {
         margin-bottom: 12px;

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

@@ -211,12 +211,19 @@ function CatgTable(props) {
     }
   }];
   var rowSelection = {
-    onChange: function onChange(selectedRowKeys) {
-      _onChange("catg-" + selectedRowKeys[0]);
+    onChange: function onChange(selectedRowKeys, selectedRow) {
+      _onChange({
+        value: selectedRowKeys[0],
+        name: selectedRow[0].catgName
+      });
     },
     type: 'radio'
   };
-  return /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
     dataSource: catgList,
@@ -230,5 +237,5 @@ function CatgTable(props) {
     scroll: {
       y: 480
     }
-  });
+  }));
 }

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

@@ -229,7 +229,10 @@ function CouponTable(props) {
   var rowSelection = {
     type: 'radio',
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange("coupons-" + selectedRows[0].couponId);
+      _onChange({
+        name: selectedRows[0].couponName,
+        value: selectedRows[0].couponId
+      });
     }
   };
 
@@ -283,7 +286,9 @@ function CouponTable(props) {
     loadCouponsList();
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "coupons_modal"
+    style: {
+      height: 550
+    }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: data,

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

@@ -202,7 +202,7 @@ function CustomTable(props) {
       verType: 'Formal',
       configVersion: 'V2',
       state: 'Using',
-      siteId: window.magicDesign.siteId
+      siteId: window.magicDesign.siteId || 1
     });
   }, []);
   var columns = [{
@@ -211,11 +211,18 @@ function CustomTable(props) {
   }];
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
+      _onChange({
+        value: selectedRows[0].pageCode || selectedRows[0].bdPageId,
+        name: selectedRows[0].pageName
+      });
     },
     type: 'radio'
   };
-  return /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
     dataSource: cusPageList,
@@ -226,5 +233,5 @@ function CustomTable(props) {
     scroll: {
       y: 480
     }
-  });
+  }));
 }

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

@@ -570,6 +570,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
     optionFilterProp: "children",
     placeholder: "Please select",
     showSearch: true,
+    size: "small",
     value: storeId
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
@@ -658,7 +659,10 @@ var FilteredProductModal = function FilteredProductModal(props) {
       paginationParams.current = 1;
       loadGoods().then(function (res) {
         if (res.total !== 0) {
-          onDataChange("filter-" + res.url, res.total);
+          onDataChange({
+            value: res.url,
+            name: res.url
+          }, res.total);
         } else {
           onDataChange('', res.total); // message.warn('no goods!');
         }

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

@@ -1,4 +1,5 @@
 .mFilteredProductModal {
+  height: 550px;
   .proModalWrap {
     .info {
       background: #ecf1fd;

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

@@ -180,7 +180,10 @@ function FunctionTable(props) {
   var rowSelection = {
     type: 'radio',
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange(selectedRows[0].url);
+      _onChange({
+        name: selectedRows[0].urlName,
+        value: selectedRows[0].url
+      });
     }
   };
 
@@ -210,7 +213,11 @@ function FunctionTable(props) {
   (0, _react.useEffect)(function () {
     qryFunctions();
   }, []);
-  return /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: functions,
     loading: loading,
@@ -220,5 +227,5 @@ function FunctionTable(props) {
     scroll: {
       y: 480
     }
-  });
+  }));
 }

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

@@ -196,7 +196,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 var Option = _antd.Select.Option;
 
 var ProductDetailPage = function ProductDetailPage(props) {
-  var setUrl = props.setUrl;
+  var _onChange = props.onChange;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -265,8 +265,11 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }];
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      setUrl("proDetail-" + selectedRows[0].offerId + "-" + selectedRows[0].productId);
-      console.log("selectedRowKeys: " + selectedRowKeys, 'selectedRows: ', selectedRows);
+      _onChange({
+        offerId: selectedRows[0].offerId,
+        productId: selectedRows[0].productId,
+        name: selectedRows[0].productName
+      });
     },
     type: 'radio'
   };

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

@@ -1,7 +1,5 @@
 .productDetailPage {
-  width: 100%;
-  padding-top: 12px;
-  border-top: 1px solid #f0f0f0;
+  height: 550px;
   .prodImage {
     width: 36px;
     height: 36px;

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

@@ -69,9 +69,15 @@ function (_super) {
     _this.onFieldChange = function (data) {
       _extends(_this.videoSetting, data);
 
+      console.log(data);
+
       _this.setState({});
 
-      _this.props.setUrl('video-' + JSON.stringify(_this.videoSetting));
+      _this.props.setUrl({
+        value: JSON.stringify(_this.videoSetting),
+        name: data.name || 'Video'
+      }); // this.props.setUrl('video-' + JSON.stringify(this.videoSetting));
+
     };
 
     return _this;
@@ -124,9 +130,10 @@ function (_super) {
       size: "20px",
       type: "icon-delete1"
     })))), this.videoSetting.sourceType === 'Upload' && /*#__PURE__*/_react["default"].createElement(_VideoUpload["default"], {
-      onChange: function onChange(v) {
+      onChange: function onChange(v, n) {
         _this.onFieldChange({
-          sourceUrl: v
+          sourceUrl: v,
+          name: n
         });
       },
       value: this.videoSetting.sourceUrl

package/es/common/LinkModal/SelectVideoModal/index.less

@@ -1,8 +1,8 @@
 .SelectVideoModal-container {
   display: flex;
-  padding: 20px 80px;
-  border-top: 1px solid #f0f0f0;
-
+  // padding: 20px 80px;
+  // border-top: 1px solid #f0f0f0;
+  height: 550px;
   .video-left-wrap {
     display: flex;
     flex-direction: column;

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = ShareUrl;
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./index.less");
+
+var _antd = require("antd");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function ShareUrl(_a) {
+  var onChange = _a.onChange;
+
+  var onChangeUrl = function onChangeUrl(e) {
+    onChange({
+      value: e.target.value,
+      name: e.target.value
+    });
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "shareWrap"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "label"
+  }, "Share Url"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    onChange: onChangeUrl
+  }));
+}

package/es/common/LinkModal/ShareUrl/index.less

@@ -0,0 +1,3 @@
+.shareWrap {
+  height: 550px;
+}

package/es/common/LinkModal/index.js

@@ -27,6 +27,8 @@ var _BundleCampaign = _interopRequireDefault(require("./BundleCampaign"));
 
 var _SelectVideoModal = _interopRequireDefault(require("./SelectVideoModal"));
 
+var _ShareUrl = _interopRequireDefault(require("./ShareUrl"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -39,6 +41,22 @@ 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; }
 
+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) {
@@ -182,20 +200,6 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
-  for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
-    s += arguments[i].length;
-  }
-
-  for (var r = Array(s), k = 0, i = 0; i < il; i++) {
-    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
-      r[k] = a[j];
-    }
-  }
-
-  return r;
-};
-
 var LinkModal = function LinkModal(props) {
   var onConfirm = props.onConfirm,
       onClose = props.onClose,
@@ -205,10 +209,9 @@ var LinkModal = function LinkModal(props) {
       linkUrl = _a[0],
       setLinkUrl = _a[1];
 
-  var _b = (0, _react.useState)(''),
+  var _b = (0, _react.useState)('Category'),
       selected = _b[0],
-      setSelected = _b[1]; // const list = ['Category', 'Customized Page', 'Product Details Page', 'Filtered Products', 'Function Page', 'Coupons', 'Bundle Campaign', 'Video'];
-
+      setSelected = _b[1];
 
   var _c = (0, _react.useState)([]),
       linkTypes = _c[0],
@@ -230,12 +233,7 @@ var LinkModal = function LinkModal(props) {
 
           case 1:
             types = _a.sent();
-            setLinkTypes(__spreadArrays(types, [{
-              comments: 'Video',
-              linkTypeCode: 'Video',
-              linkTypeName: 'Video',
-              seq: 7
-            }]));
+            setLinkTypes(types);
             setSelected(types[0].linkTypeCode);
             return [2
             /*return*/
@@ -252,9 +250,11 @@ var LinkModal = function LinkModal(props) {
     setTotal(0);
   }, [visible]);
 
-  var onModalSava = function onModalSava() {
+  var onModalSave = function onModalSave() {
     if (onConfirm) {
-      onConfirm(linkUrl);
+      onConfirm(__assign(__assign({}, linkUrl), {
+        type: selected
+      }));
     }
 
     if (onClose) {
@@ -262,69 +262,69 @@ var LinkModal = function LinkModal(props) {
     }
   };
 
+  var onTabsChange = function onTabsChange(type) {
+    setSelected(type);
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
     cancelText: (0, _locale.i18n)('CANCEL'),
     draggable: false,
     footer: null,
     okText: "OK",
-    onCancel: onClose,
-    onOk: onConfirm,
+    onCancel: onClose // onOk={onConfirm}
+    ,
     title: (0, _locale.i18n)('URL_SETUP'),
     visible: visible,
-    width: "1000",
+    width: "900px",
     wrapClassName: "linkModal"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "urlModalWrap"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "linkType"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "typeTitle"
-  }, (0, _locale.i18n)('LINK_TYPE'), ":"), linkTypes.map(function (item, index) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      key: index,
-      className: "typeItem " + (selected === item.linkTypeCode ? 'selected' : ''),
-      onClick: function onClick() {
-        return setSelected(item.linkTypeCode);
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
+    activeKey: selected,
+    onChange: onTabsChange
+  }, linkTypes.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_antd.Tabs.TabPane, {
+      key: item.linkTypeCode,
+      tab: item.linkTypeName
+    }, item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
       }
-    }, item.linkTypeName);
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "content"
-  }, selected === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
-    onChange: function onChange(value) {
-      return setLinkUrl(value);
-    }
-  }), selected === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
-    onChange: function onChange(value) {
-      return setLinkUrl(value);
-    }
-  }), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
-    setUrl: function setUrl(url) {
-      return setLinkUrl(url);
-    }
-  }), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
-    onDataChange: function onDataChange(url, t) {
-      setLinkUrl(url);
-      setTotal(t);
-    }
-  }), selected === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
-    onChange: function onChange(value) {
-      return setLinkUrl(value);
-    }
-  }), selected === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
-    onChange: function onChange(value) {
-      return setLinkUrl(value);
-    }
-  }), selected === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
-    setUrl: function setUrl(url) {
-      return setLinkUrl(url);
-    }
-  }), selected === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
-    setUrl: function setUrl(url) {
-      return setLinkUrl(url);
-    }
+    }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+      onChange: function onChange(url) {
+        return setLinkUrl(url);
+      }
+    }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+      onDataChange: function onDataChange(url, t) {
+        setLinkUrl(url);
+        setTotal(t);
+      }
+    }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
+      setUrl: function setUrl(value) {
+        return setLinkUrl(value);
+      }
+    }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
+    }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
-  }, selected === 'Filtered Products' ? /*#__PURE__*/_react["default"].createElement("div", {
+  }, selected === 'FilteredProduct' ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "total"
   }, total, " Products In Total") : /*#__PURE__*/_react["default"].createElement("div", null), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     className: "btn-cancel",
@@ -333,9 +333,9 @@ var LinkModal = function LinkModal(props) {
     }
   }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     className: "btn-confirm",
-    onClick: onModalSava,
+    onClick: onModalSave,
     type: "primary"
-  }, (0, _locale.i18n)('OK'))))));
+  }, (0, _locale.i18n)('OK')))));
 };
 
 var _default = LinkModal;