@mixd-id/web-scaffold 0.1.230406250 → 0.1.230406251

package/package.json

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

package/src/components/Chart.vue

@@ -119,8 +119,20 @@ export default{
       else{
         for(let key in items[0] ?? {}){
           if(key !== xAxis[0].key){
+
+            let label = key
+
+            const columnKey = yAxis[0].key
+            const column = this.preset.columns.find(column => column.key === columnKey)
+            switch(column.type){
+              case 'enum':
+                label = column.typeParams.find(_ => `${_.value}` === `${key}`)?.text ?? label
+                break
+            }
+
             datasets.push({
-              label: key,
+              key,
+              label,
               data: [],
               borderColor: this.borderColors[datasets.length % this.borderColors.length],
               backgroundColor: this.backgroundColors[datasets.length % this.backgroundColors.length],
@@ -138,7 +150,7 @@ export default{
         }
         else{
           for(let i in datasets){
-            datasets[i].data.push(item[datasets[i].label])
+            datasets[i].data.push(item[datasets[i].key])
           }
         }
       }
@@ -230,7 +242,6 @@ export default{
     }, 1000, { leading:true }),
 
     onSignal(event, items){
-      console.log('onSignal', event, items)
 
       const hasData = items.some(item => item._data)
       if(hasData){

package/src/utils/preset-selector.js

@@ -527,7 +527,7 @@ const chartToSequelizeWhere = async (chart, opt) => {
           attributes.push([literal(`SUM(CASE WHEN ${field} = '' THEN 1 ELSE 0 END)`), 'EMPTY'])
         }
         else{
-          attributes.push([literal(`SUM(CASE WHEN ${field} = '${group[yAxis[0].key]}' THEN 1 ELSE 0 END)`), group[yAxis[0].key]])
+          attributes.push([literal(`SUM(CASE WHEN ${field} = '${group[yAxis[0].key]}' THEN 1 ELSE 0 END)`), `${group[yAxis[0].key]}` ])
         }
       })
 

package/src/widgets/PresetBar.vue

@@ -85,7 +85,7 @@
                     body-class="divide-y divide-text-50"
                     @reorder="(from, to) => { presetColumns.splice(to, 0, presetColumns.splice(from, 1)[0]); }">
             <template v-slot="{ item }">
-              <div class="flex flex-row items-center gap-3 px-3 p-2 hover:bg-primary-100">
+              <div v-if="!item.key.startsWith('_') || (item.key.startsWith('_') && (preset.pivot && preset.pivot.enabled))" class="flex flex-row items-center gap-3 px-3 p-2 hover:bg-primary-100">
                 <div data-reorder>
                   <svg width="14" height="14" class="fill-text-300" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M496 288H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16zm0-128H16c-8.8 0-16 7.2-16 16v32c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16v-32c0-8.8-7.2-16-16-16z"/></svg>
                 </div>
@@ -104,7 +104,7 @@
 
           <div class="flex-1 flex flex-col">
 
-            <div v-for="(filter, idx) in preset.filters" class="p-5">
+            <div v-for="(filter, idx) in preset.filters">
 
               <div class="flex flex-row items-start gap-2">
                 <Checkbox v-model="filter.enabled" :default="true" />
@@ -522,10 +522,7 @@ export default{
         this.preset.columns = JSON.parse(JSON.stringify(this.config.columns))
       }
 
-      if(this.preset.pivot && this.preset.pivot.enabled){
-        return this.preset.columns
-      }
-      return this.preset.columns.filter(_ => !_.key.startsWith('_'))
+      return this.preset.columns
     },
 
     presetPivot(){