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

package/src/views/organization/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import type { VxeTableInstance, VxeTablePropTypes } from 'vxe-table';
-import { getRbacOrgDeleteOrg, getRbacOrgOrgListByParentId, getRbacOrgSearchTreeById, postRbacOrgSearch } from '@/api/modules/rbac';
 import { useToggle } from '@vueuse/core';
 import { Badge, message, Modal } from 'ant-design-vue';
 import { cloneDeep } from 'lodash-es';
 import { VxeColumn, VxeTable } from 'vxe-table';
+import { getRbacOrgDeleteOrg, getRbacOrgOrgListByParentId, getRbacOrgSearchTreeById, postRbacOrgSearch } from '@/api/modules/rbac';
 import DrawerOrganization from './components/drawerOrganization.vue';
 import DrawerRole from './components/drawerRole.vue';
 import { ACTION } from './enum';
@@ -439,78 +439,52 @@ function onAction(key: string, record?: ChilData): void {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .org_page {
-  position: relative;
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
-  padding: 0;
-  margin: 0;
+  --at-apply: [list-style:none] relative box-border w-full h-full text-sm leading-[1.5714] text-[rgb(0_0_0_/_88%)] shadow-[0_1px_2px_0_rgba(0,0,0,0.03),0_1px_6px_-1px_rgba(0,0,0,0.02),0_2px_4px_0_rgba(0,0,0,0.02)] m-0 p-0 rounded-lg;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  font-size: 14px;
-  line-height: 1.5714;
-  color: rgb(0 0 0 / 88%);
-  list-style: none;
-  border-radius: 8px;
-  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%);
 }
 
 .search_panel {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  // height: 80px;
-  padding: 16px 16px 16px 24px;
-
-  .left {
-    display: flex;
-    align-items: center;
-  }
-
-  .right {
-    display: flex;
-    align-items: center;
-  }
+  --at-apply: flex items-center justify-between pl-6 pr-4 py-4;
 }
 
-.divider {
-  :deep(.ant-divider-horizontal) {
-    margin: 0;
-  }
+.search_panel .left {
+  --at-apply: flex items-center;
+}
+.search_panel .right {
+  --at-apply: flex items-center;
+}
+:deep(.ant-divider-horizontal) {
+  --at-apply: m-0;
 }
 </style>
 
-<style lang="scss" scoped>
+<style scoped>
 :deep(.vxe-table--body-wrapper) {
-  overflow-x: hidden;
+  --at-apply: overflow-x-hidden;
 }
 
 :deep(.vxe-tree--btn-wrapper) {
+  --at-apply: w-[15px] h-[15px] border rounded-md border-solid border-[#f0f0f0];
   width: 15px !important;
   height: 15px !important;
-  border: 1px solid #f0f0f0;
-  border-radius: 6px;
+}
 
-  &:hover {
-    border-color: #69b1ff !important;
+:deep(.vxe-tree--btn-wrapper:hover) {
+  border-color: #69b1ff !important;
+}
 
-    .vxe-tree--node-btn {
-      color: #69b1ff !important;
-    }
-  }
+:deep(.vxe-tree--btn-wrapper:hover .vxe-tree--node-btn) {
+  color: #69b1ff !important;
 }
 
 :deep(.vxe-header--column .vxe-resizable) {
-  right: 0;
-  bottom: 14px;
-  width: 1px;
-  height: 1.6em;
+  --at-apply: w-px h-[1.6em] right-0 bottom-3.5;
   background-color: var(--vxe-table-border-color);
 }
 
 :deep([class*="vxe-icon-"]) {
-  font-size: 12px;
-  transform: scale(0.8);
+  --at-apply: text-xs scale-[0.8];
 }
 </style>

package/src/views/other_setting/index.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { Form, SettingsKeys } from './interface.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 {
@@ -238,7 +238,7 @@ function onReset() {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 :deep(.ant-collapse-header) {
   padding: 6.5px 16px !important;
   background: var(--g-bg);

package/src/views/page_animation_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 AnimationItem from '../components/animation_item.vue';
 import {
   darkFadeInOutData,
@@ -136,7 +136,7 @@ function setStyle(jsonStr: string) {
           </div>
           <a-switch
             v-model:checked="enableTran"
-            class="ml-30px"
+            class="ml-30px!"
             checked-children="开启"
             un-checked-children="关闭"
             @change="onChange"
@@ -176,25 +176,17 @@ function setStyle(jsonStr: string) {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .item {
-  display: flex;
-  flex-direction: column;
+  --at-apply: flex flex-col cursor-pointer 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;
-  cursor: pointer;
-  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 .jb {
+  background: linear-gradient(180deg, var(--g-container-bg) 0%, #fff0 100%);
+}
 
-  &.active {
-    border: 2.6px solid rgb(var(--ui-primary));
-    border-radius: 8px;
-    box-shadow: 0 2.6px 13px 0 #59626940;
-  }
+.item.active {
+  --at-apply: border-[rgb(var(--ui-primary))] shadow-[0_2.6px_13px_0_#59626940] rounded-lg border-[2.6px] border-solid;
 }
 </style>

package/src/views/page_w_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';
 
 defineOptions({
   name: 'PageWSetting',
@@ -96,143 +96,160 @@ function clickHandle(item: Settings.layout['widthMode']) {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .item {
-  display: flex;
-  flex-direction: column;
-  place-items: center center;
-  padding-top: 26px;
-  cursor: pointer;
+  --at-apply: flex flex-col justify-center items-center cursor-pointer border border-[color:var(--g-tabbar-tab-hover-bg)] pt-[26px] rounded-lg border-solid;
   background: linear-gradient(180deg, var(--g-bg) 0%, var(--g-bg) 100%);
-  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 .jb {
+  background: linear-gradient(180deg, var(--g-container-bg) 0%, rgba(255, 255, 255, 0) 100%);
+}
 
-    .layout-demo {
-      width: 70%;
-    }
-  }
+.item .jb .layout-demo {
+  --at-apply: w-7/10;
+}
 
-  &-adaption {
-    .mode {
-      background: url("@/assets/images/page-width/icon_auto.webp") no-repeat;
-      background-size: 100% 100%;
-    }
+.item-adaption .mode {
+  background: url("@/assets/images/page-width/icon_auto.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    .layout-demo {
-      background: url("@/assets/images/page-width/auto.webp") no-repeat;
-      background-size: 100%;
-    }
-  }
+.item-adaption .layout-demo {
+  background: url("@/assets/images/page-width/auto.webp") no-repeat;
+  background-size: 100%;
+}
 
-  &-adaption-min-width {
-    .mode {
-      background: url("@/assets/images/page-width/icon_auto_min_w.webp") no-repeat;
-      background-size: 100% 100%;
-    }
+.item-adaption-min-width .mode {
+  background: url("@/assets/images/page-width/icon_auto_min_w.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    .layout-demo {
-      background: url("@/assets/images/page-width/auto_min_w.webp") no-repeat;
-      background-size: 100%;
-    }
-  }
+.item-adaption-min-width .layout-demo {
+  background: url("@/assets/images/page-width/auto_min_w.webp") no-repeat;
+  background-size: 100%;
+}
 
-  &-center {
-    .mode {
-      background: url("@/assets/images/page-width/icon_middle.webp") no-repeat;
-      background-size: 100% 100%;
-    }
+.item-center .mode {
+  background: url("@/assets/images/page-width/icon_middle.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    .layout-demo {
-      background: url("@/assets/images/page-width/middle.webp") no-repeat;
-      background-size: 100%;
-    }
-  }
+.item-center .layout-demo {
+  background: url("@/assets/images/page-width/middle.webp") no-repeat;
+  background-size: 100%;
+}
 
-  &-center-max-width {
-    .mode {
-      background: url("@/assets/images/page-width/icon_middle_max_w.webp") no-repeat;
-      background-size: 100% 100%;
-    }
+.item-center-max-width .mode {
+  background: url("@/assets/images/page-width/icon_middle_max_w.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    .layout-demo {
-      background: url("@/assets/images/page-width/middle_max_w.webp") no-repeat;
-      background-size: 100%;
-    }
-  }
+.item-center-max-width .layout-demo {
+  background: url("@/assets/images/page-width/middle_max_w.webp") no-repeat;
+  background-size: 100%;
+}
 
-  &.active {
-    border: 2.6px solid rgb(var(--ui-primary));
-    border-radius: 8px;
-    box-shadow: 0 2.6px 13px 0 #59626940;
-  }
+.item.active {
+  --at-apply: border-[rgb(var(--ui-primary))] shadow-[0_2.6px_13px_0_rgba(89,98,105,0.25)] rounded-lg border-[2.6px] border-solid;
 }
 
-[data-theme="dark"],
-[data-theme="dracula"],
-[data-theme="luxury"],
-[data-theme="stone"],
-[data-theme="night"],
-[data-theme="synthwave"] {
-  .item {
-    background: #3a3e43;
-    border: 1px solid transparent;
-    // .jb {
-    //   background: linear-gradient(180deg, #ffffff1a 0%, #ffffff00 100%);
-    // }
-    &-adaption {
-      .mode {
-        background: url("@/assets/images/page-width/icon_auto_dark.webp") no-repeat;
-        background-size: 100% 100%;
-      }
+[data-theme="dark"] .item,
+[data-theme="dracula"] .item,
+[data-theme="luxury"] .item,
+[data-theme="stone"] .item,
+[data-theme="night"] .item,
+[data-theme="synthwave"] .item{
+  background: #3a3e43;
+  border: 1px solid transparent;
+}
 
-      .layout-demo {
-        background: url("@/assets/images/page-width/auto_dark.webp") no-repeat;
-        background-size: 100%;
-      }
-    }
+[data-theme="dark"] .item-adaption .mode,
+[data-theme="dracula"] .item-adaption .mode,
+[data-theme="luxury"] .item-adaption .mode,
+[data-theme="stone"] .item-adaption .mode,
+[data-theme="night"] .item-adaption .mode,
+[data-theme="synthwave"] .item-adaption .mode {
+  background: url("@/assets/images/page-width/icon_auto_dark.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    &-adaption-min-width {
-      .mode {
-        background: url("@/assets/images/page-width/icon_auto_min_w_dark.webp") no-repeat;
-        background-size: 100% 100%;
-      }
+[data-theme="dark"] .item-adaption .layout-demo,
+[data-theme="dracula"] .item-adaption .layout-demo,
+[data-theme="luxury"] .item-adaption .layout-demo,
+[data-theme="stone"] .item-adaption .layout-demo,
+[data-theme="night"] .item-adaption .layout-demo,
+[data-theme="synthwave"] .item-adaption .layout-demo {
+  background: url("@/assets/images/page-width/auto_dark.webp") no-repeat;
+  background-size: 100%;
+}
 
-      .layout-demo {
-        background: url("@/assets/images/page-width/auto_min_w_dark.webp") no-repeat;
-        background-size: 100%;
-      }
-    }
+[data-theme="dark"] .item-adaption-min-width .mode,
+[data-theme="dracula"] .item-adaption-min-width .mode,
+[data-theme="luxury"] .item-adaption-min-width .mode,
+[data-theme="stone"] .item-adaption-min-width .mode,
+[data-theme="night"] .item-adaption-min-width .mode,
+[data-theme="synthwave"] .item-adaption-min-width .mode {
+  background: url("@/assets/images/page-width/icon_auto_min_w_dark.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    &-center {
-      .mode {
-        background: url("@/assets/images/page-width/icon_middle_dark.webp") no-repeat;
-        background-size: 100% 100%;
-      }
+[data-theme="dark"] .item-adaption-min-width .layout-demo,
+[data-theme="dracula"] .item-adaption-min-width .layout-demo,
+[data-theme="luxury"] .item-adaption-min-width .layout-demo,
+[data-theme="stone"] .item-adaption-min-width .layout-demo,
+[data-theme="night"] .item-adaption-min-width .layout-demo,
+[data-theme="synthwave"] .item-adaption-min-width .layout-demo {
+  background: url("@/assets/images/page-width/auto_min_w_dark.webp") no-repeat;
+  background-size: 100%;
+}
 
-      .layout-demo {
-        background: url("@/assets/images/page-width/middle_dark.webp") no-repeat;
-        background-size: 100%;
-      }
-    }
+[data-theme="dark"] .item-center .mode,
+[data-theme="dracula"] .item-center .mode,
+[data-theme="luxury"] .item-center .mode,
+[data-theme="stone"] .item-center .mode,
+[data-theme="night"] .item-center .mode,
+[data-theme="synthwave"] .item-center .mode {
+  background: url("@/assets/images/page-width/icon_middle_dark.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    &-center-max-width {
-      .mode {
-        background: url("@/assets/images/page-width/icon_middle_max_w_dark.webp") no-repeat;
-        background-size: 100% 100%;
-      }
+[data-theme="dark"] .item-center .layout-demo,
+[data-theme="dracula"] .item-center .layout-demo,
+[data-theme="luxury"] .item-center .layout-demo,
+[data-theme="stone"] .item-center .layout-demo,
+[data-theme="night"] .item-center .layout-demo,
+[data-theme="synthwave"] .item-center .layout-demo {
+  background: url("@/assets/images/page-width/middle_dark.webp") no-repeat;
+  background-size: 100%;
+}
 
-      .layout-demo {
-        background: url("@/assets/images/page-width/middle_max_w_dark.webp") no-repeat;
-        background-size: 100%;
-      }
-    }
+[data-theme="dark"] .item-center-max-width .mode,
+[data-theme="dracula"] .item-center-max-width .mode,
+[data-theme="luxury"] .item-center-max-width .mode,
+[data-theme="stone"] .item-center-max-width .mode,
+[data-theme="night"] .item-center-max-width .mode,
+[data-theme="synthwave"] .item-center-max-width .mode {
+  background: url("@/assets/images/page-width/icon_middle_max_w_dark.webp") no-repeat;
+  background-size: 100% 100%;
+}
 
-    &.active {
-      border: 2.6px solid rgb(var(--ui-primary));
-    }
-  }
+[data-theme="dark"] .item-center-max-width .layout-demo,
+[data-theme="dracula"] .item-center-max-width .layout-demo,
+[data-theme="luxury"] .item-center-max-width .layout-demo,
+[data-theme="stone"] .item-center-max-width .layout-demo,
+[data-theme="night"] .item-center-max-width .layout-demo,
+[data-theme="synthwave"] .item-center-max-width .layout-demo {
+  background: url("@/assets/images/page-width/middle_max_w_dark.webp") no-repeat;
+  background-size: 100%;
+}
+
+[data-theme="dark"] .item.active,
+[data-theme="dracula"] .item.active,
+[data-theme="luxury"] .item.active,
+[data-theme="stone"] .item.active,
+[data-theme="night"] .item.active,
+[data-theme="synthwave"] .item.active {
+  border: 2.6px solid rgb(var(--ui-primary));
 }
 </style>

package/src/views/position/components/drawerPosition.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 { getDictItemList } from '@/api/modules/configData';
-import { getRbacPostDetailById, postRbacPostSave } from '@/api/modules/rbac';
 import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
+import { getDictItemList } from '@/api/modules/configData';
+import { getRbacPostDetailById, postRbacPostSave } from '@/api/modules/rbac';
 import { ACTION } from '../enum';
 
 defineOptions({

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