Merge xyh

Next xyh

src/components/SearchComponent/index.tsx

@@ -545,17 +545,18 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
     }
 
     if (type) {
-      setUrl({ q: JSON.stringify(value) });
+      setUrl({ q: JSON.stringify(value), target: props.target });
     }
     onSearch({ terms: _temp });
   };
 
   useEffect(() => {
-    if (url.q) {
+    // 防止页面下多个TabsTabPane中的查询组件共享路由中的参数
+    if (url.q && url.target && props.target && url.target === props.target) {
       form.setValues(JSON.parse(url.q));
       handleSearch(false);
     }
-  }, [url]);
+  }, [url, props.target]);
 
   useEffect(() => {
     if (defaultParam) {
@@ -579,7 +580,6 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
   };
 
   const resetForm = async (type: boolean) => {
-    console.log('resetForm', type);
     const value = form.values;
     if (!expand) {
       value.terms1 = [defaultTerms(0), defaultTerms(1), defaultTerms(2)];

src/pages/system/Department/index.less

@@ -14,7 +14,6 @@
 
       .border-left {
         padding-right: 24px;
-        border-right: 1px solid #f0f0f0;
       }
 
       .left-tree-content {
@@ -69,6 +68,7 @@
       flex-grow: 1;
       width: 0;
       padding-left: 24px;
+      border-left: 1px solid #f0f0f0;
     }
   }
 }

src/pages/system/Menu/index.tsx

@@ -21,6 +21,7 @@ import moment from 'moment';
 import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 import { PermissionButton } from '@/components';
 import { useDomFullHeight } from '@/hooks';
+import { onlyMessage } from '@/utils/util';
 
 export const service = new Service('menu');
 

src/pages/system/Platforms/save.tsx

@@ -25,6 +25,7 @@ import { action } from '@formily/reactive';
 import type { Response } from '@/utils/typings';
 import { service } from '@/pages/system/Platforms/index';
 import { onlyMessage, randomString } from '@/utils/util';
+import { getMenuPathByCode } from '@/utils/menu';
 
 interface SaveProps {
   visible: boolean;
@@ -36,7 +37,7 @@ interface SaveProps {
 
 export default (props: SaveProps) => {
   const [loading, setLoading] = useState(false);
-  const { permission: deptPermission } = usePermissions('system/Department');
+  const { permission: RolePermission } = usePermissions('system/Role');
 
   const SchemaField = createSchemaField({
     components: {
@@ -320,9 +321,10 @@ export default (props: SaveProps) => {
                 <PermissionButton
                   type="link"
                   style={{ padding: 0 }}
-                  isPermission={deptPermission.add}
+                  isPermission={RolePermission.add}
                   onClick={() => {
-                    const tab: any = window.open(`${origin}/#/system/role?save=true`);
+                    const router = getMenuPathByCode('system/Role');
+                    const tab: any = window.open(`${origin}/#${router}?save=true`);
                     tab!.onTabSaveSuccess = (value: any) => {
                       form.setFieldState('roleIdList', async (state) => {
                         state.dataSource = await getRole().then((resp: any) =>