ele-admin-plus 1.3.0-beta.2 → 1.3.0-beta.3

package/lib/style/themes/default.scss

@@ -620,6 +620,24 @@ $ele: map.deep-merge(
       'finish-line-color': elVar('color-primary'),
       'vertical-margin': 16px
     ),
+    'tab-bar': (
+      // 标签栏
+      'padding': 0,
+      'line-color': elVar('border-color', 'light'),
+      'height': 40px,
+      'space': 16px,
+      'font-size': elVar('font-size', 'base'),
+      'color': elVar('text-color', 'regular'),
+      'hover-color': elVar('color-primary'),
+      'hover-bg': transparent,
+      'active-color': elVar('color-primary'),
+      'active-bg': transparent,
+      'active-font-weight': normal,
+      'active-line-size': 2px,
+      'active-line-color': elVar('color-primary'),
+      'item-padding': 0 2px,
+      'item-radius': 0
+    ),
     'tab': (
       // 标签页
       'bg': elVar('bg-color'),

package/lib/style/themes/theme-util.scss

@@ -24,6 +24,7 @@
 @use '../../ele-pro-table/style/css-var.scss' as *;
 @use '../../ele-segmented/style/css-var.scss' as *;
 @use '../../ele-steps/style/css-var.scss' as *;
+@use '../../ele-tab-bar/style/css-var.scss' as *;
 @use '../../ele-table/style/css-var.scss' as *;
 @use '../../ele-table-select/style/css-var.scss' as *;
 @use '../../ele-tabs/style/css-var.scss' as *;
@@ -33,6 +34,7 @@
 @use '../../ele-toolbar/style/css-var.scss' as *;
 @use '../../ele-tooltip/style/css-var.scss' as *;
 @use '../../ele-tree-select/style/css-var.scss' as *;
+@use '../../ele-tree-table/style/css-var.scss' as *;
 @use '../../ele-upload-list/style/css-var.scss' as *;
 @use '../../ele-virtual-table/style/css-var.scss' as *;
 
@@ -65,6 +67,7 @@
     @include set-pro-table-var($var);
     @include set-segmented-var($var);
     @include set-step-var($var);
+    @include set-tab-bar-var($var);
     @include set-table-var($var);
     @include set-table-select-var($var);
     @include set-tab-var($var);
@@ -74,6 +77,7 @@
     @include set-toolbar-var($var);
     @include set-tooltip-var($var);
     @include set-tree-select-var($var);
+    @include set-tree-table-var($var);
     @include set-upload-list-var($var);
     @include set-virtual-table-var($var);
   }

package/lib/utils/hook.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const elementPlus = require("element-plus");
+const core = require("./core");
 function useFormItemRest() {
   vue.provide(elementPlus.formItemContextKey, null);
 }
@@ -304,6 +305,40 @@ function useComponentEvents(events, emit) {
   });
   return { emitMethods };
 }
+function useProOptions(props, name = "options") {
+  const optionData = vue.ref([]);
+  const optionsProp = vue.computed(() => core.getValue(props, name));
+  const reloadOptions = () => {
+    if (optionsProp.value != null) {
+      if (typeof optionsProp.value === "function") {
+        optionData.value = [];
+        optionsProp.value().then((data) => {
+          optionData.value = data || [];
+        });
+        return;
+      }
+      if (Array.isArray(optionsProp.value)) {
+        optionData.value = optionsProp.value;
+        return;
+      }
+    }
+    optionData.value = [];
+  };
+  vue.watch(
+    () => optionsProp,
+    () => {
+      reloadOptions();
+    },
+    {
+      deep: true,
+      immediate: true
+    }
+  );
+  return {
+    optionData,
+    reloadOptions
+  };
+}
 exports.useCollapseAnim = useCollapseAnim;
 exports.useComponentEvents = useComponentEvents;
 exports.useFormItemRest = useFormItemRest;
@@ -312,6 +347,7 @@ exports.useMobile = useMobile;
 exports.useMobileDevice = useMobileDevice;
 exports.useMousewheel = useMousewheel;
 exports.useMoveEvent = useMoveEvent;
+exports.useProOptions = useProOptions;
 exports.useTimer = useTimer;
 exports.useTouchEvent = useTouchEvent;
 exports.useWindowListener = useWindowListener;

package/lib/utils/hook.d.ts

@@ -1,4 +1,4 @@
-import { Ref } from 'vue';
+import { Ref, EmitsOptions, ObjectEmitsOptions } from 'vue';
 
 /**
  * 重置组件表单验证
@@ -133,9 +133,24 @@ export declare function useMoveEvent(option?: UseTouchEventOption<MoveEvent>): {
     handleMousedown: (e: MouseEvent) => void;
     handleTouchstart: (e: TouchEvent) => void;
 };
+/**
+ * 组件事件对应的方法类型
+ */
+export type EmitMethods<T extends EmitsOptions> = T extends string[] ? {
+    [K in T[number]]: (...args: any[]) => void;
+} : T extends ObjectEmitsOptions ? {
+    [K in string & keyof T]: (...args: T[K] extends (...args: infer P) => any ? P : T[K] extends null ? any[] : never) => void;
+} : {};
 /**
  * 二次封装组件事件处理 hook
  */
-export declare function useComponentEvents(events: string[] | Record<string, any>, emit: any): {
-    emitMethods: Record<string, (...params: any) => void>;
+export declare function useComponentEvents<T extends EmitsOptions>(events: T, emit: any): {
+    emitMethods: EmitMethods<T>;
+};
+/**
+ * 高级选项数据 hook
+ */
+export declare function useProOptions<T>(props: Record<string, any>, name?: string): {
+    optionData: Ref<T[]>;
+    reloadOptions: () => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",

package/typings/global.d.ts

@@ -4,6 +4,7 @@ declare module 'vue' {
     EleAdminLayout: (typeof import('ele-admin-plus'))['EleAdminLayout'];
     EleAlert: (typeof import('ele-admin-plus'))['EleAlert'];
     EleApp: (typeof import('ele-admin-plus'))['EleApp'];
+    EleAutocomplete: (typeof import('ele-admin-plus'))['EleAutocomplete'];
     EleAvatarGroup: (typeof import('ele-admin-plus'))['EleAvatarGroup'];
     EleBacktop: (typeof import('ele-admin-plus'))['EleBacktop'];
     EleBarCode: (typeof import('ele-admin-plus'))['EleBarCode'];
@@ -13,6 +14,7 @@ declare module 'vue' {
     EleCard: (typeof import('ele-admin-plus'))['EleCard'];
     EleCascader: (typeof import('ele-admin-plus'))['EleCascader'];
     EleCheckCard: (typeof import('ele-admin-plus'))['EleCheckCard'];
+    EleCheckboxGroup: (typeof import('ele-admin-plus'))['EleCheckboxGroup'];
     EleConfigProvider: (typeof import('ele-admin-plus'))['EleConfigProvider'];
     EleCopyable: (typeof import('ele-admin-plus'))['EleCopyable'];
     EleCountUp: (typeof import('ele-admin-plus'))['EleCountUp'];
@@ -32,6 +34,7 @@ declare module 'vue' {
     EleImageViewer: (typeof import('ele-admin-plus'))['EleImageViewer'];
     EleLoading: (typeof import('ele-admin-plus'))['EleLoading'];
     EleMapPicker: (typeof import('ele-admin-plus'))['EleMapPicker'];
+    EleMention: (typeof import('ele-admin-plus'))['EleMention'];
     EleMenus: (typeof import('ele-admin-plus'))['EleMenus'];
     EleModal: (typeof import('ele-admin-plus'))['EleModal'];
     ElePage: (typeof import('ele-admin-plus'))['ElePage'];
@@ -45,10 +48,13 @@ declare module 'vue' {
     EleProTable: (typeof import('ele-admin-plus'))['EleProTable'];
     EleQrCode: (typeof import('ele-admin-plus'))['EleQrCode'];
     EleQrCodeSvg: (typeof import('ele-admin-plus'))['EleQrCodeSvg'];
+    EleRadioGroup: (typeof import('ele-admin-plus'))['EleRadioGroup'];
     EleSegmented: (typeof import('ele-admin-plus'))['EleSegmented'];
     EleSelect: (typeof import('ele-admin-plus'))['EleSelect'];
+    EleSelectTree: (typeof import('ele-admin-plus'))['EleSelectTree'];
     EleSplitPanel: (typeof import('ele-admin-plus'))['EleSplitPanel'];
     EleSteps: (typeof import('ele-admin-plus'))['EleSteps'];
+    EleTabBar: (typeof import('ele-admin-plus'))['EleTabBar'];
     EleTabTool: (typeof import('ele-admin-plus'))['EleTabTool'];
     EleTabWrap: (typeof import('ele-admin-plus'))['EleTabWrap'];
     EleTable: (typeof import('ele-admin-plus'))['EleTable'];
@@ -60,7 +66,9 @@ declare module 'vue' {
     EleToolbar: (typeof import('ele-admin-plus'))['EleToolbar'];
     EleTooltip: (typeof import('ele-admin-plus'))['EleTooltip'];
     EleTour: (typeof import('ele-admin-plus'))['EleTour'];
+    EleTransfer: (typeof import('ele-admin-plus'))['EleTransfer'];
     EleTreeSelect: (typeof import('ele-admin-plus'))['EleTreeSelect'];
+    EleTreeTable: (typeof import('ele-admin-plus'))['EleTreeTable'];
     EleUploadList: (typeof import('ele-admin-plus'))['EleUploadList'];
     EleVirtualTable: (typeof import('ele-admin-plus'))['EleVirtualTable'];
     EleWatermark: (typeof import('ele-admin-plus'))['EleWatermark'];