@mixd-id/web-scaffold 0.1.230406286 → 0.1.230406288

package/package.json

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

package/src/components/List.vue

@@ -663,7 +663,9 @@ export default{
           })
         }
 
-        const [ kk, vv ] = column.key.split('-')
+        let [ kk, ...vv ] = column.key.split('-')
+        vv = vv.join('-')
+
         if(![ 'count' ].includes(vv)){
           filters.push({
             key: kk.substring(1),

package/src/utils/preset-selector.js

@@ -22,17 +22,39 @@ const getValue = (filter, opt) => {
       break
 
     case 'number':
+    case 'currency':
       switch(operator) {
         case '=':
           withoutKey ? whereObj = { [Op.eq]:filter.value } : whereObj[key] = filter.value
           break
 
         case '>':
+          withoutKey ?
+            whereObj = { [Op.gt]:filter.value } :
+            whereObj[key] = {
+              [Op[operator]]: filter.value
+            }
+          break
+
         case '>=':
+          withoutKey ?
+            whereObj = { [Op.gte]:filter.value } :
+            whereObj[key] = {
+              [Op[operator]]: filter.value
+            }
+          break
+
         case '<':
+          withoutKey ?
+            whereObj = { [Op.lt]:filter.value } :
+            whereObj[key] = {
+              [Op[operator]]: filter.value
+            }
+          break
+
         case '<=':
           withoutKey ?
-            whereObj = { [Op[operator]]:filter.value } :
+            whereObj = { [Op.lte]:filter.value } :
             whereObj[key] = {
               [Op[operator]]: filter.value
             }
@@ -40,11 +62,11 @@ const getValue = (filter, opt) => {
 
         case 'in':
           withoutKey ?
-            whereObj = { [Op.in]: filter.value.split(',')
+            whereObj = { [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(_))
             }
@@ -321,13 +343,11 @@ const getValue = (filter, opt) => {
           withoutKey ?
             whereObj = {
               [Op.in]: (!Array.isArray(filter.value) ? filter.value.split(',') : filter.value)
-                .map(_ => parseInt(_))
-                .filter(_ => !isNaN(_))
+                .filter(_ => _)
             } :
             whereObj[key] = {
               [Op.in]: (!Array.isArray(filter.value) ? filter.value.split(',') : filter.value)
-                .map(_ => parseInt(_))
-                .filter(_ => !isNaN(_))
+                .filter(_ => _)
             }
           break
 
@@ -358,6 +378,8 @@ const getValue = (filter, opt) => {
       break
   }
 
+  //console.log('getValue', type, util.inspect({ filter, whereObj }, false, null, true /* enable colors */))
+
   return whereObj
 }
 
@@ -867,7 +889,7 @@ const filtersToSequelizeInclude = async(filters, opt, includes) => {
       }
     }
   }
-  //console.log('whereObj', whereObj)
+  //console.log('whereObj', util.inspect(whereObj, false, null, true /* enable colors */))
 
   // Apply where to includes
   for(let key in whereObj){
@@ -895,7 +917,8 @@ const filtersToSequelizeInclude = async(filters, opt, includes) => {
     include.where[Op.and].push({ [currentKey]: whereObj[key] })
   }
 
-  //console.log('includes', includes)
+  //console.log('includes', util.inspect(includes, false, null, true /* enable colors */))
+
   return includes
 }
 
@@ -916,7 +939,13 @@ const syntaxSearchToSequelizeOpt = async(search, opt) => {
 }
 
 const presetToSequelizeList = async(preset, {
-  conn, model, order:initialOrder, config, where:initialWhere, replacements: initialReplacements
+  conn,
+  model,
+  config,
+  where:initialWhere,
+  replacements: initialReplacements,
+  include,
+  order:initialOrder
 }) => {
 
   if(!initialOrder){
@@ -965,6 +994,10 @@ const presetToSequelizeList = async(preset, {
     }
   }
 
+  if(include){
+    include = await filtersToSequelizeInclude(filters, config, include)
+  }
+
   if(pivot && pivot.enabled){
     const { attributes, group, order } = await pivotToSequelizeWhere(pivot, {
       model,
@@ -1005,6 +1038,7 @@ const presetToSequelizeList = async(preset, {
       },
       limit: itemsPerPage,
       order,
+      include,
       replacements: [
         ...(initialReplacements ?? []),
         ...replacements,