@mixd-id/web-scaffold 0.1.230406019 → 0.1.230406021

package/package.json

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

package/src/components/Alert.vue

@@ -3,7 +3,7 @@
 		<Transition name="alert-outer">
 			<div v-if="!!state" :class="$style.alert" ref="alert">
 				<Transition name="alert" @after-appear="onAfterAppear" appear>
-					<div class="p-4 flex flex-col items-center leading-6">
+					<div :class="$style.cont1">
 						<slot v-if="$slots['icon']" name="icon"></slot>
 						<svg v-else-if="mode === 'alert'" width="100" height="100" class="fill-red-500" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M12 13.75C12.4142 13.75 12.75 13.4142 12.75 13V8.00001C12.75 7.5858 12.4142 7.25001 12 7.25001C11.5858 7.25001 11.25 7.5858 11.25 8.00001V13C11.25 13.4142 11.5858 13.75 12 13.75Z"/>
@@ -16,9 +16,9 @@
 							<path fill-rule="evenodd" clip-rule="evenodd" d="M12 20.5C16.6944 20.5 20.5 16.6944 20.5 12C20.5 7.30558 16.6944 3.5 12 3.5C7.30558 3.5 3.5 7.30558 3.5 12C3.5 16.6944 7.30558 20.5 12 20.5ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"/>
 						</svg>
 						
-						<div class="my-4 text-center flex-1 overflow-y-auto">
-							<h5 class="my-1 break-all">{{ title }}</h5>
-							<p class="break-words overflow-y-auto whitespace-pre-line text-center">{{ description }}</p>
+						<div :class="$style.cont2">
+							<h5 :class="$style.title">{{ title }}</h5>
+							<p :class="$style.description">{{ description }}</p>
 						</div>
 						
 						<div class="mt-4" v-if="mode === 'alert'">
@@ -140,6 +140,22 @@ export default{
 	@apply min-w-[280px] max-w-[80vw] md:max-w-[400px];
 }
 
+.cont1{
+	@apply p-4 flex flex-col items-center leading-6;
+}
+
+.cont2{
+	@apply my-4 text-center flex-1 overflow-y-auto;
+}
+
+.title{
+	@apply my-1 break-words;
+}
+
+.description{
+	@apply break-words overflow-y-auto whitespace-pre-line text-center;
+}
+
 </style>
 
 <style>

package/src/components/Textbox.vue

@@ -1,9 +1,9 @@
 <template>
 	<div :class="computedClass">
 		<slot name="start"></slot>
-		<input :type="type" :disabled="isDisabled" @focus="isActive = true" @blur="onBlur"
+		<input :type="computedType" :disabled="isDisabled" @focus="isActive = true" @blur="onBlur"
 			:placeholder="placeholder" :maxlength="maxlength" ref="input" autocomplete="new-password"
-					 :value="modelValue ?? value" @input="onInput" :readonly="Boolean(readonly)"
+					 :value="displayedValue" @input="onInput" :readonly="Boolean(readonly)"
 			@keydown="onKeyDown"/>
 		<div v-if="!!(errors)">
 			<svg :class="$style.svg" width="24" height="24" class="fill-red-500" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -100,6 +100,36 @@ export default{
 
 		isDisabled(){
 			return this.state === 2
+		},
+
+		displayedValue(){
+			if(this.isActive){
+				return this.modelValue ?? this.value
+			}
+			else{
+				switch(this.type){
+
+					case 'number':
+						const val = parseInt(this.modelValue)
+						return isNaN(val) ? '' : val.toLocaleString()
+
+					default:
+						return this.modelValue ?? this.value
+
+				}
+			}
+		},
+
+		computedType(){
+
+			switch(this.type){
+
+				case 'number':
+					return 'text'
+
+				default:
+					return this.type
+			}
 		}
 
 	},

package/src/utils/helpers.js

@@ -228,6 +228,35 @@ const getPresetSortWhereParams = (order, afterItem) => {
   return sortWhere
 }
 
+const unflatten = (flatObject) => {
+  const nestedObject = {};
+
+  for (const key in flatObject) {
+    if (Object.prototype.hasOwnProperty.call(flatObject, key)) {
+      const value = flatObject[key];
+      const keys = key.split('.');
+
+      let currentObj = nestedObject;
+      for (let i = 0; i < keys.length; i++) {
+        const currentKey = keys[i];
+
+        if (!currentObj[currentKey]) {
+          currentObj[currentKey] = {};
+        }
+
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = value;
+        } else {
+          currentObj = currentObj[currentKey];
+        }
+      }
+    }
+  }
+
+  return nestedObject;
+}
+
+
 module.exports = {
   ceil,
   floor,
@@ -244,5 +273,6 @@ module.exports = {
   writeStorage,
   bufferToStream,
   sequelizeChunk,
-  getPresetSortWhereParams
+  getPresetSortWhereParams,
+  unflatten
 }

package/src/utils/importer.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const AdmZip = require("adm-zip");
 const glob = require("glob");
 const Exceljs = require("exceljs")
-const { saveBuffer } = require('./helpers.js')
+const { saveBuffer, unflatten } = require('./helpers.js')
 
 const analyseRequest = async(req) => {
 
@@ -64,10 +64,17 @@ const analyseRequest = async(req) => {
 
   const columns = []
   const header = worksheet.getRow(1)
+
   if(!header)
     throw new Error('Invalid file')
   header.eachCell((cell) => {
-    columns.push(cell.value)
+    if(cell.isMerged){
+      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+      columns.push(cell.value + '>' + sub)
+    }
+    else{
+      columns.push(cell.value)
+    }
   })
 
   return {
@@ -87,8 +94,7 @@ const importRequest = async(req) => {
       throw new Error({name: ['Kolom ' + key.text + ' harus diisi']})
   })
 
-  const rows = []
-  const cols = {}
+  let rows = []
   const workbook = new Exceljs.Workbook();
   switch(xlsxFileType){
 
@@ -106,37 +112,35 @@ const importRequest = async(req) => {
   }
 
   const worksheet = workbook.worksheets[0]
-  worksheet.eachRow((row, index) => {
-    if(index === 1){
-      row.eachCell((cell, index) => {
-
-        let mapped = false
-        keys.forEach((key) => {
-          if(key.value === cell.value){
-            cols[key.key] = index
-            mapped = true
-          }
-        })
-
-        if(!mapped){
-          cols[cell.value] = index
-        }
-      })
+
+  let rowStart = 2
+  const header = worksheet.getRow(1)
+  const columnAddress = {}
+  header.eachCell((cell, index) => {
+    if(cell.isMerged){
+      const sub = worksheet.getCell(cell.address.replace(/\d/g, '') + '2').value
+      columnAddress[cell.value + '>' + sub] = index
+      rowStart = 3
     }
     else{
+      columnAddress[cell.value] = index
+    }
+  })
+
+  worksheet.eachRow((row, index) => {
+    if(index >= rowStart){
       const obj = {}
 
-      for(let key in cols){
-        const cell = row.getCell(cols[key])
-        obj[key] = cell.formulaType === 1 ? cell.result : cell.value
+      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
       }
 
-      rows.push(obj)
+      rows.push(unflatten(obj))
     }
   })
 
-  //console.log(JSON.stringify(rows, null, 2))
-
   const images = glob.sync(process.env.ROOT_PATH + '/storage/files/temp/' + folderName +
       '/**/*(*.jpg|*.jpeg|*.png|*.webp)')