by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

Browse Source
This commit is contained in:
dap
2025-01-01 12:57:20 +08:00
parent 26431faf6c 081d2aed23
commit 844a9b5013
251 changed files with 619 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/effects/plugins/src/echarts/use-echarts.ts
View File

@@ -1,12 +1,9 @@
import type { EChartsOption } from 'echarts';
import type { Ref } from 'vue';
import type EchartsUI from './echarts-ui.vue';
import type { Ref } from 'vue';
import { computed, nextTick, watch } from 'vue';
import { usePreferences } from '@vben/preferences';
import {
tryOnUnmounted,
useDebounceFn,
@@ -14,6 +11,7 @@ import {
useTimeoutFn,
useWindowSize,
} from '@vueuse/core';
import { computed, nextTick, watch } from 'vue';
import echarts from './echarts';

3
packages/effects/plugins/src/vxe-table/api.ts
View File

@@ -3,8 +3,6 @@ import type { VxeGridInstance } from 'vxe-table';
import type { VxeGridProps } from './types';
import { toRaw } from 'vue';
import { Store } from '@vben-core/shared/store';
import {
bindMethods,
@@ -13,6 +11,7 @@ import {
mergeWithArrayOverride,
StateHandler,
} from '@vben-core/shared/utils';
import { toRaw } from 'vue';
function getDefaultState(): VxeGridProps {
return {

5
packages/effects/plugins/src/vxe-table/init.ts
View File

@@ -1,10 +1,8 @@
import type { SetupVxeTable } from './types';
import { defineComponent, watch } from 'vue';
import { usePreferences } from '@vben/preferences';
import { useVbenForm } from '@vben-core/form-ui';
import { defineComponent, watch } from 'vue';
import {
VxeButton,
VxeCheckbox,
@@ -34,7 +32,6 @@ import {
// VxeTextarea,
} from 'vxe-pc-ui';
import enUS from 'vxe-pc-ui/lib/language/en-US';
// 导入默认的语言
import zhCN from 'vxe-pc-ui/lib/language/zh-CN';
import {

3
packages/effects/plugins/src/vxe-table/types.ts
View File

@@ -1,5 +1,6 @@
import type { ClassType, DeepPartial } from '@vben/types';
import type { VbenFormProps } from '@vben-core/form-ui';
import type { Ref } from 'vue';
import type {
VxeGridListeners,
VxeGridPropTypes,
@@ -9,8 +10,6 @@ import type {
import type { VxeGridApi } from './api';
import type { Ref } from 'vue';
import { useVbenForm } from '@vben-core/form-ui';
export interface VxePaginationInfo {

14
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
View File

@@ -11,6 +11,12 @@ import type {
import type { ExtendedVxeGridApi, VxeGridProps } from './types';
import { usePriorityValues } from '@vben/hooks';
import { EmptyIcon } from '@vben/icons';
import { $t } from '@vben/locales';
import { usePreferences } from '@vben/preferences';
import { cloneDeep, cn, mergeWithArrayOverride } from '@vben/utils';
import { VbenHelpTooltip, VbenLoading } from '@vben-core/shadcn-ui';
import {
computed,
nextTick,
@@ -21,14 +27,6 @@ import {
useTemplateRef,
watch,
} from 'vue';
import { usePriorityValues } from '@vben/hooks';
import { EmptyIcon } from '@vben/icons';
import { $t } from '@vben/locales';
import { usePreferences } from '@vben/preferences';
import { cloneDeep, cn, mergeWithArrayOverride } from '@vben/utils';
import { VbenHelpTooltip, VbenLoading } from '@vben-core/shadcn-ui';
import { VxeGrid, VxeUI } from 'vxe-table';
import { extendProxyOptions } from './extends';