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

Browse Source
This commit is contained in:
dap
2024-10-28 15:21:42 +08:00
parent 3be5f90e62 ad3963ff70
commit 9d908a2f40
48 changed files with 99 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@core/base/design/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/design",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/icons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/icons",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/shared/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/shared",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/typings/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/typings",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/composables/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/composables",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/preferences/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/preferences",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

5
packages/@core/ui-kit/form-ui/src/form-render/form.vue
View File

@@ -81,7 +81,10 @@ const formCollapsed = computed(() => {
});
const computedSchema = computed(
(): ({ commonComponentProps: Record<string, any> } & FormSchema)[] => {
(): ({
commonComponentProps: Record<string, any>;
formFieldProps: Record<string, any>;
} & Omit<FormSchema, 'formFieldProps'>)[] => {
const {
componentProps = {},
controlClass = '',

2
packages/@core/ui-kit/layout-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/layout-ui",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/menu-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/menu-ui",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/shadcn-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/shadcn-ui",
"version": "5.4.2",
"version": "5.4.3",
"#main": "./dist/index.mjs",
"#module": "./dist/index.mjs",
"homepage": "https://github.com/vbenjs/vue-vben-admin",

2
packages/@core/ui-kit/tabs-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben-core/tabs-ui",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/constants/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/constants",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/access/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/access",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/common-ui/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/common-ui",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/hooks/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/hooks",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/layouts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/layouts",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/plugins/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/plugins",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

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

@@ -31,12 +31,11 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
const getOptions = computed((): EChartsOption => {
if (!isDark.value) {
return cacheOptions;
return {};
}
return {
backgroundColor: 'transparent',
...cacheOptions,
};
});
@@ -52,10 +51,14 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
const renderEcharts = (options: EChartsOption, clear = true) => {
cacheOptions = options;
const currentOptions = {
...options,
...getOptions.value,
};
return new Promise((resolve) => {
if (chartRef.value?.offsetHeight === 0) {
useTimeoutFn(() => {
renderEcharts(getOptions.value);
renderEcharts(currentOptions);
resolve(null);
}, 30);
return;
@@ -67,7 +70,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
if (!instance) return;
}
clear && chartInstance?.clear();
chartInstance?.setOption(getOptions.value);
chartInstance?.setOption(currentOptions);
resolve(null);
}, 30);
});

2
packages/effects/request/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/request",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/icons/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/icons",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/locales/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/locales",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/preferences/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/preferences",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/stores/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/stores",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/styles/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/styles",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/types/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/types",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@vben/utils",
"version": "5.4.2",
"version": "5.4.3",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {