kts-component-invoice-operate 3.2.33 → 3.2.35

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

@@ -4,7 +4,7 @@ import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
 import { message, Form, Input, Icon as Icon$1, Tag as Tag$1, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete as AutoComplete$2, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover, Table as Table$1, Tree, Modal as Modal$1, Row as Row$1, Col as Col$1 } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
-import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Checkbox as Checkbox$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
+import { message as message$1, TableManual, Switch, AutoComplete as AutoComplete$1, Row, Col, Button as Button$1, Tooltip as Tooltip$1, Input as Input$1, Select as Select$1, Spin as Spin$1, Menu as Menu$1, Form as Form$1, Drawer as Drawer$1, Space, Radio, InputNumber, Popconfirm, Modal } from 'kts-xui';
 import classnames from 'classnames';
 import { Table } from 'kts-components-antd-x4-v4';
 import { render } from 'react-dom';
@@ -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;
 });
@@ -12256,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) {
@@ -13109,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') {
@@ -13121,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;
 });
 /** 字段 */
@@ -15624,13 +15633,6 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
     gutter: [16, 0]
   }, React.createElement(Col, {
     span: 24
-  }, React.createElement(Form.Item, {
-    label: "\u8D2D\u4E70\u65B9\u4FE1\u606F",
-    colon: false
-  }, getFieldDecorator('naturalPersonFlag', {})(React.createElement(NaturalPersonFlag, {
-    readOnly: isReadOnly('naturalPersonFlag')
-  })))), React.createElement(Col, {
-    span: 24
   }, React.createElement(Form.Item, {
     label: "\u540D\u79F0",
     colon: false
@@ -15813,27 +15815,6 @@ var Stakeholder$1 = decorator(Form.create())(function (props) {
   })))))))));
 });
 
-function NaturalPersonFlag(props) {
-  var _React$useState3 = React.useState(props.value || 0),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      value = _React$useState4[0],
-      setValue = _React$useState4[1];
-
-  var onChange = React.useCallback(function (e) {
-    if (props.readOnly) return;
-    setValue(e.target.checked ? 1 : 0);
-    props.onChange && props.onChange(e.target.checked ? 1 : 0);
-  }, [props.onChange, props.readOnly]);
-  React.useEffect(function () {
-    setValue(props.value || 0);
-  }, [props.value]);
-  return React.createElement(Checkbox$1, {
-    disabled: props.readOnly,
-    checked: value === 1,
-    onChange: onChange
-  }, "\u662F\u5426\u5F00\u7968\u7ED9\u81EA\u7136\u4EBA");
-}
-
 function BuyerNameInput$1(props) {
   var fieldName = props.fieldName,
       form = props.myform;
@@ -16826,6 +16807,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
@@ -16836,7 +16818,6 @@ function ItemNameInput$1(props) {
     style: {
       height: '100%'
     },
-    value: props.value,
     onChange: onChange,
     suffix: props.suffix
   })));
@@ -18254,6 +18235,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) {
@@ -19048,6 +19034,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') {
@@ -19060,7 +19049,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) }

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;
 });
@@ -12266,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) {
@@ -13119,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') {
@@ -13131,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;
 });
 /** 字段 */
@@ -15634,13 +15643,6 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
     gutter: [16, 0]
   }, React__default['default'].createElement(ktsXui.Col, {
     span: 24
-  }, React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
-    label: "\u8D2D\u4E70\u65B9\u4FE1\u606F",
-    colon: false
-  }, getFieldDecorator('naturalPersonFlag', {})(React__default['default'].createElement(NaturalPersonFlag, {
-    readOnly: isReadOnly('naturalPersonFlag')
-  })))), React__default['default'].createElement(ktsXui.Col, {
-    span: 24
   }, React__default['default'].createElement(ktsComponentsAntdX3.Form.Item, {
     label: "\u540D\u79F0",
     colon: false
@@ -15823,27 +15825,6 @@ var Stakeholder$1 = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(fu
   })))))))));
 });
 
-function NaturalPersonFlag(props) {
-  var _React$useState3 = React__default['default'].useState(props.value || 0),
-      _React$useState4 = _slicedToArray(_React$useState3, 2),
-      value = _React$useState4[0],
-      setValue = _React$useState4[1];
-
-  var onChange = React__default['default'].useCallback(function (e) {
-    if (props.readOnly) return;
-    setValue(e.target.checked ? 1 : 0);
-    props.onChange && props.onChange(e.target.checked ? 1 : 0);
-  }, [props.onChange, props.readOnly]);
-  React__default['default'].useEffect(function () {
-    setValue(props.value || 0);
-  }, [props.value]);
-  return React__default['default'].createElement(ktsXui.Checkbox, {
-    disabled: props.readOnly,
-    checked: value === 1,
-    onChange: onChange
-  }, "\u662F\u5426\u5F00\u7968\u7ED9\u81EA\u7136\u4EBA");
-}
-
 function BuyerNameInput$1(props) {
   var fieldName = props.fieldName,
       form = props.myform;
@@ -16836,6 +16817,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
@@ -16846,7 +16828,6 @@ function ItemNameInput$1(props) {
     style: {
       height: '100%'
     },
-    value: props.value,
     onChange: onChange,
     suffix: props.suffix
   })));
@@ -18264,6 +18245,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) {
@@ -19058,6 +19044,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') {
@@ -19070,7 +19059,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) }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.33",
+  "version": "3.2.35",
   "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/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/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>
     )

package/src/Invoice/ui/digtal/Stakeholder/index.tsx

@@ -113,14 +113,14 @@ export default decorator<IStakeholder, IStakeholder & FormComponentProps>(Form.c
             <div>
                 <Form className="digtal-stakeholder-form" >
                     <Row gutter={[16, 0]}>
-                        <Col span={24} >
+                        {/* <Col span={24} >
                             <Form.Item label='购买方信息' colon={false}>
                                 {getFieldDecorator('naturalPersonFlag', {
                                 })(
                                     <NaturalPersonFlag readOnly={isReadOnly('naturalPersonFlag')} />
                                 )}
                             </Form.Item>
-                        </Col>
+                        </Col> */}
 
                         <Col span={24} >
                             <Form.Item label='名称' colon={false}>