@mixd-id/web-scaffold 0.1.230406032 → 0.1.230406033

package/package.json

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

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/utils/importer.js

@@ -131,6 +131,24 @@ 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]
         if(key.value && columnAddress[key.value]){

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)
     }