@mixd-id/web-scaffold 0.1.230406147 → 0.1.230406148

package/package.json

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

package/src/components/Alert.vue

@@ -104,17 +104,21 @@ export default{
 		},
 
 		title(){
-			if(this.alert.title){
-				return this.alert.title
+			const err = this.alert.response && this.alert.response.data ?
+				this.alert.response.data :
+				this.alert
+
+			if(err.title){
+				return err.title
 			}
-			else if(this.alert.name){
-				return unPascalCase(this.alert.name)
+			else if(err.name){
+				return unPascalCase(err.name)
 			}
-			else if(this.alert.type){
-				return unPascalCase(this.alert.type)
+			else if(err.type){
+				return unPascalCase(err.type)
 			}
-			else if(this.alert.status){
-				return `Error ${this.alert.status}`
+			else if(err.status){
+				return `Error ${err.status}`
 			}
 			else{
 				return this.$t('Alert')
@@ -122,7 +126,19 @@ export default{
 		},
 
 		message(){
-			return this.alert.message ?? ''
+			const err = this.alert.response && this.alert.response.data ?
+				this.alert.response.data :
+				this.alert
+
+			if(err.errors){
+				return Object.values(err.errors).join("\n")
+			}
+			else if(err.message){
+				return err.message
+			}
+			else{
+				return ''
+			}
 		},
 
 		details(){

package/src/utils/listview.js

@@ -255,8 +255,8 @@ let ListView = {
     }
 
     let attributes = { id:1, updatedAt:1 }
+    let modelAttributes = this.model.getAttributes();
     if(preset.columns){
-      let modelAttributes = this.model.getAttributes();
       preset.columns.forEach((column) => {
         if(column.visible && modelAttributes[column.key]){
           attributes[column.key] = 1
@@ -281,7 +281,15 @@ let ListView = {
     }
     attributes = Object.keys(attributes)
 
-    if(preset.filters){
+    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)
+    }
+    else if(preset.filters){
       const { where:presetWhere } = this.getPresetFilterParams(preset, includes)
       where = {
         ...where,
@@ -303,15 +311,6 @@ 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(afterItem){
       const sortWhere = getPresetSortWhereParams(order, afterItem)
       where = {