@fonixtree/magic-design 0.1.93 → 0.2.2

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

@@ -128,11 +128,10 @@ function (_super) {
       size: "20px",
       type: "icon-delete1"
     })))), this.videoSetting.sourceType === 'Upload' && /*#__PURE__*/_react["default"].createElement(_VideoUpload["default"], {
-      onChange: function onChange(v, n, id) {
+      onChange: function onChange(v, n) {
         _this.onFieldChange({
           sourceUrl: v,
-          name: n,
-          sourceId: id
+          name: n
         });
       },
       value: this.videoSetting.sourceUrl

package/lib/common/LinkModal/index.js

@@ -37,10 +37,6 @@ var _StoreCatgTable = _interopRequireDefault(require("./StoreCatgTable"));
 
 var _AffiliateProductTable = _interopRequireDefault(require("./AffiliateProductTable"));
 
-var _AffiliateStore = _interopRequireDefault(require("./AffiliateStore"));
-
-var _AffiliatePlatform = _interopRequireDefault(require("./AffiliatePlatform"));
-
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -236,7 +232,7 @@ var LinkModal = function LinkModal(props) {
 
   var getLinkTypes = function getLinkTypes() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var types, type_1;
+      var types, type;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -250,15 +246,12 @@ var LinkModal = function LinkModal(props) {
             types = _a.sent();
 
             if (onlySpecificCode) {
-              type_1 = [];
-              onlySpecificCode.forEach(function (code) {
-                type_1.push(types.find(function (item) {
-                  return item.linkTypeCode === code;
-                }));
+              type = types.filter(function (item) {
+                return item.linkTypeCode === onlySpecificCode;
               });
 
-              if (type_1.length > 0) {
-                types = type_1;
+              if (type.length > 0) {
+                types = type;
               }
             }
 
@@ -366,14 +359,6 @@ var LinkModal = function LinkModal(props) {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
-    }), item.linkTypeCode === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
-    }), item.linkTypeCode === 'AffiliatePlatform' && /*#__PURE__*/_react["default"].createElement(_AffiliatePlatform["default"], {
-      onChange: function onChange(value) {
-        return setLinkUrl(value);
-      }
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"

package/lib/common/MagicLink/index.js

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

package/lib/common/ProductModal/index.js

@@ -5,18 +5,18 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatData = exports["default"] = void 0;
+exports["default"] = void 0;
 
 var _antd = require("antd");
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _SortableImageList = _interopRequireDefault(require("./SortableImageList"));
-
 var _commonUtil = require("../../utils/commonUtil");
 
 var _businessUtil = require("../../utils/businessUtil");
 
+var _Iconfont = _interopRequireDefault(require("../Iconfont"));
+
 var _currencyUtil = require("../../utils/currencyUtil");
 
 require("./index.less");
@@ -204,26 +204,18 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   return r;
 };
 
-var promType = {
-  FLASH_SALE: '2',
-  GROUP_BUY: '4'
-};
-var proTypeOption = [{
-  label: 'SKU',
-  value: 'sku'
-}, {
-  label: 'SPU',
-  value: 'spu'
-}];
-
-var formatData = function formatData(list, type) {
+var formatData = function formatData(list) {
   list.map(function (item) {
-    item.id = type === 'spu' ? item.offerId : item.productId;
+    item.preSalesPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.salesPrice);
+    item.preMarketPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.marketPrice);
   });
   return list;
 };
 
-exports.formatData = formatData;
+var promType = {
+  FLASH_SALE: '2',
+  GROUP_BUY: '4'
+};
 var Option = _antd.Select.Option;
 var InputGroup = _antd.Input.Group;
 
@@ -231,12 +223,14 @@ var ProductModal = function ProductModal(props) {
   var handleModalSave = props.handleModalSave,
       closeModal = props.closeModal,
       visible = props.visible,
-      _a = props.prodType,
-      prodType = _a === void 0 ? 'sku' : _a,
-      _b = props.defaultList,
-      defaultList = _b === void 0 ? [] : _b,
-      _c = props.maxSelect,
-      maxSelect = _c === void 0 ? 20 : _c;
+      _a = props.defaultList,
+      defaultList = _a === void 0 ? [] : _a,
+      _b = props.maxSelect,
+      maxSelect = _b === void 0 ? 20 : _b;
+
+  var _c = (0, _react.useState)(defaultList),
+      selectedList = _c[0],
+      setSelectedList = _c[1];
 
   var _d = (0, _react.useState)([]),
       catgsList = _d[0],
@@ -298,35 +292,15 @@ var ProductModal = function ProductModal(props) {
       loading = _t[0],
       setLoading = _t[1];
 
-  var _u = (0, _react.useState)(prodType),
-      proType = _u[0],
-      setProType = _u[1];
-
-  var _v = (0, _react.useState)(false),
-      flag = _v[0],
-      setFlag = _v[1];
-
-  var _w = (0, _react.useState)(defaultList),
-      selectedList = _w[0],
-      setSelectedList = _w[1];
-
-  var _x = (0, _react.useState)(''),
-      dragId = _x[0],
-      setDragId = _x[1];
-
-  var _y = (0, _react.useState)({
-    pageSize: 20,
-    current: 1,
-    total: 0
-  }),
-      paginationParams = _y[0],
-      setPaginationParams = _y[1];
+  var _u = (0, _react.useState)(defaultList.map(function (v) {
+    return v.productId;
+  })),
+      selectedRowKeys = _u[0],
+      setSelectedRowKeys = _u[1];
 
   var rowSelection = {
-    selectedRowKeys: selectedList.map(function (v) {
-      return v.id;
-    }),
-    onSelect: function onSelect(record, selected) {
+    selectedRowKeys: selectedRowKeys,
+    onSelect: function onSelect(record, selected, selectedRows) {
       if (selected) {
         if (selectedList.length === maxSelect) {
           _antd.message.warning("Max " + maxSelect);
@@ -335,13 +309,17 @@ var ProductModal = function ProductModal(props) {
         }
 
         if (selectedList.length < maxSelect) {
-          setSelectedList(__spreadArrays(selectedList, [record]));
+          setSelectedList(__spreadArrays(selectedList, formatData([record])));
         }
       } else {
         setSelectedList(selectedList.filter(function (v) {
-          return v.id !== record.id;
+          return v.productId !== record.productId;
         }));
       }
+
+      setSelectedRowKeys(selectedRows.map(function (v) {
+        return v === null || v === void 0 ? void 0 : v.productId;
+      }));
     },
     getCheckboxProps: function getCheckboxProps(record) {
       return {
@@ -350,104 +328,41 @@ var ProductModal = function ProductModal(props) {
     }
   };
 
-  var moveItem = function moveItem(dragNodeId, hoverNodeId) {
-    var source = JSON.parse(JSON.stringify(selectedList));
-    var dragIndex = source.findIndex(function (obj) {
-      return obj.productId == dragNodeId;
-    });
-    var hoverIndex = source.findIndex(function (obj) {
-      return obj.productId == hoverNodeId;
-    });
-    var list = dragSource(source, dragIndex, hoverIndex);
-    setSelectedList(list);
-  };
-
-  var onDragStart = function onDragStart(e) {
-    setDragId(e.currentTarget.dataset.nodeid);
-  };
-
-  var onDragEnter = function onDragEnter(e) {
-    var hoverNodeId = e.currentTarget.dataset.nodeid;
-
-    if (dragId === hoverNodeId) {
-      return;
-    }
-
-    moveItem(dragId, hoverNodeId);
-  };
-
-  var onDragEnd = function onDragEnd() {
-    setDragId('');
+  var _v = (0, _react.useState)({
+    pageSize: 20,
+    current: 1,
+    total: 0
+  }),
+      paginationParams = _v[0],
+      setPaginationParams = _v[1];
+
+  var delSelectedItem = function delSelectedItem(index) {
+    console.log(selectedRowKeys, index, 2223);
+    var rowKeys = JSON.parse(JSON.stringify(selectedRowKeys));
+    rowKeys.splice(index, 1);
+    setSelectedRowKeys(rowKeys);
+    var rows = JSON.parse(JSON.stringify(selectedList));
+    rows.splice(index, 1);
+    setSelectedList(rows);
   }; // 请求商品列表
 
 
-  var queryGoods = function queryGoods() {
+  var queryGoods = function queryGoods(data) {
     return __awaiter(void 0, void 0, void 0, function () {
-      var _list, total, params, res_1, res;
-
+      var res;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            setLoading(true);
-            setGoodsList([]);
-            _list = [];
-            total = 0;
-            params = {
-              productName: productName,
-              storeId: storeId,
-              cmpTypeId: promotions || '',
-              minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
-              maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
-              catgIds: selCatgsList.join(','),
-              brandIds: selBrandsList.join(','),
-              labelIds: selLabelData.value || '',
-              pageSize: paginationParams.pageSize,
-              pageIndex: paginationParams.current
-            };
-            if (!(proType === 'spu')) return [3
-            /*break*/
-            , 2];
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
-              offerCode: productCode,
-              isDefaultCover: 'Y',
-              onlyQryPublishSku: true,
-              auditState: 'S',
-              crmFlag: 'on'
-            }), 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", data, 'GET')];
 
           case 1:
-            res_1 = _a.sent();
-            _list = formatData((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*/
-            , 4];
-
-          case 2:
-            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 = formatData(res.list || []);
-            total = res.total;
-            _a.label = 4;
-
-          case 4:
             setLoading(false);
-            setGoodsList(_list);
-            paginationParams.total = total;
-            setPaginationParams(__assign({}, paginationParams));
+            paginationParams.total = res.total;
+            setPaginationParams(paginationParams);
+            setGoodsList(res.list || []);
             return [2
             /*return*/
             ];
@@ -545,18 +460,6 @@ 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();
@@ -568,19 +471,27 @@ var ProductModal = function ProductModal(props) {
   }, []);
   (0, _react.useEffect)(function () {
     setSelectedList(defaultList);
+    setSelectedRowKeys(defaultList.map(function (v) {
+      return v.productId;
+    }));
 
     if (props.type === 'groupBuy') {
       setPromotions(promType.GROUP_BUY);
     }
   }, [visible]);
-  (0, _react.useEffect)(function () {
-    reset();
-    paginationParams.current = 1;
-    setFlag(!flag);
-  }, [proType]);
-  (0, _react.useEffect)(function () {
-    queryGoods();
-  }, [flag]);
+
+  var reset = function reset() {
+    setSelBrandsList([]);
+    setSelCatgsList([]);
+    setSelLabelData([]);
+    setProductName('');
+    setStoreId('');
+    setProductCode('');
+    setMinPrice('');
+    setMaxPrice('');
+    setPromotions(props.type === 'groupBuy' ? promType.GROUP_BUY : null);
+  };
+
   var columns = [{
     title: (0, _locale.i18n)('IMAGE'),
     dataIndex: 'productImageUrl',
@@ -599,8 +510,8 @@ var ProductModal = function ProductModal(props) {
     width: 120,
     ellipsis: true
   }, {
-    title: proType === 'spu' ? (0, _locale.i18n)('SPU_CODE') : (0, _locale.i18n)('SKU_CODE'),
-    dataIndex: proType === 'spu' ? 'offerCode' : 'productCode',
+    title: (0, _locale.i18n)('PRODUCT_CODE'),
+    dataIndex: 'productCode',
     width: 120,
     ellipsis: true
   }, _defineProperty({
@@ -688,7 +599,7 @@ var ProductModal = function ProductModal(props) {
       return setStoreId(value);
     },
     optionFilterProp: "children",
-    placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
+    placeholder: "Please select",
     showSearch: true,
     value: storeId
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
@@ -701,6 +612,7 @@ var ProductModal = function ProductModal(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
     defaultValue: selLabelData.children || null,
     onChange: function onChange(v, o) {
+      console.log(v, o, 33);
       setSelLabelData(o);
     },
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -747,7 +659,7 @@ var ProductModal = function ProductModal(props) {
     size: "small",
     value: productName
   })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: proType === 'spu' ? 'SPU Code' : 'SKU Code'
+    label: "SKU Code"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     className: "inputStyle",
     onChange: function onChange(e) {
@@ -781,7 +693,20 @@ var ProductModal = function ProductModal(props) {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.current = 1;
-      queryGoods();
+      queryGoods({
+        productName: productName,
+        productCode: productCode,
+        storeId: storeId,
+        cmpTypeId: promotions || '',
+        minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
+        maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
+        catgIds: selCatgsList.join(','),
+        brandIds: selBrandsList.join(','),
+        labelIds: selLabelData.value || '',
+        pageSize: paginationParams.pageSize,
+        pageIndex: paginationParams.current,
+        state: 'A'
+      });
     },
     size: "small",
     style: {
@@ -790,17 +715,7 @@ var ProductModal = function ProductModal(props) {
     type: "primary"
   }, (0, _locale.i18n)('QUERY'))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightCot"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
-    buttonStyle: "solid",
-    className: "btn-select-type",
-    onChange: function onChange(e) {
-      setProType(e.target.value);
-      setSelectedList([]);
-    },
-    options: proTypeOption,
-    optionType: "button",
-    value: proType
-  }), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: goodsList,
     loading: loading,
@@ -808,19 +723,47 @@ var ProductModal = function ProductModal(props) {
       onChange: function onChange(page) {
         setLoading(true);
         paginationParams.current = page;
-        queryGoods();
+        setPaginationParams(paginationParams);
+        queryGoods({
+          productName: productName,
+          productCode: productCode,
+          cmpTypeId: promotions || '',
+          minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
+          maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
+          catgIds: selCatgsList.join(','),
+          brandIds: selBrandsList.join(','),
+          labelIds: selLabelData.value || '',
+          pageSize: paginationParams.pageSize,
+          pageIndex: paginationParams.current,
+          state: 'A'
+        });
       }
     }),
-    rowKey: "id",
+    rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 420
+      y: 500
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"
-  }, /*#__PURE__*/_react["default"].createElement(_SortableImageList["default"], {
-    selectedList: selectedList,
-    setSelectedList: setSelectedList
+  }, selectedList.map(function (item, index) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: index,
+      className: "selectedItem"
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "selectedItemImg " + (item.state !== 'A' ? 'invalid' : ''),
+      src: item.productImageUrl,
+      title: item.productName
+    }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      className: "selectedItemClose",
+      color: "#000",
+      onClick: function onClick() {
+        return delSelectedItem(index);
+      },
+      size: 12,
+      type: "icon-close"
+    }));
   })))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -829,7 +772,7 @@ var ProductModal = function ProductModal(props) {
     className: "totalNum"
   }, selectedList.length, "/", maxSelect)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
-      handleModalSave && handleModalSave(selectedList, proType);
+      handleModalSave && handleModalSave(selectedList);
       closeModal && closeModal();
     },
     style: {

package/lib/common/ProductModal/index.less

@@ -17,13 +17,7 @@
         margin-left: 16px;
         display: flex;
         flex-direction: column;
-        justify-content: flex-start;
-
-
-        .btn-select-type {
-          text-align: right;
-          margin-bottom: 15px;
-        }
+        justify-content: space-between;
 
         .prodImg {
           display: inline-block;