@pubinfo/module-rbac 2.0.0-beta.9 → 2.0.0-rc.1

package/src/views/resource/model.ts

@@ -0,0 +1,53 @@
+/**
+ * 默认的 meta 对象
+ *
+ * @see https://github.com/wsypower/pubinfo/issues/16
+ *
+ * @param url vue-router 路径
+ * @param component 组件路径
+ * @param routeName 路由名称
+ * @param scope 组件所属模块
+ * @param activeMenu 激活路径
+ * @param isDev 是否正在开发
+ * @param devText 开发模式提示文本
+ * @param cache 是否缓存页面
+ * @param pin 是否固定在标签页
+ * @param sidebar 是否在侧边栏显示
+ * @param tabbar 是否在标签栏显示
+ * @param breadcrumb 是否在面包屑显示
+ * @param link 外链地址
+ * @param iframe 内嵌地址
+ */
+export interface CustomMeta {
+  url: string
+  component: string
+  routeName: string
+  scope: string
+  activeMenu?: string
+  isDev: boolean
+  devText: string
+  cache: boolean
+  pin: boolean
+  sidebar: boolean
+  tabbar: boolean
+  breadcrumb: boolean
+  link?: string
+  iframe?: string
+}
+
+export const defaultMeta: CustomMeta = {
+  url: '',
+  component: '',
+  routeName: '',
+  scope: '',
+  activeMenu: undefined,
+  isDev: false,
+  devText: '该功能暂未上线，敬请期待！',
+  cache: false,
+  pin: false,
+  sidebar: true,
+  tabbar: true,
+  breadcrumb: true,
+  link: undefined,
+  iframe: undefined,
+};

package/src/views/role/components/ResourceRelation.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { TreeNode } from '../interface';
-import { postRbacOrgRoleRoleOrgPage, postRbacRoleRoleUserPage } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { useToggle } from '@vueuse/core';
+import { postRbacOrgRoleRoleOrgPage, postRbacRoleRoleUserPage } from '@/api/modules/rbac';
 
 defineOptions({
   name: 'ResourceRelation',
@@ -105,9 +105,8 @@ defineExpose({
   </a-drawer>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 :deep(.ant-drawer-body) {
-  padding-right: 0;
-  padding-left: 0;
+  --at-apply: px-0;
 }
 </style>

package/src/views/role/components/drawerRole.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import type { SelectedResourceInfo } from '@/components/ResourceSelector/hooks/useAppAndResource';
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
+import type { SelectedResourceInfo } from '@/components/ResourceSelector/hooks/useAppAndResource';
+import { useToggle } from '@vueuse/core';
+import { message } from 'ant-design-vue';
 import { getRbacRoleInfo, postRbacRoleAddRole, postRbacRoleRoleUpdate } from '@/api/modules/rbac';
 import useAppAndResource from '@/components/ResourceSelector/hooks/useAppAndResource';
 import ResourceSelector from '@/components/ResourceSelector/index.vue';
-import { useToggle } from '@vueuse/core';
-import { message } from 'ant-design-vue';
 import { ACTION, kjOptions } from '../enum';
 
 defineOptions({

package/src/views/role/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { getRbacRoleRoleDelete, postRbacRoleRolePage } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { Badge, message, Modal } from 'ant-design-vue';
+import { getRbacRoleRoleDelete, postRbacRoleRolePage } from '@/api/modules/rbac';
 import DrawerRole from './components/drawerRole.vue';
 import ResourceRelation from './components/ResourceRelation.vue';
 import { ACTION, kjOptions } from './enum';

package/src/views/role_group/components/ResourceRelation.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { TreeNode } from '../interface';
-import { postRbacRoleRoleUserPage } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { useToggle } from '@vueuse/core';
 import { theme } from 'ant-design-vue';
+import { postRbacRoleRoleUserPage } from '@/api/modules/rbac';
 
 defineOptions({
   name: 'ResourceRelation',
@@ -83,9 +83,8 @@ defineExpose({
   </a-drawer>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 :deep(.ant-drawer-body) {
-  padding-right: 0;
-  padding-left: 0;
+  --at-apply: px-0;
 }
 </style>

package/src/views/role_group/components/drawerRole.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
-import { getRbacPubRoleGroupGetById, postRbacPubRoleGroupSave, postRbacPubRoleGroupUpdate } from '@/api/modules/rbac';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { getRbacPubRoleGroupGetById, postRbacPubRoleGroupSave, postRbacPubRoleGroupUpdate } from '@/api/modules/rbac';
+import { RoleSelector } from '@/components/RoleSelector';
 import { ACTION } from '../enum';
-import RoleSelect from './roleSelect.vue';
 
 defineOptions({
   name: 'DrawerRoleGroup',
@@ -78,11 +78,12 @@ function close() {
 
 const roleModelRef = ref();
 function chooseRole() {
-  roleModelRef.value.open(selectedRoles.value.map(item => item.id));
+  const selectedValue = selectedRoles.value.map(item => ({ value: item.id, label: item.name }));
+  roleModelRef.value.open(selectedValue);
 }
-function onRoleSelected(data: API.PubRole[]) {
-  form.value.roleIds = data.map(item => item.id).join(',');
-  selectedRoles.value = data;
+function onRoleSelected(data: any[]) {
+  form.value.roleIds = data.map(item => item.value).join(',');
+  selectedRoles.value = data.map(e => ({ id: e.value, name: e.label }));
 }
 defineExpose({
   open: onOpen,
@@ -148,6 +149,6 @@ defineExpose({
         </a-button>
       </a-space>
     </template>
-    <RoleSelect ref="roleModelRef" @select="onRoleSelected" />
+    <RoleSelector ref="roleModelRef" @select="onRoleSelected" />
   </a-drawer>
 </template>

package/src/views/role_group/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { deleteRbacPubRoleGroupDelete, postRbacPubRoleGroupPageQuery } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { Badge, message, Modal } from 'ant-design-vue';
+import { deleteRbacPubRoleGroupDelete, postRbacPubRoleGroupPageQuery } from '@/api/modules/rbac';
 import DrawerRole from './components/drawerRole.vue';
 import { ACTION } from './enum';
 

package/src/views/safe_setting/index.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { UnwrapRef } from 'vue';
-import { getSysconfigGetSysSecurityConfig, postSysconfigEditSysSecurityConfig } from '@/api/modules/configData';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
 import { PassStrengthValidator } from 'pubinfo';
 import { reactive, ref } from 'vue';
+import { getSysconfigGetSysSecurityConfig, postSysconfigEditSysSecurityConfig } from '@/api/modules/configData';
 
 interface FormState {
   blackWhiteListMode: string
@@ -227,11 +227,9 @@ async function onSubmit() {
   </div>
 </template>
 
-<style lang="scss">
-.safe-rule-form {
-  .ant-input,
-  .ant-select {
-    width: 90%;
-  }
+<style>
+.safe-rule-form .ant-input,
+.safe-rule-form .ant-select {
+  --at-apply: w-9/10;
 }
 </style>

package/src/views/tabbar_setting/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { message } from 'ant-design-vue';
 import { postSysconfigAddOrEidtSysThemeStyleConfig } from '@/api/modules/configData';
 import { useSettingsStore } from '@/stores';
-import { message } from 'ant-design-vue';
 import SetItem from '../components/setItem.vue';
 import {
   darkEnableData,
@@ -179,7 +179,7 @@ function setStyle(jsonStr: string) {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .bar-header {
   background: var(--g-bg);
 }

package/src/views/tenant/components/TenantEdit.vue

@@ -2,10 +2,10 @@
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
 import type { AddForm, EditForm, Form, RecordData } from '../interface';
-import { getRbacResourceTenantAddResourceTree, getRbacTenantPubTenantInfo, postRbacTenantPubTenantAdd, postRbacTenantPubTenantUpdate } from '@/api/modules/rbac';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
 import { cloneDeep } from 'lodash-es';
+import { getRbacResourceTenantAddResourceTree, getRbacTenantPubTenantInfo, postRbacTenantPubTenantAdd, postRbacTenantPubTenantUpdate } from '@/api/modules/rbac';
 import { ACTION } from '../enum';
 
 defineOptions({

package/src/views/tenant/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { RecordData } from './interface';
-import { getRbacTenantPubTenantDelete, postRbacTenantPubTenantPage } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { Badge, message, Modal } from 'ant-design-vue';
 import dayjs from 'dayjs';
+import { getRbacTenantPubTenantDelete, postRbacTenantPubTenantPage } from '@/api/modules/rbac';
 import TenantEdit from './components/TenantEdit.vue';
 import { ACTION } from './enum';