kts-component-invoice-operate 3.2.32 → 3.2.34

package/dist/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/Drag/index.d.ts

@@ -1,5 +1,7 @@
 /** 商品拖拽数据 */
 export default class Drag {
+    /** 是否启用拖拽 */
+    isStart: boolean;
     /** 当前拖动中的货品索引 */
     current?: string;
     /** 准备插入的货物索引 */

package/dist/index.esm.js

@@ -990,6 +990,7 @@ var ProductComparison = /*#__PURE__*/_createClass(function ProductComparison() {
 var Drag = /*#__PURE__*/_createClass(function Drag() {
   _classCallCheck(this, Drag);
 
+  this.isStart = false;
   this.current = void 0;
   this.container = void 0;
 });
@@ -10619,7 +10620,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React.createElement(AutoComplete$1, {
     onSearch: onSearch,
-    defaultValue: props.value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -10631,7 +10632,6 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
-    value: props.value,
     onChange: onChange
   })));
 } // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
@@ -12257,6 +12257,11 @@ var useColumns = (function (form) {
   var model = controller.useMemo(function (e) {
     return e.model;
   }, []);
+  /** 是否启用拖拽 */
+
+  var isStart = controller.useMemo(function (e) {
+    return e.goodsListState.drag.isStart;
+  }, []);
   /** 是否显示我方 */
 
   var isMyShow = controller.useMemo(function (e) {
@@ -13110,6 +13115,9 @@ var useColumns = (function (form) {
       } else {
         return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
       }
+    }) // 是否启动拖拽
+    .filter(function (e) {
+      return e.key !== 'drag' || isStart;
     }) // 只读
     .filter(function (e) {
       if (model === 'readOnly') {
@@ -13122,7 +13130,7 @@ var useColumns = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide, isStart]);
   return columns;
 });
 /** 字段 */
@@ -16827,6 +16835,7 @@ function ItemNameInput$1(props) {
     }
   }, "*", props.shorthand, "*"), React.createElement(AutoComplete$1, {
     onSearch: onSearch,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -16837,7 +16846,6 @@ function ItemNameInput$1(props) {
     style: {
       height: '100%'
     },
-    value: props.value,
     onChange: onChange,
     suffix: props.suffix
   })));
@@ -18255,6 +18263,11 @@ var useColumns$1 = (function (form) {
   var editGood = controller.useMemo(function (e) {
     return e.goodsListState.editGood;
   }, []);
+  /** 是否启用拖拽 */
+
+  var isStart = controller.useMemo(function (e) {
+    return e.goodsListState.drag.isStart;
+  }, []);
   /** 搜索条件 */
 
   var searchValue = controller.useMemo(function (e) {
@@ -19049,6 +19062,9 @@ var useColumns$1 = (function (form) {
       } else {
         return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
       }
+    }) // 是否启动拖拽
+    .filter(function (e) {
+      return e.key !== 'drag' || isStart;
     }) // 只读
     .filter(function (e) {
       if (model === 'readOnly') {
@@ -19061,7 +19077,7 @@ var useColumns$1 = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]); // React.useEffect(() => {
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]); // React.useEffect(() => {
   //   clearTimeout(t)
   //   const t = setTimeout(() => { setChangeField('') }, 1000);
   //   return () => { clearTimeout(t) }
@@ -21246,14 +21262,17 @@ var DrawerBody$2 = function DrawerBody() {
                       } // 导入FORM里
 
 
-                      if (s.goodsListState.isMyShow) {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
-                          itemName: editGood.itemNameSelf,
-                          itemModelName: editGood.itemModelNameSelf
-                        }));
-                      } else {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
-                      }
+                      s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood)); // if (s.goodsListState.isMyShow) {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //     itemName: editGood.itemNameSelf,
+                      //     itemModelName: editGood.itemModelNameSelf,
+                      //   });
+                      // } else {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //   });
+                      // }
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 

package/dist/index.js

@@ -1000,6 +1000,7 @@ var ProductComparison = /*#__PURE__*/_createClass(function ProductComparison() {
 var Drag = /*#__PURE__*/_createClass(function Drag() {
   _classCallCheck(this, Drag);
 
+  this.isStart = false;
   this.current = void 0;
   this.container = void 0;
 });
@@ -10629,7 +10630,7 @@ function ItemNameInput(props) {
     }
   }, "*", props.shorthand, "*"), React__default['default'].createElement(ktsXui.AutoComplete, {
     onSearch: onSearch,
-    defaultValue: props.value,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -10641,7 +10642,6 @@ function ItemNameInput(props) {
       height: '100%',
       border: 'none'
     },
-    value: props.value,
     onChange: onChange
   })));
 } // function removeNullUndefined(obj: Record<string, any>): Record<string, any> {
@@ -12267,6 +12267,11 @@ var useColumns = (function (form) {
   var model = controller.useMemo(function (e) {
     return e.model;
   }, []);
+  /** 是否启用拖拽 */
+
+  var isStart = controller.useMemo(function (e) {
+    return e.goodsListState.drag.isStart;
+  }, []);
   /** 是否显示我方 */
 
   var isMyShow = controller.useMemo(function (e) {
@@ -13120,6 +13125,9 @@ var useColumns = (function (form) {
       } else {
         return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
       }
+    }) // 是否启动拖拽
+    .filter(function (e) {
+      return e.key !== 'drag' || isStart;
     }) // 只读
     .filter(function (e) {
       if (model === 'readOnly') {
@@ -13132,7 +13140,7 @@ var useColumns = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide, isStart]);
   return columns;
 });
 /** 字段 */
@@ -16837,6 +16845,7 @@ function ItemNameInput$1(props) {
     }
   }, "*", props.shorthand, "*"), React__default['default'].createElement(ktsXui.AutoComplete, {
     onSearch: onSearch,
+    value: props.value,
     options: options.map(function (e) {
       return {
         value: e.itemName
@@ -16847,7 +16856,6 @@ function ItemNameInput$1(props) {
     style: {
       height: '100%'
     },
-    value: props.value,
     onChange: onChange,
     suffix: props.suffix
   })));
@@ -18265,6 +18273,11 @@ var useColumns$1 = (function (form) {
   var editGood = controller.useMemo(function (e) {
     return e.goodsListState.editGood;
   }, []);
+  /** 是否启用拖拽 */
+
+  var isStart = controller.useMemo(function (e) {
+    return e.goodsListState.drag.isStart;
+  }, []);
   /** 搜索条件 */
 
   var searchValue = controller.useMemo(function (e) {
@@ -19059,6 +19072,9 @@ var useColumns$1 = (function (form) {
       } else {
         return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
       }
+    }) // 是否启动拖拽
+    .filter(function (e) {
+      return e.key !== 'drag' || isStart;
     }) // 只读
     .filter(function (e) {
       if (model === 'readOnly') {
@@ -19071,7 +19087,7 @@ var useColumns$1 = (function (form) {
         ellipsis: true
       });
     });
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]); // React.useEffect(() => {
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]); // React.useEffect(() => {
   //   clearTimeout(t)
   //   const t = setTimeout(() => { setChangeField('') }, 1000);
   //   return () => { clearTimeout(t) }
@@ -21256,14 +21272,17 @@ var DrawerBody$2 = function DrawerBody() {
                       } // 导入FORM里
 
 
-                      if (s.goodsListState.isMyShow) {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2(_objectSpread2({}, editGood), {}, {
-                          itemName: editGood.itemNameSelf,
-                          itemModelName: editGood.itemModelNameSelf
-                        }));
-                      } else {
-                        s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood));
-                      }
+                      s.goodsListState.form.setFieldsValue(_objectSpread2({}, editGood)); // if (s.goodsListState.isMyShow) {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //     itemName: editGood.itemNameSelf,
+                      //     itemModelName: editGood.itemModelNameSelf,
+                      //   });
+                      // } else {
+                      //   s.goodsListState.form.setFieldsValue({
+                      //     ...editGood,
+                      //   });
+                      // }
 
                       s.goodsListState.importGoods.isVisibleDrawer = false;
 

package/package.json

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

package/src/Invoice/InvoiceController/InvoiceControllerState/GoodsListState/Drag/index.ts

@@ -2,6 +2,9 @@
 /** 商品拖拽数据 */
 export default class Drag {
 
+    /** 是否启用拖拽 */
+    isStart: boolean = false;
+
     /** 当前拖动中的货品索引 */
     current?: string;
 

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

@@ -65,6 +65,7 @@ class MyController1 extends Invoice.InvoiceController {
     super()
     this.state.model = 'default'
     this.state.goodsListState.isMergeDetails = true;
+    this.state.goodsListState.drag.isStart = true;
   }
 
   getTaxCategoryCodeList = this.pipeline(async (s) => {
@@ -90,6 +91,7 @@ class MyController2 extends Invoice.InvoiceController {
     super()
     this.state.model = 'prefab'
     this.state.goodsListState.isMergeDetails = true;
+    this.state.goodsListState.drag.isStart = true;
   }
 
   getTaxCategoryCodeList = this.pipeline(async (s) => {

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

@@ -1,7 +1,7 @@
 
 import React from 'react';
 import { Button } from 'kts-components-antd-x3/lib/radio';
-import { Invoice, IGood } from '../../../..';
+import { Invoice, IGood } from '../../../../src';
 import { IGetBuyerListOption } from '../../../Invoice/InvoiceController/InvoiceControllerState/BuyerState';
 
 const InvoiceController = Invoice.InvoiceController

package/src/Invoice/ui/default/GoodsList/hook/useColumns/index.tsx

@@ -32,6 +32,9 @@ export default (form: WrappedFormUtils) => {
   /** 组件模式 */
   const model = controller.useMemo(e => e.model, []);
 
+  /** 是否启用拖拽 */
+  const isStart = controller.useMemo((e) => e.goodsListState.drag.isStart, []);
+
   /** 是否显示我方 */
   const isMyShow = controller.useMemo(e => e.goodsListState.isMyShow, []);
 
@@ -548,6 +551,8 @@ export default (form: WrappedFormUtils) => {
           return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
         }
       })
+      // 是否启动拖拽
+      .filter(e => e.key !=='drag' || isStart)
       // 只读
       .filter(e => {
         if (model === 'readOnly') {
@@ -562,7 +567,7 @@ export default (form: WrappedFormUtils) => {
           ellipsis: true,
         };
       }) as any[];
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide, isStart]);
   return columns;
 };
 

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

@@ -99,8 +99,8 @@ export default function ItemNameInput(props: { onChange?: (e: ChangeEvent<HTMLIn
     return (
         <div className='kts-invoice-operate-goods-list-itemName-input'>
             {props.shorthand && <span style={{ alignSelf: 'center', fontSize: 12 }} >*{props.shorthand}*</span>}
-            <AutoComplete onSearch={onSearch} defaultValue={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
-                <Input style={{ height: '100%', border: 'none' }} value={props.value} onChange={onChange} />
+            <AutoComplete onSearch={onSearch} value={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
+                <Input style={{ height: '100%', border: 'none' }} onChange={onChange} />
             </AutoComplete>
         </div>
     )

package/src/Invoice/ui/default/ImportGoodsDrawer/index.tsx

@@ -27,10 +27,12 @@ export default () => {
       onClose={onClose}
       visible={visible}
     >
-      {topExpand &&
+      {
+        topExpand &&
         <div style={{ marginBottom: 10 }}  >
           {topExpand}
-        </div>}
+        </div>
+      }
       <DrawerBody />
     </Drawer>
   );
@@ -98,17 +100,20 @@ const DrawerBody = () => {
               }
 
               // 导入FORM里
-              if (s.goodsListState.isMyShow) {
-                s.goodsListState.form.setFieldsValue({
-                  ...editGood,
-                  itemName: editGood.itemNameSelf,
-                  itemModelName: editGood.itemModelNameSelf,
-                });
-              } else {
-                s.goodsListState.form.setFieldsValue({
-                  ...editGood,
-                });
-              }
+              s.goodsListState.form.setFieldsValue({
+                ...editGood,
+              });
+              // if (s.goodsListState.isMyShow) {
+              //   s.goodsListState.form.setFieldsValue({
+              //     ...editGood,
+              //     itemName: editGood.itemNameSelf,
+              //     itemModelName: editGood.itemModelNameSelf,
+              //   });
+              // } else {
+              //   s.goodsListState.form.setFieldsValue({
+              //     ...editGood,
+              //   });
+              // }
 
               s.goodsListState.importGoods.isVisibleDrawer = false;
               s.goodsListState.isTaxIncluded
@@ -165,6 +170,5 @@ const getItemNameOther = (record: any, editGood: IGood) => {
   // if (shorthand) {
   //   return `*${shorthand}*${record.itemNameSelf}`;
   // }
-
   return record.itemName;
 }

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

@@ -38,6 +38,9 @@ export default (form: WrappedFormUtils) => {
   /** 正在编辑的货物 */
   const editGood = controller.useMemo((e) => e.goodsListState.editGood, []);
 
+  /** 是否启用拖拽 */
+  const isStart = controller.useMemo((e) => e.goodsListState.drag.isStart, []);
+
   /** 搜索条件 */
   const searchValue = controller.useMemo((e) => e.goodsListState.searchValue, []);
 
@@ -528,6 +531,8 @@ export default (form: WrappedFormUtils) => {
           return !(e.key === 'priceIncludeTax' || e.key === 'lineAmountIncludeTax');
         }
       })
+      // 是否启动拖拽
+      .filter(e => e.key !=='drag' || isStart)
       // 只读
       .filter(e => {
         if (model === 'readOnly') {
@@ -542,7 +547,7 @@ export default (form: WrappedFormUtils) => {
           ellipsis: true,
         };
       }) as any[];
-  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish]);
+  }, [isTaxIncluded, editGood, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]);
 
   // React.useEffect(() => {
   //   clearTimeout(t)

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

@@ -42,8 +42,8 @@ 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} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
-                <Input style={{ height: '100%' }} value={props.value} onChange={onChange} suffix={props.suffix} />
+            <AutoComplete onSearch={onSearch} value={props.value} options={options.map(e => ({ value: e.itemName }))} onChange={onChangeAutoComplete} >
+                <Input style={{ height: '100%' }}  onChange={onChange} suffix={props.suffix} />
             </AutoComplete>
         </div>
     )