kts-component-invoice-operate 3.2.181-5 → 3.2.181-6

package/dist/index.esm.js

@@ -15794,13 +15794,19 @@ function AddDiscountRowDrawer(props) {
   /** 表单变化 */
 
   var onChangeForm = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var values;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            setFormValues(form.getFieldsValue());
+            _context6.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context6.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context6.stop();
         }
@@ -15908,18 +15914,18 @@ function AddDiscountRowDrawer(props) {
   })), [discountGood, form, totalAmount, onClose, controller]); // 打开抽屉时 重置form
 
   React.useEffect(function () {
-    // if (open) {
-    // form.resetFields();
-    // setFormValues(form.getFieldsValue())
-    // } 
     if (open) {
       form.resetFields();
       form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
         discolineType: '1'
       });
-      setFormValues(form.getFieldsValue());
     }
-  }, [open, form]); // 切换 折扣方式 清空折扣值
+  }, [open]); // 切换 折扣方式 清空折扣值
 
   React.useEffect(function () {
     form.setFieldsValue(_objectSpread2(_objectSpread2({}, formValues), {}, {
@@ -23816,13 +23822,19 @@ function AddDiscountRowDrawer$1(props) {
   /** 表单变化 */
 
   var onChangeForm = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var values;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            setFormValues(form.getFieldsValue());
+            _context4.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context4.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -23932,7 +23944,14 @@ function AddDiscountRowDrawer$1(props) {
   React.useEffect(function () {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue());
+      form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
+        discolineType: '1'
+      }); // 强制设置formValues的初始状态
     }
   }, [open]); // 切换 折扣方式 清空折扣值
 
@@ -23962,7 +23981,10 @@ function AddDiscountRowDrawer$1(props) {
   }, /*#__PURE__*/React.createElement(Form$1, {
     form: form,
     layout: 'vertical',
-    onChange: onChangeForm
+    onChange: onChangeForm,
+    initialValues: {
+      discolineType: '1'
+    }
   }, /*#__PURE__*/React.createElement(Form$1.Item, {
     label: "\u5546\u54C1\u91D1\u989D\uFF08\u542B\u7A0E\uFF09"
   }, totalAmount.toFixed(2), "\uFF08\u5171 ", discountGood.length, " \u884C\uFF09"), /*#__PURE__*/React.createElement(Form$1.Item, {

package/dist/index.js

@@ -15804,13 +15804,19 @@ function AddDiscountRowDrawer(props) {
   /** 表单变化 */
 
   var onChangeForm = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var values;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            setFormValues(form.getFieldsValue());
+            _context6.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context6.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context6.stop();
         }
@@ -15918,18 +15924,18 @@ function AddDiscountRowDrawer(props) {
   })), [discountGood, form, totalAmount, onClose, controller]); // 打开抽屉时 重置form
 
   React__default['default'].useEffect(function () {
-    // if (open) {
-    // form.resetFields();
-    // setFormValues(form.getFieldsValue())
-    // } 
     if (open) {
       form.resetFields();
       form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
         discolineType: '1'
       });
-      setFormValues(form.getFieldsValue());
     }
-  }, [open, form]); // 切换 折扣方式 清空折扣值
+  }, [open]); // 切换 折扣方式 清空折扣值
 
   React__default['default'].useEffect(function () {
     form.setFieldsValue(_objectSpread2(_objectSpread2({}, formValues), {}, {
@@ -23826,13 +23832,19 @@ function AddDiscountRowDrawer$1(props) {
   /** 表单变化 */
 
   var onChangeForm = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var values;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            setFormValues(form.getFieldsValue());
+            _context4.next = 2;
+            return form.getFieldsValue();
 
-          case 1:
+          case 2:
+            values = _context4.sent;
+            setFormValues(values);
+
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -23942,7 +23954,14 @@ function AddDiscountRowDrawer$1(props) {
   React__default['default'].useEffect(function () {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue());
+      form.setFieldsValue({
+        discolineType: '1',
+        discolineValue: undefined
+      }); // 强制设置初始值
+
+      setFormValues({
+        discolineType: '1'
+      }); // 强制设置formValues的初始状态
     }
   }, [open]); // 切换 折扣方式 清空折扣值
 
@@ -23972,7 +23991,10 @@ function AddDiscountRowDrawer$1(props) {
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form, {
     form: form,
     layout: 'vertical',
-    onChange: onChangeForm
+    onChange: onChangeForm,
+    initialValues: {
+      discolineType: '1'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {
     label: "\u5546\u54C1\u91D1\u989D\uFF08\u542B\u7A0E\uFF09"
   }, totalAmount.toFixed(2), "\uFF08\u5171 ", discountGood.length, " \u884C\uFF09"), /*#__PURE__*/React__default['default'].createElement(ktsXui.Form.Item, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.181-5",
+  "version": "3.2.181-6",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

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

@@ -25,7 +25,7 @@ import Invoice from '../../..';
 import './index.less';
 
 import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
-import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
+import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton'; 
 import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
 import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
 import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -247,7 +247,9 @@ function AddDiscountRowDrawer(props: {
 
   /** 表单变化 */
   const onChangeForm = React.useCallback(async () => {
-    setFormValues(form.getFieldsValue())
+    // setFormValues(form.getFieldsValue())
+    const values = await form.getFieldsValue();
+    setFormValues(values);
   }, [form])
 
   /** 点击了确认 */
@@ -308,18 +310,12 @@ function AddDiscountRowDrawer(props: {
 
   // 打开抽屉时 重置form
   React.useEffect(() => {
-    // if (open) {
-      // form.resetFields();
-      // setFormValues(form.getFieldsValue())
-    // } 
     if (open) {
-      form.resetFields(); 
-      form.setFieldsValue({
-        discolineType: '1',
-      });
-      setFormValues(form.getFieldsValue());
+      form.resetFields();  
+      form.setFieldsValue({ discolineType: '1', discolineValue: undefined }); // 强制设置初始值
+      setFormValues({ discolineType: '1' });
     }
-  }, [open, form])
+  }, [open])
 
   // 切换 折扣方式 清空折扣值
   React.useEffect(() => {

package/src/Invoice/ui/digtal/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.tsx

@@ -167,7 +167,10 @@ function AddDiscountRowDrawer(props: {
 
   /** 表单变化 */
   const onChangeForm = React.useCallback(async () => {
-    setFormValues(form.getFieldsValue())
+    // setFormValues(form.getFieldsValue())
+    // 仅在输入框值变化时更新 formValues
+    const values = await form.getFieldsValue();
+    setFormValues(values);
   }, [form])
 
   /** 点击了确认 */
@@ -230,7 +233,8 @@ function AddDiscountRowDrawer(props: {
   React.useEffect(() => {
     if (open) {
       form.resetFields();
-      setFormValues(form.getFieldsValue())
+      form.setFieldsValue({ discolineType: '1', discolineValue: undefined }); // 强制设置初始值
+      setFormValues({ discolineType: '1' }); // 强制设置formValues的初始状态
     }
   }, [open])
 
@@ -257,6 +261,9 @@ function AddDiscountRowDrawer(props: {
         form={form}
         layout='vertical'
         onChange={onChangeForm}
+        initialValues={{
+          discolineType: '1',
+        }}
       >
         <Form.Item label='商品金额（含税）' >
           {totalAmount.toFixed(2)}（共 {discountGood.length} 行）