@mixd-id/web-scaffold 0.1.230406150 → 0.1.230406152

package/package.json

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

package/src/components/Alert.vue

@@ -131,7 +131,9 @@ export default{
 				this.alert
 
 			if(err.errors){
-				return Object.values(err.errors).join("\n")
+				return typeof err.errors === 'object' && Object.keys(err.errors).length > 0 ?
+            Object.values(err.errors).join("\n") :
+            err.errors
 			}
 			else if(err.message){
 				return err.message

package/src/components/Article.vue

@@ -1,6 +1,6 @@
 <template>
 	<div :class="$style.comp">
-    <article :class="$style.article"
+    <article ref="article" :class="$style.article"
              v-html="htmlText"
              :contenteditable="editMode"
              @input="onInput"
@@ -27,7 +27,7 @@ export default{
 	methods: {
 
 		getSelection(){
-			const { text = '', href = '', target = '' } = saveSelection(this.$el)
+			const { text = '', href = '', target = '' } = saveSelection(this.$refs.article)
 			return {
 				text,
 				href,
@@ -55,7 +55,7 @@ export default{
 
 		onClick(){
 			if(this.editMode){
-				let { element } = getSelection(this.$el)
+				let { element } = getSelection(this.$refs.article)
 
 				const table = this.closest(element, 'table')
 
@@ -81,7 +81,7 @@ export default{
 				uid: this.uid,
 				type: 'setProp',
 				value: {
-					htmlText: this.$el.innerHTML
+					htmlText: this.$refs.article.innerHTML
 				}
 			}, '*')
 		},
@@ -100,7 +100,7 @@ export default{
 
 		addTableColumn(){
 
-			let { element } = getSelection(this.$el)
+			let { element } = getSelection(this.$refs.article)
 			if(element.nodeType !== 1)
 				element = element.parentNode
 			const table = this.closest(element, 'table')
@@ -129,7 +129,7 @@ export default{
 
 		addTableRow(){
 
-			let { element } = getSelection(this.$el)
+			let { element } = getSelection(this.$refs.article)
 			if(element.nodeType !== 1)
 				element = element.parentNode
 			const table = this.closest(element, 'table')
@@ -153,7 +153,7 @@ export default{
 
 		removeTableRow(){
 
-			let { element } = getSelection(this.$el)
+			let { element } = getSelection(this.$refs.article)
 			if(element.nodeType !== 1)
 				element = element.parentNode
 			const table = this.closest(element, 'table')
@@ -170,7 +170,7 @@ export default{
 
 		removeTableColumn(){
 
-			let { element } = getSelection(this.$el)
+			let { element } = getSelection(this.$refs.article)
 			if(element.nodeType !== 1)
 				element = element.parentNode
 			const table = this.closest(element, 'table')
@@ -231,7 +231,7 @@ export default{
 
 						case 'saveSelection':
 						case 'getSelection':
-							const sel = saveSelection(this.$el)
+							const sel = saveSelection(this.$refs.article)
 							const { text, target, href } = sel
 							result = {
 								text,
@@ -256,7 +256,7 @@ export default{
 							break
 
 						case 'removeLink':
-							const { element } = getSelection(this.$el)
+							const { element } = getSelection(this.$refs.article)
 
 							let a = element
 							while(a && a.tagName !== 'A'){

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/components/Modal.vue

@@ -239,7 +239,7 @@ export default{
 }
 
 .modalBody{
-	@apply flex-1 min-h-0 overflow-y-auto flex bg-base-400;
+	@apply flex-1 min-h-0 overflow-y-auto flex;
 }
 
 .overlay{

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

package/src/widgets/IconList.vue

@@ -3,7 +3,7 @@
 		<div v-for="(icon, index) in icons" :key="index" class="text-center p-3">
 			<router-link :to="icon.target ?? ''">
 				<Image :src="imageUrl(icon)" class="inline-block aspect-square w-[90%] md:w-[95%] max-w-[64px] rounded-xl"
-							 spinner-type="shimmer"/>
+							 spinner-type="shimmer" edit-selectable="false"/>
 				<small class="block mt-1 text-center text-xs md:text-sm">{{ icon.text }}</small>
 			</router-link>
 		</div>

package/src/widgets/WebPageBuilder.vue

@@ -1009,10 +1009,10 @@ export default{
 
 		onKeyDown(e){
 			if(e.keyCode === 67 && (e.metaKey || e.ctrlKey)){
-				this.copy()
+				//this.copy()
 			}
 			else if(e.keyCode === 86 && (e.metaKey || e.ctrlKey)){
-				this.paste(e)
+				//this.paste(e)
 			}
 			/*else if(e.keyCode === 8){
 				if(this.currentItem){