@mixd-id/web-scaffold 0.1.240411027 → 0.1.240411028

package/package.json

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

package/src/components/PresetSelectorFilterItem.vue

@@ -88,7 +88,8 @@
       </div>
 
       <div v-else class="flex flex-row gap-2">
-        <Dropdown v-model="value.operator" class="w-[100px]"
+        <Dropdown v-model="value.operator"
+                  :class="![ 'notEmpty' ].includes(value.operator) ? 'w-[100px]' : 'w-full'"
                   :readonly="readonly"
                   @change="apply">
           <option value="eq">Equal</option>
@@ -100,8 +101,10 @@
           <option value="in">Multiple with comma</option>
           <option value="notIn">Except with comma</option>
           <option value="regex">Regex</option>
+          <option value="notEmpty">Not Empty</option>
         </Dropdown>
-        <Textbox v-model="value.value"
+        <Textbox v-if="![ 'notEmpty' ].includes(value.operator)"
+                 v-model="value.value"
                  :readonly="readonly"
                  class="flex-1"
                  @keyup.enter="apply"

package/src/utils/helpers.mjs

@@ -560,34 +560,37 @@ const arrayRemove = (arr, items, opt = {}) => {
   }
 }
 
-const arrayUnshift = (arr, item, opt = {}) => {
+const arrayUnshift = (arr, items, opt = { update:true }) => {
   if(!Array.isArray(arr)) return
+  if(!Array.isArray(items)) items = [ items ]
   if(!opt.key){
-    opt.key = item && item.uid ? 'uid' : 'id'
+    opt.key = items[0] && items[0].uid ? 'uid' : 'id'
   }
 
-  opt = Object.assign({ key:"id", highlight:false }, opt)
+  if(!Array.isArray(opt.key)){
+    opt.key = [ opt.key ]
+  }
 
-  const index = arr.findIndex((_) => _[opt.key] === item[opt.key])
-  if(index >= 0){
+  for(let item of items){
+    if(!item) continue
 
-    const keys = []
-    for(let key in item){
-      if(!(key in arr[index]) || arr[index][key] !== item[key]){
-        keys.push(key)
+    const index = arr.findIndex((_) => {
+      for(let key of opt.key){
+        if(_[key] !== item[key]){
+          return false
+        }
       }
-    }
+      return true
+    })
 
-    if(opt.highlight){
-      item._highlight = keys
+    if(index >= 0){
+      if(opt.update !== false){
+        Object.assign(arr[index], item)
+      }
     }
-    Object.assign(arr[index], item)
-  }
-  else{
-    if(opt.highlight){
-      item._highlight = true
+    else{
+      arr.unshift(item)
     }
-    arr.unshift(item)
   }
 }
 

package/src/utils/preset-selector.cjs

@@ -307,6 +307,17 @@ const getValue = (filter, opt) => {
             }
           break
 
+        case 'notEmpty':
+          whereObj = {
+            [key]:{
+              [Op.or]: [
+                { [Op.ne]: null },
+                { [Op.ne]: '' }
+              ]
+            }
+          }
+          break
+
         case 'in':
           withoutKey ?
             whereObj = {
@@ -676,6 +687,17 @@ const filtersToSequelizeWhere = async(filters, opt) => {
             }
             break
 
+          case 'notEmpty':
+            whereObj = {
+              [key]:{
+                [Op.or]: [
+                  { [Op.ne]: null },
+                  { [Op.ne]: '' }
+                ]
+              }
+            }
+            break
+
           case 'in':
             whereObj = {
               [key]:{

package/src/utils/preset-selector.js

@@ -307,6 +307,17 @@ const getValue = (filter, opt) => {
             }
           break
 
+        case 'notEmpty':
+          whereObj = {
+            [key]:{
+              [Op.or]: [
+                { [Op.ne]: null },
+                { [Op.ne]: '' }
+              ]
+            }
+          }
+          break
+
         case 'in':
           withoutKey ?
             whereObj = {
@@ -676,6 +687,17 @@ const filtersToSequelizeWhere = async(filters, opt) => {
             }
             break
 
+          case 'notEmpty':
+            whereObj = {
+              [key]:{
+                [Op.or]: [
+                  { [Op.ne]: null },
+                  { [Op.ne]: '' }
+                ]
+              }
+            }
+            break
+
           case 'in':
             whereObj = {
               [key]:{