@mixd-id/web-scaffold 0.1.230406032 → 0.1.230406034

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@mixd-id/web-scaffold",
3
3
  "private": false,
4
- "version": "0.1.230406032",
4
+ "version": "0.1.230406034",
5
5
  "scripts": {
6
6
  "dev": "vite serve",
7
7
  "build": "vite build",
@@ -162,6 +162,9 @@ export default{
162
162
  reader.readAsDataURL(this.src)
163
163
  this.status = 1
164
164
  }
165
+ else{
166
+ this.actualSrc = this.defaultSrc
167
+ }
165
168
  }
166
169
 
167
170
  },
@@ -32,7 +32,7 @@
32
32
  <option value="thisMonth">This Month</option>
33
33
  <option value="monthAgo">1 Month Ago</option>
34
34
  <option value="lastMonth">Last Month</option>
35
- <option value="thisMonth">This Year</option>
35
+ <option value="thisYear">This Year</option>
36
36
  <option value="lastYear">Last Year</option>
37
37
  <option value="between">Between</option>
38
38
  </Dropdown>
@@ -85,7 +85,7 @@ export default{
85
85
  <style module>
86
86
 
87
87
  .toast{
88
- @apply max-w-[90vw] md:max-w-[640px] bg-base-400 mt-4 mx-auto rounded-xl border-[1px] border-text-50;
88
+ @apply max-w-[90vw] md:max-w-[640px] bg-base-300 mt-4 mx-auto rounded-xl border-[1px] border-text-200;
89
89
  @apply min-h-[var(--h-cp)];
90
90
  z-index: 61;
91
91
  }
@@ -131,6 +131,24 @@ const importRequest = async(req) => {
131
131
  if(index >= rowStart){
132
132
  const obj = {}
133
133
 
134
+ // Check if cells in row 2 and 3 is notes in italic
135
+ if(index <= 3){
136
+ let isItalic = false
137
+ for(let idx in keys){
138
+ const key = keys[idx]
139
+ if(key.value && columnAddress[key.value]){
140
+ const cell = row.getCell(columnAddress[key.value])
141
+ if(cell.font && cell.font.italic){
142
+ isItalic = true
143
+ break
144
+ }
145
+ }
146
+ }
147
+
148
+ if(isItalic)
149
+ return
150
+ }
151
+
134
152
  for(let idx in keys){
135
153
  const key = keys[idx]
136
154
  if(key.value && columnAddress[key.value]){
@@ -526,7 +526,7 @@ let ListPage1 = {
526
526
  }
527
527
 
528
528
  let derivedSql
529
- const { rows:items, count } = await this.model.findAndCountAll({
529
+ let { rows:items, count } = await this.model.findAndCountAll({
530
530
  where,
531
531
  attributes: {
532
532
  ...attributes,
@@ -564,6 +564,13 @@ let ListPage1 = {
564
564
  }
565
565
  }*/
566
566
 
567
+ if(this.postLoadItems){
568
+ const postLoadItems = await this.postLoadItems(params, { where, attributes, order, include:includes, replacements })
569
+ if(Array.isArray(postLoadItems)){
570
+ items = postLoadItems.concat(items)
571
+ }
572
+ }
573
+
567
574
  if(this.socket){
568
575
  this.socket.join(this.channel)
569
576
  }