kts-component-invoice-operate 3.2.79 → 3.2.80

package/dist/index.esm.js

@@ -22082,7 +22082,9 @@ function TaxClassificationModal(props) {
 
   React.useEffect(function () {
     if (!props.open) {
-      form.resetFields();
+      setTimeout(function () {
+        form.resetFields();
+      }, 500);
     }
   }, [form, props.open]);
   return React.createElement(Drawer$1, {
@@ -22098,14 +22100,16 @@ function TaxClassificationModal(props) {
   }, React.createElement(Input$1, {
     placeholder: "\u8BF7\u8F93\u5165\u7A0E\u6536\u5206\u7C7B\u7F16\u7801\u3001\u7A0E\u6536\u5206\u7C7B\u540D\u79F0\u8FDB\u884C\u68C0\u7D22",
     onChange: props.onSearch
-  })), React.createElement(Tree, {
+  })), React.createElement(Form$1.Item, {
+    name: 'tree'
+  }, React.createElement(Tree, {
     onSelect: props.onSelect,
     loadData: props.onLoad,
     treeData: props.list,
     switcherIcon: React.createElement(Icon$1, {
       type: "down"
     })
-  })));
+  }))));
 }
 
 var TreeNode = Tree$1.TreeNode;
@@ -22622,93 +22626,118 @@ var DrawerBody$3 = function DrawerBody(props) {
         setList = _React$useState16[1];
 
     var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-      var _value$target;
-
       var value,
+          _value$target,
           arr,
-          list,
+          _list,
           _args11 = arguments;
+
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
             case 0:
               value = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : null;
-              _context11.next = 3;
+
+              if (!value) {
+                _context11.next = 9;
+                break;
+              }
+
+              _context11.next = 4;
               return controller.state.goodsListState.endowCode.onSearchTaxClassificationCode(value === null || value === void 0 ? void 0 : (_value$target = value.target) === null || _value$target === void 0 ? void 0 : _value$target.value);
 
-            case 3:
+            case 4:
               arr = _context11.sent;
-              list = arr.map(function (item) {
-                var _value$target2;
-
-                var data = _objectSpread2(_objectSpread2({}, item), {}, {
+              _list = arr.map(function (item) {
+                return _objectSpread2(_objectSpread2({}, item), {}, {
                   title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
-                  key: item.taxCategoryCode
+                  key: item.taxCategoryCode,
+                  isLeaf: true
                 });
-
-                if (value === null || value === void 0 ? void 0 : (_value$target2 = value.target) === null || _value$target2 === void 0 ? void 0 : _value$target2.value) {
-                  data.isLeaf = true;
-                } else {
-                  data.selectable = false;
-                }
-
-                return data;
               });
-              setList(list);
+              setList(_list);
+              _context11.next = 11;
+              break;
 
-            case 6:
+            case 9:
+              _context11.next = 11;
+              return onLoad();
+
+            case 11:
             case "end":
               return _context11.stop();
           }
         }
       }, _callee11);
     })), []);
-    var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+    var onLoad = React.useCallback( /*#__PURE__*/function () {
+      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(value) {
+        var arr, data, treeData;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) {
+            switch (_context12.prev = _context12.next) {
+              case 0:
+                _context12.next = 2;
+                return controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value === null || value === void 0 ? void 0 : value.taxCategoryCode);
+
+              case 2:
+                arr = _context12.sent;
+                data = arr.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
+                    key: item.taxCategoryCode
+                  });
+                });
+                treeData = optimizeTreeData(data);
+
+                if (value === null || value === void 0 ? void 0 : value.key) {
+                  setList(function (origin) {
+                    updateTreeData(origin, value.key, treeData);
+                  });
+                } else {
+                  setList(treeData);
+                }
+
+                return _context12.abrupt("return", []);
+
+              case 7:
+              case "end":
+                return _context12.stop();
+            }
+          }
+        }, _callee12);
+      }));
+
+      return function (_x9) {
+        return _ref12.apply(this, arguments);
+      };
+    }(), []);
+    var onClick = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
-              _context12.next = 2;
-              return onSearch();
+              _context13.next = 2;
+              return onLoad();
 
             case 2:
               setOpen(true);
 
             case 3:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee12);
+      }, _callee13);
     })), []);
     var onSelect = React.useCallback(function (key, info) {
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(s) {
-          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-            while (1) {
-              switch (_context13.prev = _context13.next) {
-                case 0:
-                  s.value = info.node.taxCategoryCode;
-
-                case 1:
-                case "end":
-                  return _context13.stop();
-              }
-            }
-          }, _callee13);
-        }));
-
-        return function (_x9) {
-          return _ref13.apply(this, arguments);
-        };
-      }());
-      actions.setFieldState('productName', /*#__PURE__*/function () {
         var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
           return _regeneratorRuntime().wrap(function _callee14$(_context14) {
             while (1) {
               switch (_context14.prev = _context14.next) {
                 case 0:
-                  s.value = info.node.productName;
+                  s.value = info.node.taxCategoryCode;
 
                 case 1:
                 case "end":
@@ -22722,13 +22751,13 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref14.apply(this, arguments);
         };
       }());
-      actions.setFieldState('shorthand', /*#__PURE__*/function () {
+      actions.setFieldState('productName', /*#__PURE__*/function () {
         var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(s) {
           return _regeneratorRuntime().wrap(function _callee15$(_context15) {
             while (1) {
               switch (_context15.prev = _context15.next) {
                 case 0:
-                  s.value = info.node.shorthand;
+                  s.value = info.node.productName;
 
                 case 1:
                 case "end":
@@ -22742,13 +22771,13 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref15.apply(this, arguments);
         };
       }());
-      actions.setFieldState('taxRate', /*#__PURE__*/function () {
+      actions.setFieldState('shorthand', /*#__PURE__*/function () {
         var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
           return _regeneratorRuntime().wrap(function _callee16$(_context16) {
             while (1) {
               switch (_context16.prev = _context16.next) {
                 case 0:
-                  s.value = info.node.taxRate;
+                  s.value = info.node.shorthand;
 
                 case 1:
                 case "end":
@@ -22762,11 +22791,40 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref16.apply(this, arguments);
         };
       }());
+      actions.setFieldState('taxRate', /*#__PURE__*/function () {
+        var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(s) {
+          return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+            while (1) {
+              switch (_context17.prev = _context17.next) {
+                case 0:
+                  s.value = info.node.taxRate;
+
+                case 1:
+                case "end":
+                  return _context17.stop();
+              }
+            }
+          }, _callee17);
+        }));
+
+        return function (_x13) {
+          return _ref17.apply(this, arguments);
+        };
+      }());
       setOpen(false);
     }, [controller, actions]);
 
+    var optimizeTreeData = function optimizeTreeData(data) {
+      return data.map(function (item) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          selectable: (item === null || item === void 0 ? void 0 : item.hzx) === 'N',
+          isLeaf: (item === null || item === void 0 ? void 0 : item.hzx) === 'N'
+        });
+      });
+    };
+
     var updateTreeData = function updateTreeData(list, key, children) {
-      var demo = list.map(function (node) {
+      return list.map(function (node) {
         if (node.key === key) {
           return _objectSpread2(_objectSpread2({}, node), {}, {
             children: children
@@ -22781,52 +22839,8 @@ var DrawerBody$3 = function DrawerBody(props) {
 
         return node;
       });
-      setList(demo);
     };
 
-    var onLoad = React.useCallback( /*#__PURE__*/function () {
-      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(value) {
-        var arr, data;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) {
-            switch (_context17.prev = _context17.next) {
-              case 0:
-                if (!value.children) {
-                  _context17.next = 2;
-                  break;
-                }
-
-                return _context17.abrupt("return", []);
-
-              case 2:
-                _context17.next = 4;
-                return controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value.taxCategoryCode);
-
-              case 4:
-                arr = _context17.sent;
-                data = arr.map(function (item) {
-                  return _objectSpread2(_objectSpread2({}, item), {}, {
-                    title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
-                    key: item.taxCategoryCode
-                  });
-                });
-                setList(function (origin) {
-                  updateTreeData(origin, value.key, data);
-                });
-                return _context17.abrupt("return", []);
-
-              case 8:
-              case "end":
-                return _context17.stop();
-            }
-          }
-        }, _callee17);
-      }));
-
-      return function (_x13) {
-        return _ref17.apply(this, arguments);
-      };
-    }(), []);
     return React.createElement(React.Fragment, null, React.createElement(Input, {
       readOnly: true,
       onClick: onClick,
@@ -22951,7 +22965,7 @@ var DrawerBody$3 = function DrawerBody(props) {
     actions: actions,
     previewPlaceholder: " ",
     components: _objectSpread2(_objectSpread2({}, components), {}, {
-      showSearch: !!controller.state.goodsListState.endowCode.onSearchTaxClassificationCode() ? ShowSearch3 : ShowSearch
+      showSearch: !!controller.state.goodsListState.endowCode.onLoadTaxClassificationCode() ? ShowSearch3 : ShowSearch
     }),
     effects: effects
   }, React.createElement(FormButtonGroup, null, React.createElement(SchemaMarkupField, {

package/dist/index.js

@@ -22092,7 +22092,9 @@ function TaxClassificationModal(props) {
 
   React__default['default'].useEffect(function () {
     if (!props.open) {
-      form.resetFields();
+      setTimeout(function () {
+        form.resetFields();
+      }, 500);
     }
   }, [form, props.open]);
   return React__default['default'].createElement(ktsXui.Drawer, {
@@ -22108,14 +22110,16 @@ function TaxClassificationModal(props) {
   }, React__default['default'].createElement(ktsXui.Input, {
     placeholder: "\u8BF7\u8F93\u5165\u7A0E\u6536\u5206\u7C7B\u7F16\u7801\u3001\u7A0E\u6536\u5206\u7C7B\u540D\u79F0\u8FDB\u884C\u68C0\u7D22",
     onChange: props.onSearch
-  })), React__default['default'].createElement(ktsXui.Tree, {
+  })), React__default['default'].createElement(ktsXui.Form.Item, {
+    name: 'tree'
+  }, React__default['default'].createElement(ktsXui.Tree, {
     onSelect: props.onSelect,
     loadData: props.onLoad,
     treeData: props.list,
     switcherIcon: React__default['default'].createElement(ktsComponentsAntdX3.Icon, {
       type: "down"
     })
-  })));
+  }))));
 }
 
 var TreeNode = ktsComponentsAntdX3.Tree.TreeNode;
@@ -22632,93 +22636,118 @@ var DrawerBody$3 = function DrawerBody(props) {
         setList = _React$useState16[1];
 
     var onSearch = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-      var _value$target;
-
       var value,
+          _value$target,
           arr,
-          list,
+          _list,
           _args11 = arguments;
+
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
             case 0:
               value = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : null;
-              _context11.next = 3;
+
+              if (!value) {
+                _context11.next = 9;
+                break;
+              }
+
+              _context11.next = 4;
               return controller.state.goodsListState.endowCode.onSearchTaxClassificationCode(value === null || value === void 0 ? void 0 : (_value$target = value.target) === null || _value$target === void 0 ? void 0 : _value$target.value);
 
-            case 3:
+            case 4:
               arr = _context11.sent;
-              list = arr.map(function (item) {
-                var _value$target2;
-
-                var data = _objectSpread2(_objectSpread2({}, item), {}, {
+              _list = arr.map(function (item) {
+                return _objectSpread2(_objectSpread2({}, item), {}, {
                   title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
-                  key: item.taxCategoryCode
+                  key: item.taxCategoryCode,
+                  isLeaf: true
                 });
-
-                if (value === null || value === void 0 ? void 0 : (_value$target2 = value.target) === null || _value$target2 === void 0 ? void 0 : _value$target2.value) {
-                  data.isLeaf = true;
-                } else {
-                  data.selectable = false;
-                }
-
-                return data;
               });
-              setList(list);
+              setList(_list);
+              _context11.next = 11;
+              break;
 
-            case 6:
+            case 9:
+              _context11.next = 11;
+              return onLoad();
+
+            case 11:
             case "end":
               return _context11.stop();
           }
         }
       }, _callee11);
     })), []);
-    var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+    var onLoad = React__default['default'].useCallback( /*#__PURE__*/function () {
+      var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(value) {
+        var arr, data, treeData;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) {
+            switch (_context12.prev = _context12.next) {
+              case 0:
+                _context12.next = 2;
+                return controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value === null || value === void 0 ? void 0 : value.taxCategoryCode);
+
+              case 2:
+                arr = _context12.sent;
+                data = arr.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
+                    key: item.taxCategoryCode
+                  });
+                });
+                treeData = optimizeTreeData(data);
+
+                if (value === null || value === void 0 ? void 0 : value.key) {
+                  setList(function (origin) {
+                    updateTreeData(origin, value.key, treeData);
+                  });
+                } else {
+                  setList(treeData);
+                }
+
+                return _context12.abrupt("return", []);
+
+              case 7:
+              case "end":
+                return _context12.stop();
+            }
+          }
+        }, _callee12);
+      }));
+
+      return function (_x9) {
+        return _ref12.apply(this, arguments);
+      };
+    }(), []);
+    var onClick = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context13.prev = _context13.next) {
             case 0:
-              _context12.next = 2;
-              return onSearch();
+              _context13.next = 2;
+              return onLoad();
 
             case 2:
               setOpen(true);
 
             case 3:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
         }
-      }, _callee12);
+      }, _callee13);
     })), []);
     var onSelect = React__default['default'].useCallback(function (key, info) {
       actions.setFieldState('taxClassificationCode', /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(s) {
-          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-            while (1) {
-              switch (_context13.prev = _context13.next) {
-                case 0:
-                  s.value = info.node.taxCategoryCode;
-
-                case 1:
-                case "end":
-                  return _context13.stop();
-              }
-            }
-          }, _callee13);
-        }));
-
-        return function (_x9) {
-          return _ref13.apply(this, arguments);
-        };
-      }());
-      actions.setFieldState('productName', /*#__PURE__*/function () {
         var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(s) {
           return _regeneratorRuntime().wrap(function _callee14$(_context14) {
             while (1) {
               switch (_context14.prev = _context14.next) {
                 case 0:
-                  s.value = info.node.productName;
+                  s.value = info.node.taxCategoryCode;
 
                 case 1:
                 case "end":
@@ -22732,13 +22761,13 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref14.apply(this, arguments);
         };
       }());
-      actions.setFieldState('shorthand', /*#__PURE__*/function () {
+      actions.setFieldState('productName', /*#__PURE__*/function () {
         var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(s) {
           return _regeneratorRuntime().wrap(function _callee15$(_context15) {
             while (1) {
               switch (_context15.prev = _context15.next) {
                 case 0:
-                  s.value = info.node.shorthand;
+                  s.value = info.node.productName;
 
                 case 1:
                 case "end":
@@ -22752,13 +22781,13 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref15.apply(this, arguments);
         };
       }());
-      actions.setFieldState('taxRate', /*#__PURE__*/function () {
+      actions.setFieldState('shorthand', /*#__PURE__*/function () {
         var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(s) {
           return _regeneratorRuntime().wrap(function _callee16$(_context16) {
             while (1) {
               switch (_context16.prev = _context16.next) {
                 case 0:
-                  s.value = info.node.taxRate;
+                  s.value = info.node.shorthand;
 
                 case 1:
                 case "end":
@@ -22772,11 +22801,40 @@ var DrawerBody$3 = function DrawerBody(props) {
           return _ref16.apply(this, arguments);
         };
       }());
+      actions.setFieldState('taxRate', /*#__PURE__*/function () {
+        var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(s) {
+          return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+            while (1) {
+              switch (_context17.prev = _context17.next) {
+                case 0:
+                  s.value = info.node.taxRate;
+
+                case 1:
+                case "end":
+                  return _context17.stop();
+              }
+            }
+          }, _callee17);
+        }));
+
+        return function (_x13) {
+          return _ref17.apply(this, arguments);
+        };
+      }());
       setOpen(false);
     }, [controller, actions]);
 
+    var optimizeTreeData = function optimizeTreeData(data) {
+      return data.map(function (item) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          selectable: (item === null || item === void 0 ? void 0 : item.hzx) === 'N',
+          isLeaf: (item === null || item === void 0 ? void 0 : item.hzx) === 'N'
+        });
+      });
+    };
+
     var updateTreeData = function updateTreeData(list, key, children) {
-      var demo = list.map(function (node) {
+      return list.map(function (node) {
         if (node.key === key) {
           return _objectSpread2(_objectSpread2({}, node), {}, {
             children: children
@@ -22791,52 +22849,8 @@ var DrawerBody$3 = function DrawerBody(props) {
 
         return node;
       });
-      setList(demo);
     };
 
-    var onLoad = React__default['default'].useCallback( /*#__PURE__*/function () {
-      var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(value) {
-        var arr, data;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) {
-            switch (_context17.prev = _context17.next) {
-              case 0:
-                if (!value.children) {
-                  _context17.next = 2;
-                  break;
-                }
-
-                return _context17.abrupt("return", []);
-
-              case 2:
-                _context17.next = 4;
-                return controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value.taxCategoryCode);
-
-              case 4:
-                arr = _context17.sent;
-                data = arr.map(function (item) {
-                  return _objectSpread2(_objectSpread2({}, item), {}, {
-                    title: "".concat(item.productName, " ").concat(item.taxCategoryCode),
-                    key: item.taxCategoryCode
-                  });
-                });
-                setList(function (origin) {
-                  updateTreeData(origin, value.key, data);
-                });
-                return _context17.abrupt("return", []);
-
-              case 8:
-              case "end":
-                return _context17.stop();
-            }
-          }
-        }, _callee17);
-      }));
-
-      return function (_x13) {
-        return _ref17.apply(this, arguments);
-      };
-    }(), []);
     return React__default['default'].createElement(React__default['default'].Fragment, null, React__default['default'].createElement(ktsComponentsAntdX3.Input, {
       readOnly: true,
       onClick: onClick,
@@ -22961,7 +22975,7 @@ var DrawerBody$3 = function DrawerBody(props) {
     actions: actions,
     previewPlaceholder: " ",
     components: _objectSpread2(_objectSpread2({}, components), {}, {
-      showSearch: !!controller.state.goodsListState.endowCode.onSearchTaxClassificationCode() ? ShowSearch3 : ShowSearch
+      showSearch: !!controller.state.goodsListState.endowCode.onLoadTaxClassificationCode() ? ShowSearch3 : ShowSearch
     }),
     effects: effects
   }, React__default['default'].createElement(antd.FormButtonGroup, null, React__default['default'].createElement(antd.SchemaMarkupField, {

package/package.json

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

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

@@ -298,25 +298,46 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
     const [list, setList] = React.useState<any>([]);
 
     const onSearch = React.useCallback(async (value: any = null) => {
-      const arr = await controller.state.goodsListState.endowCode.onSearchTaxClassificationCode(value?.target?.value);
-      const list: any[] = arr.map((item: any)=> {
-        const data = {
+      if(value){
+        const arr = await controller.state.goodsListState.endowCode.onSearchTaxClassificationCode(value?.target?.value);
+        const list: any[] = arr.map((item: any)=> {
+          return {
+            ...item,
+            title: `${item.productName} ${item.taxCategoryCode}`,
+            key: item.taxCategoryCode,
+            isLeaf: true
+          }
+        });
+        setList(list);
+      } else {
+        await onLoad();
+      }
+    }, []);
+
+    const onLoad = React.useCallback(async (value?: any) => {
+      const arr = await controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value?.taxCategoryCode);
+      const data: any[] = arr.map((item: any)=> {
+        return {
           ...item,
           title: `${item.productName} ${item.taxCategoryCode}`,
-          key: item.taxCategoryCode,
-        }
-        if(value?.target?.value) {
-          data.isLeaf = true;
-        } else {
-          data.selectable = false
+          key: item.taxCategoryCode
         }
-        return data
       });
-      setList(list);
+
+      const treeData = optimizeTreeData(data);
+
+      if(value?.key) {
+        setList((origin: any)=> {
+          updateTreeData(origin, value.key, treeData)
+        });
+      } else {
+        setList(treeData);
+      }
+      return [];
     }, []);
 
     const onClick = React.useCallback(async () => {
-      await onSearch();
+      await onLoad();
       setOpen(true);
     }, []);
 
@@ -338,44 +359,34 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
       setOpen(false);
     }, [controller, actions]);
 
+    const optimizeTreeData = (data: any): any => {
+      return data.map((item: any)=> {
+        return {
+          ...item,
+          selectable: item?.hzx === 'N',
+          isLeaf: item?.hzx === 'N'
+        }
+      });
+    }
+
     const updateTreeData = (list: any, key: React.Key, children: any): any => {
-      const demo = list.map((node: any) => {
+      return list.map((node: any) => {
         if (node.key === key) {
           return {
             ...node,
-            children,
+            children
           };
         }
         if (node.children) {
           return {
             ...node,
-            children: updateTreeData(node.children, key, children),
+            children: updateTreeData(node.children, key, children)
           };
         }
         return node;
       });
-      setList(demo);
     }
 
-    const onLoad = React.useCallback(async (value: any) => {
-      if (value.children) {
-        return [];
-      }
-      const arr = await controller.state.goodsListState.endowCode.onLoadTaxClassificationCode(value.taxCategoryCode);
-      const data: any[] = arr.map((item: any)=> {
-        return {
-          ...item,
-          title: `${item.productName} ${item.taxCategoryCode}`,
-          key: item.taxCategoryCode
-        }
-      });
-
-      setList((origin: any)=> {
-          updateTreeData(origin, value.key, data)
-      });
-      return [];
-    }, []);
-
     return (
       <>
         <InputAntd readOnly onClick={onClick} value={props.value} />
@@ -454,7 +465,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
   }, [controller]);
 
   return (
-    <SchemaForm actions={actions} previewPlaceholder=" "  components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.onSearchTaxClassificationCode() ? ShowSearch3 : ShowSearch }} effects={effects}>
+    <SchemaForm actions={actions} previewPlaceholder=" "  components={{ ...components, showSearch: !!controller.state.goodsListState.endowCode.onLoadTaxClassificationCode() ? ShowSearch3 : ShowSearch }} effects={effects}>
       <FormButtonGroup>
         <Field
           name="taxClassificationCode"

package/src/TaxClassificationCodeModal/_test/easiest/index.tsx

@@ -9,6 +9,25 @@ export default () => {
 
   const [list, setList] = React.useState<any>([]);
 
+  const updateTreeData = (list: any, key: React.Key, children: any): any => {
+    const demo = list.map((node: any) => {
+      if (node.key === key) {
+        return {
+          ...node,
+          children,
+        };
+      }
+      if (node.children) {
+        return {
+          ...node,
+          children: updateTreeData(node.children, key, children),
+        };
+      }
+      return node;
+    });
+    setList(demo);
+  }
+
   const onSearch = React.useCallback(async (value: any = null) => {
     const arr = [
       {
@@ -70,38 +89,7 @@ export default () => {
     setList(list);
   }, []);
 
-  const onClick = React.useCallback(async () => {
-    await onSearch();
-    setOpen(true);
-  }, []);
-
-  const onSelect = React.useCallback((key: any, info: any) => {
-    setOpen(false);
-  }, []);
-
-  const updateTreeData = (list: any, key: React.Key, children: any): any => {
-    const demo = list.map((node: any) => {
-      if (node.key === key) {
-        return {
-          ...node,
-          children,
-        };
-      }
-      if (node.children) {
-        return {
-          ...node,
-          children: updateTreeData(node.children, key, children),
-        };
-      }
-      return node;
-    });
-    setList(demo);
-  }
-
-  const onLoad = React.useCallback(async (value: any) => {
-    if (value.children) {
-      return [];
-    }
+  const onLoad = React.useCallback(async (value?: any) => {
     const arr = [
       {
         "id": "3a4eae5278cd428f975d4da278fd18eb",
@@ -150,16 +138,30 @@ export default () => {
       return {
         ...item,
         title: `${item.productName} ${item.taxCategoryCode}`,
-        key: item.taxCategoryCode
+        key: item.taxCategoryCode,
+        selectable: false
       }
     });
 
-    setList((origin: any)=> {
-      updateTreeData(origin, value.key, data)
-    });
+    if(value?.key) {
+      setList((origin: any)=> {
+        updateTreeData(origin, value.key, data)
+      });
+    } else {
+      setList(data);
+    }
     return [];
   }, []);
 
+  const onClick = React.useCallback(async () => {
+    await onLoad();
+    setOpen(true);
+  }, []);
+
+  const onSelect = React.useCallback((key: any, info: any) => {
+    setOpen(false);
+  }, []);
+
     return (
         <>
             <Button onClick={onClick} >打开</Button>

package/src/TaxClassificationCodeModal/index.tsx

@@ -30,7 +30,9 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
 
     React.useEffect(() => {
       if (!props.open) {
-        form.resetFields();
+        setTimeout(()=> {
+          form.resetFields();
+        }, 500)
       }
     }, [form, props.open])
 
@@ -51,12 +53,14 @@ export default function TaxClassificationModal(props: TaxClassificationProps) {
               onChange={props.onSearch}
             />
           </Form.Item>
-          <Tree
-            onSelect={props.onSelect}
-            loadData={props.onLoad}
-            treeData={props.list}
-            switcherIcon={<Icon type="down" />}
-          />
+          <Form.Item name='tree'>
+            <Tree
+              onSelect={props.onSelect}
+              loadData={props.onLoad}
+              treeData={props.list}
+              switcherIcon={<Icon type="down" />}
+            />
+          </Form.Item>
         </Form>
       </Drawer>
     )