soleilw
/
job-manage
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

deploy

master
Soleilw 6 months ago
parent
0aa23e1888
commit
cc35b52b51
10 changed files with 57 additions and 62 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 1
    0
      dist/p__Permission__Role__index.706c7ee2.async.js
  3. 0
    1
      dist/p__Permission__Role__index.9392c614.async.js
  4. 39
    39
      dist/umi.11ccb2a8.js
  5. 3
    0
      src/apis/api/index.ts
  6. 1
    0
      src/apis/types/url.d.ts
  7. 2
    0
      src/apis/url/index.ts
  8. 9
    19
      src/components/Render/Permission/Role/dispense/index.tsx
  9. 1
    1
      src/constants/index.ts
  10. 0
    1
      src/pages/Main/Company/List/index.tsx

+ 1
- 1
dist/index.html View File

@@ -8,6 +8,6 @@
</head>
<body>
<div id="root"></div>
<script src="/umi.59ecbd58.js"></script>
<script src="/umi.11ccb2a8.js"></script>
</body>
</html>

+ 1
- 0
dist/p__Permission__Role__index.706c7ee2.async.js
File diff suppressed because it is too large
View File


+ 0
- 1
dist/p__Permission__Role__index.9392c614.async.js
File diff suppressed because it is too large
View File


dist/umi.11ccb2a8.js
File diff suppressed because it is too large
View File


+ 3
- 0
src/apis/api/index.ts View File

@@ -24,6 +24,9 @@ export const getPermission = GetModel(url.permissionList);
export const updatePermission = PostModel(url.permissionUpdate);
export const GetDetailPermission = GetModel(url.permissionDetail);
export const getPermissionListWithchilds = GetModel(url.permissionListWithchilds);
export const getRoleGetpermissionids = GetModel(url.roleGetpermissionids);



// 账号
export const addAccount = PostModel(url.accountAdd);

+ 1
- 0
src/apis/types/url.d.ts View File

@@ -17,6 +17,7 @@ declare namespace urlType {
permissionList: String,
permissionUpdate: String,
permissionDetail: String,
roleGetpermissionids: String,
permissionListWithchilds: String,
accountAdd: String,
accountList: String,

+ 2
- 0
src/apis/url/index.ts View File

@@ -23,6 +23,8 @@ export const url: urlType.url = {
permissionUpdate: admin + '/permission/update',
permissionDetail: admin + '/permission/detail',
roleGetpermissionids: admin + '/role/getpermissionids', // 获取角色的id

permissionListWithchilds: admin + '/permission/listwithchilds',
accountAdd: admin + '/user/add',
accountList: admin + '/user/list',

+ 9
- 19
src/components/Render/Permission/Role/dispense/index.tsx View File

@@ -2,7 +2,7 @@
import { useRef, useState, useEffect } from 'react';
import { connect } from '@umijs/max';
import { ConfigProvider, Space, Collapse, Tag, Modal, Row, Col, message} from 'antd';
import { PostRoleAddpermission,PostRoleDelpermission, getPermissionListWithchilds, getRoleGetpermissions } from '@/apis/api';
import { PostRoleAddpermission,PostRoleDelpermission, getPermissionListWithchilds, getRoleGetpermissions, getRoleGetpermissionids } from '@/apis/api';

const PagesMainPermissionRoleDispense: React.FC = ({ dispatch, dictModel, openModel, id }: any) => {
const [openPreview, setOpenPreview] = useState(false);
@@ -35,18 +35,8 @@ const PagesMainPermissionRoleDispense: React.FC = ({ dispatch, dictModel, openMo
}
};

// 递归函数用于收集所有权限ID
function collectAllPermissionIds(permission) {
let ids = [permission.id];
if (permission.childs && Array.isArray(permission.childs)) {
permission.childs.forEach(child => {
ids = ids.concat(collectAllPermissionIds(child));
});
}
return ids;
}
// 检查给定的 id 是否存在于 res.data 中，并返回对应的下标加 1
function checkIdInData(ids : number, data :number) {
function checkIdInData(ids : number[], data :number) {
const result: any = [];
if(ids && ids.length > 0) {
ids.forEach(id => {
@@ -72,9 +62,10 @@ const PagesMainPermissionRoleDispense: React.FC = ({ dispatch, dictModel, openMo
title={'分配权限'}
open={openPreview}
centered
maskClosable={false}
maskClosable={true}
destroyOnClose
width={1000}
width={1200}
footer={null}
onCancel={() => {
dispatch({ type: 'openModel/getOpenDispenseModal', payload: false })
}}
@@ -85,10 +76,10 @@ const PagesMainPermissionRoleDispense: React.FC = ({ dispatch, dictModel, openMo
setCollapseKey([])
let res = await getPermissionListWithchilds()
setDetail(res.data)
let resrole = await getRoleGetpermissions({ ids: id })
const nextSelectedTags = resrole.data.permissions.length > 0 ? resrole.data.permissions.flatMap(permission =>
collectAllPermissionIds(permission)
) : []
let resrole = await getRoleGetpermissionids({ id: id })
const nextSelectedTags = resrole.data.permissionIds.map(item => {
return Number(item)
})
setSelectedIds(nextSelectedTags);
const uniqueIndexes = checkIdInData(nextSelectedTags, res.data.permissions);
console.log(uniqueIndexes); // 输出去重后的结果
@@ -97,7 +88,6 @@ const PagesMainPermissionRoleDispense: React.FC = ({ dispatch, dictModel, openMo
setCollapseKey(uniqueIndexes);
} else {
setCollapseKey(["1"]);
}
}
}}

+ 1
- 1
src/constants/index.ts View File

@@ -2,7 +2,7 @@ export const DEFAULT_NAME = 'Umi Max';
export const web: string = '/web';
export const common: string = '/common';
export type StringOptional = string | undefined;
console.log(231553,JSON.parse(process.env.BUILD_ENV) )
console.log(231553,JSON.parse(process.env.BUILD_ENV))
export const Imageprefix: string = JSON.parse(process.env.BUILD_ENV) == 'production' ? 'https://admin1.jcjob.cn/img/' : 'https://rcsc-test.jcjob.cn/img/'
export const baseUrl: string = JSON.parse(process.env.BUILD_ENV) == 'production' ? 'https://admin1.jcjob.cn/api' : 'https://rcsc-test.jcjob.cn/api'


+ 0
- 1
src/pages/Main/Company/List/index.tsx View File

@@ -30,7 +30,6 @@ const CompanyListPage: React.FC = ({ dispatch, openModel }: any) => {
>
<PagesMainCompanyListTable getId={getId}></PagesMainCompanyListTable>
<PagesMainCompanyListCreate id={id}></PagesMainCompanyListCreate>
DD
<PagesMainCompanyListHr id={id}></PagesMainCompanyListHr>
</ConfigProvider>
</>

Write Preview
Loading…
Cancel
Save