@pubinfo/module-rbac 2.0.0-beta.30 → 2.0.0-beta.32

package/src/views/position/index.vue

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

package/src/views/region/components/drawerRegion.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 { getRegionGetRegionDetailByCode, postRegionAddRegion, postRegionUpdateRegion } from '@/api/modules/assist';
-import { getDictItemList } from '@/api/modules/configData';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { getRegionGetRegionDetailByCode, postRegionAddRegion, postRegionUpdateRegion } from '@/api/modules/assist';
+import { getDictItemList } from '@/api/modules/configData';
 import { ACTION } from '../enum';
 
 defineOptions({

package/src/views/region/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { Key } from 'ant-design-vue/es/vc-table/interface';
-import { getRegionDeleteRegionByCode, getRegionGetListByParentId } from '@/api/modules/assist';
 import { ProTable } from '@pubinfo/pro-components';
 import { message, Modal } from 'ant-design-vue';
 import { cloneDeep } from 'lodash-es';
+import { getRegionDeleteRegionByCode, getRegionGetListByParentId } from '@/api/modules/assist';
 import DrawerRegion from './components/drawerRegion.vue';
 import { ACTION } from './enum';
 

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

@@ -2,11 +2,11 @@
 import type { Rule } from 'ant-design-vue/es/form';
 import type { FormExpose } from 'ant-design-vue/es/form/Form';
 import type { AddForm, EditForm, Form, TreeNode } from '../interface';
-import { getRbacResourceInfo, postRbacResourceAddResource, postRbacResourceResourceUpdate } from '@/api/modules/rbac';
-import { DATA_PERMISSION_TYPE, dataPermissionOptions } from '@/views/data-permission/enum';
 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, dataPermissionOptions } from '@/views/data-permission/enum';
 import { ACTION, RESOURCE_TYPE, resourceOptions } from '../enum';
 
 defineOptions({

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

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { ColumnsType } from 'ant-design-vue/es/table';
 import type { TreeNode } from '../interface';
-import { getRbacResourceGetRoleListByResourceId } from '@/api/modules/rbac';
 import { useToggle } from '@vueuse/core';
 import { useRequest } from 'alova/client';
 import { theme } from 'ant-design-vue';
+import { getRbacResourceGetRoleListByResourceId } from '@/api/modules/rbac';
 
 defineOptions({
   name: 'RoleRelation',

package/src/views/resource/index.vue

@@ -1,11 +1,11 @@
 <script setup lang="tsx">
 import type { ProColumns } from '@pubinfo/pro-components';
 import type { AddForm, TreeNode } from './interface';
-import { getRbacResourceResourceDelete, getRbacResourceResourceTree } from '@/api/modules/rbac';
 import { ProTable } from '@pubinfo/pro-components';
 import { Badge, message, Modal } from 'ant-design-vue';
 import { cloneDeep } from 'lodash-es';
 import { PubinfoIcon } from 'pubinfo';
+import { getRbacResourceResourceDelete, getRbacResourceResourceTree } from '@/api/modules/rbac';
 import ResourceEdit from './components/ResourceEdit.vue';
 import RoleRelation from './components/RoleRelation.vue';
 import { ACTION, RESOURCE_TYPE, resourceOptions } from './enum';

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,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 { 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 { ACTION } from '../enum';
 import RoleSelect from './roleSelect.vue';
 

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { getRbacRoleRoleList } from '@/api/modules/rbac';
 import { SearchOutlined } from '@ant-design/icons-vue';
 import { useToggle } from '@vueuse/core';
+import { getRbacRoleRoleList } from '@/api/modules/rbac';
 
 defineOptions({
   name: 'RoleSelect',
@@ -84,7 +84,7 @@ defineExpose({
           </a-input>
           <div class="overflow-y-auto overflow-x-hidden h-[calc(100%-30px)] mt-10px">
             <a-spin v-if="loading" />
-            <a-checkbox-group v-model:value="checkedKeys">
+            <a-checkbox-group v-model:value="checkedKeys" class="w-full">
               <div v-for="ite in filterName()" :key="ite.id" class="w-full py-10px bodb">
                 <a-checkbox :value="ite.id">
                   <a-tooltip v-if="(ite.name || '').length > 22" :title="ite.name">
@@ -138,87 +138,63 @@ defineExpose({
   </a-modal>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .border_color {
-  border-color: #e5e6eb;
+  --at-apply: border-[#e5e6eb];
 }
 
-[data-theme="dark"] {
-  .border_color {
-    border-color: rgb(253 253 253 / 12%);
-  }
+[data-theme="dark"] .border_color {
+  --at-apply: border-[#FDFDFD] border-op-12;
 }
 
 .border_c {
-  border: 1px dashed #ccc;
-  border-radius: 10px;
+  --at-apply: border rounded-[10px] border-dashed border-[#ccc];
 }
 
 :deep(.ant-dropdown-link) {
-  padding: 4px 6px;
-  font-size: 12px;
-  border-radius: 2px;
+  --at-apply: text-xs px-1.5 py-1 rounded-sm;
   transform: scale(0.7);
 }
-</style>
 
-<style lang='scss' scoped>
-.custom_modal {
-  :deep(.ant-modal-content) {
-    padding: 0;
-    border-radius: 0;
-  }
-
-  :deep(.ant-modal-header) {
-    padding: 12px 16px;
-    margin-bottom: 0;
-    border-bottom: 1px solid #e5e6eb;
-  }
-
-  :deep(.ant-modal-title) {
-    font-size: 16px;
-    font-weight: 500;
-    color: #1d2129;
-  }
-
-  :deep(.ant-modal-body) {
-    padding: 16px;
-  }
+.custom_modal :deep(.ant-modal-content) {
+  --at-apply: p-0 rounded-none;
+}
 
-  .bodb {
-    border-bottom: 1px solid #e5e6eb;
-  }
+.custom_modal :deep(.ant-modal-header) {
+  --at-apply: mb-0 px-4 py-3 border-b-[#e5e6eb] border-b border-solid;
+}
 
-  :deep(.ant-modal-footer) {
-    padding: 16px;
-    border-top: 1px solid #e5e6eb;
+.custom_modal :deep(.ant-modal-title) {
+  --at-apply: text-base font-medium text-[#1d2129];
+}
 
-    .ant-btn {
-      border-radius: 2px;
-    }
-  }
+.custom_modal :deep(.ant-modal-body) {
+  --at-apply: p-4;
 }
 
+.custom_modal .bodb {
+  --at-apply: border-b-[#e5e6eb] border-b border-solid border-0;
+}
+.custom_modal :deep(.ant-modal-footer) {
+  --at-apply: p-4 border-t-[#e5e6eb] border-t border-solid;
+}
+.custom_modal :deep(.ant-modal-footer .ant-btn) {
+  --at-apply: rounded-sm;
+}
 :deep(.ant-tree-checkbox) {
   margin-block-start: 0;
   margin-inline-end: 2px;
 }
-
 :deep(.ant-tree-checkbox + span .ant-tree-iconEle) {
-  margin-right: 4px;
+  --at-apply: mr-1;
 }
-
 .custom_tag {
-  padding: 3px 8px;
-  border-width: 0;
-  border-radius: 2px;
-
-  :deep(.ant-tag-close-icon) {
-    color: rgb(22 93 255 / 60%);
-
-    &:hover {
-      color: #165dff;
-    }
-  }
+  --at-apply: px-2 py-[3px] rounded-sm border-0;
+}
+.custom_tag :deep(.ant-tag-close-icon) {
+  --at-apply: text-[#165DFF] text-op-12;
+}
+.custom_tag :deep(.ant-tag-close-icon:hover) {
+  --at-apply: text-[#165dff];
 }
 </style>

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';