@mixd-id/web-scaffold 0.1.230406326 → 0.1.230406328

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406326",
+  "version": "0.1.230406328",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/List.vue

@@ -551,9 +551,8 @@ export default{
     },
 
     onSignal(event, items){
-      if(this.pivotEnabled){
-        return
-      }
+      if(this.pivotEnabled) return
+      if(!Array.isArray(items) || items.length < 1) return
 
       switch(event){
 
@@ -562,14 +561,15 @@ export default{
           break
 
         default:
+          const key = items[0] && items[0].uid ? 'uid' : 'id'
+
           this.socket.send(this.src, {
             ...this.preset,
-            id: items.map(item => item.id)
+            [key]: items.map(item => item[key])
           })
             .then(({ items:nextItems }) => {
               nextItems.forEach(item => this.$util.unshift(this.data.items, item, { highlight: true }))
 
-              const key = nextItems[0] && nextItems[0].uid ? 'uid' : 'id'
               const destroyedItems = items.filter(_ => !nextItems.find(i => i[key] === _[key]))
               this.$util.remove(this.data.items, destroyedItems)
             })

package/src/components/TextWithTag.vue

@@ -2,7 +2,11 @@
 	<div :class="$style.comp">
 
 		<div class="flex flex-row items-start">
-      <p contenteditable="true" spellcheck="false" class="flex-1 whitespace-pre-line" ref="html" v-html="html" @input="onInput"></p>
+      <p contenteditable="true" spellcheck="false" class="flex-1 whitespace-pre-line"
+         ref="html"
+         v-html="html"
+         :class="itemClass"
+         @input="onInput"></p>
 
       <button v-if="variant === 'minimal'" type="button" class="p-3" @click="$refs.modal.open()">
         <svg width="14" height="14" class="fill-text-300 hover:fill-primary" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M328 256c0 39.8-32.2 72-72 72s-72-32.2-72-72 32.2-72 72-72 72 32.2 72 72zm104-72c-39.8 0-72 32.2-72 72s32.2 72 72 72 72-32.2 72-72-32.2-72-72-72zm-352 0c-39.8 0-72 32.2-72 72s32.2 72 72 72 72-32.2 72-72-32.2-72-72-72z"/></svg>
@@ -13,7 +17,7 @@
       <div class="flex-1 flex flex-row gap-2 overflow-x-auto p-1" :class="$style.noScrollbar">
         <button type="button" v-for="item in viewedItems" :class="$style.tag2" class="text-xs" @click="add(item)">{{ item.text ?? item.value }}</button>
       </div>
-      <div class="p-1 flex items-center justify-center">
+      <div class="p-1 flex items-center justify-center" v-if="viewedItems.length > 4">
         <button type="button" class="p-1" @click="$refs.modal.open()">
           <svg width="14" height="14" class="fill-text-300 hover:fill-primary" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M328 256c0 39.8-32.2 72-72 72s-72-32.2-72-72 32.2-72 72-72 72 32.2 72 72zm104-72c-39.8 0-72 32.2-72 72s32.2 72 72 72 72-32.2 72-72-32.2-72-72-72zm-352 0c-39.8 0-72 32.2-72 72s32.2 72 72 72 72-32.2 72-72-32.2-72-72-72z"/></svg>
         </button>
@@ -63,12 +67,16 @@ export default{
 
   props:{
 
+    addFn: Function,
+
     modelValue: String,
 
     items: Array,
 
     variant: String,
 
+    itemClass: String,
+
   },
 
   computed:{
@@ -118,6 +126,10 @@ export default{
     add(item){
       this.$refs.modal.close()
 
+      if(typeof this.addFn === 'function'){
+        item = this.addFn(item)
+      }
+
       const el = document.createElement('span')
       el.setAttribute('contenteditable', 'false')
       el.setAttribute('class', this.$style.tag)
@@ -167,8 +179,10 @@ export default{
         }
 
         let html = val ?? ''
-        for(let item of this.items){
-          html = html.replaceAll(item.value, `<span class="${this.$style.tag}" contenteditable="false" @click="remove" data-value="${item.value}">${item.text ?? item.value}</span>`, 'gi')
+        if(Array.isArray(this.items)){
+          for(let item of this.items){
+            html = html.replaceAll(item.value, `<span class="${this.$style.tag}" contenteditable="false" @click="remove" data-value="${item.value}">${item.text ?? item.value}</span>`, 'gi')
+          }
         }
 
         this.html = html

package/src/utils/preset-selector.js

@@ -1277,7 +1277,7 @@ const presetToSequelizeList = async(preset, {
     ]
   }
 
-  const { itemsPerPage = 20, filters = [], sorts, pivot, afterItem, search, id } = preset;
+  const { itemsPerPage = 20, filters = [], sorts, pivot, afterItem, search, id, uid } = preset;
 
   let where = {}
   const replacements = []
@@ -1294,6 +1294,15 @@ const presetToSequelizeList = async(preset, {
     }
   }
 
+  if(Array.isArray(uid)){
+    where = {
+      ...where,
+      uid: {
+        [Op.in]: uid
+      }
+    }
+  }
+
   const { where:filterWhere, replacements:filterReplacements } = await filtersToSequelizeWhere(filters, {
     config,
     model