save

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moneywhere-user-fe",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "private": true,
   "scripts": {
     "analyze": "cross-env ANALYZE=1 max build",

src/locales/en-US/flow.ts

@@ -33,5 +33,7 @@ export default {
   'flow.file.size.error': 'Too Large',
   'flow.currency.auto.tooltip': 'Convert，Currency：{rate}',
   'flow.search.has.file': 'Has File',
+  'flow.search.label.category.check.strictly': 'Category Checked With children',
+  'flow.search.label.tag.check.strictly': 'Tag Checked With children',
 
 }

src/locales/zh-CN/flow.ts

@@ -34,5 +34,7 @@ export default {
   'flow.file.size.error': '文件太大',
   'flow.currency.auto.tooltip': '自动折算，当前汇率：{rate}',
   'flow.search.has.file': '文件',
+  'flow.search.label.category.check.strictly': '分类自动选择子类',
+  'flow.search.label.tag.check.strictly': '标签自动选择子类',
 
 }

src/pages/BalanceFlow/DataTable.jsx

@@ -1,5 +1,5 @@
 import {useEffect, useRef, useState} from 'react';
-import { Alert, Button, Dropdown, Form, Input, Modal, Space, Tag, Tooltip } from 'antd';
+import {Alert, Button, Dropdown, Form, Input, Modal, Space, Switch, Tag, Tooltip} from 'antd';
 import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import { ProTable } from '@ant-design/pro-components';
 import {useModel, useRequest, history} from '@umijs/max';
@@ -21,6 +21,9 @@ export default () => {
   const formRef = useRef();
   const { show } = useModel('modal');
 
+  const [categoryTreeCheckStrictly, setCategoryTreeCheckStrictly] = useState(false);
+  const [tagTreeCheckStrictly, setTagTreeCheckStrictly] = useState(false);
+
   // 对账点击过来的
   useEffect(() => {
     console.log(history.location.state?.account)
@@ -227,6 +230,7 @@ export default () => {
         onFocus: loadCategories,
         options: categories,
         loading: categoriesLoading,
+        treeCheckStrictly: categoryTreeCheckStrictly,
       },
     },
     {
@@ -240,6 +244,7 @@ export default () => {
         ...treeSelectMultipleProp,
         options: tags,
         loading: tagsLoading,
+        treeCheckStrictly: tagTreeCheckStrictly,
       },
     },
     {
@@ -381,6 +386,14 @@ export default () => {
 
   return (
     <>
+      <Form layout="inline" style={{background: "white", padding: "24px 24px 0 24px"}}>
+        <Form.Item label={t('flow.search.label.category.check.strictly')}>
+          <Switch checked={!categoryTreeCheckStrictly} onChange={(checked) => setCategoryTreeCheckStrictly(!checked)} />
+        </Form.Item>
+        <Form.Item label={t('flow.search.label.tag.check.strictly')}>
+          <Switch checked={!tagTreeCheckStrictly} onChange={(checked) => setTagTreeCheckStrictly(!checked)} />
+        </Form.Item>
+      </Form>
       <ProTable
         {...tableProp}
         defaultSize="small"