chore(main): release 1.0.10 (#335)

pubg · Feb 19, 2025 · cc008cd · cc008cd
1 parent e1db794
commit cc008cd
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/packages/vlossom/src/components/vs-message/VsMessage.vue b/packages/vlossom/src/components/vs-message/VsMessage.vue
@@ -1,6 +1,6 @@
 <template>
     <div :class="['vs-message', colorClass, { 'vs-dense': dense }]">
-        <vs-icon class="vs-message-icon" :icon="icon" :size="dense ? '1.4rem' : '1.6rem'" />
+        <vs-icon v-if="icon" class="vs-message-icon" :icon="icon" :size="dense ? '1.4rem' : '1.6rem'" />
         <span class="vs-message-text">{{ message.text }}</span>
     </div>
 </template>
@@ -41,6 +41,10 @@ export default defineComponent({
         });
 
         const icon = computed(() => {
+            if (!message.value.state) {
+                return null;
+            }
+
             if (message.value.state === 'idle') {
                 return 'message';
             }

diff --git a/packages/vlossom/src/components/vs-modal/VsModalView.scss b/packages/vlossom/src/components/vs-modal/VsModalView.scss
@@ -16,7 +16,7 @@
 .modal-leave-active .vs-modal-dimmed,
 .modal-enter-active .vs-modal-wrap,
 .modal-leave-active .vs-modal-wrap {
-    transition: all 0.2s;
+    transition: all 0.3s;
 }
 
 .modal-enter-from .vs-modal-dimmed,
@@ -26,6 +26,6 @@
 
 .modal-enter-from .vs-modal-wrap,
 .modal-leave-to .vs-modal-wrap {
-    transform: translate(-50%, -50%) scale(0.95);
+    transform: translate(-50%, -50%) scale(0.75);
     opacity: 0;
 }
diff --git a/packages/vlossom/src/components/vs-modal/VsModalView.vue b/packages/vlossom/src/components/vs-modal/VsModalView.vue
@@ -37,6 +37,7 @@ import VsContentRenderer from '@/components/vs-content-renderer/VsContentRendere
 import { MODAL_DURATION } from '@/declaration';
 
 export default defineComponent({
+    name: 'VsModalView',
     props: {
         container: { type: String, required: true, default: 'body' },
     },

diff --git a/packages/vlossom/src/declaration/constants.ts b/packages/vlossom/src/declaration/constants.ts
@@ -31,7 +31,7 @@ export const LAYOUT_Z_INDEX = 100;
 
 export const APP_LAYOUT_Z_INDEX = 1000;
 
-export const SCROLLBAR_WIDTH = '0.38rem';
+export const SCROLLBAR_WIDTH = '0.6rem';
 
 export const MODAL_DURATION = 300;
 

diff --git a/packages/vlossom/src/plugins/modal-plugin/modal-plugin.ts b/packages/vlossom/src/plugins/modal-plugin/modal-plugin.ts
@@ -1,5 +1,6 @@
 import { h, render } from 'vue';
 import { ModalPlugin } from './types';
+import { getApp } from '@/vlossom-framework';
 import { utils } from '@/utils';
 import { store } from '@/stores';
 import { VsModalView, VsModalOptions } from '@/components';
@@ -14,6 +15,7 @@ export const modalPlugin: ModalPlugin = {
         }
 
         const modalView = h(VsModalView, { container });
+        modalView.appContext = getApp()._context;
         render(modalView, containerElement);
 
         store.modal.push({ ...options, id });

diff --git a/packages/vlossom/src/plugins/toast-plugin/toast-plugin.ts b/packages/vlossom/src/plugins/toast-plugin/toast-plugin.ts
@@ -3,6 +3,7 @@ import { store } from '@/stores';
 import { getToastInfo } from '@/models';
 import { utils } from '@/utils';
 import { DEFAULT_TOAST_TIMEOUT } from '@/declaration';
+import { getApp } from '@/vlossom-framework';
 import VsToastView from '@/components/vs-toast/VsToastView.vue';
 
 import type { ToastPlugin } from './types';
@@ -17,6 +18,7 @@ function renderToastView(toastInfo: VsToastInfo) {
     }
 
     const toastView = h(VsToastView, { container });
+    toastView.appContext = getApp()._context;
     render(toastView, containerElement);
 
     store.toast.push(toastInfo);

diff --git a/packages/vlossom/src/vlossom-framework.ts b/packages/vlossom/src/vlossom-framework.ts
@@ -98,33 +98,40 @@ export class Vlossom {
     public modal: ModalPlugin = modalPlugin;
 }
 
-let vlossom: Vlossom;
+let _vlossom: Vlossom;
+let _app: App;
 
 function registerComponents(app: App, components: VsComponent[] = []) {
     const modules: Record<string, any> = import.meta.glob('./components/**/*.vue', { eager: true });
-    Object.values(modules).forEach((module) => {
+    Object.entries(modules).forEach(([path, module]) => {
         const component = module.default;
         if (components.length && !components.includes(component.name as VsComponent)) {
             return;
         }
-        app.component(component.name, component);
+        const componentName = component.name || (path.split('/').pop() || '').replace(/\.\w+$/, '');
+        app.component(componentName, component);
     });
 }
 
 function createVlossom(options?: VlossomOptions): any {
     return {
         install(app: App) {
-            vlossom = new Vlossom(options);
+            _app = app;
+            _vlossom = new Vlossom(options);
 
-            app.config.globalProperties.$vs = vlossom;
+            app.config.globalProperties.$vs = _vlossom;
 
             registerComponents(app, options?.components);
         },
     };
 }
 
 function useVlossom() {
-    return vlossom;
+    return _vlossom;
 }
 
-export { createVlossom, useVlossom };
+function getApp() {
+    return _app;
+}
+
+export { createVlossom, registerComponents, useVlossom, getApp };