kts-component-invoice-operate 2.0.4 → 2.0.7

package/dist/Invoice/InvoiceController/fns/getGoodsSearch.d.ts

@@ -1,2 +1,9 @@
 import IGood from "../InvoiceControllerState/GoodsListState/IGood";
-export default function getGoodsSearch(goodsList: IGood[], search: string): IGood[];
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns
+ */
+export default function getGoodsSearch(goodsList: IGood[], search: string, isTaxIncluded: boolean): IGood[];

package/dist/index.esm.js

@@ -1520,16 +1520,23 @@ var validateFields = function validateFields(form) {
   });
 };
 
-function getGoodsSearch(goodsList, search) {
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns
+ */
+function getGoodsSearch(goodsList, search, isTaxIncluded) {
   if (!search) return goodsList;
   return goodsList.filter(function (e) {
-    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName;
+    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
 
     if (((_e$itemName$indexOf = (_e$itemName = e.itemName) === null || _e$itemName === void 0 ? void 0 : _e$itemName.indexOf(search)) !== null && _e$itemName$indexOf !== void 0 ? _e$itemName$indexOf : -1) >= 0) {
       return true;
     } else if (((_e$itemModelName$inde = (_e$itemModelName = e.itemModelName) === null || _e$itemModelName === void 0 ? void 0 : _e$itemModelName.indexOf(search)) !== null && _e$itemModelName$inde !== void 0 ? _e$itemModelName$inde : -1) >= 0) {
       return true;
-    } else if ("".concat(e.lineAmountIncludeTax).indexOf(search) >= 0) {
+    } else if ("".concat(isTaxIncluded ? (_e$lineAmountIncludeT = e.lineAmountIncludeTax) === null || _e$lineAmountIncludeT === void 0 ? void 0 : _e$lineAmountIncludeT.toFixed(2) : (_e$lineAmountExcludeT = e.lineAmountExcludeTax) === null || _e$lineAmountExcludeT === void 0 ? void 0 : _e$lineAmountExcludeT.toFixed(2)).indexOf(search) >= 0) {
       return true;
     } else {
       return false;
@@ -2240,7 +2247,7 @@ function SvgMagnifier(props) {
   })));
 }
 
-var css_248z$4 = ".kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search {\n  width: 330px;\n}\n.kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search input {\n  border-radius: 999px;\n  border-color: #b8b8b8;\n}\n";
+var css_248z$4 = ".kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search {\n  width: 350px;\n}\n.kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search input {\n  border-radius: 999px;\n  border-color: #b8b8b8;\n}\n";
 styleInject(css_248z$4);
 
 function Search() {
@@ -2254,6 +2261,11 @@ function Search() {
   var readOnly = controller.useMemo(function (s) {
     return !!s.goodsListState.editGood;
   }, []);
+  /** 是否含税 */
+
+  var isTaxIncluded = controller.useMemo(function (s) {
+    return s.goodsListState.isTaxIncluded;
+  }, []);
   var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -2292,7 +2304,7 @@ function Search() {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                s.goodsListState.searchValue = value;
+                s.goodsListState.searchValue = value.replace(/^ */, '').replace(/ *$/, '');
 
               case 1:
               case "end":
@@ -2312,7 +2324,7 @@ function Search() {
     readOnly: readOnly,
     value: value,
     className: "kts-invoice-operate-goods-list-search",
-    placeholder: "\u8BF7\u60A8\u8F93\u5165\u8D27\u7269\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(\u542B\u7A0E)\u641C\u7D22",
+    placeholder: "\u8BF7\u60A8\u8F93\u5165\u8D27\u7269\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(".concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
     prefix: React.createElement(Icon, {
       component: SvgMagnifier,
       style: {
@@ -10720,7 +10732,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, formatSearch(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -11192,7 +11204,7 @@ var useRowSelection = (function () {
 
   var isAll = controller.useMemo(function (s) {
     if (s.goodsListState.selectedGoodIndex.length <= 0) return false;
-    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
       return e.$index;
     });
     var selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11203,7 +11215,7 @@ var useRowSelection = (function () {
     return selectedGoodIndex.length === seeGoodsIndex.length;
   }, []);
   var indeterminate = controller.useMemo(function (s) {
-    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
       return e.$index;
     });
     var selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11234,7 +11246,7 @@ var useRowSelection = (function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
                           return e.$index;
                         });
                         s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11269,7 +11281,7 @@ var useRowSelection = (function () {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
                           return e.$index;
                         });
                         s.goodsListState.selectedGoodIndex = [].concat(_toConsumableArray(s.goodsListState.selectedGoodIndex), _toConsumableArray(seeGoodsIndex));
@@ -11496,9 +11508,12 @@ var Main = decorator(Form.create())(function (props) {
   var searchValue = controller.useMemo(function (s) {
     return s.goodsListState.searchValue;
   }, []);
+  var isTaxIncluded = controller.useMemo(function (s) {
+    return s.goodsListState.isTaxIncluded;
+  }, []);
   var dataSourceSearch = React.useMemo(function () {
-    return controller.getGoodsSearch(dataSource, searchValue);
-  }, [dataSource, searchValue, controller]);
+    return controller.getGoodsSearch(dataSource, searchValue, isTaxIncluded);
+  }, [dataSource, searchValue, controller, isTaxIncluded]);
   /** 表格行事件 */
 
   var _onRow = useOnRow();
@@ -13614,16 +13629,6 @@ function AddComparisonDrawer() {
     gutter: [8, 8]
   }, React.createElement(Col, {
     span: 12
-  }, React.createElement(Form$1.Item, {
-    name: "itemCodeSelf",
-    label: "\u6211\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React.createElement(Input, null))), React.createElement(Col, {
-    span: 12
-  }, React.createElement(Form$1.Item, {
-    name: "itemCode",
-    label: "\u5BF9\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React.createElement(Input, null))), React.createElement(Col, {
-    span: 12
   }, React.createElement(Form$1.Item, {
     name: "itemNameSelf",
     label: "\u6211\u65B9\u5546\u54C1\u540D\u79F0"

package/dist/index.js

@@ -1530,16 +1530,23 @@ var validateFields = function validateFields(form) {
   });
 };
 
-function getGoodsSearch(goodsList, search) {
+/**
+ * 计算搜索商品
+ * @param goodsList 被搜索列表
+ * @param search 搜索条件
+ * @param isTaxIncluded 是否含税
+ * @returns
+ */
+function getGoodsSearch(goodsList, search, isTaxIncluded) {
   if (!search) return goodsList;
   return goodsList.filter(function (e) {
-    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName;
+    var _e$itemName$indexOf, _e$itemName, _e$itemModelName$inde, _e$itemModelName, _e$lineAmountIncludeT, _e$lineAmountExcludeT;
 
     if (((_e$itemName$indexOf = (_e$itemName = e.itemName) === null || _e$itemName === void 0 ? void 0 : _e$itemName.indexOf(search)) !== null && _e$itemName$indexOf !== void 0 ? _e$itemName$indexOf : -1) >= 0) {
       return true;
     } else if (((_e$itemModelName$inde = (_e$itemModelName = e.itemModelName) === null || _e$itemModelName === void 0 ? void 0 : _e$itemModelName.indexOf(search)) !== null && _e$itemModelName$inde !== void 0 ? _e$itemModelName$inde : -1) >= 0) {
       return true;
-    } else if ("".concat(e.lineAmountIncludeTax).indexOf(search) >= 0) {
+    } else if ("".concat(isTaxIncluded ? (_e$lineAmountIncludeT = e.lineAmountIncludeTax) === null || _e$lineAmountIncludeT === void 0 ? void 0 : _e$lineAmountIncludeT.toFixed(2) : (_e$lineAmountExcludeT = e.lineAmountExcludeTax) === null || _e$lineAmountExcludeT === void 0 ? void 0 : _e$lineAmountExcludeT.toFixed(2)).indexOf(search) >= 0) {
       return true;
     } else {
       return false;
@@ -2250,7 +2257,7 @@ function SvgMagnifier(props) {
   })));
 }
 
-var css_248z$4 = ".kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search {\n  width: 330px;\n}\n.kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search input {\n  border-radius: 999px;\n  border-color: #b8b8b8;\n}\n";
+var css_248z$4 = ".kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search {\n  width: 350px;\n}\n.kts-invoice-operate-goods-list-able-list .kts-invoice-operate-goods-list-search input {\n  border-radius: 999px;\n  border-color: #b8b8b8;\n}\n";
 styleInject(css_248z$4);
 
 function Search() {
@@ -2264,6 +2271,11 @@ function Search() {
   var readOnly = controller.useMemo(function (s) {
     return !!s.goodsListState.editGood;
   }, []);
+  /** 是否含税 */
+
+  var isTaxIncluded = controller.useMemo(function (s) {
+    return s.goodsListState.isTaxIncluded;
+  }, []);
   var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -2302,7 +2314,7 @@ function Search() {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                s.goodsListState.searchValue = value;
+                s.goodsListState.searchValue = value.replace(/^ */, '').replace(/ *$/, '');
 
               case 1:
               case "end":
@@ -2322,7 +2334,7 @@ function Search() {
     readOnly: readOnly,
     value: value,
     className: "kts-invoice-operate-goods-list-search",
-    placeholder: "\u8BF7\u60A8\u8F93\u5165\u8D27\u7269\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(\u542B\u7A0E)\u641C\u7D22",
+    placeholder: "\u8BF7\u60A8\u8F93\u5165\u8D27\u7269\u540D\u79F0\u3001\u89C4\u683C\u578B\u53F7\u3001\u91D1\u989D(".concat(isTaxIncluded ? '含税' : '不含税', ")\u641C\u7D22"),
     prefix: React__default['default'].createElement(ktsComponentsAntdX3.Icon, {
       component: SvgMagnifier,
       style: {
@@ -10730,7 +10742,7 @@ var useColumns = (function (form) {
             style: {
               padding: '0 10px'
             }
-          }, parseFloat(value).toFixed(2));
+          }, formatSearch(parseFloat(value).toFixed(2), searchValue));
         }
       }
     }, {
@@ -11202,7 +11214,7 @@ var useRowSelection = (function () {
 
   var isAll = controller.useMemo(function (s) {
     if (s.goodsListState.selectedGoodIndex.length <= 0) return false;
-    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
       return e.$index;
     });
     var selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11213,7 +11225,7 @@ var useRowSelection = (function () {
     return selectedGoodIndex.length === seeGoodsIndex.length;
   }, []);
   var indeterminate = controller.useMemo(function (s) {
-    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+    var seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
       return e.$index;
     });
     var selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11244,7 +11256,7 @@ var useRowSelection = (function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
                           return e.$index;
                         });
                         s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(function (e) {
@@ -11279,7 +11291,7 @@ var useRowSelection = (function () {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue).map(function (e) {
+                        seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(function (e) {
                           return e.$index;
                         });
                         s.goodsListState.selectedGoodIndex = [].concat(_toConsumableArray(s.goodsListState.selectedGoodIndex), _toConsumableArray(seeGoodsIndex));
@@ -11506,9 +11518,12 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
   var searchValue = controller.useMemo(function (s) {
     return s.goodsListState.searchValue;
   }, []);
+  var isTaxIncluded = controller.useMemo(function (s) {
+    return s.goodsListState.isTaxIncluded;
+  }, []);
   var dataSourceSearch = React__default['default'].useMemo(function () {
-    return controller.getGoodsSearch(dataSource, searchValue);
-  }, [dataSource, searchValue, controller]);
+    return controller.getGoodsSearch(dataSource, searchValue, isTaxIncluded);
+  }, [dataSource, searchValue, controller, isTaxIncluded]);
   /** 表格行事件 */
 
   var _onRow = useOnRow();
@@ -13624,16 +13639,6 @@ function AddComparisonDrawer() {
     gutter: [8, 8]
   }, React__default['default'].createElement(ktsComponentsAntdX3.Col, {
     span: 12
-  }, React__default['default'].createElement(ktsXui.Form.Item, {
-    name: "itemCodeSelf",
-    label: "\u6211\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React__default['default'].createElement(ktsComponentsAntdX3.Input, null))), React__default['default'].createElement(ktsComponentsAntdX3.Col, {
-    span: 12
-  }, React__default['default'].createElement(ktsXui.Form.Item, {
-    name: "itemCode",
-    label: "\u5BF9\u65B9\u5546\u54C1\u7F16\u7801"
-  }, React__default['default'].createElement(ktsComponentsAntdX3.Input, null))), React__default['default'].createElement(ktsComponentsAntdX3.Col, {
-    span: 12
   }, React__default['default'].createElement(ktsXui.Form.Item, {
     name: "itemNameSelf",
     label: "\u6211\u65B9\u5546\u54C1\u540D\u79F0"