diff --git a/vben271/src/components/Table/src/hooks/useTableScroll.ts b/vben271/src/components/Table/src/hooks/useTableScroll.ts
index e4931d04..cce39341 100644
--- a/vben271/src/components/Table/src/hooks/useTableScroll.ts
+++ b/vben271/src/components/Table/src/hooks/useTableScroll.ts
@@ -88,7 +88,7 @@ export function useTableScroll(
bodyEl!.style.height = 'unset';
- if (!unref(getCanResize) || tableData.length === 0) return;
+ if (!unref(getCanResize) || !tableData || tableData.length === 0) return;
await nextTick();
//Add a delay to get the correct bottomIncludeBody paginationHeight footerHeight headerHeight
diff --git a/vben271/src/components/registerGlobComp.ts b/vben271/src/components/registerGlobComp.ts
index d44c618e..cafe4f13 100644
--- a/vben271/src/components/registerGlobComp.ts
+++ b/vben271/src/components/registerGlobComp.ts
@@ -1,19 +1,10 @@
import type { App } from 'vue';
// import { Icon } from './Icon';
-import { Button } from './Button';
-import {
- // Need
- Button as AntButton,
- Input,
- Layout,
-} from 'ant-design-vue';
-const compList = [AntButton.Group];
+const compList: any[] = [];
export function registerGlobComp(app: App) {
compList.forEach((comp) => {
app.component(comp.name || comp.displayName, comp);
});
-
- app.use(Input).use(Button).use(Layout);
}
diff --git a/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue b/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue
index d6fbdf74..8e28a738 100644
--- a/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue
+++ b/vben271/src/layouts/default/header/components/user-dropdown/ChangePassword.vue
@@ -5,7 +5,7 @@
@register="register"
:canFullscreen="false"
@ok="submit"
- minHeight="100"
+ :minHeight="100"
>
@@ -78,7 +78,7 @@
await _userServiceProxy.changePassword(request as ChangePasswordInput);
changeOkLoading(false);
closeModal();
- await resetFields();
+ await resetFields();
} catch (error) {
changeOkLoading(false);
}
diff --git a/vben271/src/views/admin/roles/CreateAbpRole.vue b/vben271/src/views/admin/roles/CreateAbpRole.vue
index 1034a661..1faa2189 100644
--- a/vben271/src/views/admin/roles/CreateAbpRole.vue
+++ b/vben271/src/views/admin/roles/CreateAbpRole.vue
@@ -11,58 +11,58 @@
diff --git a/vben271/src/views/admin/roles/EditAbpRole.vue b/vben271/src/views/admin/roles/EditAbpRole.vue
index 896c44e5..b4a7f74f 100644
--- a/vben271/src/views/admin/roles/EditAbpRole.vue
+++ b/vben271/src/views/admin/roles/EditAbpRole.vue
@@ -10,70 +10,70 @@
diff --git a/vben271/src/views/admin/users/CreateAbpUser.vue b/vben271/src/views/admin/users/CreateAbpUser.vue
index 7f182de8..2a95a94e 100644
--- a/vben271/src/views/admin/users/CreateAbpUser.vue
+++ b/vben271/src/views/admin/users/CreateAbpUser.vue
@@ -20,8 +20,12 @@
- {{ item.name }}
+ {{ item.name }}
@@ -33,88 +37,88 @@
diff --git a/vben271/src/views/admin/users/EditAbpUser.vue b/vben271/src/views/admin/users/EditAbpUser.vue
index 539b8070..4e71ec6c 100644
--- a/vben271/src/views/admin/users/EditAbpUser.vue
+++ b/vben271/src/views/admin/users/EditAbpUser.vue
@@ -46,7 +46,7 @@
getAllRoleAsync,
updateUserAsync,
getRolesByUserIdAsync,
- } from "/@/views/admin/users/AbpUser";
+ } from '/@/views/admin/users/AbpUser';
import {
IdentityRoleDto,
IdentityUserDto,
@@ -63,7 +63,7 @@
Tabs,
TabPane: Tabs.TabPane,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const [registerUserForm, { getFieldsValue, validate, setFieldsValue, resetFields }] = useForm(
{
diff --git a/vben271/src/views/identityServers/apiResources/CreateApiResource.vue b/vben271/src/views/identityServers/apiResources/CreateApiResource.vue
index a40982f0..35ddb2bd 100644
--- a/vben271/src/views/identityServers/apiResources/CreateApiResource.vue
+++ b/vben271/src/views/identityServers/apiResources/CreateApiResource.vue
@@ -14,7 +14,10 @@
import { defineComponent } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
- import { createFormSchema, createApiResourceAsync } from "/@/views/identityServers/apiResources/ApiResources";
+ import {
+ createFormSchema,
+ createApiResourceAsync,
+ } from '/@/views/identityServers/apiResources/ApiResources';
import { useI18n } from '/@/hooks/web/useI18n';
export default defineComponent({
@@ -23,7 +26,7 @@
BasicModal,
BasicForm,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
const [registerApiResourceForm, { getFieldsValue, validate, resetFields }] = useForm({
diff --git a/vben271/src/views/identityServers/apiResources/EditApiResources.vue b/vben271/src/views/identityServers/apiResources/EditApiResources.vue
index 7462bbb0..02455b43 100644
--- a/vben271/src/views/identityServers/apiResources/EditApiResources.vue
+++ b/vben271/src/views/identityServers/apiResources/EditApiResources.vue
@@ -22,9 +22,8 @@
v-for="(item, index) in apiScopes"
:key="index"
:value="item.value"
- >{{ item.label }}
-
+ >{{ item.label }}
+
@@ -35,81 +34,81 @@
diff --git a/vben271/src/views/identityServers/apiScopes/CreateApiScope.vue b/vben271/src/views/identityServers/apiScopes/CreateApiScope.vue
index 4bf6251e..0adc605b 100644
--- a/vben271/src/views/identityServers/apiScopes/CreateApiScope.vue
+++ b/vben271/src/views/identityServers/apiScopes/CreateApiScope.vue
@@ -14,7 +14,10 @@
import { defineComponent } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
- import { createFormSchema, createApiScopeAsync } from "/@/views/identityServers/apiScopes/ApiScopes";
+ import {
+ createFormSchema,
+ createApiScopeAsync,
+ } from '/@/views/identityServers/apiScopes/ApiScopes';
import { useI18n } from '/@/hooks/web/useI18n';
export default defineComponent({
@@ -23,7 +26,7 @@
BasicModal,
BasicForm,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
const [registerApiScopeForm, { getFieldsValue, validate, resetFields }] = useForm({
diff --git a/vben271/src/views/identityServers/apiScopes/EditApiScope.vue b/vben271/src/views/identityServers/apiScopes/EditApiScope.vue
index ba75c474..97f554e0 100644
--- a/vben271/src/views/identityServers/apiScopes/EditApiScope.vue
+++ b/vben271/src/views/identityServers/apiScopes/EditApiScope.vue
@@ -14,7 +14,7 @@
import { defineComponent } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
- import { editFormSchema, editApiScopeAsync } from "/@/views/identityServers/apiScopes/ApiScopes";
+ import { editFormSchema, editApiScopeAsync } from '/@/views/identityServers/apiScopes/ApiScopes';
import { useI18n } from '/@/hooks/web/useI18n';
export default defineComponent({
@@ -23,7 +23,7 @@
BasicModal,
BasicForm,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
const [registerApiScopeForm, { getFieldsValue, validate, resetFields, setFieldsValue }] =
diff --git a/vben271/src/views/identityServers/clients/ClientUri.vue b/vben271/src/views/identityServers/clients/ClientUri.vue
index 648ea2e8..5f114692 100644
--- a/vben271/src/views/identityServers/clients/ClientUri.vue
+++ b/vben271/src/views/identityServers/clients/ClientUri.vue
@@ -69,12 +69,12 @@
removeLogoutRedirectUriAsync,
addCorsAsync,
removeCorsAsync,
- } from "/@/views/identityServers/clients/Clients";
+ } from '/@/views/identityServers/clients/Clients';
import { PagingClientListOutput } from '/@/services/ServiceProxies';
export default defineComponent({
name: 'ClientUri',
components: { BasicDrawer, Tabs, TabPane: Tabs.TabPane },
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
let currentClient: PagingClientListOutput = new PagingClientListOutput();
diff --git a/vben271/src/views/identityServers/clients/CreateClient.vue b/vben271/src/views/identityServers/clients/CreateClient.vue
index 89fbe811..2d18a5f5 100644
--- a/vben271/src/views/identityServers/clients/CreateClient.vue
+++ b/vben271/src/views/identityServers/clients/CreateClient.vue
@@ -14,7 +14,7 @@
import { defineComponent } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
- import { createFormSchema, createClientAsync } from "/@/views/identityServers/clients/Clients";
+ import { createFormSchema, createClientAsync } from '/@/views/identityServers/clients/Clients';
import { useI18n } from '/@/hooks/web/useI18n';
export default defineComponent({
@@ -23,7 +23,7 @@
BasicModal,
BasicForm,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
const [registerClientForm, { getFieldsValue, validate, resetFields }] = useForm({
diff --git a/vben271/src/views/identityServers/clients/EditClientBasic.vue b/vben271/src/views/identityServers/clients/EditClientBasic.vue
index 956244d0..40233ab1 100644
--- a/vben271/src/views/identityServers/clients/EditClientBasic.vue
+++ b/vben271/src/views/identityServers/clients/EditClientBasic.vue
@@ -39,7 +39,7 @@
editBasicTokenSchema,
editBasicSecretSchema,
updateClientAsync,
- } from "/@/views/identityServers/clients/Clients";
+ } from '/@/views/identityServers/clients/Clients';
export default defineComponent({
name: 'EditAbpUser',
@@ -49,7 +49,7 @@
Tabs,
TabPane: Tabs.TabPane,
},
- emits: ['reload'],
+ emits: ['reload', 'register'],
setup(_, { emit }) {
const { t } = useI18n();
const [
diff --git a/vben271/src/views/identityServers/clients/EditClientIdentityResource.vue b/vben271/src/views/identityServers/clients/EditClientIdentityResource.vue
index 625fc810..1ae9b363 100644
--- a/vben271/src/views/identityServers/clients/EditClientIdentityResource.vue
+++ b/vben271/src/views/identityServers/clients/EditClientIdentityResource.vue
@@ -38,13 +38,13 @@
diff --git a/vben271/src/views/tenants/EditTenant.vue b/vben271/src/views/tenants/EditTenant.vue
index 20b554b8..6db3e009 100644
--- a/vben271/src/views/tenants/EditTenant.vue
+++ b/vben271/src/views/tenants/EditTenant.vue
@@ -5,66 +5,66 @@
@ok="submit"
@cancel="cancel"
@register="registerModal"
- minHeight="100"
+ :minHeight="100"
>