kts-component-invoice-operate 3.2.125 → 3.2.127

package/dist/index.esm.js

@@ -19343,57 +19343,95 @@ function ItemNameInput$1(props) {
       return _ref.apply(this, arguments);
     };
   }(), [autoComplete.onItemNameBlur, selectLine, props.editGood]);
-  var onChangeAutoComplete = React.useCallback(function (itemName) {
-    var record = options.filter(function (e) {
-      return e.itemName === itemName;
-    })[0];
-    if (!record) return;
-    controller.importGoodsDrawer(record);
-  }, [options, controller]);
-  var onSearch = React.useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(searchText) {
-      var list;
+  var onChangeAutoComplete = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_, i) {
+      var record;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.prev = 0;
+              record = options.filter(function (e) {
+                return e.$index === i.value;
+              })[0];
 
-              if (!autoComplete.onItemNameSearch) {
-                _context2.next = 9;
+              if (record) {
+                _context2.next = 3;
                 break;
               }
 
-              _context2.t0 = _toConsumableArray;
+              return _context2.abrupt("return");
+
+            case 3:
               _context2.next = 5;
+              return controller.setEditGood({
+                itemName: record.itemName
+              });
+
+            case 5:
+              _context2.next = 7;
+              return controller.importGoodsDrawer(_objectSpread2(_objectSpread2({}, record), {}, {
+                $index: undefined
+              }));
+
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [options, controller]);
+  var onSearch = React.useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(searchText) {
+      var list;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+
+              if (!(autoComplete.onItemNameSearch && searchText)) {
+                _context3.next = 9;
+                break;
+              }
+
+              _context3.t0 = _toConsumableArray;
+              _context3.next = 5;
               return autoComplete.onItemNameSearch(searchText);
 
             case 5:
-              _context2.t1 = _context2.sent;
-              list = (0, _context2.t0)(_context2.t1);
-              console.log('===> list', list);
+              _context3.t1 = _context3.sent;
+              list = (0, _context3.t0)(_context3.t1).map(function (e) {
+                return _objectSpread2(_objectSpread2({}, e), {}, {
+                  $index: v4()
+                });
+              });
               setOptions(list);
 
             case 9:
-              _context2.next = 15;
+              _context3.next = 15;
               break;
 
             case 11:
-              _context2.prev = 11;
-              _context2.t2 = _context2["catch"](0);
+              _context3.prev = 11;
+              _context3.t2 = _context3["catch"](0);
               setOptions([]);
-              throw _context2.t2;
+              throw _context3.t2;
 
             case 15:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[0, 11]]);
+      }, _callee3, null, [[0, 11]]);
     }));
 
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
+    return function (_x4) {
+      return _ref3.apply(this, arguments);
     };
   }(), [autoComplete.onItemNameSearch]);
   return /*#__PURE__*/React.createElement("div", {
@@ -19408,7 +19446,8 @@ function ItemNameInput$1(props) {
     value: props.value,
     options: options.map(function (e) {
       return {
-        value: e.itemName
+        value: e.$index,
+        label: e.itemName
       };
     }),
     onSelect: onChangeAutoComplete

package/dist/index.js

@@ -19353,57 +19353,95 @@ function ItemNameInput$1(props) {
       return _ref.apply(this, arguments);
     };
   }(), [autoComplete.onItemNameBlur, selectLine, props.editGood]);
-  var onChangeAutoComplete = React__default['default'].useCallback(function (itemName) {
-    var record = options.filter(function (e) {
-      return e.itemName === itemName;
-    })[0];
-    if (!record) return;
-    controller.importGoodsDrawer(record);
-  }, [options, controller]);
-  var onSearch = React__default['default'].useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(searchText) {
-      var list;
+  var onChangeAutoComplete = React__default['default'].useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_, i) {
+      var record;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.prev = 0;
+              record = options.filter(function (e) {
+                return e.$index === i.value;
+              })[0];
 
-              if (!autoComplete.onItemNameSearch) {
-                _context2.next = 9;
+              if (record) {
+                _context2.next = 3;
                 break;
               }
 
-              _context2.t0 = _toConsumableArray;
+              return _context2.abrupt("return");
+
+            case 3:
               _context2.next = 5;
+              return controller.setEditGood({
+                itemName: record.itemName
+              });
+
+            case 5:
+              _context2.next = 7;
+              return controller.importGoodsDrawer(_objectSpread2(_objectSpread2({}, record), {}, {
+                $index: undefined
+              }));
+
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [options, controller]);
+  var onSearch = React__default['default'].useCallback( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(searchText) {
+      var list;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+
+              if (!(autoComplete.onItemNameSearch && searchText)) {
+                _context3.next = 9;
+                break;
+              }
+
+              _context3.t0 = _toConsumableArray;
+              _context3.next = 5;
               return autoComplete.onItemNameSearch(searchText);
 
             case 5:
-              _context2.t1 = _context2.sent;
-              list = (0, _context2.t0)(_context2.t1);
-              console.log('===> list', list);
+              _context3.t1 = _context3.sent;
+              list = (0, _context3.t0)(_context3.t1).map(function (e) {
+                return _objectSpread2(_objectSpread2({}, e), {}, {
+                  $index: uuid.v4()
+                });
+              });
               setOptions(list);
 
             case 9:
-              _context2.next = 15;
+              _context3.next = 15;
               break;
 
             case 11:
-              _context2.prev = 11;
-              _context2.t2 = _context2["catch"](0);
+              _context3.prev = 11;
+              _context3.t2 = _context3["catch"](0);
               setOptions([]);
-              throw _context2.t2;
+              throw _context3.t2;
 
             case 15:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[0, 11]]);
+      }, _callee3, null, [[0, 11]]);
     }));
 
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
+    return function (_x4) {
+      return _ref3.apply(this, arguments);
     };
   }(), [autoComplete.onItemNameSearch]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -19418,7 +19456,8 @@ function ItemNameInput$1(props) {
     value: props.value,
     options: options.map(function (e) {
       return {
-        value: e.itemName
+        value: e.$index,
+        label: e.itemName
       };
     }),
     onSelect: onChangeAutoComplete

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.125",
+  "version": "3.2.127",
   "scripts": {
     "dev": "dumi dev",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/importGoods/index.tsx

@@ -74,10 +74,37 @@ class MyInvoiceController extends InvoiceController {
     };
 
     this.state.autoComplete.onItemNameSearch = async (value: any) => {
-      console.log(value, 'onItemNameSearch - Search');
-
+      console.log('===> onItemNameSearch')
       const data = [
         {
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "uuuuuu",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": 1,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": 1,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": 1,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": 1,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "lineAmountIncludeTax":1,
+          "lineAmountExcludeTax":2,
+          "taxAmount":2,
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
           "taxCategoryCode": "1090111090000000000",
           "productName": "苹果",
           "name": null,
@@ -102,12 +129,287 @@ class MyInvoiceController extends InvoiceController {
           "specialGoodsMark": "",
           "createTime": "2023-03-22 17:09:32",
           "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "苹果",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "zzzzz",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "cccccc",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "qqqqqq",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "wwwww",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "eeeee",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "rrrrrr",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "tttttt",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "yyyy",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "uuuuu",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
+        },{
+          "taxCategoryCode": "1090111090000000000",
+          "productName": "iiiiii",
+          "name": null,
+          "productCode": "0003",
+          "shorthand": "小型起重设备",
+          "id": "10881474649024102400167947617243",
+          "specification": null,
+          "categoryId": "10688389540499947520167487266471",
+          "categoryName": "水果",
+          "internalNumber": null,
+          "taxCategoryName": "轻小型起重设备配套件",
+          "referenceAmount": null,
+          "priceAmount": 200.00000000000000000000,
+          "taxId": null,
+          "taxRate": null,
+          "unitId": null,
+          "unitName": null,
+          "taxExemptionType": null,
+          "enjoyPreferentialPolicies": 0,
+          "preferentialPoliciesType": null,
+          "productStatus": 1,
+          "specialGoodsMark": "",
+          "createTime": "2023-03-22 17:09:32",
+          "updateTime": "2023-03-22 17:09:32"
         }
       ];
 
       return data.map((item: any) =>{
         return {
-          ...data,
+          ...item,
           itemName:item.productName,
           taxClassificationCode:item.taxCategoryCode,
           itemModelName:item.specification,

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/ItemNameInput/index.tsx

@@ -1,6 +1,7 @@
 
 import { AutoComplete, Input } from 'kts-xui';
 import React, { ChangeEvent } from 'react';
+import { v4 as uuid } from 'uuid';
 import { IGood, Invoice } from '../../../../../../../..';
 import './index.less';
 
@@ -45,17 +46,18 @@ export default function ItemNameInput(props: {
       }
     }, [autoComplete.onItemNameBlur, selectLine, props.editGood])
 
-    const onChangeAutoComplete = React.useCallback(itemName => {
-        const record = options.filter(e => e.itemName === itemName)[0] as any;
+    const onChangeAutoComplete = React.useCallback(async (_, i) => {
+        const record = options.filter(e => e.$index === i.value)[0] as any;
         if (!record) return;
-        controller.importGoodsDrawer(record);
+
+        await controller.setEditGood({ itemName: record.itemName });
+        await controller.importGoodsDrawer({ ...record, $index: undefined });
     }, [options, controller])
 
     const onSearch = React.useCallback(async (searchText: string) => {
         try {
-            if (autoComplete.onItemNameSearch) {
-                const list = [...await autoComplete.onItemNameSearch(searchText)];
-                console.log('===> list', list);
+            if (autoComplete.onItemNameSearch && searchText) {
+                const list = [...await autoComplete.onItemNameSearch(searchText)].map(e => ({ ...e, $index: uuid() }));;
                 setOptions(list);
             }
         } catch (error) {
@@ -67,7 +69,12 @@ export default function ItemNameInput(props: {
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} value={props.value} options={options.map(e => ({ value: e.itemName }))} onSelect={onChangeAutoComplete} >
+            <AutoComplete 
+              onSearch={onSearch} 
+              value={props.value} 
+              options={options.map(e => ({ value: e.$index, label: e.itemName }))}
+              onSelect={onChangeAutoComplete} 
+            >
                 <Input style={{ height: '100%' }} onChange={onChange} suffix={props.suffix} onBlur={onBlur} />
             </AutoComplete>
         </div>