@pubinfo-pr/module-rbac 0.171.1 → 0.171.3

package/dist/watermark_setting.css

@@ -0,0 +1 @@
+.item_ani[data-v-0ecfa3a5]{background-color:var(--g-bg);border:1px solid var(--g-tabbar-tab-hover-bg);border-radius:.5rem;flex-direction:column;place-items:center;padding-top:26px;display:flex}.item_ani .jb[data-v-0ecfa3a5]{background:linear-gradient(180deg,var(--g-container-bg)0%,#fff0 100%)}.bar-header[data-v-0ecfa3a5]{background:var(--g-bg)}

package/dist/zddata-Ceyga3_2.js

@@ -0,0 +1,2 @@
+var zddata_default = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20fill='none'%20class='design-iconfont'%20viewBox='0%200%2016%2016'%20width='24'%20height='24'%20preserveAspectRatio='xMidYMid%20meet'%3e%3cpath%20stroke='%23165DFF'%20d='M2.839%203H13.16v3H2.84zm0%205H13.16v3H2.84z'/%3e%3cpath%20stroke='%23165DFF'%20stroke-width='.5'%20d='M2.589%2012.75H13.41v.5H2.59z'/%3e%3cpath%20stroke='%23165DFF'%20d='M2.839%203h3v3h-3zm0%205h3v3h-3z'/%3e%3c/svg%3e";
+export { zddata_default as default };

package/dist/zy_checked-DvD7k9F8.js

@@ -0,0 +1,2 @@
+var zy_checked_default = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20fill='none'%20class='design-iconfont'%20viewBox='0%200%2025%2024'%20width='24'%20height='24'%20preserveAspectRatio='xMidYMid%20meet'%3e%3cpath%20fill='%23165DFF'%20d='M12.66%202a10%2010%200%201%200%200%2020%2010%2010%200%201%200%200-20'/%3e%3cpath%20fill='url(%23a)'%20d='M17.398%208a.527.527%200%200%201%20.061%201.049l-.061.004v5.79a1.053%201.053%200%200%201-1.053%201.052h-2.413l1.206%201.207a.527.527%200%200%201-.694.788l-.05-.044-1.733-1.733-1.733%201.733a.53.53%200%200%201-.695.044l-.05-.044a.526.526%200%200%201-.043-.695l.044-.05%201.206-1.206H8.977a1.05%201.05%200%200%201-.676-.246l-.068-.063a1.05%201.05%200%200%201-.309-.744v-5.79a.526.526%200%200%201-.061-1.048L7.924%208zm-1.053%201.053H8.976v5.79h7.37zm-.68%201.206a.53.53%200%200%201%20.043.695l-.043.05-2.105%202.105a.53.53%200%200%201-.695.044l-.05-.044-1.207-1.207-1.206%201.207a.53.53%200%200%201-.695.044l-.05-.044a.526.526%200%200%201-.043-.695l.043-.05%201.58-1.578a.53.53%200%200%201%20.694-.044l.05.044%201.206%201.206%201.734-1.733a.526.526%200%200%201%20.744%200'/%3e%3cdefs%3e%3clinearGradient%20id='a'%20x1='12.661'%20x2='12.661'%20y1='8'%20y2='18'%20gradientUnits='userSpaceOnUse'%3e%3cstop%20stop-color='%23fff'/%3e%3cstop%20offset='1'%20stop-color='%23fff'%20stop-opacity='.75'/%3e%3c/linearGradient%3e%3c/defs%3e%3c/svg%3e";
+export { zy_checked_default as default };

package/dist/zy_default-DJ2tB3Fo.js

@@ -0,0 +1,2 @@
+var zy_default_default = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20fill='none'%20class='design-iconfont'%20viewBox='0%200%2025%2024'%20width='24'%20height='24'%20preserveAspectRatio='xMidYMid%20meet'%3e%3cpath%20fill='%2386909C'%20d='M12.66%202a10%2010%200%201%200%200%2020%2010%2010%200%201%200%200-20'/%3e%3cpath%20fill='url(%23a)'%20d='M17.398%208a.527.527%200%200%201%20.061%201.049l-.061.004v5.79a1.053%201.053%200%200%201-1.053%201.052h-2.413l1.206%201.207a.527.527%200%200%201-.694.788l-.05-.044-1.733-1.733-1.733%201.733a.53.53%200%200%201-.695.044l-.05-.044a.526.526%200%200%201-.043-.695l.044-.05%201.206-1.206H8.977a1.05%201.05%200%200%201-.676-.246l-.068-.063a1.05%201.05%200%200%201-.309-.744v-5.79a.526.526%200%200%201-.061-1.048L7.924%208zm-1.053%201.053H8.976v5.79h7.37zm-.68%201.206a.53.53%200%200%201%20.043.695l-.043.05-2.105%202.105a.53.53%200%200%201-.695.044l-.05-.044-1.207-1.207-1.206%201.207a.53.53%200%200%201-.695.044l-.05-.044a.526.526%200%200%201-.043-.695l.043-.05%201.58-1.578a.53.53%200%200%201%20.694-.044l.05.044%201.206%201.206%201.734-1.733a.526.526%200%200%201%20.744%200'/%3e%3cdefs%3e%3clinearGradient%20id='a'%20x1='12.661'%20x2='12.661'%20y1='8'%20y2='18'%20gradientUnits='userSpaceOnUse'%3e%3cstop%20stop-color='%23fff'/%3e%3cstop%20offset='1'%20stop-color='%23fff'%20stop-opacity='.75'/%3e%3c/linearGradient%3e%3c/defs%3e%3c/svg%3e";
+export { zy_default_default as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo-pr/module-rbac",
   "type": "module",
-  "version": "0.171.1",
+  "version": "0.171.3",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -24,15 +24,16 @@
     "@pubinfo/pro-components": "^1.8.0",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
-    "pubinfo-pr": "0.171.1"
+    "pinia": "^3.0.4",
+    "pubinfo-pr": "0.171.3"
   },
   "dependencies": {
     "@destyler/color-picker": "^0.1.0",
     "@destyler/popover": "^0.1.0",
     "@destyler/vue": "^0.1.0",
     "@pubinfo/headlessui": "^1.5.4",
-    "@vueuse/core": "^13.7.0",
-    "dayjs": "^1.11.13",
+    "@vueuse/core": "^14.1.0",
+    "dayjs": "^1.11.19",
     "file-saver": "^2.0.5",
     "json-editor-vue": "^0.18.1",
     "lodash-es": "^4.17.21",
@@ -48,7 +49,8 @@
     "@types/lodash-es": "^4.17.12",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
-    "pubinfo-pr": "0.171.1",
+    "pinia": "^3.0.4",
+    "pubinfo-pr": "0.171.3",
     "type-fest": "^4.41.0"
   },
   "scripts": {

package/src/components/OrgUserSelector/provider.ts

@@ -1,4 +1,5 @@
 import type { OrgProviderProps, UserProviderProps } from '@pubinfo/headlessui';
+import type { RequestMethod } from 'pubinfo-pr';
 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) => {

package/src/components/ResourceIcones/Select.vue

@@ -1,12 +1,33 @@
 <script setup lang="ts">
-import * as AntdIcons from '@ant-design/icons-vue';
 import { Empty } from 'ant-design-vue';
 import { getAllIconModules, PubinfoIcon } from 'pubinfo-pr';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, shallowRef, watch } from 'vue';
 import ResourceIconesBoxColorPicker from './BoxColorPicker.vue';
 
 defineOptions({ name: 'ResourceIconesSelect' });
 
+// 懒加载 Ant Design 图标名称列表，避免全量打包
+const antdIconNames = shallowRef<string[]>([]);
+const antdIconsLoading = ref(false);
+
+async function loadAntdIconNames() {
+  if (antdIconNames.value.length > 0 || antdIconsLoading.value) {
+    return;
+  }
+  antdIconsLoading.value = true;
+  try {
+    // 动态导入，仅在需要时加载
+    const AntdIcons = await import('@ant-design/icons-vue');
+    antdIconNames.value = Object.keys(AntdIcons)
+      .filter(n => /(?:Outlined|Filled|TwoTone)$/.test(n))
+      .map(n => `antd:${n}`)
+      .sort();
+  }
+  finally {
+    antdIconsLoading.value = false;
+  }
+}
+
 // v-model（对外的值）
 const modelValueRef = defineModel<string>();
 // 额外样式参数的多路 v-model：边框(boxType)、角度(angle)、背景(background)、圆角(radius)、图标色(iconColor)
@@ -33,6 +54,8 @@ const iconColorPickerRef = ref<HTMLInputElement | null>(null);
 // 弹窗
 const visibleRef = ref(false);
 function handleOpenModal() {
+  // 打开时加载 AntD 图标名称
+  loadAntdIconNames();
   // 打开时同步一次外部值到临时值，避免未确认的变更影响外部
   tempValueRef.value = modelValueRef.value;
   // 同步样式参数到对话框内部状态
@@ -88,12 +111,8 @@ const moduleIconMap = computed(() => {
   return m;
 });
 
-// AntD 图标（带前缀 antd:）
-const antdIcons = computed<string[]>(() => Object.keys(AntdIcons)
-  .filter(n => /(?:Outlined|Filled|TwoTone)$/.test(n))
-  .map(n => `antd:${n}`)
-  .sort(),
-);
+// AntD 图标（带前缀 antd:）- 使用懒加载的数据
+const antdIcons = computed<string[]>(() => antdIconNames.value);
 
 // 模块列表（全部 + 本地(local) 优先 + 其余模块 + Ant Design）
 const moduleOptions = computed(() => {

package/src/views/blackWhiteList/index.vue

@@ -12,7 +12,7 @@ defineOptions({
 });
 
 const route = useRoute();
-const isBlacklistMode = ref(route.path.includes('blacklist'));
+const isBlacklistMode = computed(() => route.path.includes('blacklist'));
 
 // 黑名单0，白名单1
 const currentType = computed(() => {
@@ -196,6 +196,7 @@ function onAction(key: string, record?: API.PubBlackWhiteList): void {
 
 <template>
   <div
+    :key="currentType"
     w-full
     h-full
     py-10px

package/dist/ComponentSelect-ZLey_5w7.js

@@ -1,4 +0,0 @@
-import { _ as f } from "./ComponentSelect.vue_vue_type_style_index_0_lang-CMEO08Uz.js";
-export {
-  f as default
-};