@mixd-id/web-scaffold 0.1.230406031 → 0.1.230406033

package/package.json

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

package/src/components/Alert.vue

@@ -74,6 +74,9 @@ export default{
 					else if(this.state.title.status){
 						title = 'Error ' + this.state.title.status
 					}
+          else if(this.state.title.reason && this.state.title.reason.status){
+            title = 'Error ' + this.state.title.reason.status
+					}
 				}
 				else{
 					title = this.state.title
@@ -101,6 +104,10 @@ export default{
 					else if(this.state.title.message){
 						description = this.state.title.message
 					}
+          else if(this.state.title.reason && this.state.title.reason.message &&
+							this.state.title.reason.message.message){
+            description = this.state.title.reason.message.message
+					}
 				}
 				else{
 					description = this.state.description
@@ -137,7 +144,7 @@ export default{
 .alert>*{
 	@apply max-h-[60vh] overflow-y-auto bg-base-500 rounded-xl;
 	@apply border-[1px] border-text-50;
-	@apply min-w-[280px] max-w-[80vw] md:max-w-[400px];
+	@apply min-w-[280px] max-w-[80vw] md:max-w-[480px];
 }
 
 .cont1{
@@ -153,7 +160,15 @@ export default{
 }
 
 .description{
-	@apply break-words overflow-y-auto whitespace-pre-line text-center;
+	@apply overflow-y-auto whitespace-pre-line text-center;
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  -ms-word-break: break-all;
+  word-break: break-word;
+  -ms-hyphens: auto;
+  -moz-hyphens: auto;
+  -webkit-hyphens: auto;
+  hyphens: auto;
 }
 
 </style>

package/src/components/Button.vue

@@ -33,7 +33,10 @@ export default{
 			default: '' // 0|1|2|3, default: 2
 		},
 
-		state:  [ String, Number ], // -1:disabled, 1:normal, 2:loading, default: normal
+		state: {
+      type: [ String, Number ], // -1:disabled, 1:normal, 2:loading, default: normal,
+			default: 1
+		}
 
 	},
 
@@ -60,14 +63,14 @@ export default{
 		},
 
 		computedState(){
-			return this.state ?? this._state
+			return this._state ?? this.state
 		}
 
 	},
 
 	data(){
 		return {
-			_state: 1
+			_state: null
 		}
 	},
 
@@ -79,6 +82,10 @@ export default{
 
 		setState(state){
 			this._state = state
+		},
+
+		resetState(){
+      this._state = null
 		}
 
 	}
@@ -143,19 +150,22 @@ export default{
 	fill: #fff;
 	fill-opacity: 75%;
 }
+.variant-primary:disabled{
+  @apply bg-primary-500 border-primary-500 opacity-50 top-0 left-0 cursor-not-allowed;
+}
 
 .variant-outline{
 	@apply bg-transparent text-primary-500 border-[2px] border-primary-500;
 }
 .variant-outline:hover{
-	@apply border-primary-300 text-primary-300;
+	@apply border-primary-500 text-text;
 }
 .variant-outline:active{
 	@apply top-[1px] left-[1px] active:relative;
 }
 .variant-outline:disabled{
 	@apply opacity-50 top-0 left-0 cursor-not-allowed;
-	@apply text-primary-500 border-primary-500;
+	@apply text-text border-primary-500;
 }
 .variant-outline *{
 	@apply text-primary-500 fill-primary-500;
@@ -173,7 +183,7 @@ export default{
 }
 
 .variant-secondary{
-	@apply bg-secondary text-primary rounded-md border-[2px] border-secondary;
+	@apply bg-secondary text-white rounded-md border-[2px] border-secondary;
 }
 .variant-secondary:hover{
 	@apply bg-secondary-600 border-secondary-600;
@@ -185,7 +195,7 @@ export default{
 	@apply bg-secondary-500 border-secondary-500 opacity-50 top-0 left-0 cursor-not-allowed;
 }
 .variant-secondary *{
-	@apply text-primary fill-primary;
+	@apply text-white fill-white;
 }
 .variant-secondary.loading *{
 	@apply fill-transparent
@@ -204,6 +214,9 @@ export default{
 }
 .variant-minimal:hover{
 }
+.variant-minimal:active{
+  @apply top-[1px] left-[1px] relative;
+}
 .variant-minimal .svgBg{
 	stroke: var(--base-500);
 	stroke-opacity: 25%;

package/src/components/ErrorText.vue

@@ -1,7 +1,8 @@
 <template>
 	<div :class="$style.comp" v-if="error" @click="$emit('dismissError')">
 		<div v-if="error.response && error.response.data && error.response.data.errors">
-			<div v-for="(text, key) in error.response.data.errors">
+			<div v-if="typeof error.response.data.errors === 'string'">{{ error.response.data.errors }}</div>
+			<div v-else v-for="(text, key) in error.response.data.errors">
 				<div v-if="!errorKey || key === errorKey">
 					<div v-for="txt in text">{{ txt }}</div>
 				</div>
@@ -9,7 +10,7 @@
 		</div>
 		<div v-else-if="error.message" class="p-2 bg-base-500">{{ error.message }}</div>
 		<div v-else>
-			<pre>{{ error }}</pre>
+
 		</div>
 	</div>
 </template>
@@ -18,9 +19,24 @@
 
 export default{
 
-	props: {
-		error: Object,
-		errorKey: String
+	data(){
+		return {
+      error: null,
+      errorKey: null
+		}
+	},
+
+	methods: {
+
+    show(err, key){
+      this.error = err
+			this.errorKey = key
+		},
+
+		hide(){
+      this.error = this.errorKey = null
+		}
+
 	}
 
 }

package/src/components/ListPage1Filter.vue

@@ -32,7 +32,7 @@
 							<option value="thisMonth">This Month</option>
 							<option value="monthAgo">1 Month Ago</option>
 							<option value="lastMonth">Last Month</option>
-							<option value="thisMonth">This Year</option>
+							<option value="thisYear">This Year</option>
 							<option value="lastYear">Last Year</option>
 							<option value="between">Between</option>
 						</Dropdown>

package/src/components/OTPField.vue

@@ -6,8 +6,6 @@
 						 :value="typeof modelValue === 'string' ? modelValue.split('')[i - 1] : ''"
 						 @paste="verifyPaste" @keyup="verifyKeyUp($event, i - 1)" />
 		</div>
-		<ErrorText :error="error" :errorKey="errorKey" @dismissError="$emit('dismissError')"
-			:class="$style.errorText + (errorClass ? ' ' + errorClass : '')"/>
 	</div>
 </template>
 
@@ -16,9 +14,6 @@
 export default{
 
 	props: {
-		error: Object,
-		errorKey: String,
-		errorClass: String,
 
 		modelValue: String,
 

package/src/components/Textbox.vue

@@ -149,7 +149,8 @@ export default{
 
 .textbox{
 	@apply min-h-[var(--h-cp)];
-	@apply flex items-center border-[1px] border-text-200 bg-base-50 rounded-lg overflow-hidden;
+	@apply flex items-center border-[1px] border-text-200 bg-base-50;
+	@apply rounded-lg overflow-hidden;
 }
 
 .textbox input:read-only{

package/src/utils/importer.js

@@ -131,10 +131,30 @@ const importRequest = async(req) => {
     if(index >= rowStart){
       const obj = {}
 
+      // Check if cells in row 2 and 3 is notes in italic
+      if(index <= 3){
+        let isItalic = false
+        for(let idx in keys){
+          const key = keys[idx]
+          if(key.value && columnAddress[key.value]){
+            const cell = row.getCell(columnAddress[key.value])
+            if(cell.font && cell.font.italic){
+              isItalic = true
+              break
+            }
+          }
+        }
+
+        if(isItalic)
+          return
+      }
+
       for(let idx in keys){
         const key = keys[idx]
-        const cell = row.getCell(columnAddress[key.value])
-        obj[key.key] = cell.formulaType === 1 ? cell.result : cell.value
+        if(key.value && columnAddress[key.value]){
+          const cell = row.getCell(columnAddress[key.value])
+          obj[key.key] = cell.formulaType === 1 ? cell.result : cell.value
+        }
       }
 
       rows.push(unflatten(obj))

package/src/utils/listpage1.js

@@ -526,7 +526,7 @@ let ListPage1 = {
     }
 
     let derivedSql
-    const { rows:items, count } = await this.model.findAndCountAll({
+    let { rows:items, count } = await this.model.findAndCountAll({
       where,
       attributes: {
         ...attributes,
@@ -564,6 +564,13 @@ let ListPage1 = {
       }
     }*/
 
+    if(this.postLoadItems){
+      const postLoadItems = await this.postLoadItems(params, { where, attributes, order, include:includes, replacements })
+      if(Array.isArray(postLoadItems)){
+        items = postLoadItems.concat(items)
+      }
+    }
+
     if(this.socket){
       this.socket.join(this.channel)
     }