@mixd-id/web-scaffold 0.1.230406270 → 0.1.230406272

package/package.json

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

package/src/components/List.vue

@@ -247,7 +247,6 @@ export default{
     },
 
     loadNext(){
-      console.log('loadNext', this.data)
       if(this.src &&
           ((this.data ?? {}).hasNext !== false) &&
           !(this.preset.pivot ?? {}).enabled) {

package/src/components/PresetSelectorFilterItem.vue

@@ -57,6 +57,12 @@
         <Radio :name="value.key" :value="false" v-model="value.value" @change="apply">False</Radio>
       </div>
 
+      <div v-else-if="type === 'component'">
+        <component :is="column.component"
+                   :value="value"
+                   @change="apply" />
+      </div>
+
       <div v-else class="flex flex-row gap-2">
         <Dropdown v-model="value.operator" class="w-[100px]"
                   @change="apply">
@@ -89,6 +95,10 @@ export default{
 
   props: {
 
+    column: {
+      type: Object,
+      default: {}
+    },
     type: String,
     value: Object,
 

package/src/utils/preset-selector.js

@@ -304,12 +304,12 @@ const getValue = (filter, opt) => {
         case 'in':
           withoutKey ?
             whereObj = {
-              [Op.in]: filter.value.split(',')
+              [Op.in]: (!Array.isArray(filter.value) ? filter.value.split(',') : filter.value)
                 .map(_ => parseInt(_))
                 .filter(_ => !isNaN(_))
             } :
             whereObj[key] = {
-              [Op.in]: filter.value.split(',')
+              [Op.in]: (!Array.isArray(filter.value) ? filter.value.split(',') : filter.value)
                 .map(_ => parseInt(_))
                 .filter(_ => !isNaN(_))
             }
@@ -342,12 +342,15 @@ const getValue = (filter, opt) => {
       break
   }
 
+
+  console.log('getValue', filter, key, type, operator, util.inspect(whereObj, false, null, true /* enable colors */))
+
   return whereObj
 }
 
 
 const filtersToSequelizeWhere = async(filters, opt) => {
-  if(!Array.isArray(filters)){
+  if(!Array.isArray(filters) || filters.length < 1){
     return {
       where: {},
       replacements: []
@@ -361,9 +364,9 @@ const filtersToSequelizeWhere = async(filters, opt) => {
   for(let filter of filters) {
     if (filter.enabled === false) continue
 
-    const { key, value } = filter
+    const { key, value, operator } = filter
 
-    if(Array.isArray(value)){
+    if(Array.isArray(value) && !operator){
       const { modifier = 'and' } = filter
 
       if(![ 'and', 'or' ].includes(modifier)) continue

package/src/utils/wss.mjs

@@ -162,7 +162,6 @@ class WSS extends EventEmitter2{
       return
     }
     else if(!this._instance.isAuth){
-      console.log('add pending send', { path, params, cb, err })
       this._pendingSend.push({ path, params, cb, err })
       return
     }

package/src/widgets/PresetSelector.vue

@@ -173,7 +173,13 @@
 
           <div v-for="(filter, idx) in preset.filters" class="p-6">
 
-            <div class="flex flex-row items-start gap-2">
+            <component v-if="column(filter.key).type === 'component'"
+                       :is="column(filter.key).component"
+                       :filter="filter"
+                       @remove="preset.filters.splice(idx, 1)">
+            </component>
+
+            <div v-else class="flex flex-row items-start gap-2">
               <Checkbox v-model="filter.enabled" :default="true" />
               <div class="flex-1 flex flex-col gap-3">
                 <div class="flex-1 flex flex-row gap-3">
@@ -189,12 +195,14 @@
                 </div>
                 <div v-if="Array.isArray(filter.value)" class="flex flex-col gap-2">
                   <PresetSelectorFilterItem v-for="(filterVal, filterIdx) in filter.value"
+                                            :column="column(filter.key)"
                                             :type="typeOf(column(filter.key).type)"
                                             :value="filterVal"
                                             :index="filterIdx"
                                             @remove="filter.value.splice(filterIdx, 1)" />
                 </div>
                 <PresetSelectorFilterItem v-else
+                                          :column="column(filter.key)"
                                           :type="typeOf(column(filter.key).type)"
                                           :value="filter" />
               </div>
@@ -565,10 +573,11 @@ export default{
 
 	methods: {
 
-    add(filter){
+    add(column){
       if(!Array.isArray(this.preset.filters))
         this.preset.filters = []
-      this.preset.filters.push({ key:filter.key, value:[{}] })
+
+      this.preset.filters.push({ key:column.key, value:column.type !== 'component' ? [{}] : null })
     },
 
     addPivot(type, obj){