@fle-ui/plus-choose-mall-goods 1.1.1 → 1.1.3

package/es/index.js

@@ -5,6 +5,8 @@ import "antd/es/table/style";
 import _Table from "antd/es/table";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
+import "antd/es/typography/style";
+import _Typography from "antd/es/typography";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import "antd/es/row/style";
@@ -48,8 +50,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 import React, { useEffect, useState, useRef } from 'react';
+import PlusConfigProvider from '@fle-ui/plus-config-provider';
 import AddressSelection from '@fle-ui/plus-address-selection';
 import ProImage from '@fle-ui/plus-image';
 import { QuestionCircleOutlined, LoadingOutlined } from '@ant-design/icons';
@@ -199,7 +202,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     setLoading = _useState14[1];
   var getGoodsList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchParams$flagCat, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
+      var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -219,7 +222,14 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
               flagTags: searchParams.flagTags,
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
-            }); // 价格区间
+            });
+            if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
+              params['isOnce'] = 1;
+            }
+            if ((_searchParams$priceTy2 = searchParams.priceType) === null || _searchParams$priceTy2 === void 0 ? void 0 : _searchParams$priceTy2.includes('purchase')) {
+              params['isPurchase'] = 1;
+            }
+            // 价格区间
             if (searchParams.priceRangeMin !== undefined) {
               params[searchParams.priceType + 'Min'] = Number(searchParams.priceRangeMin * 100);
             }
@@ -255,9 +265,9 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
             apiKey = '';
             if (mode === 1) apiKey = 'getGoodsList';
             if (mode === 2) apiKey = 'getGoodsListForTemplate';
-            _context.next = 14;
+            _context.next = 16;
             return $http.post(api[apiKey], params);
-          case 14:
+          case 16:
             res = _context.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               list = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
@@ -273,15 +283,15 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
                 getJdStock(list, jdGoods);
               }
             }
-          case 16:
-            _context.prev = 16;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 16, 19]]);
+      }, _callee, null, [[0,, 18, 21]]);
     }));
     return function getGoodsList() {
       return _ref.apply(this, arguments);
@@ -628,7 +638,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
         placeholder: "\u9009\u62E9\u884C\u4E1A\u6807\u7B7E",
         allowClear: true
       }), /*#__PURE__*/React.createElement(_Cascader, {
-        placeholder: "\u9009\u62E9\u5546\u54C1\u54C1\u7C7B",
+        placeholder: "\u9009\u62E9\u5546\u54C1\u5206\u7C7B",
         fieldNames: {
           label: 'name',
           value: 'id'
@@ -649,13 +659,13 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       })))
     }, {
       name: 'categoryTree',
-      show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('categoryTree')),
+      show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('categoryTree')) && searchParams.tab !== 'zy',
       span: 8,
       node: /*#__PURE__*/React.createElement(_Col, {
         span: 8
       }, /*#__PURE__*/React.createElement("div", {
         className: "ww-search-flex"
-      }, "\u5546\u54C1\u7C7B\u76EE\uFF1A", /*#__PURE__*/React.createElement(_TreeSelect, {
+      }, /*#__PURE__*/React.createElement(_TreeSelect, {
         style: {
           flex: 1
         },
@@ -664,7 +674,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
           maxHeight: 400,
           overflow: 'auto'
         },
-        placeholder: "\u9009\u62E9\u5546\u54C1\u7C7B\u76EE",
+        placeholder: "\u9009\u62E9\u7CFB\u7EDF\u7C7B\u76EE",
         allowClear: true,
         onChange: function onChange(e) {
           handleChangeParams({
@@ -796,11 +806,11 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
         span: 8
       }, /*#__PURE__*/React.createElement("div", {
         className: "ww-search-flex"
-      }, "\u53EF\u552E\u5356\u57CE\u5E02\uFF1A", /*#__PURE__*/React.createElement(_Select, {
+      }, /*#__PURE__*/React.createElement(_Select, {
         showSearch: true,
         mode: "multiple",
         allowClear: true,
-        placeholder: "\u5168\u90E8",
+        placeholder: "\u8BF7\u9009\u62E9\u53EF\u552E\u5356\u57CE\u5E02",
         onChange: function onChange(v) {
           handleChangeParams({
             saleableCity: v
@@ -821,20 +831,20 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       }))))
     }, {
       name: 'addressCodes',
-      show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('addressCodes')),
+      show: !(hiddenSearchProps === null || hiddenSearchProps === void 0 ? void 0 : hiddenSearchProps.includes('addressCodes')) && searchParams.tab !== 'zy',
       span: 8,
       node: /*#__PURE__*/React.createElement(_Col, {
         span: 8
       }, /*#__PURE__*/React.createElement("div", {
         className: "ww-search-flex"
-      }, "\u53D1\u8D27\u5730\uFF1A", /*#__PURE__*/React.createElement(AddressSelection, {
+      }, /*#__PURE__*/React.createElement(AddressSelection, {
         value: searchParams.addressCodes,
         onChange: function onChange(v) {
           handleChangeParams({
             addressCodes: v
           });
         },
-        placeholder: "\u8BF7\u9009\u62E9\u5730\u5740",
+        placeholder: "\u8BF7\u9009\u62E9\u53D1\u8D27\u5730",
         level: 2,
         style: {
           flex: 1
@@ -848,7 +858,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
         span: 8
       }, /*#__PURE__*/React.createElement("div", {
         className: "ww-search-flex"
-      }, "\u6392\u5E8F\uFF1A", /*#__PURE__*/React.createElement(_Radio.Group, {
+      }, /*#__PURE__*/React.createElement(_Radio.Group, {
         onChange: handleSortChange,
         value: searchParams.orderName,
         optionType: "button",
@@ -991,7 +1001,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'marketPriceMin',
     key: 'marketPriceMin',
     align: 'center',
-    width: 120,
     render: function render(text, record) {
       var _record$purchaseInfo, _record$purchaseInfo2, _record$purchaseInfo4, _record$purchaseInfo5;
       if (record.isPurchase === 0) return '-';
@@ -1006,7 +1015,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'marketPriceMin',
     key: 'marketPriceMin',
     align: 'center',
-    width: 120,
     render: function render(text, record) {
       var _record$onceInfo, _record$onceInfo2, _record$onceInfo4, _record$onceInfo5;
       if (record.isOnce === 0) return '-';
@@ -1021,7 +1029,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'salePriceMin',
     key: 'salePriceMin',
     align: 'center',
-    width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
         var _record$purchaseInfo6, _record$purchaseInfo12;
@@ -1051,7 +1058,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'supplyPriceMin',
     key: 'supplyPriceMin',
     align: 'center',
-    width: 120,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isOnce) === 1) {
         var _record$onceInfo6, _record$onceInfo7, _record$onceInfo9, _record$onceInfo10;
@@ -1128,7 +1134,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'marketPriceMax',
     key: 'marketPriceMax',
     align: 'center',
-    width: 98,
     render: function render(text, record) {
       var _record$onceInfo16, _record$onceInfo17, _record$onceInfo19, _record$onceInfo20;
       if ((record === null || record === void 0 ? void 0 : (_record$onceInfo16 = record.onceInfo) === null || _record$onceInfo16 === void 0 ? void 0 : _record$onceInfo16.marketPriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo17 = record.onceInfo) === null || _record$onceInfo17 === void 0 ? void 0 : _record$onceInfo17.marketPriceMax)) {
@@ -1142,7 +1147,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     dataIndex: 'salePriceMax',
     key: 'salePriceMax',
     align: 'center',
-    width: 86,
     render: function render(text, record) {
       var _record$onceInfo21, _record$onceInfo22, _record$onceInfo24, _record$onceInfo25;
       if ((record === null || record === void 0 ? void 0 : (_record$onceInfo21 = record.onceInfo) === null || _record$onceInfo21 === void 0 ? void 0 : _record$onceInfo21.salePriceMin) === (record === null || record === void 0 ? void 0 : (_record$onceInfo22 = record.onceInfo) === null || _record$onceInfo22 === void 0 ? void 0 : _record$onceInfo22.salePriceMax)) {
@@ -1193,9 +1197,32 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       }, v === null || v === void 0 ? void 0 : v.slice(0, 50)));
     }
   }];
+  // 系统类目
+  var categoryTree = [{
+    title: '系统类目',
+    dataIndex: 'categoryId',
+    key: 'categoryId',
+    align: 'center',
+    width: 170,
+    render: function render(text, record) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record.isEntity ? '实物商品' : '虚拟商品'), /*#__PURE__*/React.createElement("div", null, record.categoryTreeName));
+    }
+  }];
+  // 商品分类
+  var flagCategoryInfo = [{
+    title: '商品分类',
+    key: 'flagCategoryInfo',
+    align: 'center',
+    width: 150,
+    render: function render(_, record) {
+      var _record$flagCategoryI;
+      return (record === null || record === void 0 ? void 0 : (_record$flagCategoryI = record.flagCategoryInfo) === null || _record$flagCategoryI === void 0 ? void 0 : _record$flagCategoryI.treeName) || '-';
+    }
+  }];
   var columns = function columns() {
     var list = app === 1 ? columns1 : columns2;
     var list2 = searchParams.tab === 'xhdg' && mode === 1 ? dgssColumns : [];
+    var list3 = searchParams.tab === 'zy' ? flagCategoryInfo : categoryTree;
     var _columns = [{
       title: '商品',
       dataIndex: 'goodsId',
@@ -1215,8 +1242,12 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
           needOssProcess: false
         })), /*#__PURE__*/React.createElement("div", {
           className: 'table-goods-content'
-        }, /*#__PURE__*/React.createElement("div", {
-          className: 'table-goods-content-title'
+        }, /*#__PURE__*/React.createElement(_Typography.Paragraph, {
+          ellipsis: {
+            rows: 2,
+            tooltip: true
+          },
+          className: "table-goods-content-title"
         }, record.name), /*#__PURE__*/React.createElement("div", {
           title: record.goodsId,
           className: 'table-goods-content-sub-title'
@@ -1227,17 +1258,11 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       dataIndex: 'brandName',
       key: 'brandName',
       align: 'center',
-      width: 140
-    }, {
-      title: '商品类目',
-      dataIndex: 'categoryId',
-      key: 'categoryId',
-      align: 'center',
-      width: 170,
-      render: function render(text, record) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, record.isEntity ? '实物商品' : '虚拟商品'), /*#__PURE__*/React.createElement("div", null, record.categoryTreeName));
+      width: 140,
+      render: function render(_, record) {
+        return record.brandName || '-';
       }
-    }].concat(list, [{
+    }].concat(list3, list, [{
       title: '库存',
       dataIndex: 'stock',
       key: 'stock',
@@ -1259,7 +1284,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       key: 'action',
       align: 'center',
       fixed: 'right',
-      width: 100,
+      width: 80,
       render: function render(text, record) {
         if (defaultSelectedGoodsIds.includes(record.goodsId)) {
           return /*#__PURE__*/React.createElement(_Button, {
@@ -1334,12 +1359,19 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     onSelectOk(changePriceGoodsIds, changePriceGoodss);
   };
   // 改价逻辑 end ----------
-  return /*#__PURE__*/React.createElement(_Modal, _extends({
-    title: "\u6311\u9009\u66F4\u591A\u5546\u54C1",
+  return /*#__PURE__*/React.createElement(PlusConfigProvider, {
+    prefixCls: "ant"
+  }, /*#__PURE__*/React.createElement(_Modal, _extends({
+    title: "\u6311\u9009\u5546\u54C1",
     open: true,
     footer: null,
     width: 1366,
     onCancel: onClose,
+    styles: {
+      body: {
+        padding: '0 16px'
+      }
+    },
     className: "choose-mall-goods-modal",
     centered: true
   }, otherProps), renderTabs(), renderMainSearch(), renderSearch2(), /*#__PURE__*/React.createElement(_Table, {
@@ -1351,7 +1383,8 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       current: pageNo,
       position: ['bottomRight'],
       total: total,
-      showQuickJumper: true,
+      size: 'default',
+      showQuickJumper: false,
       showSizeChanger: true,
       defaultPageSize: pageSize || 10,
       onChange: function onChange(page, size) {
@@ -1370,7 +1403,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
       marginTop: '20px'
     },
     scroll: {
-      x: 1500,
+      x: 1800,
       y: 500
     },
     rowSelection: multiple ? rowSelection : undefined
@@ -1385,6 +1418,6 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     changePriceGoodsIds: changePriceGoodsIds,
     isAllSelf: searchParams.tab === 'zy',
     onSuccess: onChangePriceSuccess
-  }));
+  })));
 };
 export default ChooseMallGoods;

package/es/index.less

@@ -1,100 +1,98 @@
-.choose-mall-goods-modal {
-  .ww-search {
-    background-color: #fafafa;
-    padding: 20px;
-    .ww-search-flex {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      overflow: hidden;
-      .ww-search-range-input {
-        flex: 1;
-        display: flex;
-        align-items: center;
-      }
-    }
-  }
-  .main-search {
-    display: flex;
-    justify-content: center;
-    margin-bottom: 16px;
-  }
-  .search-2 {
-    .sort-item {
-      display: flex;
-      align-items: center;
-      .sort-item-label {
-        font-size: 12px;
-      }
-      .sort-item-icon {
-        font-size: 10px;
-        margin-left: 4px;
-      }
-    }
-    .ant-radio-button-wrapper {
-      padding: 0 10px !important;
-    }
-  }
-  .table-goods-wrap {
-    display: flex;
-
-    .table-goods-img-wrap {
-      width: 60px;
-      height: 60px;
-      background: #ffffff;
-      border-radius: 1px;
-      border: 1px solid #cccccc;
-      box-sizing: border-box;
-      display: flex;
-      align-items: center;
-      overflow: hidden;
-      .pro-image {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        .ant-image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-    }
-
-    .table-goods-content {
-      margin-left: 10px;
-      flex: 1;
-
-      .table-goods-content-title {
-        height: 34px;
-        font-size: 12px;
-        font-weight: 500;
-        color: #666666;
-        line-height: 17px;
-        text-overflow: -o-ellipsis-lastline;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 2;
-        line-clamp: 2;
-        -webkit-box-orient: vertical;
-        text-align: left;
-        color: #2c68ff;
-      }
-
-      .table-goods-content-sub-title {
-        text-align: left;
-        height: 17px;
-        font-size: 12px;
-        font-weight: 400;
-        color: #666666;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        margin-top: 9px;
-      }
-    }
-  }
-
-  .ml-3 {
-    margin-left: 3px;
-  }
-}
+.choose-mall-goods-modal {
+  .ww-search {
+    background-color: #fafafa;
+    padding: 20px;
+    .ww-search-flex {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
+      .ww-search-range-input {
+        flex: 1;
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+  .main-search {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 16px;
+  }
+  .search-2 {
+    .sort-item {
+      display: flex;
+      align-items: center;
+      .sort-item-label {
+        font-size: 12px;
+      }
+      .sort-item-icon {
+        font-size: 10px;
+        margin-left: 4px;
+      }
+    }
+    .ant-radio-button-wrapper {
+      padding: 0 10px !important;
+    }
+  }
+  .table-goods-wrap {
+    display: flex;
+
+    .table-goods-img-wrap {
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border-radius: 1px;
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
+      .pro-image {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+        .ant-image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+
+    .table-goods-content {
+      margin-left: 10px;
+      flex: 1;
+
+      .table-goods-content-title {
+        height: 34px;
+        font-size: 12px;
+        font-weight: 500;
+        color: #666666;
+        line-height: 17px;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        line-clamp: 2;
+        -webkit-box-orient: vertical;
+        text-align: left;
+      }
+
+      .table-goods-content-sub-title {
+        text-align: left;
+        height: 17px;
+        font-size: 12px;
+        font-weight: 400;
+        color: #666666;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin-top: 9px;
+      }
+    }
+  }
+
+  .ml-3 {
+    margin-left: 3px;
+  }
+}