update 最新代码同步

web-react/src/components/query-table/index.jsx

@@ -21,7 +21,7 @@ const clearChildren = (data) => {
      */
 function renderQueryBar() {
 
-    const { query, moreQuery } = this.props
+    const { query, moreQuery, onQueryChange } = this.props
 
     return (
         <div className="yo-query-bar">
@@ -30,6 +30,7 @@ function renderQueryBar() {
                 ref={this.form}
                 onFinish={(value) => this.onQuery(value)}
                 initialValues={this.props.queryInitialValues}
+                onValuesChange={(changedValues, allValues) => onQueryChange && onQueryChange(changedValues, allValues)}
             >
                 {query}
                 <Form.Item>
@@ -181,10 +182,15 @@ export default class QueryTable extends Component {
      * 初始化表单字段值,加载数据,并返回到第一页
      */
     onResetQuery = () => {
+
+        const { queryInitialValues, onQueryChange } = this.props
+
         this.form.current.resetFields()
         this.query = {
-            ...this.props.queryInitialValues
+            ...queryInitialValues
         }
+        const values = this.form.current.getFieldsValue()
+        onQueryChange && onQueryChange(values, values)
         this.onReloadData(true)
     }