codevdesign 1.0.21 → 1.0.22

package/composants/csqcCodeBudgetaireGenerique.vue

@@ -9,15 +9,12 @@
         v-model="codeBudgetaire"
         :items="codeBudgetairesProp"
         v-bind="$attrs"
-        :label="label"
         persistent-hint
         variant="outlined"
         hide-details="auto"
-        :error="!estValide"
-        :rules="[v => (estValide ? true : regleMessageErreur)]"
+        :error="!estValideComplet"
+        :rules="reglesVuetify"
         :hint="afficherHint ? placeholder : ''"
-        :max-width="maxWidth || '100%'"
-        :min-width="minWidth || '100%'"
         @blur="sauvegarder"
         @keydown.enter="sauvegarder"
         @keydown="caractereAutorises"
@@ -42,18 +39,17 @@
     defineProps<{
       codeBudgetairesProp: string[]
       modelValue: string | null
-      label: string
       afficherHint?: boolean
       regleMessageErreur: string
-      maxWidth?: string | number
-      minWidth?: string | number
       format?: string
       activerExtension?: boolean
+      reglesSupp?: ((v: string) => true | string)[]
     }>(),
     {
       afficherHint: false,
       format: '999-9-99999-999',
       activerExtension: false,
+      reglesSupp: () => [],
     },
   )
 
@@ -94,6 +90,23 @@
     return alphanumAt.every(i => /^[A-Z0-9]$/i.test(extension[i]!))
   })
 
+  //  Règles Vuetify combinées (interne + supplémentaires)
+  const reglesVuetify = computed(() => [
+    // règle interne
+    () => (estValide.value ? true : props.regleMessageErreur),
+
+    // règles supplémentaires venant du parent
+    ...props.reglesSupp.map(rule => {
+      return () => rule(codeBudgetaire.value) // on passe la valeur formatée
+    }),
+  ])
+
+  //  Validité globale du composant (interne + toutes les règles supp)
+  const estValideComplet = computed(() => {
+    if (!estValide.value) return false
+    return props.reglesSupp.every(rule => rule(codeBudgetaire.value) === true)
+  })
+
   const caractereAutorises = (e: KeyboardEvent) => {
     if (e.ctrlKey || e.metaKey) return
 
@@ -232,7 +245,9 @@
 
   const sauvegarder = () => {
     codeBudgetaire.value = formaterCodeBudgetaire(codeBudgetaire.value)
-    if (!estValide.value) return
+
+    // on utilise la validité globale
+    if (!estValideComplet.value) return
     if (codeBudgetaire.value === derniereValeurSauvegardee.value) return
 
     const existe = props.codeBudgetairesProp.some(
@@ -254,12 +269,12 @@
     const valeurFormatee = codeBudgetaire.value
     const estDansListe = props.codeBudgetairesProp.includes(valeurFormatee)
 
-    if (estDansListe && valeurFormatee !== derniereValeurSauvegardee.value && estValide.value) {
+    if (estDansListe && valeurFormatee !== derniereValeurSauvegardee.value && estValideComplet.value) {
       sauvegarder()
     }
   }
 
-  watch(estValide, value => {
+  watch(estValideComplet, value => {
     emit('update:valide', value)
   })
 </script>

package/composants/csqcEditeurTexteRiche.vue

@@ -1,370 +1,328 @@
-<template>
-  <div class="editor">
-    <!-- Remount contrôlé pour TinyMCE -->
-    <Editor
-      v-bind="$attrs"
-      v-if="editorReady"
-      v-model="editorValue"
-      :init="initOptions"
-      :disabled="desactiver"
-      license-key="gpl"
-      @blur="onBlur"
-      @keydown="onUserActivity"
-      @change="onUserActivity"
-    />
-  </div>
-</template>
-
-<script>
-  import Editor from '@tinymce/tinymce-vue'
-  import * as tinymce from 'tinymce/tinymce.js'
-
-  // Core/skins/thème
-  import 'tinymce/icons/default/icons.min.js'
-  import 'tinymce/themes/silver/theme.min.js'
-  import 'tinymce/models/dom/model.min.js'
-  import 'tinymce/skins/ui/oxide/skin.js'
-  import 'tinymce/skins/ui/oxide/content.js'
-  import 'tinymce/skins/content/default/content.js'
-
-  // Langue
-  import 'tinymce-i18n/langs7/fr_FR'
-
-  // Plugins
-  import 'tinymce/plugins/autoresize/plugin.min.js'
-  import 'tinymce/plugins/advlist/plugin.min.js'
-  import 'tinymce/plugins/lists/plugin.min.js'
-  import 'tinymce/plugins/link/plugin.min.js'
-  import 'tinymce/plugins/autolink/plugin.min.js'
-  import 'tinymce/plugins/fullscreen/plugin.min.js'
-  import 'tinymce/plugins/table/plugin.min.js'
-  import 'tinymce/plugins/image/plugin.min.js'
-  //import 'tinymce/plugins/emoticons/plugin.min.js'
-  //import 'tinymce/plugins/emoticons/js/emojis.min.js'
-  import 'tinymce/plugins/code/plugin.min.js'
-
-  const openLink = (url, target) => {
-    if (!url) return
-    if (import.meta.env.MODE !== 'development') {
-      if (target && target !== '_blank') {
-        document.location.href = url
-        return
-      }
-      window.open(url, target || '_blank', 'noopener,noreferrer')
-    }
-  }
-
-  export default {
-    name: 'EditeurForm',
-    components: { Editor },
-
-    props: {
-      modelValue: { type: String, default: '' },
-      langue: { type: String, default: 'fr_FR' },
-      redimension: { type: Boolean, default: false },
-      desactiver: { type: Boolean, default: false },
-      hauteur: { type: [String, Number], default: '400' },
-      hauteurMinimale: { type: [String, Number], default: '200' },
-      plugins: {
-        type: [String, Array],
-        default: 'autoresize table image link fullscreen advlist lists autolink code',
-      },
-      autoriserImage: { type: Boolean, default: false },
-      imageTailleMaximale: { type: Number, default: 5 }, // Mo
-      cacherBarreMenu: { type: Boolean, default: false },
-      cacherBarreOutils: { type: Boolean, default: false },
-      toolbar: {
-        type: [String, Array],
-        default:
-          'bold italic underline strikethrough | print | fontsizeselect | forecolor backcolor | ' +
-          'alignleft aligncenter alignright alignjustify | emoticons | bullist numlist | ' +
-          'image | link | outdent indent blockquote | undo redo | fullscreen | removeformat | table | code',
-      },
-    },
-
-    emits: ['update:modelValue', 'blur'],
-
-    data() {
-      return {
-        editorReady: true,
-        _editor: null,
-        editorValue: this.modelValue, // lié au v-model
-        _reinitPending: false,
-        _reinitLock: false,
-      }
-    },
-
-    computed: {
-      imageTailleMaxMo() {
-        const n = Number(this.imageTailleMaximale)
-        if (!Number.isFinite(n)) return 5
-        return Math.min(100, Math.max(0, n))
-      },
-
-      toolbarEffective() {
-        if (this.cacherBarreOutils) return false
-        const raw = Array.isArray(this.toolbar) ? this.toolbar.join(' | ') : this.toolbar
-        if (this.autoriserImage) return this._normalizeToolbar(raw)
-
-        const sansImage = raw
-          .replace(/\bimage\b/g, '')
-          .replace(/\s*\|\s*/g, ' | ')
-          .replace(/(\s*\|\s*){2,}/g, ' | ')
-          .replace(/^\s*\|\s*|\s*\|\s*$/g, '')
-          .replace(/\s{2,}/g, ' ')
-          .trim()
-
-        return this._normalizeToolbar(sansImage)
-      },
-
-      pluginsEffective() {
-        const list = (Array.isArray(this.plugins) ? this.plugins : this.plugins.split(/\s+/))
-          .map(p => p.trim())
-          .filter(Boolean)
-        const filtered = !this.autoriserImage ? list.filter(p => p !== 'image') : list
-        return filtered.join(' ')
-      },
-
-      initOptions() {
-        const opts = {
-          autolink: !this.desactiver,
-          autoresize: true,
-          automatic_uploads: this.autoriserImage,
-          branding: false,
-          browser_spellcheck: true,
-          content_css: 'default',
-          deprecation_warnings: false,
-          emoticons_database: 'emojis',
-          highlight_on_focus: false,
-          image_dimensions: this.autoriserImage,
-          language: this.langue === 'en' ? 'en_US' : 'fr_FR',
-          license_key: 'gpl',
-          height: Number(this.hauteur) || 200,
-          min_height: Number(this.hauteurMinimale) || 200,
-          max_height: Number(this.hauteur) || 1000,
-          menubar: !this.cacherBarreMenu,
-          object_resizing: this.autoriserImage,
-          paste_data_images: this.autoriserImage,
-          plugins: this.pluginsEffective,
-          promotion: false,
-          readonly: this.desactiver,
-          resize: this.redimension,
-          resize_img_proportional: this.autoriserImage,
-          skin_url: 'default',
-          statusbar: this.cacherBarreOutils === false,
-          theme_advanced_resizing: true,
-          theme_advanced_resizing_use_cookie: false,
-          toolbar: this.toolbarEffective,
-          content_style: `
-            @page {
-              size: 8.5in 11in;
-              margin: 0.5in;
-            }
-
-            @media print {
-              html, body {
-                margin: 0;
-                padding: 0;
-              }
-
-              body {
-                width: 8.5in;
-                min-height: 11in;
-                box-sizing: border-box;
-              }
-
-              .mce-content-body {
-                max-width: 7.5in;  /* un peu plus large si tu veux */
-                margin: 0 auto;
-                font-size: 11pt;
-                line-height: 1.3;
-              }
-
-              img, table {
-                max-width: 100%;
-                height: auto;
-              }
-            }
-          `,
-
-          // --- File picker seulement si images permises ---
-          ...(this.autoriserImage ? {} : { file_picker_types: 'image' }),
-
-          setup: editor => {
-            this._editor = editor
-
-            editor.on('init', () => {
-              // init ok
-            })
-
-            // Intercepter clics liens
-            editor.on('click', e => {
-              const a = e.target?.closest?.('a')
-              if (!a) return
-              const href = a.getAttribute('href')
-              const target = a.getAttribute('target')
-              if (href) {
-                e.preventDefault()
-                openLink(href, target)
-              }
-            })
-
-            // ENTER sur un lien
-            editor.on('keydown', e => {
-              if (e.key !== 'Enter') return
-              const node = editor.selection?.getNode?.()
-              const a = node?.closest?.('a')
-              if (a) {
-                e.preventDefault()
-                openLink(a.getAttribute('href'), a.getAttribute('target'))
-              }
-            })
-          },
-        }
-
-        if (this.autoriserImage) {
-          opts.file_picker_callback = cb => {
-            const input = document.createElement('input')
-            input.type = 'file'
-            input.accept = 'image/*'
-            input.onchange = () => {
-              const file = input.files?.[0]
-              if (!file) return
-
-              const reader = new FileReader()
-              reader.onload = () => {
-                const base64 = String(reader.result).split(',')[1]
-                const editor = this._editor
-                const blobCache = editor?.editorUpload?.blobCache
-                if (!blobCache) return
-
-                const id = 'blobid' + Date.now()
-                const blobInfo = blobCache.create(id, file, base64)
-                const imageSize = blobInfo.blob().size / 1_000_000
-                if (imageSize > this.imageTailleMaxMo) {
-                  alert('Fichier trop volumineux > ' + this.imageTailleMaxMo + ' Mo')
-                  return
-                }
-                blobCache.add(blobInfo)
-                cb(blobInfo.blobUri(), { title: file.name })
-              }
-              reader.readAsDataURL(file)
-            }
-            input.click()
-          }
-        }
-
-        return opts
-      },
-    },
-
-    watch: {
-      /* v-model (parent -> enfant) */
-      modelValue(v) {
-        this.editorValue = v
-      },
-
-      /* v-model (enfant -> parent) */
-      editorValue(v) {
-        this.$emit('update:modelValue', v)
-      },
-
-      // Re-montage propre sur changements des props
-      autoriserImage() {
-        this._scheduleReinit()
-      },
-      hauteur() {
-        this._scheduleReinit()
-      },
-      hauteurMinimale() {
-        this._scheduleReinit()
-      },
-      redimension() {
-        this._scheduleReinit()
-      },
-      toolbar() {
-        this._scheduleReinit()
-      },
-      imageTailleMaximale() {
-        this._scheduleReinit()
-      },
-      plugins() {
-        this._scheduleReinit()
-      },
-      cacherBarreOutils() {
-        this._scheduleReinit()
-      },
-      cacherBarreMenu() {
-        this._scheduleReinit()
-      },
-    },
-
-    methods: {
-      onBlur() {
-        if (!this.desactiver) this.$emit('blur')
-      },
-      onUserActivity() {},
-      insererAuCurseur(texte) {
-        const ed = this._editor
-        if (!ed) return
-
-        // Focus sur l'éditeur pour que TinyMCE sache où insérer
-        ed.focus()
-
-        // Insert au curseur (respecte le contexte HTML)
-        ed.insertContent(texte)
-      },
-      _normalizeToolbar(tb) {
-        const trimmed = (tb || '').trim()
-        return trimmed && trimmed !== '|' ? trimmed : 'undo redo'
-      },
-
-      _scheduleReinit() {
-        if (this._reinitPending) return
-        this._reinitPending = true
-        queueMicrotask(async () => {
-          this._reinitPending = false
-          await this._reinitEditor()
-        })
-      },
-
-      async _reinitEditor() {
-        if (this._reinitLock) return
-        this._reinitLock = true
-        try {
-          const ed = this._editor
-          if (ed && typeof ed.remove === 'function') {
-            try {
-              ed.remove()
-            } catch (e) {
-              console.warn('[Editeur] editor.remove erreur', e)
-            }
-          }
-          this._editor = null
-
-          // remount contrôlé
-          this.editorReady = false
-          await this.$nextTick()
-          this.editorReady = true
-          await this.$nextTick()
-        } finally {
-          this._reinitLock = false
-        }
-      },
-    },
-
-    beforeUnmount() {
-      try {
-        const ed = this._editor
-        if (ed && typeof ed.remove === 'function') ed.remove()
-      } catch {}
-      this._editor = null
-    },
-  }
-</script>
-
-<style scoped>
-  .editor a {
-    cursor: pointer !important;
-  }
-</style>
+<template>
+  <div class="editor">
+    <!-- Remount contrôlé pour TinyMCE -->
+    <Editor
+      v-bind="$attrs"
+      v-if="editorReady"
+      v-model="editorValue"
+      :init="initOptions"
+      :disabled="desactiver"
+      license-key="gpl"
+      @blur="onBlur"
+      @keydown="onUserActivity"
+      @change="onUserActivity"
+    />
+  </div>
+</template>
+
+<script>
+  import Editor from '@tinymce/tinymce-vue'
+  import * as tinymce from 'tinymce/tinymce.js'
+
+  // Core/skins/thème
+  import 'tinymce/icons/default/icons.min.js'
+  import 'tinymce/themes/silver/theme.min.js'
+  import 'tinymce/models/dom/model.min.js'
+  import 'tinymce/skins/ui/oxide/skin.js'
+  import 'tinymce/skins/ui/oxide/content.js'
+  import 'tinymce/skins/content/default/content.js'
+
+  // Langue
+  import 'tinymce-i18n/langs7/fr_FR'
+
+  // Plugins
+  import 'tinymce/plugins/autoresize/plugin.min.js'
+  import 'tinymce/plugins/advlist/plugin.min.js'
+  import 'tinymce/plugins/lists/plugin.min.js'
+  import 'tinymce/plugins/link/plugin.min.js'
+  import 'tinymce/plugins/autolink/plugin.min.js'
+  import 'tinymce/plugins/fullscreen/plugin.min.js'
+  import 'tinymce/plugins/table/plugin.min.js'
+  import 'tinymce/plugins/image/plugin.min.js'
+  //import 'tinymce/plugins/emoticons/plugin.min.js'
+  //import 'tinymce/plugins/emoticons/js/emojis.min.js'
+  import 'tinymce/plugins/code/plugin.min.js'
+
+  const openLink = (url, target) => {
+    if (!url) return
+    if (import.meta.env.MODE !== 'development') {
+      if (target && target !== '_blank') {
+        document.location.href = url
+        return
+      }
+      window.open(url, target || '_blank', 'noopener,noreferrer')
+    }
+  }
+
+  export default {
+    name: 'EditeurForm',
+    components: { Editor },
+
+    props: {
+      modelValue: { type: String, default: '' },
+      langue: { type: String, default: 'fr_FR' },
+      interdireRedimension: { type: Boolean, default: false },
+      desactiver: { type: Boolean, default: false },
+      plugins: {
+        type: [String, Array],
+        default: 'autoresize table image link fullscreen advlist lists autolink code',
+      },
+      interdireImage: { type: Boolean, default: false },
+      imageTailleMaximale: { type: Number, default: 5 }, // Mo
+      cacherBarreMenu: { type: Boolean, default: false },
+      cacherBarreOutils: { type: Boolean, default: false },
+      toolbar: {
+        type: [String, Array],
+        default:
+          'bold italic underline strikethrough | fontsizeselect | forecolor backcolor | ' +
+          'alignleft aligncenter alignright alignjustify | emoticons | bullist numlist | ' +
+          'image | link | outdent indent blockquote | undo redo | fullscreen | removeformat | table | code',
+      },
+    },
+
+    emits: ['update:modelValue', 'blur'],
+
+    data() {
+      return {
+        editorReady: true,
+        _editor: null,
+        editorValue: this.modelValue, // lié au v-model
+        _reinitPending: false,
+        _reinitLock: false,
+      }
+    },
+
+    computed: {
+      imageTailleMaxMo() {
+        const n = Number(this.imageTailleMaximale)
+        if (!Number.isFinite(n)) return 5
+        return Math.min(100, Math.max(0, n))
+      },
+
+      toolbarEffective() {
+        if (this.cacherBarreOutils) return false
+        const raw = Array.isArray(this.toolbar) ? this.toolbar.join(' | ') : this.toolbar
+        if (!this.interdireImage) return this._normalizeToolbar(raw)
+
+        const sansImage = raw
+          .replace(/\bimage\b/g, '')
+          .replace(/\s*\|\s*/g, ' | ')
+          .replace(/(\s*\|\s*){2,}/g, ' | ')
+          .replace(/^\s*\|\s*|\s*\|\s*$/g, '')
+          .replace(/\s{2,}/g, ' ')
+          .trim()
+
+        return this._normalizeToolbar(sansImage)
+      },
+
+      pluginsEffective() {
+        const list = (Array.isArray(this.plugins) ? this.plugins : this.plugins.split(/\s+/))
+          .map(p => p.trim())
+          .filter(Boolean)
+        const filtered = this.interdireImage ? list.filter(p => p !== 'image') : list
+        return filtered.join(' ')
+      },
+
+      initOptions() {
+        const opts = {
+          autolink: !this.desactiver,
+          autoresize: true,
+          automatic_uploads: !this.interdireImage,
+          branding: false,
+          browser_spellcheck: true,
+          content_css: 'default',
+          deprecation_warnings: false,
+          emoticons_database: 'emojis',
+          highlight_on_focus: false,
+          image_dimensions: !this.interdireImage,
+          language: this.langue === 'en' ? 'en_US' : 'fr_FR',
+          license_key: 'gpl',
+          menubar: !this.cacherBarreMenu,
+          object_resizing: !this.interdireImage,
+          paste_data_images: !this.interdireImage,
+          plugins: this.pluginsEffective,
+          promotion: false,
+          readonly: this.desactiver,
+          resize: !this.interdireRedimension,
+          resize_img_proportional: !this.interdireImage,
+          skin_url: 'default',
+          statusbar: this.cacherBarreOutils === false,
+          theme_advanced_resizing: true,
+          theme_advanced_resizing_use_cookie: false,
+          toolbar: this.toolbarEffective,
+
+          // --- File picker seulement si images permises ---
+          ...(this.interdireImage ? {} : { file_picker_types: 'image' }),
+
+          setup: editor => {
+            this._editor = editor
+
+            editor.on('init', () => {
+              // init ok
+            })
+
+            // Intercepter clics liens
+            editor.on('click', e => {
+              const a = e.target?.closest?.('a')
+              if (!a) return
+              const href = a.getAttribute('href')
+              const target = a.getAttribute('target')
+              if (href) {
+                e.preventDefault()
+                openLink(href, target)
+              }
+            })
+
+            // ENTER sur un lien
+            editor.on('keydown', e => {
+              if (e.key !== 'Enter') return
+              const node = editor.selection?.getNode?.()
+              const a = node?.closest?.('a')
+              if (a) {
+                e.preventDefault()
+                openLink(a.getAttribute('href'), a.getAttribute('target'))
+              }
+            })
+          },
+        }
+
+        if (!this.interdireImage) {
+          opts.file_picker_callback = cb => {
+            const input = document.createElement('input')
+            input.type = 'file'
+            input.accept = 'image/*'
+            input.onchange = () => {
+              const file = input.files?.[0]
+              if (!file) return
+
+              const reader = new FileReader()
+              reader.onload = () => {
+                const base64 = String(reader.result).split(',')[1]
+                const editor = this._editor
+                const blobCache = editor?.editorUpload?.blobCache
+                if (!blobCache) return
+
+                const id = 'blobid' + Date.now()
+                const blobInfo = blobCache.create(id, file, base64)
+                const imageSize = blobInfo.blob().size / 1_000_000
+                if (imageSize > this.imageTailleMaxMo) {
+                  alert('Fichier trop volumineux > ' + this.imageTailleMaxMo + ' Mo')
+                  return
+                }
+                blobCache.add(blobInfo)
+                cb(blobInfo.blobUri(), { title: file.name })
+              }
+              reader.readAsDataURL(file)
+            }
+            input.click()
+          }
+        }
+
+        return opts
+      },
+    },
+
+    watch: {
+      /* v-model (parent -> enfant) */
+      modelValue(v) {
+        this.editorValue = v
+      },
+
+      /* v-model (enfant -> parent) */
+      editorValue(v) {
+        this.$emit('update:modelValue', v)
+      },
+
+      // Re-montage propre sur changements des props
+      interdireImage() {
+        this._scheduleReinit()
+      },
+      interdireRedimension() {
+        this._scheduleReinit()
+      },
+      toolbar() {
+        this._scheduleReinit()
+      },
+      imageTailleMaximale() {
+        this._scheduleReinit()
+      },
+      plugins() {
+        this._scheduleReinit()
+      },
+      cacherBarreOutils() {
+        this._scheduleReinit()
+      },
+      cacherBarreMenu() {
+        this._scheduleReinit()
+      },
+    },
+
+    methods: {
+      onBlur() {
+        if (!this.desactiver) this.$emit('blur')
+      },
+      onUserActivity() {},
+      insererAuCurseur(texte) {
+        const ed = this._editor
+        if (!ed) return
+
+        // Focus sur l'éditeur pour que TinyMCE sache où insérer
+        ed.focus()
+
+        // Insert au curseur (respecte le contexte HTML)
+        ed.insertContent(texte)
+      },
+      _normalizeToolbar(tb) {
+        const trimmed = (tb || '').trim()
+        return trimmed && trimmed !== '|' ? trimmed : 'undo redo'
+      },
+
+      _scheduleReinit() {
+        if (this._reinitPending) return
+        this._reinitPending = true
+        queueMicrotask(async () => {
+          this._reinitPending = false
+          await this._reinitEditor()
+        })
+      },
+
+      async _reinitEditor() {
+        if (this._reinitLock) return
+        this._reinitLock = true
+        try {
+          const ed = this._editor
+          if (ed && typeof ed.remove === 'function') {
+            try {
+              ed.remove()
+            } catch (e) {
+              console.warn('[Editeur] editor.remove erreur', e)
+            }
+          }
+          this._editor = null
+
+          // remount contrôlé
+          this.editorReady = false
+          await this.$nextTick()
+          this.editorReady = true
+          await this.$nextTick()
+        } finally {
+          this._reinitLock = false
+        }
+      },
+    },
+
+    beforeUnmount() {
+      try {
+        const ed = this._editor
+        if (ed && typeof ed.remove === 'function') ed.remove()
+      } catch {}
+      this._editor = null
+    },
+  }
+</script>
+
+<style scoped>
+  .editor a {
+    cursor: pointer !important;
+  }
+</style>

package/package.json

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