From 00fa9e98f8764ba12ee7c87b70137bb5f92457ae Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Wed, 24 Mar 2021 10:03:16 +0800 Subject: [PATCH] add mixins LocalizationMiXin --- vueJs/src/mixins/DataListMiXin.ts | 17 +- vueJs/src/mixins/LocalizationMiXin.ts | 13 + vueJs/src/router/index.ts | 2 - vueJs/src/router/modules/file-management.ts | 27 - .../AggregateRouteConfigEditForm.vue | 10 +- .../AggregateRouteCreateOrEditForm.vue | 9 +- .../components/GlobalCreateOrEditForm.vue | 9 +- .../components/RouteCreateOrEditForm.vue | 9 +- .../components/RouteGroupCreateOrEditForm.vue | 9 +- .../CreateOrUpdateCliamTypeForm.vue | 9 +- .../components/CreateOrUpdateDataDialog.vue | 9 +- .../CreateOrUpdateDataItemDialog.vue | 13 +- .../components/DataDictionaryTree.vue | 17 +- .../components/DataItemTable.vue | 7 +- .../ApiResourceCreateOrEditForm.vue | 9 +- .../components/ApiScopeCreateOrEditForm.vue | 9 +- .../client/components/ClientClaimEditForm.vue | 9 +- .../client/components/ClientCloneForm.vue | 9 +- .../client/components/ClientCreateForm.vue | 7 +- .../client/components/ClientEditForm.vue | 9 +- .../components/PropertiesEditForm.vue | 9 +- .../components/SecretEditForm.vue | 4 - .../IdentityResourceCreateOrEditForm.vue | 9 +- .../components/PersistedGrantProfile.vue | 5 +- .../components/OrganizationUnitTree.vue | 9 +- .../components/RoleOrganizationUint.vue | 9 +- .../components/RoleReference.vue | 9 +- .../components/UserOrganizationUint.vue | 9 +- .../components/UserReference.vue | 9 +- .../roles/components/ManageRoleMenuDialog.vue | 7 +- .../RoleClaimCreateOrUpdateForm.vue | 9 +- .../admin/roles/components/RoleCreateForm.vue | 7 +- .../admin/roles/components/RoleEditForm.vue | 9 +- vueJs/src/views/admin/roles/index.vue | 8 +- .../components/GlobalSettingEditForm.vue | 7 +- .../components/TenantSettingEditForm.vue | 7 +- .../components/TenantConnectionEditForm.vue | 9 +- .../components/TenantCreateOrEditForm.vue | 9 +- .../users/components/ManageUserMenuDialog.vue | 11 +- .../UserClaimCreateOrUpdateForm.vue | 11 +- .../components/UserCreateOrUpdateForm.vue | 10 +- vueJs/src/views/admin/users/index.vue | 6 +- .../components/CreateOrUpdateLayoutDialog.vue | 15 +- vueJs/src/views/container/layouts/index.vue | 4 +- .../components/CreateOrUpdateMenuDialog.vue | 15 +- .../components/FileDownloadForm.vue | 179 ------ .../components/FileUploadForm.vue | 107 ---- vueJs/src/views/file-management/index.vue | 516 ------------------ vueJs/src/views/login/index.vue | 9 +- .../components/OssObjectProfile.vue | 1 + vueJs/src/views/oss-management/index.vue | 9 +- vueJs/src/views/register/index.vue | 9 +- vueJs/src/views/reset-password/index.vue | 9 +- 53 files changed, 184 insertions(+), 1083 deletions(-) create mode 100644 vueJs/src/mixins/LocalizationMiXin.ts delete mode 100644 vueJs/src/router/modules/file-management.ts delete mode 100644 vueJs/src/views/file-management/components/FileDownloadForm.vue delete mode 100644 vueJs/src/views/file-management/components/FileUploadForm.vue delete mode 100644 vueJs/src/views/file-management/index.vue diff --git a/vueJs/src/mixins/DataListMiXin.ts b/vueJs/src/mixins/DataListMiXin.ts index 76185319d..2fc9dd38a 100644 --- a/vueJs/src/mixins/DataListMiXin.ts +++ b/vueJs/src/mixins/DataListMiXin.ts @@ -1,11 +1,13 @@ -import { Component, Vue } from 'vue-property-decorator' +import { Component, Mixins } from 'vue-property-decorator' import { PagedResultDto, ListResultDto, PagedAndSortedResultRequestDto } from '@/api/types' + +import LocalizationMiXin from './LocalizationMiXin' /** * 数据列表mixin * 复写大部分数据列表事件 */ @Component -export default class DataListMiXin extends Vue { +export default class DataListMiXin extends Mixins(LocalizationMiXin) { /** 数据列表 */ public dataList = new Array() /** 数据总数 */ @@ -122,15 +124,4 @@ export default class DataListMiXin extends Vue { protected handleSortChange(column: any) { this.dataFilter.sorting = column.prop } - - /** - * 本地化接口 - * @param name 本地化名称 - * @param values 参数 - */ - protected l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } - - /** 还可以添加 eventbus 的通用处理器 */ } diff --git a/vueJs/src/mixins/LocalizationMiXin.ts b/vueJs/src/mixins/LocalizationMiXin.ts new file mode 100644 index 000000000..2fc1632cd --- /dev/null +++ b/vueJs/src/mixins/LocalizationMiXin.ts @@ -0,0 +1,13 @@ +import { Component, Vue } from 'vue-property-decorator' + +@Component +export default class LocalizationMiXin extends Vue { + /** + * 本地化接口 + * @param name 本地化名称 + * @param values 参数 + */ + public l(name: string, values?: any[] | { [key: string]: any }) { + return this.$t(name, values).toString() + } +} \ No newline at end of file diff --git a/vueJs/src/router/index.ts b/vueJs/src/router/index.ts index cbefb6e5f..3e2755d6d 100644 --- a/vueJs/src/router/index.ts +++ b/vueJs/src/router/index.ts @@ -17,7 +17,6 @@ import adminRouter from './modules/admin' import auditingRouter from './modules/auditing' import apigatewayRouter from './modules/apigateway' import identityServerRouter from './modules/identityServer' -import fileManagementRouter from './modules/file-management' import containerRouter from './modules/container' Vue.use(Router) @@ -159,7 +158,6 @@ export const asyncRoutes: RouteConfig[] = [ auditingRouter, apigatewayRouter, identityServerRouter, - fileManagementRouter, containerRouter, { path: '*', diff --git a/vueJs/src/router/modules/file-management.ts b/vueJs/src/router/modules/file-management.ts deleted file mode 100644 index e2a6c03ff..000000000 --- a/vueJs/src/router/modules/file-management.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { RouteConfig } from 'vue-router' -import Layout from '@/layout/index.vue' - -const fileManagementRouter: RouteConfig = { - path: '/file-management', - component: Layout, - meta: { - title: 'filemanagement', - icon: 'file-manager', - roles: ['AbpFileManagement.FileSystem'], - alwaysShow: true - }, - children: [ - { - path: 'file-system', - component: () => import(/* webpackChunkName: "file-system" */ '@/views/file-management/index.vue'), - name: 'filesystem', - meta: { - title: 'filesystem', - icon: 'file-storage', - roles: ['AbpFileManagement.FileSystem'] - } - } - ] -} - -export default fileManagementRouter diff --git a/vueJs/src/views/admin/apigateway/components/AggregateRouteConfigEditForm.vue b/vueJs/src/views/admin/apigateway/components/AggregateRouteConfigEditForm.vue index 974bfa4e1..27d1a5d74 100644 --- a/vueJs/src/views/admin/apigateway/components/AggregateRouteConfigEditForm.vue +++ b/vueJs/src/views/admin/apigateway/components/AggregateRouteConfigEditForm.vue @@ -113,16 +113,18 @@ diff --git a/vueJs/src/views/admin/apigateway/components/AggregateRouteCreateOrEditForm.vue b/vueJs/src/views/admin/apigateway/components/AggregateRouteCreateOrEditForm.vue index 65df958f8..95ce90a76 100644 --- a/vueJs/src/views/admin/apigateway/components/AggregateRouteCreateOrEditForm.vue +++ b/vueJs/src/views/admin/apigateway/components/AggregateRouteCreateOrEditForm.vue @@ -140,7 +140,8 @@ diff --git a/vueJs/src/views/admin/apigateway/components/GlobalCreateOrEditForm.vue b/vueJs/src/views/admin/apigateway/components/GlobalCreateOrEditForm.vue index 6abbd9e77..ef1231f43 100644 --- a/vueJs/src/views/admin/apigateway/components/GlobalCreateOrEditForm.vue +++ b/vueJs/src/views/admin/apigateway/components/GlobalCreateOrEditForm.vue @@ -352,7 +352,8 @@ diff --git a/vueJs/src/views/admin/apigateway/components/RouteCreateOrEditForm.vue b/vueJs/src/views/admin/apigateway/components/RouteCreateOrEditForm.vue index 55263d0e2..24a8965e4 100644 --- a/vueJs/src/views/admin/apigateway/components/RouteCreateOrEditForm.vue +++ b/vueJs/src/views/admin/apigateway/components/RouteCreateOrEditForm.vue @@ -539,7 +539,8 @@ import ElInputTag from '@/components/InputTag/index.vue' import HostAndPortInputTag from './HostAndPortInputTag.vue' import DictionaryInputTag from './DictionaryInputTag.vue' -import { Component, Vue, Prop, Watch } from 'vue-property-decorator' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import ApiGateWayService, { LoadBalancerDescriptor, RouteGroupAppIdDto, ReRouteDto, ReRouteCreateDto, ReRouteUpdateDto } from '@/api/apigateway' @Component({ @@ -550,7 +551,7 @@ import ApiGateWayService, { LoadBalancerDescriptor, RouteGroupAppIdDto, ReRouteD HostAndPortInputTag } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { @Prop({ default: '' }) private routeId!: number @@ -668,10 +669,6 @@ export default class extends Vue { this.activeTablePane = 'basicOptions' this.$emit('closed') } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/apigateway/components/RouteGroupCreateOrEditForm.vue b/vueJs/src/views/admin/apigateway/components/RouteGroupCreateOrEditForm.vue index bcb43c818..4cf9c0bd7 100644 --- a/vueJs/src/views/admin/apigateway/components/RouteGroupCreateOrEditForm.vue +++ b/vueJs/src/views/admin/apigateway/components/RouteGroupCreateOrEditForm.vue @@ -77,13 +77,14 @@ diff --git a/vueJs/src/views/admin/claim-type/components/CreateOrUpdateCliamTypeForm.vue b/vueJs/src/views/admin/claim-type/components/CreateOrUpdateCliamTypeForm.vue index 94a08c017..892a338d3 100644 --- a/vueJs/src/views/admin/claim-type/components/CreateOrUpdateCliamTypeForm.vue +++ b/vueJs/src/views/admin/claim-type/components/CreateOrUpdateCliamTypeForm.vue @@ -113,12 +113,13 @@ import ClaimTypeApiService, { IdentityClaimTypeUpdate, IdentityClaimTypeCreateOrUpdateBase } from '@/api/cliam-type' -import { Component, Vue, Prop, Watch } from 'vue-property-decorator' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' @Component({ name: 'CreateOrUpdateCliamTypeForm' }) -export default class CreateOrUpdateCliamTypeForm extends Vue { +export default class CreateOrUpdateCliamTypeForm extends Mixins(LocalizationMiXin) { @Prop({ default: '' }) private claimTypeId!: string @@ -206,10 +207,6 @@ export default class CreateOrUpdateCliamTypeForm extends Vue { claimType.required = this.claimType.required claimType.description = this.claimType.description } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/data-dictionary/components/CreateOrUpdateDataDialog.vue b/vueJs/src/views/admin/data-dictionary/components/CreateOrUpdateDataDialog.vue index d0ca4fa4f..40c796aef 100644 --- a/vueJs/src/views/admin/data-dictionary/components/CreateOrUpdateDataDialog.vue +++ b/vueJs/src/views/admin/data-dictionary/components/CreateOrUpdateDataDialog.vue @@ -73,7 +73,8 @@ diff --git a/vueJs/src/views/admin/data-dictionary/components/DataItemTable.vue b/vueJs/src/views/admin/data-dictionary/components/DataItemTable.vue index f08298083..356260b84 100644 --- a/vueJs/src/views/admin/data-dictionary/components/DataItemTable.vue +++ b/vueJs/src/views/admin/data-dictionary/components/DataItemTable.vue @@ -109,6 +109,7 @@ diff --git a/vueJs/src/views/admin/identityServer/api-scopes/components/ApiScopeCreateOrEditForm.vue b/vueJs/src/views/admin/identityServer/api-scopes/components/ApiScopeCreateOrEditForm.vue index 1829e1736..4f7299eb3 100644 --- a/vueJs/src/views/admin/identityServer/api-scopes/components/ApiScopeCreateOrEditForm.vue +++ b/vueJs/src/views/admin/identityServer/api-scopes/components/ApiScopeCreateOrEditForm.vue @@ -122,7 +122,8 @@ import ApiScopeService, { ApiScopeUpdate, ApiScopeCreateOrUpdate } from '@/api/api-scopes' -import { Component, Prop, Vue, Watch } from 'vue-property-decorator' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import { checkPermission } from '@/utils/permission' import { dateFormat } from '@/utils/index' import PropertiesEditForm from '../../components/PropertiesEditForm.vue' @@ -147,7 +148,7 @@ import UserClaimEditForm from '../../components/UserClaimEditForm.vue' checkPermission } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { @Prop({ default: false }) private showDialog!: boolean @@ -249,10 +250,6 @@ export default class extends Vue { const formApiScope = this.$refs.formApiScope as any formApiScope.resetFields() } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/identityServer/client/components/ClientClaimEditForm.vue b/vueJs/src/views/admin/identityServer/client/components/ClientClaimEditForm.vue index 23f96fd7f..abcf6331c 100644 --- a/vueJs/src/views/admin/identityServer/client/components/ClientClaimEditForm.vue +++ b/vueJs/src/views/admin/identityServer/client/components/ClientClaimEditForm.vue @@ -152,7 +152,8 @@ import { dateFormat } from '@/utils/index' import ClaimTypeApiService, { IdentityClaimType, IdentityClaimValueType } from '@/api/cliam-type' import { Client, ClientClaim } from '@/api/clients' -import { Component, Vue, Prop } from 'vue-property-decorator' +import { Component, Mixins, Prop } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import { checkPermission } from '@/utils/permission' import { Form } from 'element-ui' @@ -166,7 +167,7 @@ import { Form } from 'element-ui' event: 'change' } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { @Prop({ default: () => { return new Client() } }) private client!: Client @@ -273,10 +274,6 @@ export default class extends Vue { } }) } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/identityServer/client/components/ClientCloneForm.vue b/vueJs/src/views/admin/identityServer/client/components/ClientCloneForm.vue index 36f207207..290cece20 100644 --- a/vueJs/src/views/admin/identityServer/client/components/ClientCloneForm.vue +++ b/vueJs/src/views/admin/identityServer/client/components/ClientCloneForm.vue @@ -151,12 +151,13 @@ diff --git a/vueJs/src/views/admin/identityServer/client/components/ClientCreateForm.vue b/vueJs/src/views/admin/identityServer/client/components/ClientCreateForm.vue index dc2c4c542..832339730 100644 --- a/vueJs/src/views/admin/identityServer/client/components/ClientCreateForm.vue +++ b/vueJs/src/views/admin/identityServer/client/components/ClientCreateForm.vue @@ -82,7 +82,8 @@ diff --git a/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue b/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue index 623b1ecdb..061b1e759 100644 --- a/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue +++ b/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue @@ -97,7 +97,8 @@ diff --git a/vueJs/src/views/admin/identityServer/components/SecretEditForm.vue b/vueJs/src/views/admin/identityServer/components/SecretEditForm.vue index 6a1874b17..091e82e6d 100644 --- a/vueJs/src/views/admin/identityServer/components/SecretEditForm.vue +++ b/vueJs/src/views/admin/identityServer/components/SecretEditForm.vue @@ -214,10 +214,6 @@ export default class SecretEditForm extends Vue { console.log(type, value) this.$emit('change', this.secrets.filter(secret => secret.value !== value || secret.type !== type)) } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/identityServer/identity-resources/components/IdentityResourceCreateOrEditForm.vue b/vueJs/src/views/admin/identityServer/identity-resources/components/IdentityResourceCreateOrEditForm.vue index 1df4088fc..990c9a830 100644 --- a/vueJs/src/views/admin/identityServer/identity-resources/components/IdentityResourceCreateOrEditForm.vue +++ b/vueJs/src/views/admin/identityServer/identity-resources/components/IdentityResourceCreateOrEditForm.vue @@ -135,7 +135,8 @@ import { checkPermission } from '@/utils/permission' import { Form } from 'element-ui' -import { Component, Prop, Vue, Watch } from 'vue-property-decorator' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import PropertiesEditForm from '../../components/PropertiesEditForm.vue' import UserClaimEditForm from '../../components/UserClaimEditForm.vue' @@ -154,7 +155,7 @@ import IdentityResourceService, { checkPermission } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { @Prop({ default: false }) private showDialog!: ConstrainBoolean @@ -246,10 +247,6 @@ export default class extends Vue { const frmIdentityResource = this.$refs.formIdentityResource as Form frmIdentityResource.resetFields() } - - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } } diff --git a/vueJs/src/views/admin/identityServer/persisted-grants/components/PersistedGrantProfile.vue b/vueJs/src/views/admin/identityServer/persisted-grants/components/PersistedGrantProfile.vue index f16684fdd..646162f18 100644 --- a/vueJs/src/views/admin/identityServer/persisted-grants/components/PersistedGrantProfile.vue +++ b/vueJs/src/views/admin/identityServer/persisted-grants/components/PersistedGrantProfile.vue @@ -89,8 +89,7 @@ diff --git a/vueJs/src/views/admin/organization-unit/components/RoleOrganizationUint.vue b/vueJs/src/views/admin/organization-unit/components/RoleOrganizationUint.vue index 7a13611db..4b5286af4 100644 --- a/vueJs/src/views/admin/organization-unit/components/RoleOrganizationUint.vue +++ b/vueJs/src/views/admin/organization-unit/components/RoleOrganizationUint.vue @@ -86,8 +86,7 @@ import { checkPermission } from '@/utils/permission' import EventBusMiXin from '@/mixins/EventBusMiXin' import DataListMiXin from '@/mixins/DataListMiXin' -import { Prop, Watch } from 'vue-property-decorator' -import Component, { mixins } from 'vue-class-component' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' import Pagination from '@/components/Pagination/index.vue' import RoleApiService, { RoleGetPagedDto } from '@/api/roles' @@ -102,7 +101,7 @@ import OrganizationUnitService from '@/api/organizationunit' checkPermission } }) -export default class extends mixins(DataListMiXin, EventBusMiXin) { +export default class extends Mixins(DataListMiXin, EventBusMiXin) { @Prop({ default: '' }) private organizationUnitId!: string @@ -133,8 +132,8 @@ export default class extends mixins(DataListMiXin, EventBusMiXin) { } private handleDeleteRole(row: any) { - this.$confirm(this.$t('AbpIdentity.OrganizationUnit:AreYouSureRemoveRole', { 0: row.name }).toString(), - this.$t('AbpIdentity.AreYouSure').toString(), { + this.$confirm(this.l('AbpIdentity.OrganizationUnit:AreYouSureRemoveRole', { 0: row.name }), + this.l('AbpIdentity.AreYouSure'), { callback: (action) => { if (action === 'confirm') { RoleApiService diff --git a/vueJs/src/views/admin/organization-unit/components/RoleReference.vue b/vueJs/src/views/admin/organization-unit/components/RoleReference.vue index ae1d28615..54c32e2cb 100644 --- a/vueJs/src/views/admin/organization-unit/components/RoleReference.vue +++ b/vueJs/src/views/admin/organization-unit/components/RoleReference.vue @@ -110,8 +110,7 @@ diff --git a/vueJs/src/views/admin/roles/components/RoleCreateForm.vue b/vueJs/src/views/admin/roles/components/RoleCreateForm.vue index f19e471d3..18ea5c265 100644 --- a/vueJs/src/views/admin/roles/components/RoleCreateForm.vue +++ b/vueJs/src/views/admin/roles/components/RoleCreateForm.vue @@ -62,13 +62,14 @@ diff --git a/vueJs/src/views/admin/roles/index.vue b/vueJs/src/views/admin/roles/index.vue index e4e6c886d..0eee8411d 100644 --- a/vueJs/src/views/admin/roles/index.vue +++ b/vueJs/src/views/admin/roles/index.vue @@ -312,19 +312,19 @@ export default class extends mixins(DataListMiXin) { setDefaultRoleDto.isDefault = setDefault setDefaultRoleDto.concurrencyStamp = role.concurrencyStamp RoleService.updateRole(role.id, setDefaultRoleDto).then(role => { - this.$message.success(this.$t('roles.roleHasBeenSetDefault', { name: role.name }).toString()) + this.$message.success(this.l('roles.roleHasBeenSetDefault', { name: role.name })) this.refreshPagedData() }) } /** 删除角色 */ private handleDeleteRole(role: RoleDto) { - this.$confirm(this.$t('roles.delNotRecoverData').toString(), - this.$t('roles.whetherDeleteRole', { name: role.name }).toString(), { + this.$confirm(this.l('roles.delNotRecoverData'), + this.l('roles.whetherDeleteRole', { name: role.name }), { callback: (action) => { if (action === 'confirm') { RoleService.deleteRole(role.id).then(() => { - this.$message.success(this.$t('roles.roleHasBeenDeleted', { name: role.name }).toString()) + this.$message.success(this.l('roles.roleHasBeenDeleted', { name: role.name })) this.refreshPagedData() }) } diff --git a/vueJs/src/views/admin/settings/components/GlobalSettingEditForm.vue b/vueJs/src/views/admin/settings/components/GlobalSettingEditForm.vue index 70071c6ad..be6be3bff 100644 --- a/vueJs/src/views/admin/settings/components/GlobalSettingEditForm.vue +++ b/vueJs/src/views/admin/settings/components/GlobalSettingEditForm.vue @@ -6,7 +6,8 @@ diff --git a/vueJs/src/views/admin/tenants/components/TenantCreateOrEditForm.vue b/vueJs/src/views/admin/tenants/components/TenantCreateOrEditForm.vue index 3624eb0f3..64bc9f055 100644 --- a/vueJs/src/views/admin/tenants/components/TenantCreateOrEditForm.vue +++ b/vueJs/src/views/admin/tenants/components/TenantCreateOrEditForm.vue @@ -70,12 +70,13 @@ diff --git a/vueJs/src/views/admin/users/components/ManageUserMenuDialog.vue b/vueJs/src/views/admin/users/components/ManageUserMenuDialog.vue index d49a7aec4..ba402e268 100644 --- a/vueJs/src/views/admin/users/components/ManageUserMenuDialog.vue +++ b/vueJs/src/views/admin/users/components/ManageUserMenuDialog.vue @@ -72,7 +72,8 @@ diff --git a/vueJs/src/views/admin/users/components/UserCreateOrUpdateForm.vue b/vueJs/src/views/admin/users/components/UserCreateOrUpdateForm.vue index 836c0abcb..048225b54 100644 --- a/vueJs/src/views/admin/users/components/UserCreateOrUpdateForm.vue +++ b/vueJs/src/views/admin/users/components/UserCreateOrUpdateForm.vue @@ -130,11 +130,11 @@ diff --git a/vueJs/src/views/admin/users/index.vue b/vueJs/src/views/admin/users/index.vue index 263ab8610..5d5d48f74 100644 --- a/vueJs/src/views/admin/users/index.vue +++ b/vueJs/src/views/admin/users/index.vue @@ -342,12 +342,12 @@ export default class extends mixins(DataListMiXin, EventBusMiXin) { /** 响应删除用户事件 */ private handleDeleteUser(row: any) { - this.$confirm(this.$t('AbpIdentity.UserDeletionConfirmationMessage', { 0: row.userName }).toString(), - this.$t('AbpIdentity.AreYouSure').toString(), { + this.$confirm(this.l('AbpIdentity.UserDeletionConfirmationMessage', { 0: row.userName }), + this.l('AbpIdentity.AreYouSure'), { callback: (action) => { if (action === 'confirm') { UserApiService.deleteUser(row.id).then(() => { - this.$message.success(this.$t('global.successful').toString()) + this.$message.success(this.l('global.successful')) this.refreshPagedData() }) } diff --git a/vueJs/src/views/container/layouts/components/CreateOrUpdateLayoutDialog.vue b/vueJs/src/views/container/layouts/components/CreateOrUpdateLayoutDialog.vue index 016de8522..3cdb29dd2 100644 --- a/vueJs/src/views/container/layouts/components/CreateOrUpdateLayoutDialog.vue +++ b/vueJs/src/views/container/layouts/components/CreateOrUpdateLayoutDialog.vue @@ -139,7 +139,8 @@ diff --git a/vueJs/src/views/file-management/components/FileUploadForm.vue b/vueJs/src/views/file-management/components/FileUploadForm.vue deleted file mode 100644 index d48afc184..000000000 --- a/vueJs/src/views/file-management/components/FileUploadForm.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/vueJs/src/views/file-management/index.vue b/vueJs/src/views/file-management/index.vue deleted file mode 100644 index 86d63218e..000000000 --- a/vueJs/src/views/file-management/index.vue +++ /dev/null @@ -1,516 +0,0 @@ - - - - - - - diff --git a/vueJs/src/views/login/index.vue b/vueJs/src/views/login/index.vue index 1a5b47043..dd2a55c9e 100644 --- a/vueJs/src/views/login/index.vue +++ b/vueJs/src/views/login/index.vue @@ -156,7 +156,8 @@ import { UserModule } from '@/store/modules/user' import { Dictionary } from 'vue-router/types/router' import TenantBox from '@/components/TenantBox/index.vue' import LangSelect from '@/components/LangSelect/index.vue' -import { Component, Vue, Watch } from 'vue-property-decorator' +import { Component, Mixins, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import UserService from '@/api/users' import { AbpModule } from '@/store/modules/abp' @@ -167,7 +168,7 @@ import { AbpModule } from '@/store/modules/abp' TenantBox } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { private loginType = 'password' private passwordType = 'password' private redirect?: string @@ -324,10 +325,6 @@ export default class extends Vue { this.loginType = tab.paneName === '1' ? 'phone' : 'password' } - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } - private resetLoginButton() { setTimeout(() => { this.logining = false diff --git a/vueJs/src/views/oss-management/components/OssObjectProfile.vue b/vueJs/src/views/oss-management/components/OssObjectProfile.vue index 5ab7611a6..69b92c367 100644 --- a/vueJs/src/views/oss-management/components/OssObjectProfile.vue +++ b/vueJs/src/views/oss-management/components/OssObjectProfile.vue @@ -32,6 +32,7 @@ type="warning" center show-icon + :closable="false" /> diff --git a/vueJs/src/views/oss-management/index.vue b/vueJs/src/views/oss-management/index.vue index 1e25761f7..681d70379 100644 --- a/vueJs/src/views/oss-management/index.vue +++ b/vueJs/src/views/oss-management/index.vue @@ -170,7 +170,8 @@ diff --git a/vueJs/src/views/register/index.vue b/vueJs/src/views/register/index.vue index f031627f6..6f8bafd24 100644 --- a/vueJs/src/views/register/index.vue +++ b/vueJs/src/views/register/index.vue @@ -123,7 +123,8 @@ import { Route } from 'vue-router' import { Dictionary } from 'vue-router/types/router' import TenantBox from '@/components/TenantBox/index.vue' import LangSelect from '@/components/LangSelect/index.vue' -import { Component, Vue, Watch } from 'vue-property-decorator' +import { Component, Mixins, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import UserService, { UserRegisterData } from '@/api/users' import { AbpModule } from '@/store/modules/abp' @@ -134,7 +135,7 @@ import { AbpModule } from '@/store/modules/abp' TenantBox } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { private passwordType = 'password' private redirect?: string @@ -266,10 +267,6 @@ export default class extends Vue { }) } - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } - private resetLoginButton() { setTimeout(() => { this.registing = false diff --git a/vueJs/src/views/reset-password/index.vue b/vueJs/src/views/reset-password/index.vue index 77e74949e..397ee5951 100644 --- a/vueJs/src/views/reset-password/index.vue +++ b/vueJs/src/views/reset-password/index.vue @@ -111,7 +111,8 @@ import { Route } from 'vue-router' import { Dictionary } from 'vue-router/types/router' import TenantBox from '@/components/TenantBox/index.vue' import LangSelect from '@/components/LangSelect/index.vue' -import { Component, Vue, Watch } from 'vue-property-decorator' +import { Component, Mixins, Watch } from 'vue-property-decorator' +import LocalizationMiXin from '@/mixins/LocalizationMiXin' import UserService, { UserResetPasswordData } from '@/api/users' import { AbpModule } from '@/store/modules/abp' @@ -122,7 +123,7 @@ import { AbpModule } from '@/store/modules/abp' TenantBox } }) -export default class extends Vue { +export default class extends Mixins(LocalizationMiXin) { private passwordType = 'password' private redirect?: string @@ -246,10 +247,6 @@ export default class extends Vue { }) } - private l(name: string, values?: any[] | { [key: string]: any }) { - return this.$t(name, values).toString() - } - private resetLoginButton() { setTimeout(() => { this.reseting = false