wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

remove(vnChip): refs #7001 remove component

This commit is contained in:
Pablo Natek 2024-03-20 11:28:50 +01:00
parent 25aea39bfc
commit 2fa5b1303d
11 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/common/VnChip.vue
View File

@ -1,13 +1,11 @@
<script setup> <script setup>
const $props = defineProps({ defineProps({
color: { type: String, default: null },
text: { type: String, default: null }, text: { type: String, default: null },
dense: { type: String, default: null },
textColor: { type: String, default: 'black' }, textColor: { type: String, default: 'black' },
}); });
</script> </script>
<template> <template>
<QChip :color="$props.color" :text-color="textColor" :dense="$props.dense">{{ <QChip v-bind="$attrs">
text <slot>{{ text }}</slot>
}}</QChip> </QChip>
</template> </template>

13
src/components/common/VnLog.vue
View File

@ -14,7 +14,6 @@ import VnJsonValue from '../common/VnJsonValue.vue';
import FetchData from '../FetchData.vue'; import FetchData from '../FetchData.vue';
import VnSelectFilter from './VnSelectFilter.vue'; import VnSelectFilter from './VnSelectFilter.vue';
import VnUserLink from '../ui/VnUserLink.vue'; import VnUserLink from '../ui/VnUserLink.vue';
import VnChip from '../common/VnChip.vue';
const stateStore = useStateStore(); const stateStore = useStateStore();
const validationsStore = useValidator(); const validationsStore = useValidator();
@ -444,10 +443,10 @@ setLogTree();
> >
<QItemSection> <QItemSection>
<QItemLabel class="model-info q-mb-xs" v-if="!byRecord"> <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
<VnChip <QChip
dense
size="md" size="md"
text-color="white" class="model-name q-mr-xs text-white"
class="model-name q-mr-xs"
v-if=" v-if="
!(modelLog.changedModel && modelLog.changedModelId) && !(modelLog.changedModel && modelLog.changedModelId) &&
modelLog.model modelLog.model
@ -456,9 +455,9 @@ setLogTree();
backgroundColor: useColor(modelLog.model), backgroundColor: useColor(modelLog.model),
}" }"
:title="modelLog.model" :title="modelLog.model"
:text="t(modelLog.modelI18n)" >
dense="dense" {{ t(modelLog.modelI18n) }}
/> </QChip>
<span class="model-id" v-if="modelLog.id" <span class="model-id" v-if="modelLog.id"
>#{{ modelLog.id }}</span >#{{ modelLog.id }}</span
> >

5
src/components/common/VnSmsDialog.vue
View File

@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
import { useDialogPluginComponent } from 'quasar'; import { useDialogPluginComponent } from 'quasar';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnChip from 'src/components/common/VnChip.vue';
const { dialogRef, onDialogOK } = useDialogPluginComponent(); const { dialogRef, onDialogOK } = useDialogPluginComponent();
const { t, availableLocales } = useI18n(); const { t, availableLocales } = useI18n();
@ -138,7 +137,9 @@ async function send() {
/> />
</template> </template>
<template #counter> <template #counter>
<VnChip :color="color" :text="totalLength + '/' + maxLength" /> <QChip :color="color" dense>
{{ totalLength }}/{{ maxLength }}
</QChip>
</template> </template>
</QInput> </QInput>
</QCardSection> </QCardSection>

10
src/components/ui/CardList.vue
View File

@ -1,6 +1,5 @@
<script setup> <script setup>
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnChip from 'src/components/common/VnChip.vue';
const { t } = useI18n(); const { t } = useI18n();
@ -29,12 +28,9 @@ const toggleCardCheck = (item) => {
<div class="title text-primary text-weight-bold text-h5"> <div class="title text-primary text-weight-bold text-h5">
{{ $props.title }} {{ $props.title }}
</div> </div>
<VnChip <QChip class="q-chip-color" outline size="sm">
:text="'ID:' + $props.id" {{ t('ID') }}: {{ $props.id }}
class="q-chip-color" </QChip>
outline
size="sm"
/>
</div> </div>
<QCheckbox <QCheckbox
v-if="showCheckbox" v-if="showCheckbox"

8
src/components/ui/VnSms.vue
View File

@ -4,7 +4,6 @@ import { date } from 'quasar';
import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnPaginate from 'src/components/ui/VnPaginate.vue';
import VnAvatar from '../ui/VnAvatar.vue'; import VnAvatar from '../ui/VnAvatar.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnChip from '../common/VnChip.vue';
const $props = defineProps({ const $props = defineProps({
url: { type: String, default: null }, url: { type: String, default: null },
@ -90,14 +89,15 @@ function formatNumber(number) {
) )
}}</QItemLabel> }}</QItemLabel>
<QItemLabel class="row center"> <QItemLabel class="row center">
<VnChip <QChip
:color=" :color="
row.sms.status == 'OK' row.sms.status == 'OK'
? 'positive' ? 'positive'
: 'negative' : 'negative'
" "
:text="row.sms.status" >
/> {{ row.sms.status }}
</QChip>
</QItemLabel> </QItemLabel>
</QItemSection> </QItemSection>
</QItem> </QItem>

12
src/css/app.scss
View File

@ -1,5 +1,10 @@
// app global css in SCSS form // app global css in SCSS form
@import './icons.scss'; @import './icons.scss';
body {
.q-chip__content {
color: 'red';
}
}
body.body--light { body.body--light {
--font-color: black; --font-color: black;
@ -11,7 +16,8 @@ body.body--light {
background-color: var(--vn-page-color); background-color: var(--vn-page-color);
.q-header .q-toolbar { .q-header .q-toolbar,
.q-chip {
color: var(--font-color); color: var(--font-color);
} }
.q-card, .q-card,
@ -29,6 +35,10 @@ body.body--dark {
--vn-accent-color: #424242; --vn-accent-color: #424242;
background-color: #222; background-color: #222;
.q-chip {
color: black;
}
} }
a { a {

13
src/pages/Claim/Card/ClaimLines.vue
View File

@ -12,7 +12,6 @@ import FetchData from 'components/FetchData.vue';
import VnDiscount from 'components/common/vnDiscount.vue'; import VnDiscount from 'components/common/vnDiscount.vue';
import ClaimLinesImport from './ClaimLinesImport.vue'; import ClaimLinesImport from './ClaimLinesImport.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import VnChip from 'src/components/common/VnChip.vue';
const quasar = useQuasar(); const quasar = useQuasar();
const route = useRoute(); const route = useRoute();
@ -162,16 +161,16 @@ function showImportDialog() {
<div class="row q-gutter-md"> <div class="row q-gutter-md">
<div> <div>
{{ t('Amount') }} {{ t('Amount') }}
<VnChip :dense="$q.screen.lt.sm" :text="toCurrency(amount)" /> <QChip :dense="$q.screen.lt.sm">
{{ toCurrency(amount) }}
</QChip>
</div> </div>
<QSeparator dark vertical /> <QSeparator dark vertical />
<div> <div>
{{ t('Amount Claimed') }} {{ t('Amount Claimed') }}
<VnChip <QChip color="positive" :dense="$q.screen.lt.sm">
color="positive" {{ toCurrency(amountClaimed) }}
:dense="$q.screen.lt.sm" </QChip>
:text="toCurrency(amountClaimed)"
/>
</div> </div>
</div> </div>
</Teleport> </Teleport>

9
src/pages/Claim/Card/ClaimSummary.vue
View File

@ -12,7 +12,6 @@ import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
import VnUserLink from 'src/components/ui/VnUserLink.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
import VnChip from 'src/components/common/VnChip.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
@ -192,11 +191,9 @@ function openDialog(dmsId) {
/> />
<VnLv :label="t('claim.summary.state')"> <VnLv :label="t('claim.summary.state')">
<template #value> <template #value>
<VnChip <QChip color="stateColor(claim.claimState.code)" dense>
:color="stateColor(claim.claimState.code)" {{ claim.claimState.description }}</QChip
:text="claim.claimState.description" >
dense="dense"
/>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('globals.salesPerson')"> <VnLv :label="t('globals.salesPerson')">

8
src/pages/InvoiceIn/Card/InvoiceInSummary.vue
View File

@ -6,7 +6,6 @@ import { toCurrency, toDate } from 'src/filters';
import { getUrl } from 'src/composables/getUrl'; import { getUrl } from 'src/composables/getUrl';
import CardSummary from 'components/ui/CardSummary.vue'; import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import VnChip from 'src/components/common/VnChip.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
onMounted(async () => { onMounted(async () => {
@ -302,7 +301,7 @@ function getLink(param) {
/> />
<VnLv :label="t('invoiceIn.summary.dueTotal')"> <VnLv :label="t('invoiceIn.summary.dueTotal')">
<template #value> <template #value>
<VnChip <QChip
dense dense
class="q-pa-xs" class="q-pa-xs"
:color="amountsNotMatch ? 'negative' : 'transparent'" :color="amountsNotMatch ? 'negative' : 'transparent'"
@ -311,8 +310,9 @@ function getLink(param) {
? t('invoiceIn.summary.noMatch') ? t('invoiceIn.summary.noMatch')
: t('invoiceIn.summary.dueTotal') : t('invoiceIn.summary.dueTotal')
" "
:text="toCurrency(invoiceIn.totals.totalDueDay)" >
/> {{ toCurrency(invoiceIn.totals.totalDueDay) }}
</QChip>
</template> </template>
</VnLv> </VnLv>
</div> </div>

10
src/pages/Order/OrderLines.vue
View File

@ -14,7 +14,6 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
import { toCurrency, toDate } from 'src/filters'; import { toCurrency, toDate } from 'src/filters';
import { useSession } from 'composables/useSession'; import { useSession } from 'composables/useSession';
import axios from 'axios'; import axios from 'axios';
import VnChip from 'src/components/common/VnChip.vue';
const route = useRoute(); const route = useRoute();
const { t } = useI18n(); const { t } = useI18n();
@ -151,12 +150,9 @@ async function confirmOrder() {
> >
{{ row?.item?.name }} {{ row?.item?.name }}
</div> </div>
<VnChip <QChip class="q-chip-color" outline size="sm">
class="q-chip-color" {{ t('ID') }}: {{ row.id }}
outline </QChip>
size="sm"
:text="t('ID') + ':' + row.id"
/>
</div> </div>
</template> </template>
<template #list-items> <template #list-items>

9
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -12,7 +12,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
import { getUrl } from 'src/composables/getUrl'; import { getUrl } from 'src/composables/getUrl';
import VnUserLink from 'src/components/ui/VnUserLink.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue';
import VnChip from 'src/components/common/VnChip.vue';
import VnTitle from 'src/components/common/VnTitle.vue'; import VnTitle from 'src/components/common/VnTitle.vue';
onUpdated(() => summaryRef.value.fetch()); onUpdated(() => summaryRef.value.fetch());
@ -155,11 +154,9 @@ async function changeState(value) {
/> />
<VnLv :label="t('ticket.summary.state')"> <VnLv :label="t('ticket.summary.state')">
<template #value> <template #value>
<VnChip <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
:color="ticket.ticketState?.state?.classColor ?? 'dark'" {{ ticket.ticketState?.state?.name }}
dense="dense" </QChip>
:text="ticket.ticketState?.state?.name"
/>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('ticket.summary.salesPerson')"> <VnLv :label="t('ticket.summary.salesPerson')">