codevdesign 2.0.11 → 2.0.13

package/composants/csqcTiroir.vue

@@ -1,197 +1,194 @@
-<template>
-  <v-navigation-drawer
-    v-model="visible"
-    location="right"
-    temporary
-    class="pa-0 elevation-2 csqc-ligneBleue"
-    :persistent="persistant"
-    :width="grosseurTiroir"
-    v-bind="$attrs"
-    @keydown.esc="!persistant ? fermeture : ''"
-    @click:outside="!persistant ? fermeture : ''"
-  >
-    <v-card class="pa-0 ma-0 pl-8 pt-8">
-      <!-- Bouton en haut à droite -->
-      <v-btn
-        icon="mdi-close"
-        variant="text"
-        class="position-absolute iconeHover"
-        style="right: 5px; top: 5px"
-        @click="fermeture"
-      ></v-btn>
-
-      <v-card-title
-        class="pa-0 ma-0 pb-6 text-wrap"
-        style="font-size: 24px"
-      >
-        <slot name="titre"></slot>
-        <div text-h5>{{ titre }}</div>
-      </v-card-title>
-
-      <v-card-text class="pa-0 ma-0 pb-6 pr-6">
-        <v-container>
-          <slot></slot>
-          <slot name="content"></slot>
-        </v-container>
-      </v-card-text>
-      <v-card-actions class="my-2 d-flex justify-end pr-6 pb-5">
-        <slot name="actions"></slot>
-        <v-btn
-          v-if="btnAnnuler"
-          color="primary"
-          variant="text"
-          :loading="operationEnCours"
-          @click="fermeture"
-        >
-          {{ props.btnAnnulerTexte ? props.btnAnnulerTexte : $t('csqc.bouton.annuler') }}
-        </v-btn>
-
-        <v-btn
-          v-if="btnOk"
-          class="Gouttiere"
-          color="primary"
-          variant="flat"
-          :loading="operationEnCours"
-          :disabled="btnOkDesactiver || operationEnCours"
-          @click="okBouton"
-        >
-          {{ props.btnOkTexte ? props.btnOkTexte : $t('csqc.bouton.ok') }}
-        </v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-navigation-drawer>
-  <Teleport to="body">
-    <v-fab
-      v-if="retourEnHaut && afficherBoutonHaut"
-      style="bottom: 24px; position: fixed; right: 24px; z-index: 2000"
-      elevation="8"
-      color="primary"
-      icon="mdi-arrow-up"
-      @click="allerEnHaut"
-    />
-  </Teleport>
-</template>
-<script lang="ts" setup>
-  import { ref, computed, watch, nextTick, useAttrs } from 'vue'
-  import { useDisplay } from 'vuetify'
-
-  const visible = ref(false)
-  const display = useDisplay()
-  const attrs = useAttrs()
-
-  // Déclaration des props
-  const props = defineProps({
-    titre: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    btnAnnuler: {
-      type: Boolean,
-      default: true,
-      required: false,
-    },
-    btnOk: {
-      type: Boolean,
-      default: true,
-      required: false,
-    },
-    btnAnnulerTexte: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    btnOkDesactiver: {
-      type: Boolean,
-      default: false,
-      required: false,
-    },
-    operationEnCours: { type: Boolean, default: false },
-    persistant: { type: Boolean, default: true },
-    btnOkTexte: {
-      type: String,
-      default: '',
-      required: false,
-    },
-    retourEnHaut: {
-      type: Boolean,
-      default: true,
-    },
-  })
-
-  // Déclaration des événements
-  const emit = defineEmits(['fermer', 'ok'])
-
-  // Back to top
-  const afficherBoutonHaut = ref(false)
-  let conteneurScroll: Element | null = null
-
-  function onScroll() {
-    afficherBoutonHaut.value = (conteneurScroll?.scrollTop ?? 0) > 350
-  }
-
-  function allerEnHaut() {
-    conteneurScroll?.scrollTo({ top: 0, behavior: 'smooth' })
-  }
-
-  watch(visible, async val => {
-    if (!props.retourEnHaut) return
-    if (val) {
-      await nextTick()
-      conteneurScroll = document.querySelector('.v-navigation-drawer--active .v-navigation-drawer__content')
-      conteneurScroll?.addEventListener('scroll', onScroll)
-    } else {
-      conteneurScroll?.removeEventListener('scroll', onScroll)
-      conteneurScroll = null
-      afficherBoutonHaut.value = false
-    }
-  })
-
-  // Méthodes
-  const ouvrir = () => {
-    visible.value = true
-  }
-
-  const fermer = () => {
-    visible.value = false
-  }
-
-  const fermeture = () => {
-    emit('fermer')
-    fermer()
-  }
-
-  const okBouton = () => {
-    emit('ok')
-    fermer()
-  }
-
-  // Calcul des tailles du tiroir en fonction du breakpoint
-  const grosseurTiroir = computed(() => {
-    if (attrs.width !== undefined && attrs.width !== null) return attrs.width as string | number
-    switch (display.name.value) {
-      case 'xs':
-        return ''
-      case 'sm':
-        return 0.95 * display.width.value
-      case 'md':
-        return 0.8 * display.width.value
-      case 'lg':
-        return 0.7 * display.width.value
-      case 'xl':
-        return 0.6 * display.width.value
-      case 'xxl':
-        return 0.5 * display.width.value
-      default:
-        return ''
-    }
-  })
-
-  defineExpose({ ouvrir, fermer })
-</script>
-
-<style>
-  .csqc-ligneBleue {
-    border-left: 30px #095797 solid !important;
-  }
-</style>
+<template>
+  <v-navigation-drawer
+    v-model="visible"
+    location="right"
+    temporary
+    class="pa-0 elevation-2 csqc-ligneBleue"
+    :persistent="persistant"
+    :width="grosseurTiroir"
+    v-bind="$attrs"
+    @keydown.esc="!persistant ? fermeture : ''"
+    @click:outside="!persistant ? fermeture : ''"
+  >
+    <v-card class="pa-0 ma-0 pl-8 pt-8">
+      <!-- Bouton en haut à droite -->
+      <v-btn
+        icon="mdi-close"
+        variant="plain"
+        class="position-absolute iconeHover"
+        color="primary"
+        style="right: 5px; top: 5px; border-radius: 0px"
+        @click="fermeture"
+      ></v-btn>
+
+      <v-card-title
+        class="pa-0 ma-0 pb-6 text-wrap"
+        style="font-size: 24px"
+      >
+        <slot name="titre"></slot>
+        <div text-h5>{{ titre }}</div>
+      </v-card-title>
+
+      <v-card-text class="pa-0 ma-0 pb-6 pr-6">
+        <v-container>
+          <slot></slot>
+          <slot name="content"></slot>
+        </v-container>
+      </v-card-text>
+      <v-card-actions class="my-2 d-flex justify-end pr-6 pb-5">
+        <slot name="actions"></slot>
+        <bouton-tertiaire
+          v-if="btnAnnuler"
+          :loading="operationEnCours"
+          @click="fermeture"
+        >
+          {{ props.btnAnnulerTexte ? props.btnAnnulerTexte : $t('csqc.bouton.annuler') }}
+        </bouton-tertiaire>
+
+        <bouton-primaire
+          v-if="btnOk"
+          class="Gouttiere"
+          :loading="operationEnCours"
+          :disabled="btnOkDesactiver || operationEnCours"
+          @click="okBouton"
+        >
+          {{ props.btnOkTexte ? props.btnOkTexte : $t('csqc.bouton.ok') }}
+        </bouton-primaire>
+      </v-card-actions>
+    </v-card>
+  </v-navigation-drawer>
+  <Teleport to="body">
+    <v-fab
+      v-if="retourEnHaut && afficherBoutonHaut"
+      style="bottom: 24px; position: fixed; right: 24px; z-index: 2000"
+      elevation="8"
+      color="primary"
+      icon="mdi-arrow-up"
+      @click="allerEnHaut"
+    />
+  </Teleport>
+</template>
+<script lang="ts" setup>
+  import { ref, computed, watch, nextTick, useAttrs } from 'vue'
+  import { useDisplay } from 'vuetify'
+
+  const visible = ref(false)
+  const display = useDisplay()
+  const attrs = useAttrs()
+
+  // Déclaration des props
+  const props = defineProps({
+    titre: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    btnAnnuler: {
+      type: Boolean,
+      default: true,
+      required: false,
+    },
+    btnOk: {
+      type: Boolean,
+      default: true,
+      required: false,
+    },
+    btnAnnulerTexte: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    btnOkDesactiver: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+    operationEnCours: { type: Boolean, default: false },
+    persistant: { type: Boolean, default: true },
+    btnOkTexte: {
+      type: String,
+      default: '',
+      required: false,
+    },
+    retourEnHaut: {
+      type: Boolean,
+      default: true,
+    },
+  })
+
+  // Déclaration des événements
+  const emit = defineEmits(['fermer', 'ok'])
+
+  // Back to top
+  const afficherBoutonHaut = ref(false)
+  let conteneurScroll: Element | null = null
+
+  function onScroll() {
+    afficherBoutonHaut.value = (conteneurScroll?.scrollTop ?? 0) > 350
+  }
+
+  function allerEnHaut() {
+    conteneurScroll?.scrollTo({ top: 0, behavior: 'smooth' })
+  }
+
+  watch(visible, async val => {
+    if (!props.retourEnHaut) return
+    if (val) {
+      await nextTick()
+      conteneurScroll = document.querySelector('.v-navigation-drawer--active .v-navigation-drawer__content')
+      conteneurScroll?.addEventListener('scroll', onScroll)
+    } else {
+      conteneurScroll?.removeEventListener('scroll', onScroll)
+      conteneurScroll = null
+      afficherBoutonHaut.value = false
+    }
+  })
+
+  // Méthodes
+  const ouvrir = () => {
+    visible.value = true
+  }
+
+  const fermer = () => {
+    visible.value = false
+  }
+
+  const fermeture = () => {
+    emit('fermer')
+    fermer()
+  }
+
+  const okBouton = () => {
+    emit('ok')
+    fermer()
+  }
+
+  // Calcul des tailles du tiroir en fonction du breakpoint
+  const grosseurTiroir = computed(() => {
+    if (attrs.width !== undefined && attrs.width !== null) return attrs.width as string | number
+    switch (display.name.value) {
+      case 'xs':
+        return ''
+      case 'sm':
+        return 0.95 * display.width.value
+      case 'md':
+        return 0.8 * display.width.value
+      case 'lg':
+        return 0.7 * display.width.value
+      case 'xl':
+        return 0.6 * display.width.value
+      case 'xxl':
+        return 0.5 * display.width.value
+      default:
+        return ''
+    }
+  })
+
+  defineExpose({ ouvrir, fermer })
+</script>
+
+<style>
+  .csqc-ligneBleue {
+    border-left: 30px #095797 solid !important;
+  }
+</style>

package/index.ts

@@ -1,80 +1,84 @@
-import csqcAlerteErreur from './composants/csqcAlerteErreur.vue'
-import csqcDialogue from './composants/csqcDialogue.vue'
-
-// à enlever éventuellement.  Remplacé par csqcSwitch
-import csqcOptionSwitch from './composants/csqcSwitch.vue'
-import csqcRecherche from './composants/csqcRecherche.vue'
-import csqcSnackbar from './composants/csqcSnackbar.vue'
-import csqcTiroir from './composants/csqcTiroir.vue'
-import pivEntete from './composants/gabarit/pivEntete.vue'
-import pivFooter from './composants/gabarit/pivPiedPage.vue'
-import csqcMenu from './composants/gabarit/csqcMenu.vue'
-import csqcConfirmation from './composants/csqcConfirmation.vue'
-import csqcSaisie from './composants/csqcModaleSaisie.vue'
-import csqcDate from './composants/csqcDate.vue'
-import csqcTable from './composants/csqcTable/csqcTable.vue'
-import csqcCodeBudgetaire from './composants/csqcCodeBudgetaireGenerique.vue'
-import csqcChaise from './composants/csqcChaise/chaiseConteneur.vue'
-import csqcAide from './composants/csqcAide.vue'
-import csqcEntete from './composants/csqcEntete.vue'
-import csqcTexteBilingue from './composants/csqcTexteBilingue.vue'
-import csqcSwitch from './composants/csqcSwitch.vue'
-
-//import csqcEditeurTexteRiche from './composants/csqcEditeurTexteRiche.vue'
-import csqcImportCSV from './composants/csqcImportCSV.vue'
-import csqcRechercheUtilisateur from './composants/csqcRechercheUtilisateur.vue'
-import validateurs from './composants/validateurs'
-
-// modèles
-import NotificationGabaritDefaut from './modeles/notificationGabaritDefaut'
-import modeleSnackbar from './modeles/composants/snackbar'
-import modeleDatatableColonne from './modeles/composants/datatableColonne'
-import apiReponse from './modeles/apiReponse'
-import data from './modeles/data'
-import response from './modeles/response'
-
-// outils
-import csqcRafraichisseurToken from './outils/rafraichisseurToken'
-import csqcRafraichisseurTokenParent from './outils/csqcRafraichisseurTokenParent'
-import csqcOutils from './outils/csqcOutils'
-
-// i18n
-import csqcEn from './locales/en.json'
-import csqcFr from './locales/fr.json'
-
-export {
-  csqcFr,
-  csqcEn,
-  csqcAlerteErreur,
-  csqcDialogue,
-  csqcConfirmation,
-  csqcSaisie,
-  csqcDate,
-  csqcOptionSwitch, // a enlever eventuellement
-  csqcSwitch,
-  csqcRecherche,
-  csqcSnackbar,
-  csqcTable,
-  csqcTiroir,
-  csqcMenu,
-  csqcCodeBudgetaire,
-  csqcChaise,
-  pivFooter,
-  pivEntete,
-  csqcAide,
-  csqcEntete,
-  csqcTexteBilingue,
-  // csqcEditeurTexteRiche,
-  validateurs,
-  csqcImportCSV,
-  csqcRechercheUtilisateur,
-  csqcRafraichisseurToken,
-  csqcRafraichisseurTokenParent,
-  csqcOutils,
-  modeleSnackbar,
-  modeleDatatableColonne as colonne,
-  apiReponse,
-  data,
-  response,
-  NotificationGabaritDefaut,
-}
+import csqcAlerteErreur from './composants/csqcAlerteErreur.vue'
+import csqcDialogue from './composants/csqcDialogue.vue'
+
+// à enlever éventuellement.  Remplacé par csqcSwitch
+import csqcOptionSwitch from './composants/csqcSwitch.vue'
+import csqcRecherche from './composants/csqcRecherche.vue'
+import csqcSnackbar from './composants/csqcSnackbar.vue'
+import csqcTiroir from './composants/csqcTiroir.vue'
+import pivEntete from './composants/gabarit/pivEntete.vue'
+import pivFooter from './composants/gabarit/pivPiedPage.vue'
+import csqcMenu from './composants/gabarit/csqcMenu.vue'
+import csqcConfirmation from './composants/csqcConfirmation.vue'
+import csqcSaisie from './composants/csqcModaleSaisie.vue'
+import csqcDate from './composants/csqcDate.vue'
+import csqcTable from './composants/csqcTable/csqcTable.vue'
+import csqcCodeBudgetaire from './composants/csqcCodeBudgetaireGenerique.vue'
+import csqcChaise from './composants/csqcChaise/chaiseConteneur.vue'
+import csqcAide from './composants/csqcAide.vue'
+import csqcEntete from './composants/csqcEntete.vue'
+import csqcTexteBilingue from './composants/csqcTexteBilingue.vue'
+import csqcSwitch from './composants/csqcSwitch.vue'
+
+//import csqcEditeurTexteRiche from './composants/csqcEditeurTexteRiche.vue'
+import csqcImportCSV from './composants/csqcImportCSV.vue'
+import csqcRechercheUtilisateur from './composants/csqcRechercheUtilisateur.vue'
+import validateurs from './composants/validateurs'
+
+// modèles
+import NotificationGabaritDefaut from './modeles/notificationGabaritDefaut'
+import modeleSnackbar from './modeles/composants/snackbar'
+import modeleDatatableColonne from './modeles/composants/datatableColonne'
+import apiReponse from './modeles/apiReponse'
+import data from './modeles/data'
+import response from './modeles/response'
+
+// outils
+import csqcRafraichisseurToken from './outils/rafraichisseurToken'
+import csqcRafraichisseurTokenParent from './outils/csqcRafraichisseurTokenParent'
+import csqcOutils from './outils/csqcOutils'
+
+// plugins
+import csqcVuetify from './plugins/vuetify'
+
+// i18n
+import csqcEn from './locales/en.json'
+import csqcFr from './locales/fr.json'
+
+export {
+  csqcFr,
+  csqcEn,
+  csqcAlerteErreur,
+  csqcDialogue,
+  csqcConfirmation,
+  csqcSaisie,
+  csqcDate,
+  csqcOptionSwitch, // a enlever eventuellement
+  csqcSwitch,
+  csqcRecherche,
+  csqcSnackbar,
+  csqcTable,
+  csqcTiroir,
+  csqcMenu,
+  csqcCodeBudgetaire,
+  csqcChaise,
+  pivFooter,
+  pivEntete,
+  csqcAide,
+  csqcEntete,
+  csqcTexteBilingue,
+  // csqcEditeurTexteRiche,
+  validateurs,
+  csqcImportCSV,
+  csqcRechercheUtilisateur,
+  csqcRafraichisseurToken,
+  csqcRafraichisseurTokenParent,
+  csqcOutils,
+  modeleSnackbar,
+  modeleDatatableColonne as colonne,
+  apiReponse,
+  data,
+  response,
+  NotificationGabaritDefaut,
+  csqcVuetify
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codevdesign",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "Composants Vuetify 4 pour les projets Codev",
   "files": [
     "./**/*.vue",

package/plugins/vuetify.ts

@@ -16,19 +16,43 @@ export default createVuetify({
     BoutonPrimaire: VBtn,
     BoutonSecondaire: VBtn,
     BoutonTertiaire: VBtn,
+    BoutonPrimaireStandard: VBtn,
+    BoutonSecondaireStandard: VBtn,
+    BoutonTertiaireStandard: VBtn,
   },
   defaults: {
-    VBtn: {
-      style: 'border-radius: 0px;'
-    },
     BoutonPrimaire: {
       variant: 'flat',
+      color: "primary",
+      class: "BoutonCSQCCompact"
     },
     BoutonSecondaire: {
       variant: 'outlined',
+      color: "primary",
+      class: "BoutonCSQCCompact"
     },
     BoutonTertiaire: {
       variant: 'text',
+      color: "primary",
+      class: "BoutonCSQCCompact"
+    },
+    BoutonPrimaireStandard: {
+      variant: 'flat',
+      color: "primary",
+      size: "x-large",
+      class: "BoutonCSQC"
+    },
+    BoutonSecondaireStandard: {
+      variant: 'outlined',
+      color: "primary",
+      size: "x-large",
+      class: "BoutonCSQC"
+    },
+    BoutonTertiaireStandard: {
+      variant: 'text',
+      color: "primary",
+      size: "x-large",
+      class: "BoutonCSQC"
     },
     VTextField: {
       variant: 'outlined',
@@ -73,7 +97,7 @@ export default createVuetify({
           bleuPale: '#DAE6F0',
           bleuClair: '#4A98D9',
           bleuMoyen: '#19406C',
-          bleuFonce: '#223654',
+          bleuFonce: '#223654', // couleur du texte
           rose: '#E58271',
           rosePale: '#FFDBD6',
           rouge: '#CB381F',