@pubinfo/core 2.0.0-beta.25 → 2.0.0-beta.27

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.27",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.25"
+    "@pubinfo/config": "2.0.0-beta.27"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.13",
@@ -85,7 +85,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.25"
+    "@pubinfo/config": "2.0.0-beta.27"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/layout/components/SettingBar/components/SettingThemes.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { colorScheme, cssVarKey } from '@pubinfo/config/themes';
 import { useTheme } from '@/composables';
-import { themes } from '@pubinfo/config/themes';
+import { getThemes } from '@pubinfo/config/themes';
 import JamBookmarkF from '~icons/jam/bookmark-f';
 import PajamasCheckCircleFilled from '~icons/pajamas/check-circle-filled';
 import { useContext } from '../../../composables/useContext';
@@ -30,8 +30,10 @@ const benchmark: cssVarKey[] = [
   '--g-sub-sidebar-bg',
 ];
 
-const themeList = computed<ThemeListCard[]>(() =>
-  Object.keys(themes).map((key) => {
+const themeList = computed<ThemeListCard[]>(() => {
+  const themes = getThemes();
+
+  return Object.keys(themes).map((key) => {
     const value = themes[key];
     const colors = benchmark.map((cssVar) => {
       const cssValue = value[cssVar].startsWith('#')
@@ -48,8 +50,8 @@ const themeList = computed<ThemeListCard[]>(() =>
     };
   }).filter(cssVarScheme =>
     cssVarScheme.value['color-scheme'] === app.value.colorScheme,
-  ),
-);
+  );
+});
 
 function clickHandle(item: ThemeListCard) {
   const label = item.label;

package/src/layout/components/Tools/Preferences/PreferencesContent.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { themes } from '@pubinfo/config/themes';
+import { getThemes } from '@pubinfo/config/themes';
 import { message } from 'ant-design-vue';
 import { cloneDeep, pick } from 'lodash-es';
 import EpBack from '~icons/ep/back';
@@ -92,6 +92,7 @@ const isDark = computed({
 });
 
 const themeList = computed(() => {
+  const themes = getThemes();
   return Object.keys(themes).map((key) => {
     return {
       label: key,

package/src/layout/components/Tools/index.vue

@@ -8,14 +8,12 @@ import FluentFullScreenMinimize16Filled from '~icons/fluent/full-screen-minimize
 import IconamoonSearch from '~icons/iconamoon/search';
 import MaterialSymbolsExpandMoreRounded from '~icons/material-symbols/expand-more-rounded';
 import PhLineVerticalThin from '~icons/ph/line-vertical-thin';
-// import RiTranslate from '~icons/ri/translate';
 
 import { useContext } from '../../composables/useContext';
 import useMainPage from '../../composables/useMainPage';
 import useViewTransition from '../../composables/useViewTransition';
 import DayNightSwitch from './DayNightSwitch.vue';
 import HotkeysIntro from './HotkeysIntro.vue';
-// import I18nSelector from './I18nSelector.vue';
 import Preferences from './Preferences/index.vue';
 import Search from './Search.vue';
 
@@ -71,9 +69,7 @@ const userMenu = computed(() => [
     {
       label: t('route.personal.profile'),
       icon: 'i-iconamoon-profile-duotone',
-      handle: () => router.push({
-        name: 'Profile',
-      }),
+      handle: () => router.push({ name: 'Profile' }),
     },
     {
       label: t('app.changePassword'),
@@ -172,9 +168,6 @@ const searchComponentsClass = computed(() => {
       >
         <IconamoonSearch text="14px" />
       </span>
-      <!-- <I18nSelector class="item">
-        <RiTranslate text="15px" />
-      </I18nSelector> -->
       <span
         v-if="settingsStore.mode === 'pc' && settingsStore.settings.toolbar.enableFullscreen"
         class="item"

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PubinfoIcon } from '@/components';
+import { PubinfoIcon, PubinfoProvider } from '@/components';
 import { useUserStore } from '@/stores';
 import { message } from 'ant-design-vue';
 
@@ -49,80 +49,88 @@ async function changeOrganization() {
     message.error('请选择要切换的组织');
   }
 }
+
+function loadIcon(name: string) {
+  const modules = (import.meta as any).glob('../../../assets/icons/*', { eager: true });
+  const path = `../../../assets/icons/${name}.svg`;
+  return modules[path]?.default;
+}
 </script>
 
 <template>
-  <div class="change-org">
-    <div
-      w-full
-      h-full
-      flex="~"
-      justify-center
-    >
-      <div w-620px pt-20vh>
-        <div
-          text="30px"
-          font="bold"
-          mb-40px
-          flex="~"
-          items="center"
-        >
-          请选择组织
-        </div>
-        <div v-for="(item, index) in orgList" :key="index" @click="setActive(index)">
-          <div class="org-item" :class="{ active: index === activeIndex }">
-            <div flex="~" h-full>
-              <PubinfoIcon name="change-org" size="48px" />
-              <div
-                flex="~ col"
-                h-full
-                justify-center
-                ml="18px"
-              >
-                <div text="20px black dark:[#86909C]" flex="~" items-center>
-                  <span mr-10px>
-                    {{ item.label }}
-                  </span>
-                  <a-tag v-if="userStore.user.orgId === item.orgId" color="blue">
-                    当前使用组织
-                  </a-tag>
-                  <a-tag v-if="item.main" color="red">
-                    主组织
-                  </a-tag>
+  <PubinfoProvider :load-icon="loadIcon">
+    <div class="change-org">
+      <div
+        w-full
+        h-full
+        flex="~"
+        justify-center
+      >
+        <div w-620px pt-20vh>
+          <div
+            text="30px"
+            font="bold"
+            mb-40px
+            flex="~"
+            items="center"
+          >
+            请选择组织
+          </div>
+          <div v-for="(item, index) in orgList" :key="index" @click="setActive(index)">
+            <div class="org-item" :class="{ active: index === activeIndex }">
+              <div flex="~" h-full>
+                <PubinfoIcon name="change-org" size="48px" />
+                <div
+                  flex="~ col"
+                  h-full
+                  justify-center
+                  ml="18px"
+                >
+                  <div text="20px black dark:[#86909C]" flex="~" items-center>
+                    <span mr-10px>
+                      {{ item.label }}
+                    </span>
+                    <a-tag v-if="userStore.user.orgId === item.orgId" color="blue">
+                      当前使用组织
+                    </a-tag>
+                    <a-tag v-if="item.main" color="red">
+                      主组织
+                    </a-tag>
+                  </div>
                 </div>
               </div>
-            </div>
-            <div>
-              <PubinfoIcon
-                class="arrow"
-                name="i-iconamoon-arrow-right-6-circle-duotone"
-                :color="index === activeIndex ? '#1677ff' : '#8E97A3'"
-                size="22px"
-              />
+              <div>
+                <PubinfoIcon
+                  class="arrow"
+                  name="i-iconamoon-arrow-right-6-circle-duotone"
+                  :color="index === activeIndex ? '#1677ff' : '#8E97A3'"
+                  size="22px"
+                />
+              </div>
             </div>
           </div>
-        </div>
-        <div>
-          <a-button
-            type="primary"
-            block
-            h-40px
-            mb-15px
-            @click="changeOrganization"
-          >
-            确定
-          </a-button>
-          <a-button
-            block
-            h-40px
-            @click="handleBack"
-          >
-            返回
-          </a-button>
+          <div>
+            <a-button
+              type="primary"
+              block
+              h-40px
+              mb-15px
+              @click="changeOrganization"
+            >
+              确定
+            </a-button>
+            <a-button
+              block
+              h-40px
+              @click="handleBack"
+            >
+              返回
+            </a-button>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </PubinfoProvider>
 </template>
 
 <style lang="scss" scoped>

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { PassStrengthValidator, PubinfoIcon } from '@/components';
+import { PassStrengthValidator, PubinfoIcon, PubinfoProvider } from '@/components';
 import ChangePasswordForm from './components/ChangePasswordForm/index.vue';
 
 defineOptions({
@@ -18,48 +18,56 @@ const newPassWord = computed({
 const route = useRoute();
 const token = route.params.changePassWordToken;
 const isValidate = ref(false);
+
+function loadIcon(name: string) {
+  const modules = (import.meta as any).glob('../../../assets/icons/*', { eager: true });
+  const path = `../../../assets/icons/${name}.svg`;
+  return modules[path]?.default;
+}
 </script>
 
 <template>
-  <div class="password-bg">
-    <main
-      flex="~ auto center"
-      w-full
-      h-0
-    >
-      <div
-        h-full
-        flex="~"
-        justify-between
-        items-center
+  <PubinfoProvider :load-icon="loadIcon">
+    <div class="password-bg">
+      <main
+        flex="~ auto center"
+        w-full
+        h-0
       >
-        <div w-650px mr-20px>
-          <PassStrengthValidator v-model="newPassWord" v-model:validate="isValidate" />
-        </div>
-        <div class="change-password-form">
-          <div flex="~ col center" mb-40px>
-            <div
-              w-88px
-              h-88px
-              flex="~ center"
-              rounded="50%"
-              mb-15px
-            >
-              <PubinfoIcon
-                name="mima"
-                color="transparent"
-                :size="88"
-              />
+        <div
+          h-full
+          flex="~"
+          justify-between
+          items-center
+        >
+          <div w-650px mr-20px>
+            <PassStrengthValidator v-model="newPassWord" v-model:validate="isValidate" />
+          </div>
+          <div class="change-password-form">
+            <div flex="~ col center" mb-40px>
+              <div
+                w-88px
+                h-88px
+                flex="~ center"
+                rounded="50%"
+                mb-15px
+              >
+                <PubinfoIcon
+                  name="mima"
+                  color="transparent"
+                  :size="88"
+                />
+              </div>
+              <span text="18px" font="bold">
+                更改密码
+              </span>
             </div>
-            <span text="18px" font="bold">
-              更改密码
-            </span>
+            <ChangePasswordForm ref="ChangePassWordForm" v-model:validate="isValidate" :token="token" />
           </div>
-          <ChangePasswordForm ref="ChangePassWordForm" v-model:validate="isValidate" :token="token" />
         </div>
-      </div>
-    </main>
-  </div>
+      </main>
+    </div>
+  </PubinfoProvider>
 </template>
 
 <style lang="scss" scoped>

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

@@ -31,8 +31,8 @@ onMounted(() => {
   }, 1000);
 });
 
-async function goBack() {
-  await userStore.logout();
+function goBack() {
+  userStore.logout();
   router.push({
     name: 'login',
   });

package/dist/SettingThemes-DBq6j0zt.js

@@ -1,144 +0,0 @@
-import { _ as T } from "./HDivider-DgXBhPr0.js";
-import { markRaw as b, createElementBlock as d, openBlock as o, createElementVNode as t, defineComponent as k, useModel as V, withDirectives as S, createStaticVNode as $, vModelCheckbox as w, toRef as D, computed as B, createBlock as N, withCtx as j, createVNode as u, unref as c, isRef as L, Fragment as g, renderList as f, normalizeClass as M, normalizeStyle as h, toDisplayString as z } from "vue";
-import "./menu-Ddxel9ck.js";
-import "pinia-plugin-persistedstate";
-import { d as F, u as R } from "./index-D0CMv5FJ.js";
-import { themes as v } from "@pubinfo/config/themes";
-import { _ as x } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const A = {
-  viewBox: "-5 -2 24 24",
-  width: "1.2em",
-  height: "1.2em"
-};
-function E(i, e) {
-  return o(), d("svg", A, e[0] || (e[0] = [
-    t("path", {
-      fill: "currentColor",
-      d: "M3 0h8a3 3 0 0 1 3 3v15a2 2 0 0 1-3.348 1.477L7.674 16.76a1 1 0 0 0-1.348 0l-2.978 2.717A2 2 0 0 1 0 18V3a3 3 0 0 1 3-3"
-    }, null, -1)
-  ]));
-}
-const H = b({ name: "jam-bookmark-f", render: E }), I = {
-  viewBox: "0 0 16 16",
-  width: "1.2em",
-  height: "1.2em"
-};
-function U(i, e) {
-  return o(), d("svg", I, e[0] || (e[0] = [
-    t("path", {
-      fill: "currentColor",
-      "fill-rule": "evenodd",
-      d: "M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m3.78-9.72a.75.75 0 0 0-1.06-1.06L6.75 9.19L5.53 7.97a.75.75 0 0 0-1.06 1.06l1.75 1.75a.75.75 0 0 0 1.06 0z",
-      "clip-rule": "evenodd"
-    }, null, -1)
-  ]));
-}
-const W = b({ name: "pajamas-check-circle-filled", render: U }), J = {
-  flex: "",
-  "justify-center": "",
-  "pb-15px": ""
-}, O = { class: "toggleWrapper" }, P = /* @__PURE__ */ k({
-  name: "DayNightToggle",
-  __name: "DayNightToggle",
-  props: {
-    modelValue: {},
-    modelModifiers: {}
-  },
-  emits: ["update:modelValue"],
-  setup(i) {
-    const e = V(i, "modelValue");
-    return (_, s) => (o(), d("div", J, [
-      t("div", O, [
-        S(t("input", {
-          id: "dn",
-          "onUpdate:modelValue": s[0] || (s[0] = (p) => e.value = p),
-          type: "checkbox",
-          class: "dn"
-        }, null, 512), [
-          [w, e.value]
-        ]),
-        s[1] || (s[1] = $('<label for="dn" class="toggle" data-v-d927ea22><span class="toggle__handler" data-v-d927ea22><span class="crater crater--1" data-v-d927ea22></span><span class="crater crater--2" data-v-d927ea22></span><span class="crater crater--3" data-v-d927ea22></span></span><span class="star star--1" data-v-d927ea22></span><span class="star star--2" data-v-d927ea22></span><span class="star star--3" data-v-d927ea22></span><span class="star star--4" data-v-d927ea22></span><span class="star star--5" data-v-d927ea22></span><span class="star star--6" data-v-d927ea22></span></label>', 1))
-      ])
-    ]));
-  }
-}), q = /* @__PURE__ */ x(P, [["__scopeId", "data-v-d927ea22"]]), G = { class: "themes" }, K = ["onClick"], Q = {
-  class: "theme-type",
-  flex: "",
-  "items-center": ""
-}, X = { class: "theme-point" }, Y = { class: "explosion" }, Z = /* @__PURE__ */ k({
-  name: "SettingThemes",
-  __name: "SettingThemes",
-  setup(i) {
-    const { isDark: e } = F(), { settingsStore: _ } = R(), s = D(_.settings, "app"), p = [
-      "--ui-primary",
-      "--ui-text",
-      "--g-bg",
-      "--g-header-bg",
-      "--g-main-sidebar-bg",
-      "--g-sub-sidebar-bg"
-    ], y = B(
-      () => Object.keys(v).map((n) => {
-        const l = v[n], m = p.map((r) => l[r].startsWith("#") ? l[r] : `rgb(${l[r]})`), a = v[n].label;
-        return {
-          label: n,
-          value: l,
-          colors: m,
-          name: a
-        };
-      }).filter(
-        (n) => n.value["color-scheme"] === s.value.colorScheme
-      )
-    );
-    function C(n) {
-      const l = n.label;
-      e.value ? s.value.darkTheme = l : s.value.lightTheme = l;
-    }
-    return (n, l) => {
-      const m = T;
-      return o(), N(m, { title: "颜色主题风格" }, {
-        default: j(() => [
-          t("div", null, [
-            u(q, {
-              modelValue: c(e),
-              "onUpdate:modelValue": l[0] || (l[0] = (a) => L(e) ? e.value = a : null)
-            }, null, 8, ["modelValue"])
-          ]),
-          t("div", G, [
-            (o(!0), d(g, null, f(c(y), (a) => (o(), d("div", {
-              key: a.label,
-              class: M(["theme", { active: c(e) ? c(s).darkTheme === a.label : c(s).lightTheme === a.label }]),
-              onClick: (r) => C(a)
-            }, [
-              t("div", Q, [
-                t("span", {
-                  style: h({ color: a.colors.at(0) }),
-                  "mr-5px": ""
-                }, [
-                  u(c(H))
-                ], 4),
-                t("span", {
-                  style: h({ color: a.colors.at(0) }),
-                  "text-sm": ""
-                }, z(a.name || a.label), 5)
-              ]),
-              t("div", X, [
-                (o(!0), d(g, null, f(a.colors, (r) => (o(), d("div", {
-                  key: r,
-                  class: "point",
-                  style: h({ backgroundColor: r })
-                }, null, 4))), 128))
-              ]),
-              t("div", Y, [
-                u(c(W))
-              ])
-            ], 10, K))), 128))
-          ])
-        ]),
-        _: 1
-      });
-    };
-  }
-}), ce = /* @__PURE__ */ x(Z, [["__scopeId", "data-v-066297c5"]]);
-export {
-  ce as default
-};

package/dist/index-CC3GE307.js

@@ -1,137 +0,0 @@
-import { defineComponent as w, toRaw as z, computed as B, ref as N, createElementBlock as m, openBlock as n, createElementVNode as e, Fragment as O, renderList as V, unref as r, normalizeClass as E, createVNode as l, createBlock as x, createCommentVNode as v, toDisplayString as L, withCtx as c, createTextVNode as u } from "vue";
-import { u as S, aQ as T, v as f } from "./menu-Ddxel9ck.js";
-import "pinia-plugin-persistedstate";
-import { useRouter as j } from "vue-router";
-import { _ as k } from "./index.vue_vue_type_style_index_0_scoped_fa1c6ee4_lang-Bmtn9Oo4.js";
-import { T as A } from "./index-Bz9lh14R.js";
-import { _ as R } from "./_plugin-vue_export-helper-CHgC5LLL.js";
-const $ = { class: "change-org" }, D = {
-  "w-full": "",
-  "h-full": "",
-  flex: "~",
-  "justify-center": ""
-}, F = {
-  "w-620px": "",
-  "pt-20vh": ""
-}, Q = ["onClick"], U = {
-  flex: "~",
-  "h-full": ""
-}, q = {
-  flex: "~ col",
-  "h-full": "",
-  "justify-center": "",
-  ml: "18px"
-}, G = {
-  text: "20px black dark:[#86909C]",
-  flex: "~",
-  "items-center": ""
-}, H = { "mr-10px": "" }, J = /* @__PURE__ */ w({
-  name: "ChangeOrganization",
-  __name: "index",
-  setup(K) {
-    const s = S(), h = j(), b = z(s.user.orgList), p = B(() => b.map((o) => ({
-      orgId: o.orgId,
-      label: o.orgName,
-      ...o
-    }))), a = N(-1);
-    function C(t) {
-      a.value = t;
-    }
-    function y() {
-      h.go(-1);
-    }
-    async function I() {
-      const t = p.value[a.value], o = t == null ? void 0 : t.orgId;
-      o ? o === s.user.orgId ? f.error("请避免切换到当前已选组织") : (await s.changeOrg(o), f.success("组织切换成功")) : f.error("请选择要切换的组织");
-    }
-    return (t, o) => {
-      const _ = A, g = T;
-      return n(), m("div", $, [
-        e("div", D, [
-          e("div", F, [
-            o[4] || (o[4] = e("div", {
-              text: "30px",
-              font: "bold",
-              "mb-40px": "",
-              flex: "~",
-              items: "center"
-            }, " 请选择组织 ", -1)),
-            (n(!0), m(O, null, V(r(p), (d, i) => (n(), m("div", {
-              key: i,
-              onClick: (M) => C(i)
-            }, [
-              e("div", {
-                class: E(["org-item", { active: i === r(a) }])
-              }, [
-                e("div", U, [
-                  l(r(k), {
-                    name: "change-org",
-                    size: "48px"
-                  }),
-                  e("div", q, [
-                    e("div", G, [
-                      e("span", H, L(d.label), 1),
-                      r(s).user.orgId === d.orgId ? (n(), x(_, {
-                        key: 0,
-                        color: "blue"
-                      }, {
-                        default: c(() => o[0] || (o[0] = [
-                          u(" 当前使用组织 ")
-                        ])),
-                        _: 1
-                      })) : v("", !0),
-                      d.main ? (n(), x(_, {
-                        key: 1,
-                        color: "red"
-                      }, {
-                        default: c(() => o[1] || (o[1] = [
-                          u(" 主组织 ")
-                        ])),
-                        _: 1
-                      })) : v("", !0)
-                    ])
-                  ])
-                ]),
-                e("div", null, [
-                  l(r(k), {
-                    class: "arrow",
-                    name: "i-iconamoon-arrow-right-6-circle-duotone",
-                    color: i === r(a) ? "#1677ff" : "#8E97A3",
-                    size: "22px"
-                  }, null, 8, ["color"])
-                ])
-              ], 2)
-            ], 8, Q))), 128)),
-            e("div", null, [
-              l(g, {
-                type: "primary",
-                block: "",
-                "h-40px": "",
-                "mb-15px": "",
-                onClick: I
-              }, {
-                default: c(() => o[2] || (o[2] = [
-                  u(" 确定 ")
-                ])),
-                _: 1
-              }),
-              l(g, {
-                block: "",
-                "h-40px": "",
-                onClick: y
-              }, {
-                default: c(() => o[3] || (o[3] = [
-                  u(" 返回 ")
-                ])),
-                _: 1
-              })
-            ])
-          ])
-        ])
-      ]);
-    };
-  }
-}), to = /* @__PURE__ */ R(J, [["__scopeId", "data-v-9b12754a"]]);
-export {
-  to as default
-};