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

package/src/routes/modules/system.manage.menu.ts

@@ -1,13 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router';
-// import { $t } from '@/locales';
-
-// function Layout() {
-//   return import('@/layouts/index.vue');
-// }
 
 const routes: RouteRecordRaw = {
   path: '/system_manage',
-  // component: Layout,
   redirect: '/system_manage/dictionary',
   name: 'SystemManage',
   meta: {
@@ -20,7 +14,6 @@ const routes: RouteRecordRaw = {
       name: 'DictionaryPage',
       meta: {
         title: '字典管理',
-        // i18n: $t('route.rbac.dictionary'),
         auth: 'dictionary',
         activeIcon: 'system-point',
       },
@@ -57,7 +50,6 @@ const routes: RouteRecordRaw = {
       meta: {
         title: '岗位管理',
         singleMenu: true,
-        // i18n: $t('route.rbac.position'),
         auth: 'position',
         activeIcon: 'system-point',
       },
@@ -69,7 +61,6 @@ const routes: RouteRecordRaw = {
       meta: {
         title: '区域管理',
         singleMenu: true,
-        // i18n: $t('route.rbac.region'),
         auth: 'region',
         activeIcon: 'system-point',
       },
@@ -81,7 +72,6 @@ const routes: RouteRecordRaw = {
       meta: {
         title: '群组管理',
         singleMenu: true,
-        // i18n: $t('route.rbac.group'),
         auth: 'group',
         activeIcon: 'system-point',
       },

package/src/views/blackWhiteList/components/drawerBlackWhiteList.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
-import { postBlackWhiteListAddBlackWhiteList, postBlackWhiteListUpdateBlackWhiteList } from '@/api/modules/configData';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { postBlackWhiteListAddBlackWhiteList, postBlackWhiteListUpdateBlackWhiteList } from '@/api/modules/configData';
 
 defineOptions({
   name: 'DrawerBlackWhiteList',

package/src/views/blackWhiteList/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { getBlackWhiteListDeleteById, postBlackWhiteListGetBlackWhiteListPageList, postBlackWhiteListUpdateBlackWhiteList } from '@/api/modules/configData';
 import { ProTable } from '@pubinfo/pro-components';
 import { useToggle } from '@vueuse/core';
 import { message, Modal } from 'ant-design-vue';
+import { getBlackWhiteListDeleteById, postBlackWhiteListGetBlackWhiteListPageList, postBlackWhiteListUpdateBlackWhiteList } from '@/api/modules/configData';
 import DrawerBlackWhiteList from './components/drawerBlackWhiteList.vue';
 import { ACTION } from './enum';
 
@@ -12,7 +12,7 @@ defineOptions({
 });
 
 const route = useRoute();
-const isBlacklistMode = ref(route.meta.type === 'black');
+const isBlacklistMode = ref(route.path.includes('blacklist'));
 
 // 黑名单0，白名单1
 const currentType = computed(() => {
@@ -239,7 +239,7 @@ function onAction(key: string, record?: API.PubBlackWhiteList): void {
               <PubinfoIcon name="edit" class="text-base" />
               <span class="ml-4px">{{ ACTION.EDIT }}</span>
             </a>
-            <a
+            <span
               v-auth="deleteRights"
               flex
               items-center
@@ -251,15 +251,11 @@ function onAction(key: string, record?: API.PubBlackWhiteList): void {
             >
               <PubinfoIcon name="remove" class="text-base" />
               <span class="ml-4px">{{ ACTION.REMOVE }}</span>
-            </a>
+            </span>
             <a
               v-if="record.enable"
               v-auth="disableRights"
-              flex
-              items-center
-              class="text-#1D2129"
-              hover:cursor-pointer
-              hover:opacity-80
+              class="flex items-center"
               @click="onAction(ACTION.DISABLE, record)"
             >
               <PubinfoIcon name="blacklist-disable" class="text-20px" />
@@ -286,24 +282,16 @@ function onAction(key: string, record?: API.PubBlackWhiteList): void {
   </div>
 </template>
 
-<style lang="scss">
-.page-black-white-list {
-  .ant-card.pro-table {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-  }
+<style scoped>
+.page-black-white-list :deep(.ant-card.pro-table) {
+  --at-apply: rounded-t-none;
+}
 
-  .status-mark {
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    margin-right: 4px;
-    background-color: #aeaeae;
-    border-radius: 50%;
+.page-black-white-list .status-mark {
+  --at-apply: inline-block w-2 h-2 bg-[#aeaeae] mr-1 rounded-[50%];
+}
 
-    &.active {
-      background: #01d689;
-    }
-  }
+.page-black-white-list .status-mark.active {
+  --at-apply: [background:#01d689];
 }
 </style>

package/src/views/breadcrumb_setting/index.vue

@@ -1,8 +1,8 @@
 <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 { useSettingsStore } from '@/stores';
 import SetItem from '../components/setItem.vue';
 import {
   darkEnableData,
@@ -140,7 +140,7 @@ function setStyle(jsonStr: string) {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .bar-header {
   background: var(--g-bg);
 }

package/src/views/components/animation_item.vue

@@ -7,8 +7,8 @@ defineOptions({
 
 const props = withDefaults(
   defineProps<{
-    lightAnimationData: string
-    darkAnimationData: string
+    lightAnimationData?: string
+    darkAnimationData?: string
   }>(),
   {
     lightAnimationData: () => { return ''; },

package/src/views/components/setItem.vue

@@ -7,14 +7,14 @@ defineOptions({
 });
 const props = withDefaults(
   defineProps<{
-    name: string
-    descripe: string
-    type: string
-    open: boolean
+    name?: string
+    descripe?: string
+    type?: string
+    open?: boolean
     activeStyle?: Val
     styleOptions?: CheckOptions
-    lightAnimationData: string
-    darkAnimationData: string
+    lightAnimationData?: string
+    darkAnimationData?: string
   }>(),
   {
     name: '',
@@ -103,24 +103,17 @@ watch(() => setActiveStyle.value, () => {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .item_ani {
-  display: flex;
-  flex-direction: column;
+  --at-apply: flex flex-col bg-[color:var(--g-bg)] border border-[color:var(--g-tabbar-tab-hover-bg)] pt-[26px] rounded-lg border-solid;
   place-items: center center;
-  padding-top: 26px;
-  background-color: var(--g-bg);
-  border: 1px solid var(--g-tabbar-tab-hover-bg);
-  border-radius: 8px;
+}
 
-  .jb {
-    background: linear-gradient(180deg, var(--g-container-bg) 0%, #fff0 100%);
-  }
+.item_ani .jb {
+  background: linear-gradient(180deg, var(--g-container-bg) 0%, transparent 100%);
 }
 
-.custom_style {
-  :deep(.text-sm) {
-    font-size: 12px;
-  }
+.custom_style :deep(.text-sm) {
+  --at-apply: text-xs;
 }
 </style>

package/src/views/data-permission/components/createAndEditDataPermission.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import type { ModelValue } from '@/components/OrgUserSelector/OrgSelector.vue';
-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 { ModelValue } from '@/components/OrgUserSelector/OrgSelector.vue';
+import type { SelectedResourceInfo } from '@/components/ResourceSelector/hooks/useAppAndResource';
+import { useToggle } from '@vueuse/core';
+import { message } from 'ant-design-vue';
 import { getRbacPubDataPermissionsGetById, postRbacPubDataPermissionsSave, postRbacPubDataPermissionsUpdate } from '@/api/modules/rbac';
 import GroupSelector from '@/components/GroupSelector/index.vue';
 import OrgSelector from '@/components/OrgUserSelector/OrgSelector.vue';
 import { RESOURCE_MODE } from '@/components/ResourceSelector/enum';
 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 { DATA_PERMISSION_TYPE, dataPermissionOptionsAll } from '../enum';
 
 defineOptions({

package/src/views/data-permission/enum.ts

@@ -23,13 +23,13 @@ export enum DATA_PERMISSION_TYPE {
   CUSTOM_GROUP = '7',
 }
 
-export type dataPermissionType = DATA_PERMISSION_TYPE.ALL |
-  DATA_PERMISSION_TYPE.ONLY_SELF |
-  DATA_PERMISSION_TYPE.SELF_DEPT_ONLY |
-  DATA_PERMISSION_TYPE.SELF_DEPT_AND_SUB |
-  DATA_PERMISSION_TYPE.CUSTOM_DEPT_AND_SUB |
-  DATA_PERMISSION_TYPE.CUSTOM_DEPT_ONLY |
-  DATA_PERMISSION_TYPE.CUSTOM_GROUP;
+export type dataPermissionType = DATA_PERMISSION_TYPE.ALL
+  | DATA_PERMISSION_TYPE.ONLY_SELF
+  | DATA_PERMISSION_TYPE.SELF_DEPT_ONLY
+  | DATA_PERMISSION_TYPE.SELF_DEPT_AND_SUB
+  | DATA_PERMISSION_TYPE.CUSTOM_DEPT_AND_SUB
+  | DATA_PERMISSION_TYPE.CUSTOM_DEPT_ONLY
+  | DATA_PERMISSION_TYPE.CUSTOM_GROUP;
 
 export const dataPermissionTypeLabel = {
   [DATA_PERMISSION_TYPE.ALL]: '查看全部',

package/src/views/data-permission/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { dataPermissionType } from './enum';
-import { deleteRbacPubDataPermissionsDelete, postRbacPubDataPermissionsPageQuery } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { useToggle } from '@vueuse/core';
 import { message, Modal } from 'ant-design-vue';
+import { deleteRbacPubDataPermissionsDelete, postRbacPubDataPermissionsPageQuery } from '@/api/modules/rbac';
 import CreateAndEditDataPermission from './components/createAndEditDataPermission.vue';
 import { ACTION, dataPermissionOptionsAll, dataPermissionTypeLabel } from './enum';
 
@@ -155,7 +155,7 @@ function onAction(key: string, record?: API.shujuquanxianshituduixiang): void {
               <PubinfoIcon name="edit" class="text-base" />
               <span class="ml-4px">{{ ACTION.EDIT }}</span>
             </a>
-            <a
+            <span
               v-auth="'data_permission_delete'"
               flex
               items-center
@@ -167,7 +167,7 @@ function onAction(key: string, record?: API.shujuquanxianshituduixiang): void {
             >
               <PubinfoIcon name="remove" class="text-base" />
               <span class="ml-4px">{{ ACTION.REMOVE }}</span>
-            </a>
+            </span>
           </a-space>
         </template>
       </template>
@@ -176,15 +176,12 @@ function onAction(key: string, record?: API.shujuquanxianshituduixiang): void {
   </div>
 </template>
 
-<style lang="scss">
-.page-data-permission {
-  .ant-card.pro-table {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-  }
+<style scoped>
+.page-data-permission :deep(.ant-card.pro-table) {
+  --at-apply: rounded-t-none;
+}
 
-  .ant-form-item-label {
-    width: 102px !important;
-  }
+.page-data-permission :deep(.ant-form-item-label) {
+  width: 102px !important;
 }
 </style>

package/src/views/dictionary/components/drawerDictionary.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
-import { postDictTypeSave } from '@/api/modules/configData';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { postDictTypeSave } from '@/api/modules/configData';
 import { ACTION } from '../enum';
 
 defineOptions({

package/src/views/dictionary/components/drawerDictionaryItem.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
-import { postDictItemSave } from '@/api/modules/configData';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { postDictItemSave } from '@/api/modules/configData';
 import { ACTION } from '../enum';
 
 defineOptions({

package/src/views/dictionary/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { deleteDictTypeDeleteById, postDictTypePage } from '@/api/modules/configData';
 import { ProTable } from '@pubinfo/pro-components';
 import { message, Modal } from 'ant-design-vue';
+import { deleteDictTypeDeleteById, postDictTypePage } from '@/api/modules/configData';
 import DrawerDictionary from './components/drawerDictionary.vue';
 import { ACTION } from './enum';
 
@@ -174,14 +174,14 @@ function getDictionaryData() {
               <PubinfoIcon name="edit" class="text-base" />
               <span class="ml-4px">{{ ACTION.EDIT }}</span>
             </a>
-            <a
+            <span
               v-auth="'dictionary_remove'"
               class="flex items-center text-red-500 hover:cursor-pointer hover:opacity-80"
               @click="onAction(ACTION.REMOVE, record)"
             >
               <PubinfoIcon name="remove" class="text-base" />
               <span class="ml-4px">{{ ACTION.REMOVE }}</span>
-            </a>
+            </span>
           </a-space>
         </template>
       </template>

package/src/views/dictionary/itemlist.vue

@@ -1,8 +1,8 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { deleteDictItemDeleteById, postDictItemPage } from '@/api/modules/configData';
 import { ProTable } from '@pubinfo/pro-components';
 import { Badge, message, Modal } from 'ant-design-vue';
+import { deleteDictItemDeleteById, postDictItemPage } from '@/api/modules/configData';
 import drawerDictionaryItem from './components/drawerDictionaryItem.vue';
 import { ACTION } from './enum';
 
@@ -147,10 +147,10 @@ function getDictData() {
               <PubinfoIcon name="edit" class="text-base" />
               <span class="ml-4px">{{ ACTION.EDIT }}</span>
             </a>
-            <a v-auth="'dictionary_data_remove'" class="flex items-center text-red-500 hover:cursor-pointer hover:opacity-80" @click="onAction(ACTION.REMOVE, record)">
+            <span v-auth="'dictionary_data_remove'" class="flex items-center text-red-500 hover:cursor-pointer hover:opacity-80" @click="onAction(ACTION.REMOVE, record)">
               <PubinfoIcon name="remove" class="text-base" />
               <span class="ml-4px">{{ ACTION.REMOVE }}</span>
-            </a>
+            </span>
           </a-space>
         </template>
       </template>

package/src/views/group/components/drawerGroup.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
-import { getGroupDetailById, postGroupSaveOrUpdate } from '@/api/modules/assist';
-import { selectOrg, selectUser } from '@/components/OrgUserSelector';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { getGroupDetailById, postGroupSaveOrUpdate } from '@/api/modules/assist';
+import { selectOrg, selectUser } from '@/components/OrgUserSelector';
 import { ACTION, GROUP_TYPE, useOptions } from '../enum';
 
 defineOptions({

package/src/views/group/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
-import { deleteGroupDeleteById, postGroupFindPage } from '@/api/modules/assist';
 import { ProTable } from '@pubinfo/pro-components';
 import { message, Modal } from 'ant-design-vue';
+import { deleteGroupDeleteById, postGroupFindPage } from '@/api/modules/assist';
 import DrawerGroup from './components/drawerGroup.vue';
 import { ACTION } from './enum';
 
@@ -156,7 +156,7 @@ function onAction(key: string, type: string, record?: API.PubGroup): void {
           :scroll="{ x: 1100 }"
         >
           <template #toolbar>
-            <a-button type="primary" @click="onAction(ACTION.ADD, query.type)">
+            <a-button v-auth="'group_save'" type="primary" @click="onAction(ACTION.ADD, query.type)">
               <PlusCircleOutlined />
               {{ ACTION.ADD }}
             </a-button>
@@ -164,11 +164,12 @@ function onAction(key: string, type: string, record?: API.PubGroup): void {
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'action'">
               <a-space>
-                <a class="flex items-center" @click="onAction(ACTION.EDIT, query.type, record)">
+                <a v-auth="'group_edit'" class="flex items-center" @click="onAction(ACTION.EDIT, query.type, record)">
                   <PubinfoIcon name="edit" class="text-base" />
                   <span class="ml-4px">{{ ACTION.EDIT }}</span>
                 </a>
                 <span
+                  v-auth="'group_delete'"
                   class="flex items-center text-red-500 hover:cursor-pointer hover:opacity-80"
                   @click="onAction(ACTION.REMOVE, query.type, record)"
                 >
@@ -185,23 +186,17 @@ function onAction(key: string, type: string, record?: API.PubGroup): void {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .box_sh {
-  box-shadow:
-    0 1px 2px 0 rgb(0 0 0 / 3%),
-    0 1px 6px -1px rgb(0 0 0 / 2%),
-    0 2px 4px 0 rgb(0 0 0 / 2%);
+  --at-apply: shadow-[0_1px_2px_0_rgb(0_0_0_/_3%),0_1px_6px_-1px_rgb(0_0_0_/_2%),0_2px_4px_0_rgb(0_0_0_/_2%)];
 }
-
 .tabs_custom {
-  height: 46px;
-
-  :deep(.ant-tabs-nav) {
-    margin: 0;
-
-    .ant-tabs-nav-list {
-      padding-left: 16px;
-    }
-  }
+  --at-apply: h-[46px];
+}
+.tabs_custom :deep(.ant-tabs-nav) {
+  --at-apply: m-0;
+}
+.tabs_custom :deep(.ant-tabs-nav .ant-tabs-nav-list) {
+  --at-apply: pl-4;
 }
 </style>