8315-devToTest #1094

Merged
alexm merged 253 commits from 8315-devToTest into test 2024-12-18 10:31:55 +00:00
1 changed files with 16 additions and 9 deletions
Showing only changes of commit 95551d9f99 - Show all commits

View File

@ -7,6 +7,7 @@ import AccountSummary from './Card/AccountSummary.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import AccountFilter from './AccountFilter.vue'; import AccountFilter from './AccountFilter.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import RightMenu from 'src/components/common/RightMenu.vue';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n(); const { t } = useI18n();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const tableRef = ref(); const tableRef = ref();
@ -88,12 +89,8 @@ const columns = computed(() => [
columnField: { columnField: {
component: null, component: null,
}, },
columnCreate: {
component: 'input',
type: 'password',
},
attrs: {}, attrs: {},
create: true, required: true,
visible: false, visible: false,
}, },
@ -159,9 +156,7 @@ const exprBuilder = (param, value) => {
urlCreate: 'VnUsers', urlCreate: 'VnUsers',
title: t('Create user'), title: t('Create user'),
onDataSaved: ({ id }) => tableRef.redirect(id), onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: { formInitialData: {},
password: null,
},
}" }"
:filter="filter" :filter="filter"
order="id DESC" order="id DESC"
@ -171,7 +166,19 @@ const exprBuilder = (param, value) => {
:use-model="true" :use-model="true"
:right-search="false" :right-search="false"
auto-load auto-load
>
<template #more-create-dialog="{ data }">
<QCardSection>
<VnInput
:label="t('Old password')"
v-model="data.password"
type="password"
:required="true"
autofocus
/> />
</QCardSection>
</template>
</VnTable>
</template> </template>
<i18n> <i18n>