kts-component-invoice-operate 1.0.85 → 1.0.86

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode.d.ts

@@ -10,8 +10,12 @@ export default class EndowCode {
     }[]>;
     /** 税率 是否可以编辑 */
     getReadOnlyTaxRate?: (value?: GoodsListState) => boolean;
-    /** 获取单条赋码时候的默认值 */
-    getDefaultValue?: (value: IGood) => Promise<IGood>;
+    /**
+     * 获取赋码时候的默认值
+     * @param value 商品信息
+     * @param length 商品数量
+     * */
+    getDefaultValue?: (value: IGood, length: number) => Promise<IGood>;
     /** 税率 是否可以编辑 校验函数 */
     readonly readOnlyTaxRateMap: {
         [key: string]: (value?: GoodsListState) => boolean;

package/dist/index.esm.js

@@ -4492,7 +4492,7 @@ var Main = decorator(Form.create())(function (props) {
     },
     dataSource: controller.useMemo(function (s) {
       return s.goodsListState.goodsList;
-    }, []),
+    }, [controller]),
     columns: useColumns(props.form),
     rowSelection: useRowSelection(),
     onRow: function onRow(record) {
@@ -5264,41 +5264,33 @@ var EndowCodeDrawer = (function () {
                   return _context2.abrupt("return");
 
                 case 4:
-                  if (!(endowcodeGoodIndex.length === 1)) {
-                    _context2.next = 17;
-                    break;
-                  }
-
                   getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
 
                   if (!getDefaultValue) {
-                    _context2.next = 14;
+                    _context2.next = 13;
                     break;
                   }
 
                   _context2.t0 = setDefaultValue;
-                  _context2.next = 10;
-                  return getDefaultValue(_objectSpread2({}, good));
+                  _context2.next = 9;
+                  return getDefaultValue(_objectSpread2({}, good), endowcodeGoodIndex.length);
 
-                case 10:
+                case 9:
                   _context2.t1 = _context2.sent;
                   (0, _context2.t0)(_context2.t1);
-                  _context2.next = 15;
-                  break;
-
-                case 14:
-                  setDefaultValue(good);
-
-                case 15:
-                  _context2.next = 18;
+                  _context2.next = 14;
                   break;
 
-                case 17:
-                  setDefaultValue({
-                    taxRate: good.taxRate
-                  });
+                case 13:
+                  if (endowcodeGoodIndex.length === 1) {
+                    setDefaultValue(good);
+                  } else {
+                    setDefaultValue({
+                      taxRate: good.taxRate
+                    });
+                  }
 
-                case 18:
+                case 14:
                 case "end":
                   return _context2.stop();
               }
@@ -5773,7 +5765,17 @@ var Main$3 = function Main(props) {
   var controller = React.useMemo(function () {
     return props.controller || new InvoiceController();
   }, [props.controller]);
+
+  var _React$useState = React.useState(0),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      key = _React$useState2[0],
+      setKey = _React$useState2[1];
+
+  React.useEffect(function () {
+    setKey(key + 1);
+  }, [controller]);
   return /*#__PURE__*/React.createElement(InvoiceContext.Provider, {
+    key: key,
     value: controller
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate"

package/dist/index.js

@@ -4502,7 +4502,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     },
     dataSource: controller.useMemo(function (s) {
       return s.goodsListState.goodsList;
-    }, []),
+    }, [controller]),
     columns: useColumns(props.form),
     rowSelection: useRowSelection(),
     onRow: function onRow(record) {
@@ -5274,41 +5274,33 @@ var EndowCodeDrawer = (function () {
                   return _context2.abrupt("return");
 
                 case 4:
-                  if (!(endowcodeGoodIndex.length === 1)) {
-                    _context2.next = 17;
-                    break;
-                  }
-
                   getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
 
                   if (!getDefaultValue) {
-                    _context2.next = 14;
+                    _context2.next = 13;
                     break;
                   }
 
                   _context2.t0 = setDefaultValue;
-                  _context2.next = 10;
-                  return getDefaultValue(_objectSpread2({}, good));
+                  _context2.next = 9;
+                  return getDefaultValue(_objectSpread2({}, good), endowcodeGoodIndex.length);
 
-                case 10:
+                case 9:
                   _context2.t1 = _context2.sent;
                   (0, _context2.t0)(_context2.t1);
-                  _context2.next = 15;
-                  break;
-
-                case 14:
-                  setDefaultValue(good);
-
-                case 15:
-                  _context2.next = 18;
+                  _context2.next = 14;
                   break;
 
-                case 17:
-                  setDefaultValue({
-                    taxRate: good.taxRate
-                  });
+                case 13:
+                  if (endowcodeGoodIndex.length === 1) {
+                    setDefaultValue(good);
+                  } else {
+                    setDefaultValue({
+                      taxRate: good.taxRate
+                    });
+                  }
 
-                case 18:
+                case 14:
                 case "end":
                   return _context2.stop();
               }
@@ -5783,7 +5775,17 @@ var Main$3 = function Main(props) {
   var controller = React__default['default'].useMemo(function () {
     return props.controller || new InvoiceController();
   }, [props.controller]);
+
+  var _React$useState = React__default['default'].useState(0),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      key = _React$useState2[0],
+      setKey = _React$useState2[1];
+
+  React__default['default'].useEffect(function () {
+    setKey(key + 1);
+  }, [controller]);
   return /*#__PURE__*/React__default['default'].createElement(InvoiceContext.Provider, {
+    key: key,
     value: controller
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/EndowCode.tsx

@@ -13,8 +13,12 @@ export default class EndowCode {
   /** 税率 是否可以编辑 */
   getReadOnlyTaxRate?: (value?: GoodsListState) => boolean;
 
-  /** 获取单条赋码时候的默认值 */
-  getDefaultValue?: (value: IGood) => Promise<IGood>;
+  /** 
+   * 获取赋码时候的默认值 
+   * @param value 商品信息
+   * @param length 商品数量
+   * */
+  getDefaultValue?: (value: IGood, length:number) => Promise<IGood>;
 
   /** 税率 是否可以编辑 校验函数 */
   readonly readOnlyTaxRateMap: { [key: string]: (value?: GoodsListState) => boolean } = {

package/src/Invoice/_test/endowCode/index.tsx

@@ -5,7 +5,11 @@ import { LineAttributeType } from '../../../Invoice/InvoiceController';
 import { Button, Switch } from 'kts-components-antd-x3';
 
 export default () => {
-  const controller = React.useMemo(() => new MyController(), []);
+  const controller1 = React.useMemo(() => new MyController1(), []);
+
+  const controller2 = React.useMemo(() => new MyController2(), []);
+
+  const [controller, setController] = React.useState(controller1)
 
   const onClick1 = React.useCallback(() => {
     controller.pipeline(async (s) => {
@@ -41,7 +45,7 @@ export default () => {
       <Button onClick={onClick2} style={{ marginBottom: 20 }}>
         模拟生成数据
       </Button>
-      <Switch checkedChildren="预制" unCheckedChildren="默认" onChange={controller.pipeline(async (s, e) => s.model = e ? 'prefab' : 'default')} ></Switch>
+      <Switch checkedChildren="预制" unCheckedChildren="默认" onChange={e => { e ? setController(controller2) : setController(controller1) }} ></Switch>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = s.goodsListState.endowCode.readOnlyTaxRateMap.DRAFT })} >税率（草稿）</Button>
       <Button onClick={controller.pipeline(async s => { s.goodsListState.endowCode.getReadOnlyTaxRate = () => true })} >税率（预制）</Button>
       <Invoice controller={controller} />
@@ -50,11 +54,42 @@ export default () => {
 };
 
 // 税收分类编码列表
-class MyController extends Invoice.InvoiceController {
+class MyController1 extends Invoice.InvoiceController {
+
+  constructor(){
+    super()
+    this.state.model = 'default'
+  }
+
+  getTaxCategoryCodeList = this.pipeline(async (s) => {
+    console.log('===> 准备赋码的货物索引列表', s.goodsListState.endowCode.endowcodeGoodIndex);
+
+    s.goodsListState.endowCode.getTaxCategoryCodeList = async (value) => {
+      console.log('===>搜索条件', value);
+      return [
+        { label: '3040201990000000000/aaa/bbb', value: '3040201990000000000', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000001/aaa/bbb', value: '3040201990000000001', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000002/aaa/bbb', value: '3040201990000000002', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000003/aaa/bbb', value: '3040201990000000003', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000004/aaa/bbb', value: '3040201990000000004', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000005/aaa/bbb', value: '3040201990000000005', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000006/aaa/bbb', value: '3040201990000000006', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000007/aaa/bbb', value: '3040201990000000007', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000008/aaa/bbb', value: '3040201990000000008', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000009/aaa/bbb', value: '3040201990000000009', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000010/aaa/bbb', value: '3040201990000000010', taxRate: 3, shorthand: 'aaa' },
+        { label: '3040201990000000011/aaa/bbb', value: '3040201990000000011', taxRate: 3, shorthand: 'aaa' },
+      ]
+    };
+  });
+}
+
+
+class MyController2 extends Invoice.InvoiceController {
 
-  constructor() {
-    super();
-    this.state.model = 'prefab';
+  constructor(){
+    super()
+    this.state.model = 'prefab'
   }
 
   getTaxCategoryCodeList = this.pipeline(async (s) => {
@@ -106,7 +141,7 @@ const lines: any[] = [
     "itemName": "*研发和技术服务*技术服务费",
     "lineAmountExcludeTax": 94.34,
     "lineAmountIncludeTax": 100.00,
-    "lineAttribute": "0",
+    "lineAttribute": '0',
     "lineDiscountExcludeTax": null,
     "lineDiscountRate": null,
     "lineId": "1449262336593362944",

package/src/Invoice/index.tsx

@@ -72,9 +72,17 @@ export default class extends React.PureComponent<IInvoiceProps> {
 }
 
 const Main = (props: IInvoiceProps) => {
+
   const controller = React.useMemo(() => props.controller || new InvoiceController(), [props.controller]);
+
+  const [key, setKey] = React.useState(0)
+
+  React.useEffect(() => {
+    setKey(key + 1);
+  }, [controller])
+
   return (
-    <InvoiceContext.Provider value={controller}>
+    <InvoiceContext.Provider key={key} value={controller}>
       <div className="kts-invoice-operate">
         {props.invoiceHeader || <InvoiceHeader /> /** 发票头 */}
         {props.buyer || <Buyer /> /** 购买方 */}
@@ -94,4 +102,4 @@ const Main = (props: IInvoiceProps) => {
       <EndowCodeDrawer />
     </InvoiceContext.Provider>
   );
-};  
+};

package/src/Invoice/ui/EndowCodeDrawer/index.tsx

@@ -42,15 +42,15 @@ export default () => {
         const good = s.goodsListState.goodsMap.get(s.goodsListState.endowCode.endowcodeGoodIndex[0]);
         if (!good) return;
 
-        if (endowcodeGoodIndex.length === 1) {
-          const getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
-          if (getDefaultValue) {
-            setDefaultValue(await getDefaultValue({ ...good }))
-          } else {
+        const getDefaultValue = s.goodsListState.endowCode.getDefaultValue;
+        if (getDefaultValue) {
+          setDefaultValue(await getDefaultValue({ ...good }, endowcodeGoodIndex.length))
+        } else {
+          if (endowcodeGoodIndex.length === 1) {
             setDefaultValue(good);
+          } else {
+            setDefaultValue({ taxRate: good.taxRate } as any);
           }
-        } else {
-          setDefaultValue({ taxRate: good.taxRate } as any);
         }
       })()
     } else {

package/src/Invoice/ui/GoodsList/index.tsx

@@ -33,9 +33,9 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 控制器 */
   const controller = Invoice.useInvoiceController();
 
-  const goodsList = controller.useMemo((s) => s.goodsListState.goodsList, []);
+  const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
 
-  const isprefab = controller.useMemo((s) => s.model === 'prefab', []);
+  const isprefab = controller.useMemo(s => s.model === 'prefab', []);
 
   /** 表格行事件 */
   const onRow = useOnRow();
@@ -101,7 +101,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
           pagination={false}
           scroll={{ y: 240 }}
           components={{ body: { row: TableRow } }}
-          dataSource={controller.useMemo((s) => s.goodsListState.goodsList, [])}
+          dataSource={controller.useMemo((s) => s.goodsListState.goodsList, [controller])}
           columns={useColumns(props.form)}
           rowSelection={useRowSelection()}
           onRow={(record) => ({