Parcourir la source

feat: 修改文件夹的名称+修复业务主体滚动、相关列表的显示缺少数据问题

outaozhen il y a 3 ans
Parent
commit
c8c5bd8655

+ 31 - 0
src/pages/Business/RuleCode/components/LeftMenu/index.less

@@ -0,0 +1,31 @@
+.menu-box {
+  .ant-menu-root.ant-menu-vertical,
+  .ant-menu-root.ant-menu-vertical-left,
+  .ant-menu-root.ant-menu-vertical-right,
+  .ant-menu-root.ant-menu-inline {
+    height: calc(100vh - 200px);
+    overflow: auto;
+    border: none;
+  }
+  ::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    border-radius: 3px;
+  }
+  ::-webkit-scrollbar-thumb {
+    background: #b3b3b3;
+    border-radius: 3px;
+    box-shadow: inset 0 0 6px rgb(0 0 0 / 20%);
+  }
+  ::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 6px rgb(0 0 0 / 20%);
+    border-radius: 3px;
+  }
+  ::-webkit-scrollbar-thumb:vertical:hover {
+    background: #868686;
+  }
+  .ant-menu-inline .ant-menu-item,
+  .ant-menu-inline .ant-menu-submenu-title {
+    width: 100%;
+  }
+}

+ 4 - 3
src/pages/Business/RuleCode/components/LeftMenu/index.tsx

@@ -1,7 +1,7 @@
 import { Menu } from 'antd'
 import React, { useState } from 'react'
 import type { MenuProps } from 'antd'
-import '@/pages/Schema/Base/components/LeftMenu/index.less'
+import './index.less'
 
 type LeftMenuProps = {
   title?: string
@@ -32,10 +32,11 @@ const LeftMenu: React.FC<LeftMenuProps> = ({ title = '业务主体列表', optio
   }
 
   return (
-    <div className="w-216px rounded-20px" style={{ height: 'calc(100vh - 122px)', background: '#ffffff' }}>
+    <div
+      className="w-216px rounded-20px menu-box"
+      style={{ height: 'calc(100vh - 122px)', background: '#ffffff' }}>
       <div className="p-5 text-16px text-opacity-85 menu-title">{title}</div>
       <Menu
-        style={{ height: 'calc(100vh - 200px)' }}
         defaultSelectedKeys={[value]}
         openKeys={openKeys}
         onOpenChange={onOpenChange}

+ 1 - 1
src/pages/Business/RuleCode/index.tsx

@@ -141,7 +141,7 @@ const RulesCode = () => {
     }
   })
 
-  const { run: trySubjectList } = useRequest(() => querySubject(), {
+  const { run: trySubjectList } = useRequest(() => querySubject({ pageNo: 1, pageSize: 214000 }), {
     manual: true,
     onSuccess: result => {
       setState({ ...state, subjectList: result?.items })

+ 1 - 1
src/pages/Institutions/Staff/components/StaffDetail.tsx

@@ -31,7 +31,7 @@ import {
   TimePicker,
   Cascader
 } from '@formily/antd'
-import { fetchRoleList } from '@/services/permission'
+import { fetchRoleList } from '@/services/api/permission'
 import consts from '@/utils/consts'
 import { RoleType } from '@/pages/Permission/FrontRole/components/RoleLeftMenu'
 type StaffModalProps = ConnectProps & {

+ 1 - 1
src/pages/Permission/BackRole/components/ConnectModal/index.tsx

@@ -1,4 +1,4 @@
-import { fetchRoleBgStaffListByRoleId, linkRoleBgAccount } from '@/services/permission'
+import { fetchRoleBgStaffListByRoleId, linkRoleBgAccount } from '@/services/api/permission'
 import { PlusOutlined } from '@ant-design/icons'
 import { ModalForm, ProFormSelect } from '@ant-design/pro-form'
 import { Button, message } from 'antd'

+ 3 - 3
src/pages/Permission/BackRole/components/DataTabs/index.tsx

@@ -1,10 +1,10 @@
 import { querySubject } from '@/services/api/subject'
-import { queryRoleBgDetailByID, setRoleBgPermission } from '@/services/permission'
+import { queryRoleBgDetailByID, setRoleBgPermission } from '@/services/api/permission'
 import { useRequest } from '@umijs/max'
 import type { CheckboxValueType } from 'antd/es/checkbox/Group'
 import { Affix, Button, Checkbox, message, Space, Spin } from 'antd'
 import React, { useEffect, useState } from 'react'
-import { OperationType } from '@/pages/Permission/FrontRole/components/PermTabs'
+import { OperationType } from '@/pages/Permission/FrontRole/components/PermTab'
 
 const DataTabs = ({ currentPermData: { ID } }) => {
   const [state, setState] = useState({
@@ -13,7 +13,7 @@ const DataTabs = ({ currentPermData: { ID } }) => {
   })
   console.log(state.value)
 
-  const { run: trySubjectList } = useRequest(() => querySubject(), {
+  const { run: trySubjectList } = useRequest(() => querySubject({ pageNo: 1, pageSize: 214000 }), {
     manual: true,
     onSuccess: result => {
       setState({ ...state, subjectList: result?.items })

src/pages/Permission/BackRole/components/PermTabs/index.less → src/pages/Permission/BackRole/components/PermTab/index.less


+ 1 - 1
src/pages/Permission/BackRole/components/PermTabs/index.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react'
 import { useRequest } from '@umijs/max'
 import { RoleType } from '../RoleLeftMenu'
 import { Card, Checkbox, Button, message, Spin, Affix } from 'antd'
-import { queryRoleBgDetailByID, setRoleBgPermission } from '@/services/permission'
+import { queryRoleBgDetailByID, setRoleBgPermission } from '@/services/api/permission'
 import { BackstagePermission } from '@/enums/access'
 
 import './index.less'

+ 1 - 1
src/pages/Permission/BackRole/components/RoleLeftMenu/index.tsx

@@ -1,4 +1,4 @@
-import { addRoleBgMenu, delRoleBgMenuByRoleID, updateRoleBgMenu } from '@/services/permission'
+import { addRoleBgMenu, delRoleBgMenuByRoleID, updateRoleBgMenu } from '@/services/api/permission'
 import { isNullOrUnDef } from '@/utils/is'
 import { DeleteOutlined, FormOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
 import { ModalForm, ProFormText } from '@ant-design/pro-form'

+ 3 - 3
src/pages/Permission/BackRole/index.tsx

@@ -1,14 +1,14 @@
-import { fetchRoleBgList, unLinkRoleBgAccount, fetchRoleBgStaffListByRoleId } from '@/services/permission'
+import { fetchRoleBgList, unLinkRoleBgAccount, fetchRoleBgStaffListByRoleId } from '@/services/api/permission'
 import { DeleteOutlined } from '@ant-design/icons'
 import { PageContainer } from '@ant-design/pro-layout'
 import { Input, message, Popconfirm, Table, Tabs } from 'antd'
 import { useState } from 'react'
 import { useRequest } from '@umijs/max'
 import RoleLeftMenu, { RoleType } from './components/RoleLeftMenu'
-import PermTabs from './components/PermTabs'
+import PermTabs from './components/PermTab'
 import type { ColumnsType } from 'antd/lib/table'
 import ConnectModal from './components/ConnectModal'
-import DataTabs from './components/DataTabs'
+import DataTabs from './components/DataTab'
 const { TabPane } = Tabs
 
 const Role = () => {

+ 1 - 1
src/pages/Permission/FrontRole/components/ConnectModal/index.tsx

@@ -1,5 +1,5 @@
 import TreeNodeSelect from '@/pages/Project/Management/List/components/TreeNodeSelect'
-import { linkRoleAccount } from '@/services/permission'
+import { linkRoleAccount } from '@/services/api/permission'
 import { PlusOutlined } from '@ant-design/icons'
 import ProForm, { ModalForm } from '@ant-design/pro-form'
 import { Button, message } from 'antd'

+ 2 - 2
src/pages/Permission/FrontRole/components/DataTabs/index.tsx

@@ -1,10 +1,10 @@
-import { queryRoleDetailByID, setRolePermission } from '@/services/permission'
+import { queryRoleDetailByID, setRolePermission } from '@/services/api/permission'
 import { useRequest } from '@umijs/max'
 import { Affix, Button, message, Radio, Space, Spin } from 'antd'
 import React, { useState } from 'react'
 import type { RadioChangeEvent } from 'antd'
 import { DataPermission } from '@/enums/access'
-import { OperationType } from '../PermTabs'
+import { OperationType } from '../PermTab'
 
 const DataTabs = ({ currentPermData: { ID } }) => {
   const [state, setState] = useState({

+ 1 - 1
src/pages/Permission/FrontRole/components/PermTabs/index.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { useRequest } from '@umijs/max'
 import { Card, Checkbox, Button, message, Spin, Affix } from 'antd'
-import { queryRoleDetailByID, setRolePermission } from '@/services/permission'
+import { queryRoleDetailByID, setRolePermission } from '@/services/api/permission'
 import { FrontPermission } from '@/enums/access'
 
 /** 权限参数枚举 */

+ 1 - 1
src/pages/Permission/FrontRole/components/RoleLeftMenu/index.tsx

@@ -1,4 +1,4 @@
-import { addRoleMenu, delRoleMenuByRoleID, updateRoleMenu } from '@/services/permission'
+import { addRoleMenu, delRoleMenuByRoleID, updateRoleMenu } from '@/services/api/permission'
 import { isNullOrUnDef } from '@/utils/is'
 import { DeleteOutlined, FormOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
 import { ModalForm, ProFormText } from '@ant-design/pro-form'

+ 3 - 3
src/pages/Permission/FrontRole/index.tsx

@@ -1,4 +1,4 @@
-import { fetchRoleList, unLinkRoleAccount, fetchRoleStaffListByRoleId } from '@/services/permission'
+import { fetchRoleList, unLinkRoleAccount, fetchRoleStaffListByRoleId } from '@/services/api/permission'
 import { DeleteOutlined } from '@ant-design/icons'
 import { PageContainer } from '@ant-design/pro-layout'
 import { Input, message, Popconfirm, Table, Tabs } from 'antd'
@@ -6,9 +6,9 @@ import { useState } from 'react'
 import { useRequest } from '@umijs/max'
 import ConnectModal from './components/ConnectModal'
 import RoleLeftMenu, { RoleType } from './components/RoleLeftMenu'
-import PermTabs from './components/PermTabs'
+import PermTabs from './components/PermTab'
 import type { ColumnsType } from 'antd/lib/table'
-import DataTabs from './components/DataTabs'
+import DataTabs from './components/DataTab'
 const { TabPane } = Tabs
 
 const Role = () => {

+ 1 - 1
src/pages/Permission/Role/components/PermTabs/index.tsx

@@ -1,6 +1,6 @@
 import { Card, Tabs, Checkbox, Button, message, Spin } from 'antd'
 import React, { useState } from 'react'
-import { queryRoleDetailByID, setRolePermission } from '@/services/permission'
+import { queryRoleDetailByID, setRolePermission } from '@/services/api/permission'
 import { useRequest } from '@umijs/max'
 import { RoleType } from '../RoleLeftMenu'
 import './index.less'

+ 1 - 0
src/pages/Subject/Mainstay/index.tsx

@@ -95,6 +95,7 @@ const Mainstay = () => {
         actionRef={tRef}
         params={state.params}
         columns={columns}
+        scroll={{ y: document.body.clientHeight - 315 }}
         search={false}
         request={async (params, filter, sorter) => {
           const { code = -1, data: { items = [], total = 0 } = {} } = await querySubject({

+ 1 - 1
src/pages/System/Account/index.tsx

@@ -4,7 +4,7 @@ import {
   fetchRoleBgList,
   fetchRoleBgStaffListByRoleId,
   updateAccountBg
-} from '@/services/permission'
+} from '@/services/api/permission'
 import consts from '@/utils/consts'
 import { PageContainer } from '@ant-design/pro-layout'
 import ProTable from '@ant-design/pro-table'

src/services/permission.ts → src/services/api/permission.ts