@mixd-id/web-scaffold 0.1.230406151 → 0.1.230406152

package/package.json

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

package/src/components/ListView.vue

@@ -115,7 +115,6 @@
 				<VirtualGrid v-else-if="computedViewType === 'grid'"
 										 :items="items"
 										 :column="gridColumn"
-										 :gap="gridGap"
 										 class="flex-1"
 										 ref="table1"
 										 :opt-bar="optBar"
@@ -740,7 +739,7 @@ export default{
 			}
 
 			if(this.$screenPrefix.value === ''){
-				return 'gap-1'
+				return 'gap-0'
 			}
 
 			return this.config.gridGap

package/src/utils/helpers.js

@@ -17,6 +17,8 @@ const floor = (num, precision = 0) => {
 }
 
 const ftWildcard = (key) => {
+  if(key.indexOf('/') >= 0) return key
+
   const term = key.replace(/[\-\+\<\>\@\(\)\~]/, ' ', 'gi')
 
   const searchTerms = []

package/src/utils/listpage1.js

@@ -2,8 +2,7 @@ const { Op } = module.parent.require('sequelize')
 const Sequelize = module.parent.require('sequelize')
 const dayjs = require("dayjs");
 const Exceljs = require("exceljs");
-const { getPresetSortWhereParams } = require("./helpers");
-const { sleep } = require('@mixd-id/web-scaffold/helpers')
+const { getPresetSortWhereParams, ftWildcard } = require("./helpers");
 
 let ListPage1 = {
 
@@ -111,7 +110,6 @@ let ListPage1 = {
   async loadSummary(params){
 
     if(!this.conn){
-      console.error('Unable to load summary, connection not found')
       return
     }
 
@@ -313,7 +311,7 @@ let ListPage1 = {
     const sheet = workbook.addWorksheet('Export ' + this.name);
     sheet.columns = columns
 
-    let where = {}
+    let where = []
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -350,14 +348,6 @@ let ListPage1 = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.filters){
-      const { where:presetWhere } = this.getPresetFilterParams(preset)
-      where = {
-        ...where,
-        ...presetWhere
-      }
-    }
-
     if(preset.sorts){
       const { order:presetOrder } = this.getPresetSortParams(preset)
       if(presetOrder){
@@ -365,21 +355,25 @@ let ListPage1 = {
       }
     }
 
-    if(preset.search){
-      const tableName = this.model.name
-      where = {
-        ...where,
-        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
-      }
-      replacements.push(preset.search)
+    if(preset.search && this.matchAgainst){
+      where.push({
+        [Op.and]: Sequelize.literal(this.matchAgainst)
+      })
+      replacements.push(ftWildcard(preset.search))
+    }
+    else if(preset.filters){
+      const { where:presetWhere } = this.getPresetFilterParams(preset)
+      where.push(presetWhere)
     }
 
     if(this.downloadFilters){
-      await this.downloadFilters(params, where)
+      where.push((await this.downloadFilters(params) ?? {}))
     }
 
     const rows = await this.model.findAll({
-      where,
+      where: {
+        [Op.and]: where
+      },
       attributes: {
         ...attributes,
         include: attributeIncludes
@@ -439,7 +433,7 @@ let ListPage1 = {
 
     const { afterItem, itemsPerPage = this.itemsPerPage ?? 24 } = params
     const { preset = {} } = params
-    let where = {}
+    let where = []
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -487,19 +481,8 @@ let ListPage1 = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.filters){
-      const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
-      where = {
-        ...where,
-        ...presetWhere
-      }
-    }
-
     if(typeof this['loadFilters'] === 'function'){
-      where = {
-        ...where,
-        ...(await this['loadFilters'](params) ?? {})
-      }
+      where.push(await this['loadFilters'](params) ?? {})
     }
 
     if(preset.sorts){
@@ -509,26 +492,27 @@ let ListPage1 = {
       }
     }
 
-    if(preset.search){
-      const tableName = this.model.name
-      where = {
-        ...where,
-        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
-      }
-      replacements.push(preset.search)
+    if(preset.search && this.matchAgainst){
+      where.push({
+        [Op.and]: Sequelize.literal(this.matchAgainst)
+      })
+      replacements.push(ftWildcard(preset.search))
+    }
+    else if(preset.filters){
+      const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
+      where.push(presetWhere)
     }
 
     if(afterItem){
       const sortWhere = getPresetSortWhereParams(order, afterItem)
-      where = {
-        ...where,
-        ...sortWhere
-      }
+      where.push(sortWhere)
     }
 
     let derivedSql
     let { rows:items, count } = await this.model.findAndCountAll({
-      where,
+      where: {
+        [Op.and]: where
+      },
       attributes: {
         ...attributes,
         include: attributeIncludes

package/src/utils/listview.js

@@ -2,7 +2,7 @@ const { Op } = module.parent.require('sequelize')
 const Sequelize = module.parent.require('sequelize')
 const dayjs = require("dayjs");
 const Exceljs = require("exceljs");
-const { getPresetSortWhereParams } = require("./helpers");
+const { getPresetSortWhereParams, ftWildcard } = require("./helpers");
 
 let ListView = {
 
@@ -45,7 +45,6 @@ let ListView = {
   async loadSummary(params, loadResults){
 
     if(!this.conn){
-      console.error('Unable to load summary, connection not found')
       return
     }
 
@@ -110,7 +109,7 @@ let ListView = {
     const sheet = workbook.addWorksheet('Export ' + this.name);
     sheet.columns = columns
 
-    let where = {}
+    let where = []
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -147,14 +146,6 @@ let ListView = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.filters){
-      const { where:presetWhere } = this.getPresetFilterParams(preset)
-      where = {
-        ...where,
-        ...presetWhere
-      }
-    }
-
     if(preset.sorts){
       const { order:presetOrder } = this.getPresetSortParams(preset)
       if(presetOrder){
@@ -162,21 +153,25 @@ let ListView = {
       }
     }
 
-    if(preset.search){
-      const tableName = this.model.name
-      where = {
-        ...where,
-        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
-      }
-      replacements.push(preset.search)
+    if(preset.search && this.matchAgainst){
+      where.push({
+        [Op.and]: Sequelize.literal(this.matchAgainst)
+      })
+      replacements.push(ftWildcard(preset.search))
+    }
+    else if(preset.filters){
+      const { where:presetWhere } = this.getPresetFilterParams(preset)
+      where.push(presetWhere)
     }
 
     if(this.downloadFilters){
-      await this.downloadFilters(params, where)
+      where.push((await this.downloadFilters(params) ?? {}))
     }
 
     const rows = await this.model.findAll({
-      where,
+      where: {
+        [Op.and]: where
+      },
       attributes: {
         ...attributes,
         include: attributeIncludes
@@ -237,7 +232,7 @@ let ListView = {
     const { afterItem, itemsPerPage = this.itemsPerPage ?? 24 } = params
 
     const { preset = {} } = params
-    let where = {}
+    let where = []
     let replacements = []
     let order = [
       [ 'updatedAt', 'desc' ],
@@ -281,27 +276,19 @@ let ListView = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.search && modelAttributes['tag']){
-      const tableName = this.model.name
-      where = {
-        ...where,
-        [Op.and]: Sequelize.literal(`MATCH(\`${tableName}\`.tag) AGAINST (? IN BOOLEAN MODE)`)
-      }
-      replacements.push(preset.search)
+    if(preset.search && this.matchAgainst){
+      where.push({
+        [Op.and]: Sequelize.literal(this.matchAgainst)
+      })
+      replacements.push(ftWildcard(preset.search))
     }
     else if(preset.filters){
       const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
-      where = {
-        ...where,
-        ...presetWhere
-      }
+      where.push(presetWhere)
     }
 
     if(typeof this['loadFilters'] === 'function'){
-      where = {
-        ...where,
-        ...(await this['loadFilters'](params) ?? {})
-      }
+      where.push(await this['loadFilters'](params) ?? {})
     }
 
     if(preset.sorts){
@@ -313,15 +300,14 @@ let ListView = {
 
     if(afterItem){
       const sortWhere = getPresetSortWhereParams(order, afterItem)
-      where = {
-        ...where,
-        ...sortWhere
-      }
+      where.push(sortWhere)
     }
 
     let derivedSql
     let { rows:items, count } = await this.model.findAndCountAll({
-      where,
+      where: {
+        [Op.and]: where
+      },
       attributes: [
         ...attributes,
         ...attributeIncludes