@mixd-id/web-scaffold 0.1.230406287 → 0.1.230406289

package/package.json

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

package/src/components/List.vue

@@ -120,7 +120,7 @@
             </div>
           </slot>
 
-          <VirtualTable v-if="presetView === 'table'"
+          <VirtualTable v-if="presetView === 'table' || pivotEnabled"
                         ref="table"
                         :columns="columns"
                         class="flex-1 rounded-lg panel-400"
@@ -170,13 +170,13 @@
         <div v-if="extBar.open && pivotEnabled"
              :style="extStyle" class="border-t-[1px] border-text-50 flex flex-col relative md:p-5">
 
-          <div :class="$style.resize2"
+          <div :class="$style.resize2" class="group"
                @mousedown="(e) => $util.dragResize(e, resize2)">
             <button type="button" @click.prevent="extBar.open = false"
-                    :class="$style.extClose">
+                    :class="$style.extClose" class="group-hover:bg-primary">
               <svg width="14"
                    height="14"
-                   class="fill-text-300 cursor-pointer"
+                   class="fill-text-300 group-hover:fill-white cursor-pointer"
                    xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.0.0-alpha3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M432.6 209.3l-191.1 183.1C235.1 397.8 229.1 400 224 400s-11.97-2.219-16.59-6.688L15.41 209.3C5.814 200.2 5.502 184.1 14.69 175.4c9.125-9.625 24.38-9.938 33.91-.7187L224 342.8l175.4-168c9.5-9.219 24.78-8.906 33.91 .7187C442.5 184.1 442.2 200.2 432.6 209.3z"/></svg>
             </button>
           </div>
@@ -922,11 +922,12 @@ export default{
 }
 
 .resize2{
-  @apply h-[3px] cursor-n-resize absolute top-0 left-0 right-0 flex items-center justify-center;
+  @apply h-[5px] hover:bg-primary bg-text-50 cursor-n-resize absolute top-0 left-0 right-0 flex items-center justify-center;
+  @apply z-20;
 }
 
 .extClose{
-  @apply w-[21px] h-[21px] rounded-full bg-base-300 flex items-center justify-center hover:bg-red-600;
+  @apply w-[21px] h-[21px] rounded-full bg-text-50 flex items-center justify-center hover:bg-red-600;
 }
 
 </style>

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,