@pubinfo/core 2.0.0-beta.31 → 2.0.0-beta.33

package/src/pages/system/change-password/index.vue

@@ -62,41 +62,28 @@ const isValidate = ref(false);
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .password-bg {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  padding: 25px;
+  --at-apply: box-border flex flex-col size-full p-[25px];
   background: url("@/assets/images/login-small.png") no-repeat 50%;
   background-size: cover;
+}
+
+.change-password-form {
+  --at-apply: flex flex-col w-[560px] min-h-[680px] overflow-hidden backdrop-blur-[7.5px]
+  pt-16 pb-[34px] px-20 rounded-lg border-2 border-solid border-white;
 
-  .change-password-form {
-    display: flex;
-    flex-direction: column;
-    width: 560px;
-    min-height: 680px;
-    padding: 64px 80px 34px;
-    overflow: hidden;
-    background: linear-gradient(180deg, hsl(0deg 0% 100% / 90%), hsl(0deg 0% 100% / 75%));
-    backdrop-filter: blur(7.5px);
-    border: 2px solid #fff;
-    border-radius: 8px;
-    box-shadow: 0 20px 50px rgb(29 42 165 / 5%);
-  }
+  box-shadow: 0 20px 50px rgb(29 42 165 / 5%);
+  background: linear-gradient(180deg, hsl(0deg 0% 100% / 90%), hsl(0deg 0% 100% / 75%));
 }
 
-[data-theme="dark"] {
-  .password-bg {
-    background: url("@/assets/images/login-small_dark.webp") no-repeat 50%;
-    background-size: cover;
-  }
+:deep([data-theme="dark"]) .password-bg {
+  background: url("@/assets/images/login-small_dark.webp") no-repeat 50%;
+  background-size: cover;
+}
 
-  .change-password-form {
-    background: #0f1e3b;
-    border-color: #0f1e3b;
-  }
+:deep([data-theme="dark"]) .change-password-form {
+  background: #0f1e3b;
+  border-color: #0f1e3b;
 }
 </style>

package/src/pages/system/not-permission/index.vue

@@ -58,16 +58,14 @@ function goBack() {
   </div>
 </template>
 
-<style lang="scss" scoped>
+<style scoped>
 .noPermissionIcon {
   background: url("@/assets/icons/403.svg") no-repeat;
   background-size: 100% 100%;
 }
 
-[data-theme="dark"] {
-  .noPermissionIcon {
-    background: url("@/assets/icons/403_dark.svg") no-repeat;
-    background-size: 100% 100%;
-  }
+[data-theme="dark"] .noPermissionIcon {
+  background: url("@/assets/icons/403_dark.svg") no-repeat;
+  background-size: 100% 100%;
 }
 </style>

package/src/route/guard/basic.ts

@@ -1,8 +1,8 @@
 import type { Router } from 'vue-router';
+import { useNProgress } from '@vueuse/integrations/useNProgress';
 import {
   useSettingsStore,
 } from '@/stores';
-import { useNProgress } from '@vueuse/integrations/useNProgress';
 
 /** 基础路由守卫 */
 export function createBasicGuard(router: Router) {

package/src/route/routes.ts

@@ -1,8 +1,8 @@
 import type { Route } from '#/vue-router';
 import type { RouteRecordRaw } from 'vue-router';
+import { isUndefined } from 'lodash-es';
 import { readProject } from '@/context';
 import { useSettingsStore, useUserStore } from '@/stores';
-import { isUndefined } from 'lodash-es';
 
 interface AsyncRoutesOptions {
   /** 路由排序 */

package/src/stores/modules/favorites.ts

@@ -2,8 +2,8 @@ import type { Favorites } from '#/favorites';
 import type { Route } from '#/vue-router';
 import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router';
 
-import { resolveRoutePath } from '@/utils';
 import { defineStore } from 'pinia';
+import { resolveRoutePath } from '@/utils';
 import { STORE_NAME } from '../enum';
 
 /**

package/src/stores/modules/menu.ts

@@ -1,8 +1,8 @@
 import type { Menu } from '#/menu';
 
-import { resolveRoutePath } from '@/utils';
 import { get, isNumber } from 'lodash-es';
 import { defineStore } from 'pinia';
+import { resolveRoutePath } from '@/utils';
 
 import { STORE_NAME } from '../enum';
 import useRouteStore from './route';

package/src/stores/modules/route.ts

@@ -1,12 +1,12 @@
 import type { Route } from '#/vue-router';
 import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 
+import { cloneDeep, defaultTo, get, has, isArray, isString, isUndefined, merge, omit } from 'lodash-es';
+import { defineStore } from 'pinia';
 import { GetApiRouteList } from '@/api/system/app';
 import { readProject } from '@/context';
 import { getAsyncRoutes, getSystemRoutes } from '@/route';
 import { resolveRoutePath } from '@/utils';
-import { cloneDeep, defaultTo, get, has, isArray, isString, isUndefined, merge, omit } from 'lodash-es';
-import { defineStore } from 'pinia';
 import { STORE_NAME } from '../enum';
 import useSettingsStore from './settings';
 import useTabbarStore from './tabbar';

package/src/stores/modules/settings.ts

@@ -1,4 +1,11 @@
 import type { RouteLocationNormalized, RouteMeta } from 'vue-router';
+import { FrownOutlined } from '@ant-design/icons-vue';
+import { usePreferredDark } from '@vueuse/core';
+import { Modal } from 'ant-design-vue';
+import { cloneDeep, defaultsDeep, get, set } from 'lodash-es';
+import { defineStore } from 'pinia';
+import { createVNode } from 'vue';
+import Message from 'vue-m-message';
 import {
   getSysconfigGetSysThemeStyleConfig,
   getSysconfigGetThemeStyleConfig,
@@ -8,13 +15,6 @@ import {
 } from '@/api/modules/configData';
 import { getSettings } from '@/config';
 import { objectToPaths, storage } from '@/utils';
-import { FrownOutlined } from '@ant-design/icons-vue';
-import { usePreferredDark } from '@vueuse/core';
-import { Modal } from 'ant-design-vue';
-import { cloneDeep, defaultsDeep, get, set } from 'lodash-es';
-import { defineStore } from 'pinia';
-import { createVNode } from 'vue';
-import Message from 'vue-m-message';
 import { STORE_NAME } from '../enum';
 
 const useSettingsStore = defineStore(

package/src/stores/modules/user.ts

@@ -1,11 +1,11 @@
 import type { AxiosRequestHeaders } from 'axios';
 import type { ComputedRef } from 'vue';
+import { find } from 'lodash-es';
+import { defineStore } from 'pinia';
 import { postAuthChangeLoginOrg, postAuthLogin } from '@/api/modules/auth';
 import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/api/modules/rbac';
 import { usePubinfoContext } from '@/context';
 import { getEncryptedData } from '@/utils';
-import { find } from 'lodash-es';
-import { defineStore } from 'pinia';
 import { STORE_NAME } from '../enum';
 
 export interface UserStore {

package/src/stores/plugin/persist.ts

@@ -1,7 +1,7 @@
 import type { Pinia } from 'pinia';
-import type { PersistedStateFactoryOptions, Serializer } from 'pinia-plugin-persistedstate';
-import { storage } from '@/utils';
+import type { PluginOptions, Serializer } from 'pinia-plugin-persistedstate';
 import { createPersistedState } from 'pinia-plugin-persistedstate';
+import { storage } from '@/utils';
 
 export function customSerializer(): Serializer {
   return {
@@ -14,7 +14,7 @@ export function customSerializer(): Serializer {
   };
 }
 
-export function createPersistedStateOptions(): PersistedStateFactoryOptions {
+export function createPersistedStateOptions(): PluginOptions {
   return {
     storage: storage.local,
     key: id => `_${id}`,

package/src/stores/plugin/sideEffect/tabbarStorage.ts

@@ -1,8 +1,8 @@
 import type { PiniaPluginContext } from 'pinia';
 import type useTabbarStore from '../../modules/tabbar';
+import { cloneDeep } from 'lodash-es';
 import { GetAPITabbar, GetAPITabbarEdit } from '@/api/system/user';
 import { storage } from '@/utils';
-import { cloneDeep } from 'lodash-es';
 import { STORE_NAME } from '../../enum';
 import { getTabbarMemoryKey } from '../../helper';
 import useSettingsStore from '../../modules/settings';

package/src/utils/crypto.ts

@@ -1,6 +1,6 @@
-import { getAuthLoginKey } from '@/api/modules/auth';
 import JSEncrypt from 'jsencrypt';
 import { template } from 'lodash-es';
+import { getAuthLoginKey } from '@/api/modules/auth';
 
 export function compilePublicKey(key: string) {
   const compiled = template('-----BEGIN PUBLIC KEY-----\n<%= publickKey %>\n-----END PUBLIC KEY-----');

package/types/auto-imports.d.ts

@@ -80,6 +80,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

package/types/components.d.ts

@@ -2,6 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
 export {}
 
 /* prettier-ignore */

package/types/vue-router.d.ts

@@ -32,14 +32,14 @@ type RouterMetaRaw = RequireExactlyOne<Partial<RouterMetaRawBaseOptions>, 'title
 
 export declare namespace Route {
 
-  type mainMeta =
-    | 'title'
-    | 'i18n'
-    | 'icon'
-    | 'activeIcon'
-    | 'auth'
-    | 'enabled'
-    | 'provider';
+  type mainMeta
+    = | 'title'
+      | 'i18n'
+      | 'icon'
+      | 'activeIcon'
+      | 'auth'
+      | 'enabled'
+      | 'provider';
 
   type recordMainRawBasicMeta = Partial<Pick<RouterMetaRawBaseOptions, mainMeta>>;
 

package/dist/HDivider-DgXBhPr0.js

@@ -1,21 +0,0 @@
-import { defineComponent as i, createElementBlock as n, openBlock as r, createElementVNode as e, renderSlot as c, toDisplayString as _ } from "vue";
-import { _ as d } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const a = { "w-full": "" }, l = { class: "divider" }, p = { class: "divider-card" }, m = /* @__PURE__ */ i({
-  name: "HDivider",
-  __name: "HDivider",
-  props: {
-    title: {}
-  },
-  setup(t) {
-    const o = t;
-    return (s, v) => (r(), n("div", a, [
-      e("div", l, [
-        e("div", p, _(o.title), 1)
-      ]),
-      c(s.$slots, "default", {}, void 0, !0)
-    ]));
-  }
-}), h = /* @__PURE__ */ d(m, [["__scopeId", "data-v-424021cc"]]);
-export {
-  h as _
-};

package/dist/HToggle-Cd71WKvG.js

@@ -1,34 +0,0 @@
-import { defineComponent as d, computed as m, createElementBlock as c, openBlock as r, withDirectives as i, createElementVNode as l, isRef as _, vModelCheckbox as f, unref as b } from "vue";
-import { _ as V } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const x = { class: "switch" }, g = /* @__PURE__ */ d({
-  __name: "HToggle",
-  props: {
-    modelValue: { type: Boolean },
-    disabled: { type: Boolean, default: !1 },
-    onIcon: {},
-    offIcon: {}
-  },
-  emits: ["update:modelValue"],
-  setup(n, { emit: s }) {
-    const a = n, p = s, o = m({
-      get() {
-        return a.modelValue;
-      },
-      set(t) {
-        p("update:modelValue", t);
-      }
-    });
-    return (t, e) => (r(), c("label", x, [
-      i(l("input", {
-        "onUpdate:modelValue": e[0] || (e[0] = (u) => _(o) ? o.value = u : null),
-        type: "checkbox"
-      }, null, 512), [
-        [f, b(o)]
-      ]),
-      e[1] || (e[1] = l("span", null, null, -1))
-    ]));
-  }
-}), B = /* @__PURE__ */ V(g, [["__scopeId", "data-v-2b5064d6"]]);
-export {
-  B as _
-};

package/src/assets/styles/globals.scss

@@ -1,189 +0,0 @@
-// 页面布局 CSS 变量
-:root {
-  // 这是一个复合变量
-  // 当页宽模式为 adaption-min-width 时，它代表 最小宽度
-  // 当页宽模式为 center 时，它代表 固定宽度
-  // 当页宽模式为 center-max-width 时，它代表 最大宽度
-  --g-app-width: #{$g-app-width};
-
-  // 头部宽度（默认自适应宽度，可固定宽度，固定宽度后为居中显示）
-  --g-header-width: #{$g-header-width};
-
-  // 头部高度
-  --g-header-height: 56px;
-
-  // 侧边栏宽度
-  --g-main-sidebar-width: 63px;
-  --g-sub-sidebar-width: 220px;
-  --g-sub-sidebar-collapse-width: 64px;
-
-  // 侧边栏 Logo 区域高度
-  --g-sidebar-logo-height: 50px;
-
-  // 标签栏高度
-  --g-tabbar-height: 48px;
-
-  // 工具栏高度
-  --g-toolbar-height: 45px;
-
-  // 标签页最大最小宽度，两个宽度为同一数值时，则为固定宽度，反之将宽度设置为 unset 则为自适应
-  --g-tabbar-tab-max-width: 150px;
-  --g-tabbar-tab-min-width: 150px;
-}
-
-// 明暗模式 CSS 变量
-/* stylelint-disable-next-line no-duplicate-selectors */
-:root {
-  color-scheme: light;
-
-  --g-box-shadow-color: rgb(0 0 0 / 12%);
-
-  &::view-transition-old(root),
-  &::view-transition-new(root) {
-    mix-blend-mode: normal;
-    animation: none;
-  }
-
-  &::view-transition-old(root) {
-    z-index: 1;
-  }
-
-  &::view-transition-new(root) {
-    z-index: 9999;
-  }
-
-  &.dark {
-    color-scheme: dark;
-
-    --g-box-shadow-color: rgb(0 0 0 / 72%);
-
-    &::view-transition-old(root) {
-      z-index: 9999;
-    }
-
-    &::view-transition-new(root) {
-      z-index: 1;
-    }
-  }
-}
-
-::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-
-::-webkit-scrollbar-thumb {
-  background-color: rgb(0 0 0 / 40%);
-  background-clip: padding-box;
-  border: 3px solid transparent;
-  border-radius: 6px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background-color: rgb(0 0 0 / 50%);
-}
-
-::-webkit-scrollbar-track {
-  background-color: transparent;
-}
-
-html,
-body {
-  height: 100%;
-}
-
-body {
-  box-sizing: border-box;
-  margin: 0;
-  font-family: Lato, "PingFang SC", "Microsoft YaHei", sans-serif;
-  background-color: var(--g-container-bg);
-  -webkit-tap-highlight-color: transparent;
-
-  &.overflow-hidden {
-    overflow: hidden;
-  }
-}
-
-* {
-  box-sizing: inherit;
-}
-
-// 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width]
-[data-fixed-calc-width] {
-  position: fixed;
-  right: 0;
-  left: 50%;
-}
-
-[data-app-width-mode="adaption"],
-[data-app-width-mode="adaption-min-width"] {
-  [data-fixed-calc-width] {
-    width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width));
-    transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2));
-  }
-}
-
-[data-app-width-mode="center"],
-[data-app-width-mode="center-max-width"] {
-  [data-fixed-calc-width] {
-    width: calc(var(--g-app-width) - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width));
-    transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2));
-  }
-
-  // @media screen and (max-width: $g-app-width) {
-  //   [data-fixed-calc-width] {
-  //     width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width));
-  //     transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2));
-  //   }
-  // }
-}
-
-[data-mode="mobile"] {
-  [data-fixed-calc-width] {
-    width: 100% !important;
-    transform: translateX(-50%) !important;
-  }
-}
-
-// textarea 字体跟随系统
-textarea {
-  font-family: inherit;
-}
-
-/* Overrides Floating Vue */
-.v-popper--theme-dropdown,
-.v-popper--theme-tooltip {
-  --at-apply: inline-flex;
-}
-
-.v-popper--theme-dropdown .v-popper__inner,
-.v-popper--theme-tooltip .v-popper__inner {
-  --at-apply: bg-white  dark:bg-dark-9 text-dark dark:text-white rounded shadow ring-1 ring-gray-200 dark:ring-gray-800 border border-solid border-stone/20 text-xs font-normal;
-
-  box-shadow: 0 6px 30px rgb(0 0 0 / 10%);
-}
-
-.v-popper--theme-tooltip .v-popper__arrow-inner,
-.v-popper--theme-dropdown .v-popper__arrow-inner {
-  --at-apply: border-white dark:border-stone-8;
-}
-
-.v-popper--theme-tooltip .v-popper__arrow-outer,
-.v-popper--theme-dropdown .v-popper__arrow-outer {
-  --at-apply: border-stone/20;
-}
-
-.v-popper--theme-tooltip.v-popper--shown,
-.v-popper--theme-tooltip.v-popper--shown * {
-  transition: none !important;
-}
-
-[data-overlayscrollbars-contents] {
-  overscroll-behavior: contain;
-}
-
-// medium-zoom
-.medium-zoom-overlay,
-.medium-zoom-image {
-  z-index: 3000;
-}

package/src/assets/styles/nprogress.scss

@@ -1,63 +0,0 @@
-#nprogress {
-  pointer-events: none;
-
-  .bar {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 1031;
-    width: 100%;
-    height: 2px;
-    background: rgb(var(--ui-primary));
-  }
-
-  .peg {
-    position: absolute;
-    right: 0;
-    display: block;
-    width: 100px;
-    height: 100%;
-    box-shadow: 0 0 10px rgb(var(--ui-primary)), 0 0 5px rgb(var(--ui-primary));
-    opacity: 1;
-    transform: rotate(3deg) translate(0, -4px);
-  }
-
-  .spinner {
-    position: fixed;
-    top: 11px;
-    right: 14px;
-    z-index: 1031;
-    display: block;
-
-    .spinner-icon {
-      box-sizing: border-box;
-      width: 18px;
-      height: 18px;
-      border: solid 2px transparent;
-      border-top-color: rgb(var(--ui-primary));
-      border-left-color: rgb(var(--ui-primary));
-      border-radius: 50%;
-      animation: nprogress-spinner 400ms linear infinite;
-    }
-  }
-}
-
-.nprogress-custom-parent {
-  position: relative;
-  overflow: hidden;
-
-  #nprogress .spinner,
-  #nprogress .bar {
-    position: absolute;
-  }
-}
-
-@keyframes nprogress-spinner {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-@keyframes nprogress-spinner {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}

package/src/assets/styles/rbac.scss

@@ -1,61 +0,0 @@
-// 目前为rbac专用配置，添加自定义样式，在模板中移除
-[data-theme="classic"] {
-  #app-main {
-    // FIXME: 临时解决方案 --------
-    background-image: url("@/assets/images/slider-bg.png");
-    background-repeat: no-repeat;
-    background-position: left bottom;
-    background-size: 450px 89%;
-
-    .sub-sidebar-container {
-      background-color: transparent;
-    }
-
-    & > header {
-      background-image: url("@/assets/images/header-bg.png");
-      background-repeat: no-repeat;
-      background-position: left bottom;
-      background-size: cover;
-
-      .menu {
-        background-color: transparent !important;
-      }
-
-      .header-container {
-        .tools {
-          & > span {
-            background-color: #4173f9;
-          }
-        }
-      }
-    }
-
-    .page-container {
-      padding-left: 0;
-    }
-  }
-
-  .wrapper .sidebar-container {
-    box-shadow: none !important;
-  }
-
-  .wrapper .main-container {
-    box-shadow: none !important;
-  }
-}
-
-/* FIXME: Over rides @pubinfo/pro-components */
-.pro-table {
-  .ant-form-item {
-    margin-bottom: 16px;
-  }
-
-  .ant-card .ant-card-body {
-    padding: 16px;
-  }
-
-  .ant-card .ant-card-head {
-    min-height: 48px;
-    padding: 0 16px;
-  }
-}

package/src/assets/styles/resources/utils.scss

@@ -1,53 +0,0 @@
-// 文字超出隐藏，默认为单行超出隐藏，可设置多行
-@mixin text-overflow($line: 1, $fixed-width: true) {
-  @if $line == 1 and $fixed-width == true {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  } @else {
-    /* stylelint-disable-next-line value-no-vendor-prefix */
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    -webkit-line-clamp: $line;
-  }
-}
-
-// 定位居中，默认水平居中，可选择垂直居中，或者水平垂直都居中
-@mixin position-center($type: x) {
-  position: absolute;
-
-  @if $type == x {
-    left: 50%;
-    transform: translateX(-50%);
-  }
-
-  @if $type == y {
-    top: 50%;
-    transform: translateY(-50%);
-  }
-
-  @if $type == xy {
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%) translateY(-50%);
-  }
-}
-
-// 文字两端对齐
-%justify-align {
-  text-align: justify;
-  text-align-last: justify;
-}
-
-// 清除浮动
-%clearfix {
-  zoom: 1;
-
-  &::before,
-  &::after {
-    display: block;
-    clear: both;
-    content: "";
-  }
-}