@pubinfo/module-rbac 2.0.0-rc.2 → 2.0.0-rc.3

package/src/views/resource/components/ComponentSelect.vue

@@ -4,7 +4,6 @@ import { CaretDownOutlined } from '@ant-design/icons-vue';
 import * as popover from '@destyler/popover';
 import { normalizeProps, useMachine } from '@destyler/vue';
 import { Empty } from 'ant-design-vue';
-import { getAllRouteModules, readProjectModules } from 'pubinfo';
 import ComponentsIcones from '@/components/DirectoryIcones/ComponentsIcones.vue';
 import FolderIcones from '@/components/DirectoryIcones/FolderIcones.vue';
 import ModuleIcones from '@/components/DirectoryIcones/ModuleIcones.vue';
@@ -12,6 +11,7 @@ import PackagesIcones from '@/components/DirectoryIcones/PackagesIcones.vue';
 import SrcIcones from '@/components/DirectoryIcones/SrcIcones.vue';
 import ViewIcones from '@/components/DirectoryIcones/ViewIcones.vue';
 import VueIcones from '@/components/DirectoryIcones/VueIcones.vue';
+import { useViewStore } from '@/stores/view';
 
 defineOptions({
   name: 'ComponentSelect',
@@ -19,6 +19,9 @@ defineOptions({
 
 const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
 
+// 使用 Pinia store
+const viewStore = useViewStore();
+
 const moduleValue = defineModel<string>({
   default: '',
 });
@@ -125,131 +128,21 @@ watch(visibleRef, (open) => {
   }
 });
 
-// 自定义树形结构
-interface ComponentTreeNode {
-  title: string
-  key: string
-  // 是否为根节点（如：'local'/'module:<id>'）
-  root?: boolean
-  module?: boolean
-  children?: ComponentTreeNode[]
-  isLeaf?: boolean
-  // 额外数据，选择时可用
-  value?: string
-  scope?: string
-}
-
-/**
- * 从扁平路径数组构建“目录树”节点
- * @param label 根节点标题（如：'本地'/'模块名'）
- * @param keyPrefix 根节点 key（如：'local'/'module:<id>'）
- * @param paths 叶子路径（views 相对路径）
- * @param scope 作用域（模块 id），本地为 undefined
- */
-function buildTree(label: string, keyPrefix: string, paths: string[], scope?: string): ComponentTreeNode {
-  const root: ComponentTreeNode = { title: label, key: keyPrefix, root: true, module: keyPrefix !== 'local', children: [] };
-
-  // 便捷查找当前层的子节点
-  const findOrCreate = (parent: ComponentTreeNode, title: string, key: string) => {
-    if (!parent.children) {
-      parent.children = [];
-    }
-    let node = parent.children.find(n => n.title === title && !n.isLeaf);
-    if (!node) {
-      node = { title, key, children: [] };
-      parent.children.push(node);
-    }
-    return node;
-  };
-
-  for (const p of paths) {
-    const segs = p.split('/').filter(Boolean);
-    let current = root;
-    let acc = keyPrefix;
-    for (let i = 0; i < segs.length; i++) {
-      const seg = segs[i];
-      acc = acc ? `${acc}/${seg}` : seg;
-      const isLast = i === segs.length - 1;
-      if (isLast) {
-        // 叶子结点携带 value 与 scope 信息
-        current.children = current.children || [];
-        current.children.push({
-          title: seg,
-          key: acc,
-          isLeaf: true,
-          value: p,
-          scope,
-        });
-      }
-      else {
-        current = findOrCreate(current, seg, acc);
-      }
-    }
-  }
-
-  return root;
-}
-
-// 计算：树数据，根为“本地”和各模块名，叶子为 views 下的路径
-const componentTreeOptions = computed<TreeProps['treeData']>(() => {
-  // 获取主项目的 pages
-  const projectStructure = readProjectModules();
-  const mainPages = projectStructure?.pages || {};
-
-  // 获取所有模块的 pages
-  const routeModuleMap = getAllRouteModules();
-
-  const treeNodes: ComponentTreeNode[] = [];
-
-  // 本地节点
-  treeNodes.push(
-    buildTree('本地', 'local', Object.keys(mainPages)),
-  );
-
-  // 模块节点
-  for (const [id, moduleMap] of routeModuleMap) {
-    treeNodes.push(
-      buildTree(id, `module:${id}`, Object.keys(moduleMap), id),
-    );
+// 弹层再次打开时，若之前被手动折叠，重新展开到选中层级
+watch(visibleRef, (open) => {
+  if (open) {
+    expandToSelected();
   }
-
-  return treeNodes as unknown as TreeProps['treeData'];
 });
 
-// 根据搜索关键字过滤树数据，保留匹配节点及其祖先
+// 从 store 获取树数据并支持搜索过滤
 const displayedTreeData = computed<TreeProps['treeData']>(() => {
-  const q = searchQuery.value.trim().toLowerCase();
-  const source = componentTreeOptions.value as any[];
+  const q = searchQuery.value.trim();
   if (!q) {
-    return source as unknown as TreeProps['treeData'];
+    return viewStore.getRouteTreeData() as unknown as TreeProps['treeData'];
   }
 
-  const filterNodes = (nodes: any[]): any[] => {
-    const res: any[] = [];
-    for (const n of nodes || []) {
-      const title = String(n?.title ?? '').toLowerCase();
-      const value = String(n?.value ?? '').toLowerCase();
-      const keyStr = String(n?.key ?? '').toLowerCase();
-      const selfMatch = title.includes(q) || value.includes(q) || keyStr.includes(q);
-      let childrenFiltered: any[] | undefined;
-      if (Array.isArray(n?.children) && n.children.length) {
-        childrenFiltered = filterNodes(n.children);
-      }
-      if (selfMatch || (childrenFiltered && childrenFiltered.length)) {
-        const cloned = { ...n };
-        if (childrenFiltered) {
-          cloned.children = childrenFiltered;
-        }
-        else if (cloned.children) {
-          delete cloned.children;
-        }
-        res.push(cloned);
-      }
-    }
-    return res;
-  };
-
-  return filterNodes(source) as unknown as TreeProps['treeData'];
+  return viewStore.filterRouteTree(q) as unknown as TreeProps['treeData'];
 });
 
 // 收集非叶子节点 key，用于搜索时全部展开

package/src/views/resource/components/HoverCard.vue

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { DoubleRightOutlined } from '@ant-design/icons-vue';
+import { useToggle } from '@vueuse/core';
+import { theme } from 'ant-design-vue';
+
+defineOptions({
+  name: 'HoverCard',
+});
+
+defineProps<{
+  more?: boolean
+}>();
+
+const { token } = theme.useToken();
+const [hovered, toggle] = useToggle();
+const [expanded, expand] = useToggle();
+</script>
+
+<template>
+  <div
+    class="relative rounded-t-lg h-[72px] px-5 border border-solid"
+    :class="[expanded && more ? 'rounded-b-none' : 'rounded-b-lg']"
+    :style="{
+      borderColor: hovered ? token.colorPrimary : token.colorBorder,
+      boxShadow: hovered ? token.boxShadow : 'none',
+    }"
+    @mouseenter="toggle(true)"
+    @mouseleave="toggle(false)"
+  >
+    <slot />
+
+    <template v-if="more">
+      <div v-if="!expanded" class="absolute bottom-1 left-0 w-full text-center text-xs space-x-1 cursor-pointer" @click="expand(true)">
+        <span>更多</span>
+        <DoubleRightOutlined
+          :rotate="90"
+          class="animate-bounce"
+        />
+      </div>
+
+      <div
+        v-if="expanded"
+        class="absolute top-[70px] -left-[1px] z-50 w-[calc(100%+2px)] pt-5 px-5 border border-solid rounded-b-lg"
+        :style="{
+          borderColor: hovered ? token.colorPrimary : token.colorBorder,
+          backgroundColor: token.colorBgElevated,
+          boxShadow: token.boxShadow,
+        }"
+      >
+        <slot name="more" />
+
+        <div class="mt-5 pb-1 w-full text-center text-xs space-x-1 cursor-pointer" @click="expand(false)">
+          <span>收起</span>
+          <DoubleRightOutlined
+            :rotate="270"
+            class="animate-bounce"
+          />
+        </div>
+      </div>
+    </template>
+  </div>
+</template>

package/src/views/resource/components/MetaForm.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Form } from '../interface';
-import { dataPermissionOptions } from '@/views/data-permission/enum';
 import { useMetaForm } from '../hooks/useMetaForm';
+import HoverCard from './HoverCard.vue';
 
 defineOptions({
   name: 'MetaForm',
@@ -30,90 +30,152 @@ const { show } = useMetaForm(form);
       - 其他显示相关配置：适用于所有可视化的资源类型
     -->
 
-    <a-row :gutter="8">
-      <a-col :span="9" :offset="3">
-        <a-form-item name="enable">
-          <a-checkbox v-model:checked="form.enable">
-            启用
-          </a-checkbox>
+    <a-row :gutter="[8, 8]">
+      <a-col :span="12">
+        <a-form-item name="enable" :label-col="{ span: 0 }">
+          <HoverCard class="flex items-center justify-between">
+            <div class="text-sm font-medium">
+              启用
+            </div>
+            <a-switch v-model:checked="form.enable" />
+          </HoverCard>
         </a-form-item>
       </a-col>
+
       <!-- 开发模式：仅在应用或动态应用中显示 -->
-      <a-col v-if="show.devMode" :span="9" :offset="3">
-        <a-form-item name="isDev">
-          <a-checkbox v-model:checked="form.meta!.isDev">
-            开发模式
-          </a-checkbox>
-        </a-form-item>
-      </a-col>
-      <!-- 开发模式文本：仅在开启开发模式时显示 -->
-      <a-col v-if="show.devMode && form.meta?.isDev" :span="18" :offset="3">
-        <a-form-item label="开发模式提示文本" name="devText" :label-col="{ style: { width: '120px' } }">
-          <a-input
-            v-model:value="form.meta!.devText"
-            placeholder="请输入开发模式下的提示文本"
-            :maxlength="100"
-            show-count
-          />
-          <div class="text-xs text-gray-500 mt-1">
-            此文本将在用户点击开发模式应用时显示在提示框中
-          </div>
-        </a-form-item>
+      <a-col v-if="show.devMode" :span="12">
+        <HoverCard :more="form.meta?.isDev" class="flex flex-wrap items-center">
+          <a-form-item
+            name="isDev"
+            :label-col="{ span: 0 }"
+            class="form-item-bottom-0 w-full"
+          >
+            <div class="flex items-center justify-between">
+              <div class="text-sm font-medium">
+                开发模式
+              </div>
+              <a-switch v-model:checked="form.meta!.isDev" />
+            </div>
+          </a-form-item>
+
+          <template #more>
+            <!-- 开发模式文本：仅在开启开发模式时显示 -->
+            <a-form-item
+              v-if="form.meta?.isDev"
+              label="提示文本"
+              name="devText"
+              tooltip="此文本将在用户点击开发模式应用时显示在提示框中"
+              :label-col="{ style: { fontSize: '12px' } }"
+              class="w-full"
+            >
+              <a-input
+                v-model:value="form.meta!.devText"
+                placeholder="请输入开发模式下的提示文本"
+                :maxlength="100"
+                show-count
+                size="small"
+              />
+            </a-form-item>
+          </template>
+        </HoverCard>
       </a-col>
+
       <!-- 缓存标签页：仅在菜单中显示 -->
-      <a-col v-if="show.cacheAndPin" :span="9" :offset="3">
-        <a-form-item name="cache">
-          <a-checkbox v-model:checked="form.meta!.cache">
-            缓存标签页
-          </a-checkbox>
-        </a-form-item>
+      <a-col v-if="show.cacheAndPin" :span="12">
+        <HoverCard :more="form.meta?.cache" class="flex flex-wrap items-center">
+          <a-form-item name="cache" :label-col="{ span: 0 }" class="form-item-bottom-0 w-full">
+            <div class="flex items-center justify-between">
+              <div class="text-sm font-medium">
+                缓存标签页
+              </div>
+              <a-switch v-model:checked="form.meta!.cache" />
+            </div>
+          </a-form-item>
+
+          <template #more>
+            <a-form-item
+              label="指定页缓存"
+              name="cacheName"
+              tooltip="设置页面name值，前往指定页面时，当前页被缓存"
+              :label-col="{ style: { fontSize: '12px', width: '120px' } }"
+              class="w-full"
+            >
+              <a-input
+                v-model:value="form.meta!.cacheName"
+                placeholder="路由名称（多个用,隔开）"
+                size="small"
+              />
+            </a-form-item>
+
+            <a-form-item
+              label="指定页不缓存"
+              name="cacheName"
+              tooltip="设置页面name值，前往指定页面时，当前页不缓存"
+              :label-col="{ style: { fontSize: '12px', width: '120px' } }"
+              class="w-full"
+            >
+              <a-input
+                v-model:value="form.meta!.noCache"
+                placeholder="路由名称（多个用,隔开）"
+                size="small"
+              />
+            </a-form-item>
+          </template>
+        </HoverCard>
       </a-col>
+
       <!-- 固定标签页：仅在菜单中显示 -->
-      <a-col v-if="show.cacheAndPin" :span="9" :offset="3">
-        <a-form-item name="pin">
-          <a-checkbox v-model:checked="form.meta!.pin">
-            固定在标签页
-          </a-checkbox>
+      <a-col v-if="show.cacheAndPin" :span="12">
+        <a-form-item name="pin" :label-col="{ span: 0 }">
+          <HoverCard class="flex items-center justify-between">
+            <div class="text-sm font-medium">
+              固定在标签页
+            </div>
+            <a-switch v-model:checked="form.meta!.pin" />
+          </HoverCard>
         </a-form-item>
       </a-col>
+
       <!-- 侧边栏显示：不适用于应用和动态应用 -->
-      <a-col v-if="show.sidebar" :span="9" :offset="3">
-        <a-form-item name="sidebar">
-          <a-checkbox v-model:checked="form.meta!.sidebar">
-            在侧边栏显示
-          </a-checkbox>
+      <a-col v-if="show.sidebar" :span="12">
+        <a-form-item name="sidebar" :label-col="{ span: 0 }">
+          <HoverCard class="flex items-center justify-between">
+            <div class="text-sm font-medium">
+              在侧边栏显示
+            </div>
+            <a-switch v-model:checked="form.meta!.sidebar" />
+          </HoverCard>
         </a-form-item>
       </a-col>
+
       <!-- 标签栏显示：不适用于应用、动态应用和目录 -->
-      <a-col v-if="show.tabbar" :span="9" :offset="3">
-        <a-form-item name="tabbar">
-          <a-checkbox v-model:checked="form.meta!.tabbar">
-            在标签栏显示
-          </a-checkbox>
-        </a-form-item>
-      </a-col>
-      <a-col v-if="show.breadcrumb" :span="9" :offset="3">
-        <a-form-item name="breadcrumb">
-          <a-checkbox v-model:checked="form.meta!.breadcrumb">
-            在面包屑显示
-          </a-checkbox>
+      <a-col v-if="show.tabbar" :span="12">
+        <a-form-item name="tabbar" :label-col="{ span: 0 }">
+          <HoverCard class="flex items-center justify-between">
+            <div class="text-sm font-medium">
+              在标签栏显示
+            </div>
+            <a-switch v-model:checked="form.meta!.tabbar" />
+          </HoverCard>
         </a-form-item>
       </a-col>
-    </a-row>
 
-    <a-row v-if="show.dataPermission" :gutter="8">
-      <a-col :span="6" :offset="3">
-        <a-form-item name="enableDataPermission">
-          <a-checkbox v-model:checked="form.enableDataPermission">
-            启用数据权限
-          </a-checkbox>
-        </a-form-item>
-      </a-col>
-      <a-col :span="12" :offset="3">
-        <a-form-item v-if="form.enableDataPermission" label="数据权限规则" name="dataPermissionType">
-          <a-select v-model:value="form.dataPermissionType" :options="dataPermissionOptions" />
+      <a-col v-if="show.breadcrumb" :span="12">
+        <a-form-item name="breadcrumb" :label-col="{ span: 0 }">
+          <HoverCard class="flex items-center justify-between">
+            <div class="text-sm font-medium">
+              在面包屑显示
+            </div>
+            <a-switch v-model:checked="form.meta!.breadcrumb" />
+          </HoverCard>
         </a-form-item>
       </a-col>
     </a-row>
   </div>
 </template>
+
+<style lang="css" scoped>
+.form-item-bottom-0, .ant-form-item {
+  margin-bottom: 0;
+}
+</style>

package/src/views/resource/components/ResourceEdit.vue

@@ -6,7 +6,7 @@ import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
 import { cloneDeep } from 'lodash-es';
 import { getRbacResourceInfo, postRbacResourceAddResource, postRbacResourceResourceUpdate } from '@/api/modules/rbac';
-import { DATA_PERMISSION_TYPE } from '@/views/data-permission/enum';
+import { DATA_PERMISSION_TYPE, dataPermissionOptions } from '@/views/data-permission/enum';
 import { ACTION, RESOURCE_COLOR, RESOURCE_TYPE, resourceOptions } from '../enum';
 import { useMetaForm } from '../hooks/useMetaForm';
 import { defaultMeta } from '../model';
@@ -87,7 +87,7 @@ const resourceComputedOptions = computed(() => {
       return [];
 
     default:
-      return resourceOptions.filter(node => [RESOURCE_TYPE.APP, RESOURCE_TYPE.MICRO_APP, RESOURCE_TYPE.DYNAMIC_APP].includes(node.value));
+      return resourceOptions.filter(node => [RESOURCE_TYPE.APP, /* RESOURCE_TYPE.MICRO_APP, */ RESOURCE_TYPE.DYNAMIC_APP].includes(node.value));
   }
 });
 
@@ -129,10 +129,10 @@ async function onOpen(key: ACTION, record?: Form) {
 const [loading, setLoading] = useToggle(false);
 function onSubmit() {
   formRef.value?.validate().then(() => {
-    const params = {
+    const params = cloneDeep({
       ...form.value,
       icon: form.value.icon || undefined,
-    };
+    });
 
     // app, 目录等不参与数据权限筛选
     if (!show.value.dataPermission) {
@@ -144,6 +144,22 @@ function onSubmit() {
       console.warn('开发模式应用的子路由将不会在生产环境中注册到vue-router，请确保这是预期行为。');
     }
 
+    // 处理 cache 相关逻辑
+    if (params.meta?.cache) {
+      if (params.meta.cacheName) {
+        params.meta.cache = params.meta.cacheName.split(',');
+      }
+    }
+
+    if (params.meta?.noCache) {
+      params.meta.noCache = params.meta.noCache.split(',');
+    }
+
+    if (!params.meta?.cache) {
+      delete params?.meta?.noCache;
+    }
+    delete params?.meta?.cacheName;
+
     // 可以在提交前检查目录下是否有有效的子菜单，如果没有则给出提示
     // 这部分逻辑可能需要额外的API调用来检查子资源
 
@@ -262,6 +278,19 @@ defineExpose({
           </a-col>
         </a-row>
 
+        <a-row v-if="show.dataPermission" :gutter="8">
+          <a-col :span="8">
+            <a-form-item label="启用数据权限" name="enableDataPermission">
+              <a-switch v-model:checked="form.enableDataPermission" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="16">
+            <a-form-item v-if="form.enableDataPermission" label="数据权限规则" name="dataPermissionType">
+              <a-select v-model:value="form.dataPermissionType" :options="dataPermissionOptions" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+
         <MetaForm v-model="form" />
       </a-form>
     </a-spin>

package/src/views/resource/hooks/useMetaForm.ts

@@ -64,6 +64,29 @@ export function useMetaForm(form: Ref<Form>) {
       form.value.meta = { ...defaultMeta };
     }
 
+    // 设置 cache 相关值
+    if (form.value.meta.cache) {
+      const cache = form.value.meta.cache;
+
+      if (typeof cache === 'boolean') {
+        form.value.meta.cache = cache;
+      }
+
+      if (typeof cache === 'string') {
+        form.value.meta.cacheName = cache;
+        form.value.meta.cache = true;
+      }
+
+      if (Array.isArray(cache)) {
+        form.value.meta.cacheName = cache.join(',');
+        form.value.meta.cache = true;
+      }
+    }
+
+    if (form.value.meta.noCache && Array.isArray(form.value.meta.noCache)) {
+      form.value.meta.noCache = form.value.meta.noCache.join(',');
+    }
+
     // 如果当前资源类型不支持开发模式，则重置为false
     if (!show.value.devMode) {
       form.value.meta.isDev = false;

package/src/views/resource/model.ts

@@ -26,7 +26,9 @@ export interface CustomMeta {
   activeMenu?: string
   isDev: boolean
   devText: string
-  cache: boolean
+  cache: boolean | string | string[]
+  cacheName?: string
+  noCache?: string | string[]
   pin: boolean
   sidebar: boolean
   tabbar: boolean
@@ -44,6 +46,8 @@ export const defaultMeta: CustomMeta = {
   isDev: false,
   devText: '该功能暂未上线，敬请期待！',
   cache: false,
+  cacheName: undefined,
+  noCache: undefined,
   pin: false,
   sidebar: true,
   tabbar: true,

package/src/views/watermark_setting/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { message } from 'ant-design-vue';
-import { eventBus } from 'pubinfo';
+import { updateWatermark } from 'pubinfo';
 import { postSysconfigAddOrEidtSysThemeStyleConfig } from '@/api/modules/configData';
 import { useSettingsStore } from '@/stores';
 import AnimationItem from '../components/animation_item.vue';
@@ -79,7 +79,7 @@ function setStyle(jsonStr: string) {
   postSysconfigAddOrEidtSysThemeStyleConfig({ content: jsonStr }).then((res: API.ResponseDataBoolean) => {
     if (res.success) {
       message.success('设置成功');
-      eventBus.emit('updateWatermark');
+      updateWatermark();
     }
   });
 }

package/dist/ComponentSelect-Din5Vses.js

@@ -1,2 +0,0 @@
-import { b as e } from "./ComponentSelect-Dyqb3Uh3.js";
-export { e as default };

package/dist/DynamicRoutesForm-CkmCaHum.js

@@ -1,4 +0,0 @@
-import "./ComponentSelect-Dyqb3Uh3.js";
-import { b as e } from "./DynamicRoutesForm-D3nGj7oA.js";
-import "./enum-BMY6bmPA.js";
-export { e as default };

package/dist/HCheckList-Dd2Tx0jW.js

@@ -1,2 +0,0 @@
-import { b as e } from "./HCheckList-3zLNVNr0.js";
-export { e as default };

package/dist/ImportExport-BbZkZEW_.js

@@ -1,4 +0,0 @@
-import "./enum-BMY6bmPA.js";
-import "./dayjs.min-KffHrkDe.js";
-import { b as e } from "./ImportExport-Yt6dABIv.js";
-export { e as default };