beyond-webui 1.1.28 → 1.1.30

package/lib/components/table/src/util.d.ts

@@ -30,9 +30,9 @@ export declare function createTablePopper(parentNode: HTMLElement | undefined, t
     $: import("vue").ComponentInternalInstance;
     $data: {};
     $props: Partial<{
-        readonly role: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown>;
+        readonly role: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown>;
     }> & Omit<Readonly<import("vue").ExtractPropTypes<{
-        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
+        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "role">;
     $attrs: {
         [x: string]: unknown;
@@ -48,10 +48,10 @@ export declare function createTablePopper(parentNode: HTMLElement | undefined, t
     $emit: (event: string, ...args: any[]) => void;
     $el: any;
     $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
+        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     }>>, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-            readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
+            readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
         }>> & {
             [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
         }>>;
@@ -59,10 +59,10 @@ export declare function createTablePopper(parentNode: HTMLElement | undefined, t
         popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
         contentRef: import("vue").Ref<HTMLElement | undefined>;
         referenceRef: import("vue").Ref<HTMLElement | undefined>;
-        role: import("vue").ComputedRef<import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown>>;
+        role: import("vue").ComputedRef<import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown>>;
         popperProvides: import("beyond-webui/es/components/popper").ElPopperInjectionContext;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, {
-        readonly role: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown>;
+        readonly role: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown>;
     }> & {
         beforeCreate?: ((() => void) | (() => void)[]) | undefined;
         created?: ((() => void) | (() => void)[]) | undefined;
@@ -84,10 +84,10 @@ export declare function createTablePopper(parentNode: HTMLElement | undefined, t
     $nextTick: typeof import("vue").nextTick;
     $watch(source: string | Function, cb: Function, options?: import("vue").WatchOptions<boolean> | undefined): import("vue").WatchStopHandle;
 } & Readonly<import("vue").ExtractPropTypes<{
-    readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
+    readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
 }>> & import("vue").ShallowUnwrapRef<{
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
+        readonly role: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     }>> & {
         [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
@@ -95,7 +95,7 @@ export declare function createTablePopper(parentNode: HTMLElement | undefined, t
     popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
     contentRef: import("vue").Ref<HTMLElement | undefined>;
     referenceRef: import("vue").Ref<HTMLElement | undefined>;
-    role: import("vue").ComputedRef<import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "listbox" | "grid" | "menu" | "tooltip" | "group" | "dialog" | "navigation" | "tree", unknown>>;
+    role: import("vue").ComputedRef<import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "group" | "listbox" | "grid" | "menu" | "tooltip" | "dialog" | "navigation" | "tree", unknown>>;
     popperProvides: import("beyond-webui/es/components/popper").ElPopperInjectionContext;
 }> & {} & import("vue").ComponentCustomProperties>;
 export declare const isFixedColumn: <T>(index: number, fixed: string | boolean, store: any, realColumns?: TableColumnCtx<T>[] | undefined) => {

package/lib/components/tabs/index.d.ts

@@ -15,7 +15,7 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
         __epPropKey: true;
     };
     readonly editable: BooleanConstructor;
-    readonly tabPosition: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "top" | "bottom" | "left" | "right", unknown, "top", boolean>;
+    readonly tabPosition: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "top" | "bottom" | "right" | "left", unknown, "top", boolean>;
     readonly beforeLeave: import("beyond-webui/es/utils").EpPropFinalized<(new (...args: any[]) => (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>) | (() => (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>) | {
         (): (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>;
         new (): any;
@@ -34,9 +34,9 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -66,7 +66,7 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
         __epPropKey: true;
     };
     readonly editable: BooleanConstructor;
-    readonly tabPosition: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "top" | "bottom" | "left" | "right", unknown, "top", boolean>;
+    readonly tabPosition: import("beyond-webui/es/utils").EpPropFinalized<StringConstructor, "top" | "bottom" | "right" | "left", unknown, "top", boolean>;
     readonly beforeLeave: import("beyond-webui/es/utils").EpPropFinalized<(new (...args: any[]) => (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>) | (() => (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>) | {
         (): (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>;
         new (): any;
@@ -85,9 +85,9 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -102,11 +102,11 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
     onTabAdd?: (() => any) | undefined;
 }, {
     readonly type: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "" | "card" | "border-card", unknown>;
-    readonly stretch: boolean;
     readonly closable: boolean;
+    readonly stretch: boolean;
     readonly editable: boolean;
     readonly beforeLeave: (newName: import("./src/tabs").TabPaneName, oldName: import("./src/tabs").TabPaneName) => import("beyond-webui/es/utils").Awaitable<boolean | void>;
-    readonly tabPosition: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "top" | "bottom" | "left" | "right", unknown>;
+    readonly tabPosition: import("beyond-webui/es/utils").EpPropMergeType<StringConstructor, "top" | "bottom" | "right" | "left", unknown>;
     readonly addable: boolean;
 }>> & {
     TabPane: import("vue").DefineComponent<{
@@ -172,9 +172,9 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
             }>;
             props: {
                 [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-                readonly disabled: boolean;
                 readonly closable: boolean;
                 readonly label: string;
+                readonly disabled: boolean;
                 readonly name: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
                 readonly lazy: boolean;
             };
@@ -195,9 +195,9 @@ export declare const ElTabs: import("beyond-webui/es/utils").SFCWithInstall<impo
         readonly disabled: BooleanConstructor;
         readonly lazy: BooleanConstructor;
     }>>, {
-        readonly disabled: boolean;
         readonly closable: boolean;
         readonly label: string;
+        readonly disabled: boolean;
         readonly lazy: boolean;
     }>;
 };
@@ -264,9 +264,9 @@ export declare const ElTabPane: import("beyond-webui/es/utils").SFCWithInstall<i
         }>;
         props: {
             [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly name: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
             readonly lazy: boolean;
         };
@@ -287,9 +287,9 @@ export declare const ElTabPane: import("beyond-webui/es/utils").SFCWithInstall<i
     readonly disabled: BooleanConstructor;
     readonly lazy: BooleanConstructor;
 }>>, {
-    readonly disabled: boolean;
     readonly closable: boolean;
     readonly label: string;
+    readonly disabled: boolean;
     readonly lazy: boolean;
 }>>;
 export default ElTabs;

package/lib/components/tabs/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 require('../../utils/index.js');
 var tabs = require('./src/tabs.js');
 var tabPane$1 = require('./src/tab-pane2.js');
-var tabBar = require('./src/tab-bar2.js');
+var tabBar = require('./src/tab-bar.js');
 var tabNav = require('./src/tab-nav.js');
 var tabPane = require('./src/tab-pane.js');
 var constants = require('./src/constants.js');

package/lib/components/tabs/src/tab-bar.d.ts

@@ -7,9 +7,9 @@ export declare const tabBarProps: {
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -23,9 +23,9 @@ export declare const tabBarProps: {
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -39,9 +39,9 @@ export declare const tabBarProps: {
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -55,9 +55,9 @@ export declare const tabBarProps: {
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };

package/lib/components/tabs/src/tab-bar.js

@@ -2,84 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
-var core = require('@vueuse/core');
 require('../../../utils/index.js');
-require('../../../hooks/index.js');
-var constants = require('./constants.js');
-var tabBar = require('./tab-bar2.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
-var error = require('../../../utils/error.js');
-var index = require('../../../hooks/use-namespace/index.js');
-var strings = require('../../../utils/strings.js');
+var runtime = require('../../../utils/vue/props/runtime.js');
+var typescript = require('../../../utils/typescript.js');
 
-const COMPONENT_NAME = "ElTabBar";
-const __default__ = vue.defineComponent({
-  name: COMPONENT_NAME
-});
-const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
-  props: tabBar.tabBarProps,
-  setup(__props, { expose }) {
-    const props = __props;
-    const instance = vue.getCurrentInstance();
-    const rootTabs = vue.inject(constants.tabsRootContextKey);
-    if (!rootTabs)
-      error.throwError(COMPONENT_NAME, "<el-tabs><el-tab-bar /></el-tabs>");
-    const ns = index.useNamespace("tabs");
-    const barRef = vue.ref();
-    const barStyle = vue.ref();
-    const getBarStyle = () => {
-      let offset = 0;
-      let tabSize = 0;
-      const sizeName = ["top", "bottom"].includes(rootTabs.props.tabPosition) ? "width" : "height";
-      const sizeDir = sizeName === "width" ? "x" : "y";
-      const position = sizeDir === "x" ? "left" : "top";
-      props.tabs.every((tab) => {
-        var _a, _b;
-        const $el = (_b = (_a = instance.parent) == null ? void 0 : _a.refs) == null ? void 0 : _b[`tab-${tab.uid}`];
-        if (!$el)
-          return false;
-        if (!tab.active) {
-          return true;
-        }
-        offset = $el[`offset${strings.capitalize(position)}`];
-        tabSize = $el[`client${strings.capitalize(sizeName)}`];
-        const tabStyles = window.getComputedStyle($el);
-        if (sizeName === "width") {
-          if (props.tabs.length > 1) {
-            tabSize -= Number.parseFloat(tabStyles.paddingLeft) + Number.parseFloat(tabStyles.paddingRight);
-          }
-          offset += Number.parseFloat(tabStyles.paddingLeft);
-        }
-        return false;
-      });
-      return {
-        [sizeName]: `${tabSize}px`,
-        transform: `translate${strings.capitalize(sizeDir)}(${offset}px)`
-      };
-    };
-    const update = () => barStyle.value = getBarStyle();
-    vue.watch(() => props.tabs, async () => {
-      await vue.nextTick();
-      update();
-    }, { immediate: true });
-    core.useResizeObserver(barRef, () => update());
-    expose({
-      ref: barRef,
-      update
-    });
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", {
-        ref_key: "barRef",
-        ref: barRef,
-        class: vue.normalizeClass([vue.unref(ns).e("active-bar"), vue.unref(ns).is(vue.unref(rootTabs).props.tabPosition)]),
-        style: vue.normalizeStyle(barStyle.value)
-      }, null, 6);
-    };
+const tabBarProps = runtime.buildProps({
+  tabs: {
+    type: runtime.definePropType(Array),
+    default: () => typescript.mutable([])
   }
 });
-var TabBar = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "D:\\beyondtrucks\\beyond-ui\\packages\\components\\tabs\\src\\tab-bar.vue"]]);
 
-exports["default"] = TabBar;
+exports.tabBarProps = tabBarProps;
 //# sourceMappingURL=tab-bar.js.map

package/lib/components/tabs/src/tab-bar.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar.js","sources":["../../../../../../packages/components/tabs/src/tab-bar.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"barRef\"\n    :class=\"[ns.e('active-bar'), ns.is(rootTabs.props.tabPosition)]\"\n    :style=\"barStyle\"\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { getCurrentInstance, inject, nextTick, ref, watch } from 'vue'\nimport { useResizeObserver } from '@vueuse/core'\nimport { capitalize, throwError } from '@element-plus/utils'\nimport { useNamespace } from '@element-plus/hooks'\nimport { tabsRootContextKey } from './constants'\nimport { tabBarProps } from './tab-bar'\n\nimport type { CSSProperties } from 'vue'\n\nconst COMPONENT_NAME = 'ElTabBar'\ndefineOptions({\n  name: COMPONENT_NAME,\n})\nconst props = defineProps(tabBarProps)\n\nconst instance = getCurrentInstance()!\nconst rootTabs = inject(tabsRootContextKey)\nif (!rootTabs) throwError(COMPONENT_NAME, '<el-tabs><el-tab-bar /></el-tabs>')\n\nconst ns = useNamespace('tabs')\n\nconst barRef = ref<HTMLDivElement>()\nconst barStyle = ref<CSSProperties>()\n\nconst getBarStyle = (): CSSProperties => {\n  let offset = 0\n  let tabSize = 0\n\n  const sizeName = ['top', 'bottom'].includes(rootTabs.props.tabPosition)\n    ? 'width'\n    : 'height'\n  const sizeDir = sizeName === 'width' ? 'x' : 'y'\n  const position = sizeDir === 'x' ? 'left' : 'top'\n\n  props.tabs.every((tab) => {\n    const $el = instance.parent?.refs?.[`tab-${tab.uid}`] as HTMLElement\n    if (!$el) return false\n\n    if (!tab.active) {\n      return true\n    }\n\n    offset = $el[`offset${capitalize(position)}`]\n    tabSize = $el[`client${capitalize(sizeName)}`]\n\n    const tabStyles = window.getComputedStyle($el)\n\n    if (sizeName === 'width') {\n      if (props.tabs.length > 1) {\n        tabSize -=\n          Number.parseFloat(tabStyles.paddingLeft) +\n          Number.parseFloat(tabStyles.paddingRight)\n      }\n      offset += Number.parseFloat(tabStyles.paddingLeft)\n    }\n    return false\n  })\n\n  return {\n    [sizeName]: `${tabSize}px`,\n    transform: `translate${capitalize(sizeDir)}(${offset}px)`,\n  }\n}\n\nconst update = () => (barStyle.value = getBarStyle())\n\nwatch(\n  () => props.tabs,\n  async () => {\n    await nextTick()\n    update()\n  },\n  { immediate: true }\n)\nuseResizeObserver(barRef, () => update())\n\ndefineExpose({\n  /** @description tab root html element */\n  ref: barRef,\n  /** @description method to manually update tab bar style */\n  update,\n})\n</script>\n"],"names":["getCurrentInstance","inject","tabsRootContextKey","throwError","useNamespace","ref","capitalize","watch","nextTick","useResizeObserver"],"mappings":"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"}
+{"version":3,"file":"tab-bar.js","sources":["../../../../../../packages/components/tabs/src/tab-bar.ts"],"sourcesContent":["import { buildProps, definePropType, mutable } from '@element-plus/utils'\nimport type { ExtractPropTypes } from 'vue'\nimport type { TabsPaneContext } from './constants'\nimport type TabBar from './tab-bar.vue'\n\nexport const tabBarProps = buildProps({\n  tabs: {\n    type: definePropType<TabsPaneContext[]>(Array),\n    default: () => mutable([] as const),\n  },\n} as const)\n\nexport type TabBarProps = ExtractPropTypes<typeof tabBarProps>\nexport type TabBarInstance = InstanceType<typeof TabBar>\n"],"names":["buildProps","definePropType","mutable"],"mappings":";;;;;;;;AACY,MAAC,WAAW,GAAGA,kBAAU,CAAC;AACtC,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAEC,sBAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAMC,kBAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,CAAC;;;;"}

package/lib/components/tabs/src/tab-bar.vue.d.ts

@@ -6,9 +6,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -22,9 +22,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -38,9 +38,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -54,9 +54,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -74,9 +74,9 @@ declare const _default: import("vue").DefineComponent<{
                 [name: string]: import("vue").Slot | undefined;
             }>;
             props: {
-                readonly disabled: boolean;
                 readonly closable: boolean;
                 readonly label: string;
+                readonly disabled: boolean;
                 readonly lazy: boolean;
                 readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
             };
@@ -90,9 +90,9 @@ declare const _default: import("vue").DefineComponent<{
                 [name: string]: import("vue").Slot | undefined;
             }>;
             props: {
-                readonly disabled: boolean;
                 readonly closable: boolean;
                 readonly label: string;
+                readonly disabled: boolean;
                 readonly lazy: boolean;
                 readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
             };
@@ -106,9 +106,9 @@ declare const _default: import("vue").DefineComponent<{
                 [name: string]: import("vue").Slot | undefined;
             }>;
             props: {
-                readonly disabled: boolean;
                 readonly closable: boolean;
                 readonly label: string;
+                readonly disabled: boolean;
                 readonly lazy: boolean;
                 readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
             };
@@ -122,9 +122,9 @@ declare const _default: import("vue").DefineComponent<{
                 [name: string]: import("vue").Slot | undefined;
             }>;
             props: {
-                readonly disabled: boolean;
                 readonly closable: boolean;
                 readonly label: string;
+                readonly disabled: boolean;
                 readonly lazy: boolean;
                 readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
             };
@@ -167,9 +167,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -183,9 +183,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -199,9 +199,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -215,9 +215,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };
@@ -233,9 +233,9 @@ declare const _default: import("vue").DefineComponent<{
             [name: string]: import("vue").Slot | undefined;
         }>;
         props: {
-            readonly disabled: boolean;
             readonly closable: boolean;
             readonly label: string;
+            readonly disabled: boolean;
             readonly lazy: boolean;
             readonly name?: import("beyond-webui/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown> | undefined;
         };

package/lib/components/tabs/src/tab-bar2.js

@@ -2,16 +2,84 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
+var core = require('@vueuse/core');
 require('../../../utils/index.js');
-var runtime = require('../../../utils/vue/props/runtime.js');
-var typescript = require('../../../utils/typescript.js');
+require('../../../hooks/index.js');
+var constants = require('./constants.js');
+var tabBar = require('./tab-bar.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var error = require('../../../utils/error.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var strings = require('../../../utils/strings.js');
 
-const tabBarProps = runtime.buildProps({
-  tabs: {
-    type: runtime.definePropType(Array),
-    default: () => typescript.mutable([])
+const COMPONENT_NAME = "ElTabBar";
+const __default__ = vue.defineComponent({
+  name: COMPONENT_NAME
+});
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: tabBar.tabBarProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    const instance = vue.getCurrentInstance();
+    const rootTabs = vue.inject(constants.tabsRootContextKey);
+    if (!rootTabs)
+      error.throwError(COMPONENT_NAME, "<el-tabs><el-tab-bar /></el-tabs>");
+    const ns = index.useNamespace("tabs");
+    const barRef = vue.ref();
+    const barStyle = vue.ref();
+    const getBarStyle = () => {
+      let offset = 0;
+      let tabSize = 0;
+      const sizeName = ["top", "bottom"].includes(rootTabs.props.tabPosition) ? "width" : "height";
+      const sizeDir = sizeName === "width" ? "x" : "y";
+      const position = sizeDir === "x" ? "left" : "top";
+      props.tabs.every((tab) => {
+        var _a, _b;
+        const $el = (_b = (_a = instance.parent) == null ? void 0 : _a.refs) == null ? void 0 : _b[`tab-${tab.uid}`];
+        if (!$el)
+          return false;
+        if (!tab.active) {
+          return true;
+        }
+        offset = $el[`offset${strings.capitalize(position)}`];
+        tabSize = $el[`client${strings.capitalize(sizeName)}`];
+        const tabStyles = window.getComputedStyle($el);
+        if (sizeName === "width") {
+          if (props.tabs.length > 1) {
+            tabSize -= Number.parseFloat(tabStyles.paddingLeft) + Number.parseFloat(tabStyles.paddingRight);
+          }
+          offset += Number.parseFloat(tabStyles.paddingLeft);
+        }
+        return false;
+      });
+      return {
+        [sizeName]: `${tabSize}px`,
+        transform: `translate${strings.capitalize(sizeDir)}(${offset}px)`
+      };
+    };
+    const update = () => barStyle.value = getBarStyle();
+    vue.watch(() => props.tabs, async () => {
+      await vue.nextTick();
+      update();
+    }, { immediate: true });
+    core.useResizeObserver(barRef, () => update());
+    expose({
+      ref: barRef,
+      update
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", {
+        ref_key: "barRef",
+        ref: barRef,
+        class: vue.normalizeClass([vue.unref(ns).e("active-bar"), vue.unref(ns).is(vue.unref(rootTabs).props.tabPosition)]),
+        style: vue.normalizeStyle(barStyle.value)
+      }, null, 6);
+    };
   }
 });
+var TabBar = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "D:\\beyondtrucks\\beyond-ui\\packages\\components\\tabs\\src\\tab-bar.vue"]]);
 
-exports.tabBarProps = tabBarProps;
+exports["default"] = TabBar;
 //# sourceMappingURL=tab-bar2.js.map

package/lib/components/tabs/src/tab-bar2.js.map

@@ -1 +1 @@
-{"version":3,"file":"tab-bar2.js","sources":["../../../../../../packages/components/tabs/src/tab-bar.ts"],"sourcesContent":["import { buildProps, definePropType, mutable } from '@element-plus/utils'\nimport type { ExtractPropTypes } from 'vue'\nimport type { TabsPaneContext } from './constants'\nimport type TabBar from './tab-bar.vue'\n\nexport const tabBarProps = buildProps({\n  tabs: {\n    type: definePropType<TabsPaneContext[]>(Array),\n    default: () => mutable([] as const),\n  },\n} as const)\n\nexport type TabBarProps = ExtractPropTypes<typeof tabBarProps>\nexport type TabBarInstance = InstanceType<typeof TabBar>\n"],"names":["buildProps","definePropType","mutable"],"mappings":";;;;;;;;AACY,MAAC,WAAW,GAAGA,kBAAU,CAAC;AACtC,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAEC,sBAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAMC,kBAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"tab-bar2.js","sources":["../../../../../../packages/components/tabs/src/tab-bar.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"barRef\"\n    :class=\"[ns.e('active-bar'), ns.is(rootTabs.props.tabPosition)]\"\n    :style=\"barStyle\"\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { getCurrentInstance, inject, nextTick, ref, watch } from 'vue'\nimport { useResizeObserver } from '@vueuse/core'\nimport { capitalize, throwError } from '@element-plus/utils'\nimport { useNamespace } from '@element-plus/hooks'\nimport { tabsRootContextKey } from './constants'\nimport { tabBarProps } from './tab-bar'\n\nimport type { CSSProperties } from 'vue'\n\nconst COMPONENT_NAME = 'ElTabBar'\ndefineOptions({\n  name: COMPONENT_NAME,\n})\nconst props = defineProps(tabBarProps)\n\nconst instance = getCurrentInstance()!\nconst rootTabs = inject(tabsRootContextKey)\nif (!rootTabs) throwError(COMPONENT_NAME, '<el-tabs><el-tab-bar /></el-tabs>')\n\nconst ns = useNamespace('tabs')\n\nconst barRef = ref<HTMLDivElement>()\nconst barStyle = ref<CSSProperties>()\n\nconst getBarStyle = (): CSSProperties => {\n  let offset = 0\n  let tabSize = 0\n\n  const sizeName = ['top', 'bottom'].includes(rootTabs.props.tabPosition)\n    ? 'width'\n    : 'height'\n  const sizeDir = sizeName === 'width' ? 'x' : 'y'\n  const position = sizeDir === 'x' ? 'left' : 'top'\n\n  props.tabs.every((tab) => {\n    const $el = instance.parent?.refs?.[`tab-${tab.uid}`] as HTMLElement\n    if (!$el) return false\n\n    if (!tab.active) {\n      return true\n    }\n\n    offset = $el[`offset${capitalize(position)}`]\n    tabSize = $el[`client${capitalize(sizeName)}`]\n\n    const tabStyles = window.getComputedStyle($el)\n\n    if (sizeName === 'width') {\n      if (props.tabs.length > 1) {\n        tabSize -=\n          Number.parseFloat(tabStyles.paddingLeft) +\n          Number.parseFloat(tabStyles.paddingRight)\n      }\n      offset += Number.parseFloat(tabStyles.paddingLeft)\n    }\n    return false\n  })\n\n  return {\n    [sizeName]: `${tabSize}px`,\n    transform: `translate${capitalize(sizeDir)}(${offset}px)`,\n  }\n}\n\nconst update = () => (barStyle.value = getBarStyle())\n\nwatch(\n  () => props.tabs,\n  async () => {\n    await nextTick()\n    update()\n  },\n  { immediate: true }\n)\nuseResizeObserver(barRef, () => update())\n\ndefineExpose({\n  /** @description tab root html element */\n  ref: barRef,\n  /** @description method to manually update tab bar style */\n  update,\n})\n</script>\n"],"names":["getCurrentInstance","inject","tabsRootContextKey","throwError","useNamespace","ref","capitalize","watch","nextTick","useResizeObserver"],"mappings":";;;;;;;;;;;;;;;;uCAmBc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR;;;;;;AAGA,IAAA,MAAM,WAAWA,sBAAmB,EAAA,CAAA;AACpC,IAAM,MAAA,QAAA,GAAWC,WAAOC,4BAAkB,CAAA,CAAA;AAC1C,IAAA,IAAI,CAAC,QAAA;AAAU,MAAAC,gBAAA,CAAW,gBAAgB,mCAAmC,CAAA,CAAA;AAE7E,IAAM,MAAA,EAAA,GAAKC,mBAAa,MAAM,CAAA,CAAA;AAE9B,IAAA,MAAM,SAASC,OAAoB,EAAA,CAAA;AACnC,IAAA,MAAM,WAAWA,OAAmB,EAAA,CAAA;AAEpC,IAAA,MAAM,cAAc,MAAqB;AACvC,MAAA,IAAI,MAAS,GAAA,CAAA,CAAA;AACb,MAAA,IAAI,OAAU,GAAA,CAAA,CAAA;AAEd,MAAM,MAAA,QAAA,GAAW,CAAC,KAAA,EAAO,QAAQ,CAAA,CAAE,SAAS,QAAS,CAAA,KAAA,CAAM,WAAW,CAAA,GAClE,OACA,GAAA,QAAA,CAAA;AACJ,MAAM,MAAA,OAAA,GAAU,QAAa,KAAA,OAAA,GAAU,GAAM,GAAA,GAAA,CAAA;AAC7C,MAAM,MAAA,QAAA,GAAW,OAAY,KAAA,GAAA,GAAM,MAAS,GAAA,KAAA,CAAA;AAE5C,MAAM,KAAA,CAAA,IAAA,CAAK,KAAM,CAAA,CAAC,GAAQ,KAAA;AACxB,QAAA,IAAA,EAAM,EAAM,EAAA,CAAA;AACZ,QAAA,MAAK,GAAA,GAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,QAAA,CAAA,MAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,CAAA,IAAA,EAAA,GAAA,CAAA,GAAA,CAAA,CAAA,CAAA,CAAA;AAAK,QAAO,IAAA,CAAA,GAAA;AAEjB,UAAI,OAAK,KAAQ,CAAA;AACf,QAAO,IAAA,CAAA,GAAA,CAAA,MAAA,EAAA;AAAA,UACT,OAAA,IAAA,CAAA;AAEA,SAAS;AACT,QAAU,MAAA,GAAA,GAAA,CAAA,CAAI,MAAS,EAAAC,kBAAA,CAAA,QAAmB,CAAA,CAAA,CAAA,CAAA,CAAA;AAE1C,QAAM,OAAA,GAAA,GAAA,CAAA,CAAA,MAAmB,EAAAA,kBAAA,CAAA,QAAiB,CAAG,CAAA,CAAA,CAAA,CAAA;AAE7C,QAAA,kBAA0B,MAAA,CAAA,gBAAA,CAAA,GAAA,CAAA,CAAA;AACxB,QAAI,IAAA,QAAM,KAAK,OAAA,EAAS;AACtB,UACE,IAAA,KAAA,CAAA,IAAA,CAAA;AACwC,YAC5C,OAAA,IAAA,MAAA,CAAA,UAAA,CAAA,SAAA,CAAA,WAAA,CAAA,GAAA,MAAA,CAAA,UAAA,CAAA,SAAA,CAAA,YAAA,CAAA,CAAA;AACA,WAAU;AAAuC,UACnD,MAAA,IAAA,MAAA,CAAA,UAAA,CAAA,SAAA,CAAA,WAAA,CAAA,CAAA;AACA,SAAO;AAAA,QACR,OAAA,KAAA,CAAA;AAED,OAAO,CAAA,CAAA;AAAA,MACL;AAAe,QACf,CAAW,QAAA,GAAA,CAAA,EAAA,OAAA,CAAY,EAAW,CAAA;AAAY,QAChD,SAAA,EAAA,CAAA,SAAA,EAAAA,kBAAA,CAAA,OAAA,CAAA,CAAA,CAAA,EAAA,MAAA,CAAA,GAAA,CAAA;AAAA,OACF,CAAA;AAEA,KAAA,CAAA;AAEA,IACE,MAAA,MAAM,GAAM,MAAA,QACA,CAAA,KAAA,GAAA,WAAA,EAAA,CAAA;AACV,IAAAC,SAAA,CAAA,MAAe,KAAA,CAAA,IAAA,EAAA,YAAA;AACf,MAAO,MAAAC,YAAA,EAAA,CAAA;AAAA,MAET,MAAa,EAAA,CAAA;AAEf,KAAkB,EAAA,EAAA,SAAA,EAAA,IAAA,EAAA,CAAA,CAAA;AAElB,IAAaC,sBAAA,CAAA,MAAA,EAAA,MAAA,MAAA,EAAA,CAAA,CAAA;AAAA,IAAA,MAEN,CAAA;AAAA,MAEL,GAAA,EAAA,MAAA;AAAA,MACD,MAAA;;;;;;;;;;;;;;;;"}