diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index c67283297..e2072dfa0 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -4,19 +4,11 @@ import { ref, computed } from 'vue';
import VnTable from 'components/VnTable/VnTable.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import { useStateStore } from 'stores/useStateStore';
-
+import exprBuilder from './Alias/AliasExprBuilder.js';
const tableRef = ref();
const { t } = useI18n();
const stateStore = useStateStore();
-const exprBuilder = (param, value) => {
- switch (param) {
- case 'search':
- return /^\d+$/.test(value)
- ? { id: value }
- : { alias: { like: `%${value}%` } };
- }
-};
const columns = computed(() => [
{
align: 'left',
diff --git a/src/pages/Account/Alias/AliasExprBuilder.js b/src/pages/Account/Alias/AliasExprBuilder.js
new file mode 100644
index 000000000..f7a5a104c
--- /dev/null
+++ b/src/pages/Account/Alias/AliasExprBuilder.js
@@ -0,0 +1,8 @@
+export default (param, value) => {
+ switch (param) {
+ case 'search':
+ return /^\d+$/.test(value)
+ ? { id: value }
+ : { alias: { like: `%${value}%` } };
+ }
+};
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index b9676df49..49c4e06b9 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,8 +1,7 @@
@@ -13,9 +12,10 @@ const { t } = useI18n();
search-data-key="AccountAliasList"
:searchbar-props="{
url: 'MailAliases',
- info: t('mailAlias.searchInfo'),
- label: t('mailAlias.search'),
+ info: $t('mailAlias.searchInfo'),
+ label: $t('mailAlias.search'),
searchUrl: 'table',
+ exprBuilder,
}"
/>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 713cecf75..619e5098b 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -7,7 +7,6 @@ import { useQuasar } from 'quasar';
import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
@@ -29,9 +28,6 @@ const entityId = computed(() => {
return $props.id || route.params.id;
});
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
const removeAlias = () => {
quasar
.dialog({
@@ -60,10 +56,8 @@ const removeAlias = () => {
ref="descriptor"
:url="`MailAliases/${entityId}`"
module="Alias"
- @on-fetch="setData"
- data-key="aliasData"
- :title="data.title"
- :subtitle="data.subtitle"
+ data-key="Alias"
+ title="alias"
>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index 1f76fe7c2..b4b9abd25 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -1,13 +1,11 @@
- (alias = data)"
- data-key="MailAliasesSummary"
- >
- {{ alias.id }} - {{ alias.alias }}
-
+
+
+ {{ alias.id }} - {{ alias.alias }}
+
+