@mixd-id/web-scaffold 0.1.230406013 → 0.1.230406015

package/package.json

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

package/src/components/OTPField.vue

@@ -1,7 +1,7 @@
 <template>
 	<div :class="$style.comp">
 		<div :class="computedClass">
-			<input :class="$style.input" maxlength="1" type="tel"
+			<input :class="$style.input" maxlength="1" type="tel" @focus="onFocus"
 						 ref="verify" @keydown="verifyKeyDown" v-for="i in parseInt(length)"
 						 :value="typeof modelValue === 'string' ? modelValue.split('')[i - 1] : ''"
 						 @paste="verifyPaste" @keyup="verifyKeyUp($event, i - 1)" />
@@ -81,6 +81,10 @@ export default{
 			if((new RegExp('^\\d{' + this.size + '}$')).test(text)){
 				this.$emit('update:modelValue', text)
 			}
+		},
+
+		onFocus(e){
+			e.target.select()
 		}
 
 	}

package/src/components/VirtualTable.vue

@@ -321,7 +321,7 @@ export default{
 		formatColumn(item, column){
 
 			let value
-			if(column.key.indexOf('.') > -1){
+			if((column.key ?? '').toString().indexOf('.') > -1){
 				const columnKeys = column.key.split('.')
 				const columnAs = columnKeys[0]
 				const columnKey = columnKeys[1]
@@ -448,6 +448,10 @@ export default{
 	width: 100%;
 }
 
+.table tr{
+	vertical-align: top;
+}
+
 .table th{
 	@apply relative text-left;
 }

package/src/utils/helpers.js

@@ -1,6 +1,7 @@
 const md5 = require("md5");
 const fs = require("fs");
 const { Op } = module.parent.require('sequelize')
+const axios = module.parent.require('axios')
 
 
 const ceil = (num, precision = 0) => {
@@ -96,7 +97,7 @@ const saveBuffer = async(buffer, dir = '/storage/files/images') => {
 
   const type = await fileTypeFromBuffer(buffer)
 
-  const storagePath = process.env.ROOT_PATH + (dir)
+  const storagePath = process.env.ROOT_PATH + dir
   const ext = type && type.ext ? '.' + type.ext : ''
   const filename = md5(buffer) + ext
   const to = storagePath + '/' + filename

package/src/utils/listpage1.js

@@ -89,6 +89,14 @@ let ListPage1 = {
 
     const { items, hasNext, count } = await this._load(params)
 
+    if(this.name){
+      if(!this.socket.loadParams){
+        this.socket.loadParams = {}
+      }
+
+      this.socket.loadParams[this.name] = params
+    }
+
     return {
       items,
       hasNext,
@@ -477,6 +485,13 @@ let ListPage1 = {
       }
     }
 
+    if(typeof this['loadFilters'] === 'function'){
+      where = {
+        ...where,
+        ...(await this['loadFilters'](params) ?? {})
+      }
+    }
+
     if(preset.sorts){
       const { order:presetOrder } = this.getPresetSortParams(preset, includes)
       if(presetOrder){
@@ -541,7 +556,7 @@ let ListPage1 = {
     }*/
 
     if(this.socket){
-      this.socket.joinWithArgs(this.channel, { preset })
+      this.socket.join(this.channel)
     }
 
     return {
@@ -1046,8 +1061,6 @@ let ListPage1 = {
 
     if(preset.filters){
 
-      //console.log(util.inspect(preset.filters, false, null, true /* enable colors */))
-
       preset.filters.forEach((filter) => {
 
         if(!filter.enabled) return
@@ -1127,12 +1140,6 @@ let ListPage1 = {
       })
     }
 
-    //console.log(util.inspect(where, false, null, true /* enable colors */))
-
-    /*console.log(util.inspect(preset.filters, false, null, true /!* enable colors *!/))
-    console.log(where)
-    console.log(replacements)*/
-
     return {
       where,
       replacements
@@ -1284,6 +1291,13 @@ let ListPage1 = {
                 [Op.lte]: parseFloat(value)
               }
               break
+
+            case 'in':
+              whereValue = {
+                ...whereValue,
+                [Op.in]: Array.isArray(value) ? value : (value.toString().split(','))
+              }
+              break
           }
         })
         break
@@ -1349,6 +1363,14 @@ let ListPage1 = {
                 [Op.regexp]: value
               })
               break
+
+            case 'in':
+              console.log('#number in', Array.isArray(value) ? value : (value.toString().split(',')))
+              whereValue = {
+                ...whereValue,
+                [Op.in]: Array.isArray(value) ? value : (value.toString().split(','))
+              }
+              break
           }
         })
         break
@@ -1407,13 +1429,44 @@ let ListPage1 = {
 
   async onHooks(model, event, items, socket){
 
-    switch(event){
-      case 'destroy':
-      case 'remove':
-      default:
-        socket.emit(model, event, items)
-        break
+    if(socket.loadParams[this.name] && [ 'create', 'update' ].includes(event)){
+      const loadParams = { ...socket.loadParams[this.name] }
+
+      if(!loadParams.preset.filters)
+        loadParams.preset.filters = []
+      const filterIndex = loadParams.preset.filters.findIndex(filter => filter.key === 'id')
+      if(filterIndex > -1){
+        loadParams.preset.filters[filterIndex] = {
+          enabled: true,
+          type: "number",
+          key: "id",
+          filters: [
+            {
+              operator: "in",
+              value: items.map((_) => _.id)
+            }
+          ]
+        }
+      }
+      else{
+        loadParams.preset.filters.push({
+          enabled: true,
+          type: "number",
+          key: "id",
+          filters: [
+            {
+              operator: "in",
+              value: items.map((_) => _.id)
+            }
+          ]
+        })
+      }
+
+      const res = await this.load(loadParams)
+      items = res.items
     }
+
+    socket.emit(model, event, items)
   }