@fle-ui/plus-choose-goods 0.0.12 → 0.0.13

package/es/index.d.ts

@@ -3,6 +3,10 @@ import { EnvType } from './utils/serviceEnv';
 import type { ProColumns } from '@ant-design/pro-table';
 import './index.less';
 export interface ChooseGoodsProps {
+    /** 弹窗标题 */
+    title?: string;
+    /** 按钮文案 */
+    actionText?: string;
     open: boolean;
     env?: EnvType;
     token?: string;

package/es/index.js

@@ -38,8 +38,8 @@ import React, { useEffect, useState, useRef, useMemo } from 'react';
 import lodash from 'lodash';
 import { useRequest } from 'ahooks';
 import PlusRangeInput from '@fle-ui/plus-range-input';
-import { ProTable, QueryFilter } from '@ant-design/pro-components';
 import PlusConfigProvider from '@fle-ui/plus-config-provider';
+import { ProTable, QueryFilter } from '@ant-design/pro-components';
 import ProImage from '@fle-ui/plus-image';
 import { priceRangeForPurchase, sortOptions } from './utils/options';
 import httpClient from './utils/request';
@@ -49,7 +49,11 @@ import Icon from './components/icon';
 import { showMoney, formartNum } from './utils/common';
 import './index.less';
 var ChooseSiteGoods = function ChooseSiteGoods(props) {
-  var open = props.open,
+  var _props$title = props.title,
+    title = _props$title === void 0 ? '挑选商品' : _props$title,
+    _props$actionText = props.actionText,
+    actionText = _props$actionText === void 0 ? '挑选' : _props$actionText,
+    open = props.open,
     env = props.env,
     token = props.token,
     serviceUrl = props.serviceUrl,
@@ -318,7 +322,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
     }
   }, [open]);
-  // 选择 begin
   var _useState17 = useState([]),
     _useState18 = _slicedToArray(_useState17, 2),
     selectedRowKeys = _useState18[0],
@@ -386,8 +389,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     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.goodsCategoryTreeName) || '-';
+      return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
     }
   }, {
     title: '所属供应商',
@@ -395,7 +397,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'subSupplierName',
     align: 'center',
     width: 150,
-    colSpan: show.supplierShow ? 1 : 0
+    hidden: !show.supplierShow
   }, {
     title: '一件代发价格',
     key: 'oncePrice',
@@ -435,18 +437,18 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
           style: {
             color: '#999'
           }
-        }, "\u5DF2\u6311\u9009");
+        }, "\u5DF2", actionText);
       }
       return /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
           return onOk([record[rowKey]], [record]);
         }
-      }, "\u6311\u9009");
+      }, actionText);
     }
   }];
   return /*#__PURE__*/React.createElement(PlusConfigProvider, null, /*#__PURE__*/React.createElement(_Modal, {
     centered: true,
-    title: "\u6311\u9009\u5546\u54C1",
+    title: title,
     open: open,
     footer: null,
     width: 1300,
@@ -639,6 +641,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       onOk(selectedRowKeys, selectedRows);
     },
     disabled: selectedRowKeys.length === 0
-  }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
+  }, "\u6279\u91CF", actionText, "(", Math.max(selectedRowKeys.length, 0), ")"))));
 };
 export default ChooseSiteGoods;

package/lib/index.d.ts

@@ -3,6 +3,10 @@ import { EnvType } from './utils/serviceEnv';
 import type { ProColumns } from '@ant-design/pro-table';
 import './index.less';
 export interface ChooseGoodsProps {
+    /** 弹窗标题 */
+    title?: string;
+    /** 按钮文案 */
+    actionText?: string;
     open: boolean;
     env?: EnvType;
     token?: string;

package/lib/index.js

@@ -10,8 +10,8 @@ var _antd = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _ahooks = require("ahooks");
 var _plusRangeInput = _interopRequireDefault(require("@fle-ui/plus-range-input"));
-var _proComponents = require("@ant-design/pro-components");
 var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
+var _proComponents = require("@ant-design/pro-components");
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _options = require("./utils/options");
 var _request = _interopRequireDefault(require("./utils/request"));
@@ -43,7 +43,11 @@ 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; }
 var ChooseSiteGoods = function ChooseSiteGoods(props) {
-  var open = props.open,
+  var _props$title = props.title,
+    title = _props$title === void 0 ? '挑选商品' : _props$title,
+    _props$actionText = props.actionText,
+    actionText = _props$actionText === void 0 ? '挑选' : _props$actionText,
+    open = props.open,
     env = props.env,
     token = props.token,
     serviceUrl = props.serviceUrl,
@@ -312,7 +316,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.resetFields();
     }
   }, [open]);
-  // 选择 begin
   var _useState17 = (0, _react.useState)([]),
     _useState18 = _slicedToArray(_useState17, 2),
     selectedRowKeys = _useState18[0],
@@ -380,8 +383,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     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.goodsCategoryTreeName) || '-';
+      return (record === null || record === void 0 ? void 0 : record.goodsCategoryTreeName) || '-';
     }
   }, {
     title: '所属供应商',
@@ -389,7 +391,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     key: 'subSupplierName',
     align: 'center',
     width: 150,
-    colSpan: show.supplierShow ? 1 : 0
+    hidden: !show.supplierShow
   }, {
     title: '一件代发价格',
     key: 'oncePrice',
@@ -429,18 +431,18 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
           style: {
             color: '#999'
           }
-        }, "\u5DF2\u6311\u9009");
+        }, "\u5DF2", actionText);
       }
       return /*#__PURE__*/_react.default.createElement("a", {
         onClick: function onClick() {
           return onOk([record[rowKey]], [record]);
         }
-      }, "\u6311\u9009");
+      }, actionText);
     }
   }];
   return /*#__PURE__*/_react.default.createElement(_plusConfigProvider.default, null, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
     centered: true,
-    title: "\u6311\u9009\u5546\u54C1",
+    title: title,
     open: open,
     footer: null,
     width: 1300,
@@ -633,6 +635,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
       onOk(selectedRowKeys, selectedRows);
     },
     disabled: selectedRowKeys.length === 0
-  }, "\u6279\u91CF\u6311\u9009(", Math.max(selectedRowKeys.length, 0), ")"))));
+  }, "\u6279\u91CF", actionText, "(", Math.max(selectedRowKeys.length, 0), ")"))));
 };
 var _default = exports.default = ChooseSiteGoods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-goods",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "@fle-ui/plus-choose-goods",
   "keywords": [
     "fle-ui",
@@ -24,7 +24,7 @@
     "@ant-design/icons": "^5.3.0",
     "@fle-tools/env": "^1.0.3",
     "@fle-ui/plus-address-selection": "^1.0.14",
-    "@fle-ui/plus-choose-mall-goods": "^1.1.9",
+    "@fle-ui/plus-choose-mall-goods": "^1.1.11-alpha.1",
     "@fle-ui/plus-config-provider": "~1.0.15",
     "ahooks": "^3.8.0",
     "lodash": "^4.17.21"
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "78d16169a36349aacd44e43a9923104e950067e3"
+  "gitHead": "0c631954240d64433307f9b73b617ecc96a843a2"
 }