diff --git a/docs/package.json b/docs/package.json
index b5d17996..12982de7 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -14,7 +14,7 @@
"@tmagic/form": "1.2.0-beta.9",
"@tmagic/schema": "1.2.0-beta.9",
"@tmagic/utils": "1.2.0-beta.9",
- "element-plus": "^2.2.17",
+ "element-plus": "^2.2.19",
"highlight.js": "^11.2.0",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
diff --git a/magic-admin/web/package.json b/magic-admin/web/package.json
index 34d98e5f..d7cb5e2b 100644
--- a/magic-admin/web/package.json
+++ b/magic-admin/web/package.json
@@ -17,7 +17,7 @@
"axios": "^0.27.2",
"axios-jsonp": "^1.0.4",
"core-js": "^3.20.0",
- "element-plus": "^2.2.17",
+ "element-plus": "^2.2.19",
"js-cookie": "^3.0.0",
"moment": "^2.29.3",
"moment-timezone": "^0.5.34",
diff --git a/packages/editor/src/layouts/sidebar/Sidebar.vue b/packages/editor/src/layouts/sidebar/Sidebar.vue
index b344a5d7..79984040 100644
--- a/packages/editor/src/layouts/sidebar/Sidebar.vue
+++ b/packages/editor/src/layouts/sidebar/Sidebar.vue
@@ -6,46 +6,91 @@
type="card"
tab-position="left"
>
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/editor/src/type.ts b/packages/editor/src/type.ts
index 3e21436b..cbae79e3 100644
--- a/packages/editor/src/type.ts
+++ b/packages/editor/src/type.ts
@@ -200,6 +200,7 @@ export interface MenuComponent {
/** 是否显示,默认为true */
className?: string;
display?: boolean | ((data?: Services) => Promise | boolean);
+ [key: string]: any;
}
/**
diff --git a/packages/element-plus-adapter/package.json b/packages/element-plus-adapter/package.json
index cd8f21a0..22b26d49 100644
--- a/packages/element-plus-adapter/package.json
+++ b/packages/element-plus-adapter/package.json
@@ -34,11 +34,11 @@
"typescript"
],
"dependencies": {
- "element-plus": "^2.2.17",
+ "element-plus": "^2.2.19",
"vue": "^3.2.37"
},
"peerDependencies": {
- "element-plus": "^2.2.17",
+ "element-plus": "^2.2.19",
"vue": "^3.2.37"
},
"devDependencies": {
diff --git a/packages/form/src/containers/Tabs.vue b/packages/form/src/containers/Tabs.vue
index 7111cc97..685735ce 100644
--- a/packages/form/src/containers/Tabs.vue
+++ b/packages/form/src/containers/Tabs.vue
@@ -10,8 +10,9 @@
@tab-remove="onTabRemove"
>
-
-
+
@@ -45,13 +46,15 @@
import { computed, inject, ref, watchEffect } from 'vue';
import { cloneDeep } from 'lodash-es';
-import { TMagicTabPane, TMagicTabs } from '@tmagic/design';
+import { getConfig, TMagicTabs } from '@tmagic/design';
import { FormState, TabConfig, TabPaneConfig } from '../schema';
import { display as displayFunc, filterFunction } from '../utils/form';
import Container from './Container.vue';
+const uiComponent = getConfig('components').tabPane;
+
const getActive = (mForm: FormState | undefined, props: any, activeTabName: string) => {
const { config, model, prop } = props;
const { active } = config;
diff --git a/playground/package.json b/playground/package.json
index edda4d3a..a915de70 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -19,7 +19,7 @@
"@tmagic/schema": "1.2.0-beta.9",
"@tmagic/stage": "1.2.0-beta.9",
"@tmagic/utils": "1.2.0-beta.9",
- "element-plus": "^2.2.17",
+ "element-plus": "^2.2.19",
"monaco-editor": "^0.34.0",
"serialize-javascript": "^6.0.0",
"terser": "^5.14.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ab96b2c..857070fe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,7 +87,7 @@ importers:
'@vuepress/client': ^2.0.0-beta.51
'@vuepress/plugin-search': ^2.0.0-beta.51
'@vuepress/theme-default': ^2.0.0-beta.51
- element-plus: ^2.2.17
+ element-plus: ^2.2.19
highlight.js: ^11.2.0
lodash: ^4.17.21
lodash-es: ^4.17.21
@@ -102,7 +102,7 @@ importers:
'@tmagic/form': link:../packages/form
'@tmagic/schema': link:../packages/schema
'@tmagic/utils': link:../packages/utils
- element-plus: 2.2.17_vue@3.2.37
+ element-plus: 2.2.19_vue@3.2.37
highlight.js: 11.5.1
lodash: 4.17.21
lodash-es: 4.17.21
@@ -250,13 +250,13 @@ importers:
packages/element-plus-adapter:
specifiers:
'@types/node': ^15.12.4
- element-plus: ^2.2.17
+ element-plus: ^2.2.19
rimraf: ^3.0.2
typescript: ^4.7.4
vite: ^3.1.3
vue: ^3.2.37
dependencies:
- element-plus: 2.2.17_vue@3.2.37
+ element-plus: 2.2.19_vue@3.2.37
vue: 3.2.37
devDependencies:
'@types/node': 15.14.9
@@ -491,7 +491,7 @@ importers:
'@vitejs/plugin-vue': ^3.1.0
'@vitejs/plugin-vue-jsx': ^1.3.10
'@vue/compiler-sfc': ^3.2.37
- element-plus: ^2.2.17
+ element-plus: ^2.2.19
monaco-editor: ^0.34.0
sass: ^1.35.1
serialize-javascript: ^6.0.0
@@ -510,7 +510,7 @@ importers:
'@tmagic/schema': link:../packages/schema
'@tmagic/stage': link:../packages/stage
'@tmagic/utils': link:../packages/utils
- element-plus: 2.2.17_vue@3.2.37
+ element-plus: 2.2.19_vue@3.2.37
monaco-editor: 0.34.0
serialize-javascript: 6.0.0
terser: 5.14.2
@@ -3528,8 +3528,8 @@ packages:
resolution: {integrity: sha512-H+mFNKow6gi2P5Gi2d1Fvd3TUEJlB9CF7zYaIV9T83BE3wP1xZ0mRPbNTm0KUjyd1QiVy7iKXuIcjlDtBQMiAQ==}
dev: true
- /element-plus/2.2.17_vue@3.2.37:
- resolution: {integrity: sha512-MGwMIE/q+FFD3kgS23x8HIe5043tmD1cTRwjhIX9o6fim1avFnUkrsfYRvybbz4CkyqSb185EheZS5AUPpXh2g==}
+ /element-plus/2.2.19_vue@3.2.37:
+ resolution: {integrity: sha512-uN0gt9lUus/IHzu5J6vkbYoYJgUtU05osdtFv9RO27bHKOG5GN7dH6uA3OKfkQQ6R2sV8ZxY1rc9PH1X8Dgrow==}
peerDependencies:
vue: ^3.2.0
dependencies: