@pubinfo/module-rbac 2.0.13 → 2.0.15

package/dist/views/resource/model.d.ts

@@ -45,6 +45,7 @@ export interface CustomMeta {
     breadcrumb: boolean;
     link?: string;
     iframe?: string;
+    iframeCache?: boolean;
     layout: CustomMetaLayout;
     partyLogin?: any[];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/module-rbac",
   "type": "module",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -21,10 +21,10 @@
   },
   "peerDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/pro-components": "^1.7.3",
+    "@pubinfo/pro-components": "^1.8.0",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
-    "pubinfo": "2.0.13"
+    "pubinfo": "2.0.15"
   },
   "dependencies": {
     "@destyler/color-picker": "^0.1.0",
@@ -40,15 +40,15 @@
   },
   "devDependencies": {
     "@ant-design/icons-vue": "^7.0.1",
-    "@pubinfo/openapi": "^0.9.0",
-    "@pubinfo/preset-openapi": "^0.9.0",
-    "@pubinfo/pro-components": "^1.7.3",
+    "@pubinfo/openapi": "^0.9.1",
+    "@pubinfo/preset-openapi": "^0.9.1",
+    "@pubinfo/pro-components": "^1.8.0",
     "@types/file-saver": "^2.0.7",
     "@types/lodash-es": "^4.17.12",
     "alova": "^3.3.4",
     "ant-design-vue": "^4.2.6",
     "type-fest": "^4.41.0",
-    "pubinfo": "2.0.13"
+    "pubinfo": "2.0.15"
   },
   "scripts": {
     "dev": "pubinfo build -w --sourcemap",

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

@@ -24,7 +24,7 @@ const show = computed(() => {
   const type = form.value.type as RESOURCE_TYPE;
 
   return {
-    path: [RESOURCE_TYPE.INDEX, RESOURCE_TYPE.MENU, RESOURCE_TYPE.MICRO_APP, RESOURCE_TYPE.NON_MENU, RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(type),
+    path: [RESOURCE_TYPE.INDEX, RESOURCE_TYPE.MENU, RESOURCE_TYPE.NON_MENU, RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(type),
     component: [RESOURCE_TYPE.MENU, RESOURCE_TYPE.NON_MENU].includes(type),
     iframe: [RESOURCE_TYPE.IFRAME].includes(type),
     link: [RESOURCE_TYPE.LINK].includes(type),

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

@@ -95,7 +95,7 @@ const show = computed(() => {
   const type = modelValue.value.type as RESOURCE_TYPE;
 
   return {
-    icon: [RESOURCE_TYPE.DYNAMIC_APP, RESOURCE_TYPE.MICRO_APP, RESOURCE_TYPE.INDEX, RESOURCE_TYPE.MENU, RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(type),
+    icon: [RESOURCE_TYPE.DYNAMIC_APP, RESOURCE_TYPE.INDEX, RESOURCE_TYPE.MENU, RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(type),
   };
 });
 

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

@@ -80,6 +80,17 @@ const { show } = useMetaForm(form);
         </HoverCard>
       </a-col>
 
+      <a-col v-if="show.iframe" :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.meta!.iframeCache" />
+          </HoverCard>
+        </a-form-item>
+      </a-col>
+
       <!-- 缓存标签页：仅在菜单中显示 -->
       <a-col v-if="show.cacheAndPin" :span="12">
         <HoverCard :more="form.meta?.cache" class="flex flex-wrap items-center">

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

@@ -73,7 +73,6 @@ function recursiveTreeFind<T extends { children?: T[] }>(tree: T[], fn: (node: T
 const resourceComputedOptions = computed(() => {
   switch (parentNode.value?.type) {
     case RESOURCE_TYPE.APP:
-    case RESOURCE_TYPE.MICRO_APP:
     case RESOURCE_TYPE.DYNAMIC_APP:
       return resourceOptions.filter(node => [RESOURCE_TYPE.INDEX, RESOURCE_TYPE.MENU, RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(node.value));
 
@@ -90,7 +89,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.DYNAMIC_APP].includes(node.value));
   }
 });
 
@@ -220,16 +219,11 @@ defineExpose({
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="资源类型" name="type">
+            <a-form-item label="资源类型" name="type" :tooltip="!parentNode?.type ? '动态应用为后端路由，应用为前端路由' : ''">
               <div
                 v-if="state.title === ACTION.EDIT"
                 class="flex items-center space-x-1"
               >
-                <!-- <PubinfoIcon v-if="form.type" :name="`resource-${RESOURCE_ICON[Number(form.type)]}`" class="text-xl" />
-                <span>
-                  {{ resourceComputedOptions.find(e => e.value === form.type)?.label }}
-                </span> -->
-
                 <a-tag v-if="form.type" :color="RESOURCE_COLOR[Number(form.type)]" :bordered="false">
                   {{ resourceComputedOptions.find(e => e.value === form.type)?.label }}
                 </a-tag>

package/src/views/resource/enum.ts

@@ -24,7 +24,6 @@ export const RESOURCE_COLOR = ['', 'geekblue', 'blue', 'default', 'cyan', 'defau
 export const resourceOptions = [
   { label: '动态应用', value: RESOURCE_TYPE.DYNAMIC_APP },
   { label: '应用', value: RESOURCE_TYPE.APP },
-  { label: '微应用', value: RESOURCE_TYPE.MICRO_APP },
   { label: '目录', value: RESOURCE_TYPE.INDEX },
   { label: '菜单', value: RESOURCE_TYPE.MENU },
   { label: '按钮', value: RESOURCE_TYPE.BUTTON },

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

@@ -25,6 +25,8 @@ export function useMetaForm(form: Ref<Form>) {
       breadcrumb: ![RESOURCE_TYPE.BUTTON].includes(type),
 
       dynamic: [RESOURCE_TYPE.IFRAME, RESOURCE_TYPE.LINK].includes(type),
+
+      iframe: [RESOURCE_TYPE.IFRAME].includes(type),
     };
   });
 

package/src/views/resource/index.vue

@@ -42,9 +42,6 @@ const columns: ProColumns<TreeNode> = [
     customRender({ text }) {
       return (
         <div class="flex items-center space-x-1">
-          {/* <PubinfoIcon name={`resource-${RESOURCE_ICON[text]}`} class="text-xl" />
-          <span>{resourceOptions.find(item => item.value === text)?.label}</span> */}
-
           <Tag color={RESOURCE_COLOR[text]} bordered={false}>{resourceOptions.find(item => item.value === text)?.label}</Tag>
         </div>
       );

package/src/views/resource/model.ts

@@ -46,6 +46,7 @@ export interface CustomMeta {
   breadcrumb: boolean
   link?: string
   iframe?: string
+  iframeCache?: boolean
   layout: CustomMetaLayout
   partyLogin?: any[] // 第三方登录配置数据
 }
@@ -67,6 +68,7 @@ export const defaultMeta: CustomMeta = {
   breadcrumb: true,
   link: undefined,
   iframe: undefined,
+  iframeCache: false,
   layout: {
     header: true,
     sidebar: true,