@pubinfo/module-rbac 2.1.4 → 2.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-rbac",
   "type": "module",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -24,7 +24,7 @@
     "@pubinfo/pro-components": "^1.8.0",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
-    "pubinfo": "2.1.4"
+    "pubinfo": "2.1.6"
   },
   "dependencies": {
     "@destyler/color-picker": "^0.1.0",
@@ -49,7 +49,7 @@
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
     "type-fest": "^4.41.0",
-    "pubinfo": "2.1.4"
+    "pubinfo": "2.1.6"
   },
   "scripts": {
     "dev": "pubinfo build -w --sourcemap",

package/src/components/OrgUserSelector/provider.ts

@@ -1,4 +1,5 @@
 import type { OrgProviderProps, UserProviderProps } from '@pubinfo/headlessui';
+import type { RequestMethod } from 'pubinfo';
 import { message } from 'ant-design-vue';
 import { getGroupDetailById, postGroupFindPage } from '@/api/modules/assist';
 import { getRbacOrgOrgListByParentId, getRbacOrgSearchSubOrgById, postRbacCollectAdd, postRbacCollectFindPage, postRbacCollectRemoveCollect, postRbacOrgSearch, postRbacOrgSearchOrgByIds, postRbacUsedAddBatch, postRbacUsedFindPage, postRbacUserUserAndOrgList, postRbacUserUserForMultiOrgPage } from '@/api/modules/rbac';
@@ -31,33 +32,35 @@ export function joinId(orgId: string = '', userId: string = '') {
 }
 
 export function resolveId(orgUserId: string) {
-  const [orgId, userId] = orgUserId?.split('_');
+  const [orgId, userId] = orgUserId.split('_');
   return {
     orgId,
     userId,
   };
 }
 
-function setDataAuth(auth?: string) {
-  if (auth) {
-    return {
-      headers: { 'X-ResourceMark': auth },
-    };
+function useRequestHeader(auth?: string) {
+  function setRequestHeader<T extends RequestMethod>(method: T) {
+    method.config.headers['X-ResourceMark'] = auth;
+    return method;
   }
 
-  return {};
+  return {
+    setRequestHeader,
+  };
 }
 
 export function useOrgAPIs(
   { auth, filter }: { auth?: string, filter: Filter },
 ): OrgProviderProps['apis'] & ExtraApis {
+  const { setRequestHeader } = useRequestHeader(auth);
+
   return {
     // 回显选中项
     async getSelectedData(items: any[]) {
-      const res = await postRbacOrgSearchOrgByIds(
+      const res = await setRequestHeader(postRbacOrgSearchOrgByIds(
         items.map(item => item[orgFieldNames.value]),
-        setDataAuth(auth),
-      );
+      ));
       return res?.data?.map((e) => {
         return {
           ...e,
@@ -70,24 +73,24 @@ export function useOrgAPIs(
 
     // 添加到最近常用
     async addRecentlyUsed(items: any[]) {
-      await postRbacUsedAddBatch(items.map((item) => {
+      await setRequestHeader(postRbacUsedAddBatch(items.map((item) => {
         return {
           type: '1',
           orgId: item[orgFieldNames.value],
           orgName: item[orgFieldNames.label],
         };
-      }), setDataAuth(auth));
+      })));
     },
 
     // 最近常用
     async recentlyUsed({ search, current }) {
-      const res = await postRbacUsedFindPage({
+      const res = await setRequestHeader(postRbacUsedFindPage({
         type: '1',
         orgName: search,
         currentPage: current,
         pageSize: 20,
         showIsCollect: true,
-      }, setDataAuth(auth));
+      }));
       return {
         total: 20,
         data: res.data?.records?.map((e) => {
@@ -103,12 +106,12 @@ export function useOrgAPIs(
 
     // 收藏
     async favorites({ search, current, pageSize }) {
-      const res = await postRbacCollectFindPage({
+      const res = await setRequestHeader(postRbacCollectFindPage({
         type: '1',
         orgName: search,
         currentPage: current,
         pageSize,
-      }, setDataAuth(auth));
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {
@@ -125,7 +128,7 @@ export function useOrgAPIs(
     // 添加取消收藏
     async favoriteToggle({ favorite, record }) {
       const request = favorite ? postRbacCollectAdd : postRbacCollectRemoveCollect;
-      const res = await request({ type: '1', orgId: record?.[orgFieldNames.value] }, setDataAuth(auth));
+      const res = await setRequestHeader(request({ type: '1', orgId: record?.[orgFieldNames.value] }));
       if (res.success) {
         message.success(favorite ? '收藏成功' : '取消收藏成功');
       }
@@ -133,12 +136,12 @@ export function useOrgAPIs(
 
     // 群组列表
     async groups({ search, current, pageSize }) {
-      const res = await postGroupFindPage({
+      const res = await setRequestHeader(postGroupFindPage({
         type: '1',
         name: search,
         currentPage: current,
         pageSize,
-      });
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {
@@ -153,7 +156,7 @@ export function useOrgAPIs(
 
     // 群组数据
     async groupData({ node }) {
-      const res = await getGroupDetailById({ id: node?.id, showIsCollect: true }, setDataAuth(auth));
+      const res = await setRequestHeader(getGroupDetailById({ id: node?.id, showIsCollect: true }));
       return res.data?.pubGroupMemberList?.map((e) => {
         return {
           ...e,
@@ -167,12 +170,12 @@ export function useOrgAPIs(
 
     // 组织树
     async orgTree({ node }) {
-      const res = await getRbacOrgOrgListByParentId({
+      const res = await setRequestHeader(getRbacOrgOrgListByParentId({
         parentId: node?.orgId,
         enable: true,
         showFullName: true,
         showIsCollect: true,
-      }, setDataAuth(auth));
+      }));
       return res.data?.map((e) => {
         return {
           ...e,
@@ -186,7 +189,7 @@ export function useOrgAPIs(
 
     // 组织的所有子节点
     async orgChildren({ node }) {
-      const res = await getRbacOrgSearchSubOrgById({ parentId: node?.orgId }, setDataAuth(auth));
+      const res = await setRequestHeader(getRbacOrgSearchSubOrgById({ parentId: node?.orgId }));
       return res.data?.map((e) => {
         return {
           ...e,
@@ -200,12 +203,12 @@ export function useOrgAPIs(
 
     // 组织列表
     async orgList({ search, current, pageSize }) {
-      const res = await postRbacOrgSearch({
+      const res = await setRequestHeader(postRbacOrgSearch({
         keyWord: search,
         currentPage: current,
         pageSize,
         showIsCollect: true,
-      }, setDataAuth(auth));
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {
@@ -224,15 +227,17 @@ export function useOrgAPIs(
 export function useUserAPIs(
   { auth, filter }: { auth?: string, filter: Filter },
 ): UserProviderProps['apis'] & ExtraApis {
+  const { setRequestHeader } = useRequestHeader(auth);
+
   return {
     // 回显选中项
     async getSelectedData(items: any[]) {
-      const res = await postRbacUserUserAndOrgList(items.map((item) => {
+      const res = await setRequestHeader(postRbacUserUserAndOrgList(items.map((item) => {
         return {
           orgId: item.orgId,
           userId: item.userId,
         };
-      }), setDataAuth(auth));
+      })));
       return res?.data?.map((e) => {
         return {
           ...e,
@@ -245,7 +250,7 @@ export function useUserAPIs(
 
     // 添加到最近常用
     async addRecentlyUsed(items: any[]) {
-      await postRbacUsedAddBatch(items.map((item) => {
+      await setRequestHeader(postRbacUsedAddBatch(items.map((item) => {
         const ids = resolveId(item[userFieldNames.value]);
         return {
           type: '2',
@@ -253,18 +258,18 @@ export function useUserAPIs(
           userId: ids.userId,
           userName: item[userFieldNames.label],
         };
-      }), setDataAuth(auth));
+      })));
     },
 
     // 最近常用
     async recentlyUsed({ search, current }) {
-      const res = await postRbacUsedFindPage({
+      const res = await setRequestHeader(postRbacUsedFindPage({
         type: '2',
         userName: search,
         currentPage: current,
         pageSize: 20,
         showIsCollect: true,
-      }, setDataAuth(auth));
+      }));
       return {
         total: 20,
         data: res.data?.records?.map((e) => {
@@ -280,12 +285,12 @@ export function useUserAPIs(
 
     // 收藏
     async favorites({ search, current, pageSize }) {
-      const res = await postRbacCollectFindPage({
+      const res = await setRequestHeader(postRbacCollectFindPage({
         type: '2',
         userName: search,
         currentPage: current,
         pageSize,
-      }, setDataAuth(auth));
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {
@@ -303,11 +308,11 @@ export function useUserAPIs(
     async favoriteToggle({ favorite, record }) {
       const request = favorite ? postRbacCollectAdd : postRbacCollectRemoveCollect;
       const ids = resolveId(record?.[userFieldNames.value]);
-      const res = await request({
+      const res = await setRequestHeader(request({
         type: '2',
         orgId: ids.orgId,
         userId: ids.userId,
-      }, setDataAuth(auth));
+      }));
       if (res.success) {
         message.success(favorite ? '收藏成功' : '取消收藏成功');
       }
@@ -315,12 +320,12 @@ export function useUserAPIs(
 
     // 群组列表
     async groups({ search, current, pageSize }) {
-      const res = await postGroupFindPage({
+      const res = await setRequestHeader(postGroupFindPage({
         type: '2',
         name: search,
         currentPage: current,
         pageSize,
-      }, setDataAuth(auth));
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {
@@ -335,7 +340,7 @@ export function useUserAPIs(
 
     // 群组数据
     async groupData({ node }) {
-      const res = await getGroupDetailById({ id: node?.id, showIsCollect: true }, setDataAuth(auth));
+      const res = await setRequestHeader(getGroupDetailById({ id: node?.id, showIsCollect: true }));
       return res.data?.pubGroupMemberList?.map((e) => {
         return {
           ...e,
@@ -349,14 +354,14 @@ export function useUserAPIs(
 
     // 用户列表
     async userList({ orgId, search, current, pageSize }) {
-      const res = await postRbacUserUserForMultiOrgPage({
+      const res = await setRequestHeader(postRbacUserUserForMultiOrgPage({
         orgId,
         realName: search,
         currentPage: current,
         pageSize,
         enable: true,
         showIsCollect: true,
-      }, setDataAuth(auth));
+      }));
       return {
         total: res.data?.total ?? 0,
         data: res.data?.records?.map((e) => {