@mixd-id/web-scaffold 0.1.230406279 → 0.1.230406281

package/package.json

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

package/src/components/Alert.vue

@@ -212,7 +212,7 @@ export default{
 }
 
 .title{
-	@apply whitespace-nowrap overflow-hidden;
+	@apply text-center;
 }
 
 .details{

package/src/components/MultilineText.vue

@@ -1,8 +1,8 @@
 <template>
 	<div :class="computedClass">
 		<slot name="start"></slot>
-		<textarea :maxlength="maxlength"
-			:placeholder="placeholder" :rows="rows" ref="input" @focus="isActive = true" @blur="onBlur" @input="onInput"
+		<textarea :maxlength="maxlength" :class="itemClass"
+			:placeholder="placeholder" :rows="computedRows" ref="input" @focus="isActive = true" @blur="onBlur" @input="onInput"
 			:value="modelValue" :readonly="Boolean(readonly)" />
 		<div v-if="state === -2 && !!(errors)">
 			<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -39,11 +39,6 @@ export default{
 			default: ''
 		},
 
-		size: {
-			type: String,
-			default: ''
-		},
-
 		errors:{
 			type: [ String, Array ],
 			default: ''
@@ -51,6 +46,8 @@ export default{
 
 		modelValue: [ String, Number ],
 
+    itemClass: String,
+
 		placeholder: String,
 
 		readonly: undefined,
@@ -67,8 +64,8 @@ export default{
 			this.$emit('update:modelValue', to)
 			this.$emit('change', to)
 			this.$nextTick(() => {
-				this.$el.style.height = '';
-				this.$el.style.height = this.$refs.input.scrollHeight + 'px'
+				this.$refs.input.style.height = '';
+				this.$refs.input.style.height = this.$refs.input.scrollHeight + 'px'
 			})
 		}
 
@@ -94,10 +91,13 @@ export default{
 				this.isActive && !this.readonly ? this.$style.active : '',
 				this.align ? this.$style['align-' + this.align] : '',
 				this.readonly ? this.$style.readonly : '',
-				this.size ? this.$style['size-' + this.size] : ''
 			].join(' ')
 		},
 
+    computedRows(){
+      return 1
+    },
+
 		isDisabled(){
 
 		}
@@ -138,12 +138,12 @@ export default{
 
 .textarea{
 	@apply flex items-start border-[1px] border-text-200 bg-base-500 rounded-lg overflow-hidden;
-	@apply !max-h-[200px];
 }
 .textarea textarea{
 	@apply flex-1 outline-none p-2 bg-transparent resize-none;
 	@apply self-stretch;
 	scrollbar-width: none;
+  @apply !max-h-[200px];
 }
 .textarea>textarea::-webkit-scrollbar{
 	display: none;
@@ -155,12 +155,6 @@ export default{
 	@apply bg-text-50;
 }
 
-.size-sm{ @apply min-h-[var(--h-cp-sm)]; }
-.size-sm textarea{ @apply text-sm; }
-
-.size-lg{ @apply min-h-[var(--h-cp-lg)]; }
-.size-lg textarea{ @apply text-lg p-2; }
-
 
 .active{
 	@apply border-primary

package/src/utils/preset-selector.js

@@ -574,6 +574,12 @@ const chartToSequelizeWhere = async (chart, opt) => {
             order = literal(`DATE_FORMAT(${model.name}.${field}, \"%Y-%m-%d\")`)
             break
 
+          case 'hour':
+            attributes.push([literal(`DATE_FORMAT(${model.name}.${field}, "%H")`), xAxis[0].key])
+            group.push(literal(`DATE_FORMAT(${model.name}.${field}, "%H")`))
+            order = literal(`DATE_FORMAT(${model.name}.${field}, \"%H\")`)
+            break
+
           default:
             attributes.push([literal(`${model.name}.${field}`), xAxe.key])
             group.push(literal(`${model.name}.${field}`))

package/src/utils/preset-selector.mjs

@@ -20,21 +20,12 @@ const sortsFn = function(a, b, sorts, index){
 }
 
 const pickColumns = function(columns, keys){
-  if(!Array.isArray(columns)) return keys
+  if(!Array.isArray(columns)) return []
 
-  const picked = []
+  const picked = JSON.parse(JSON.stringify(columns))
 
-  const groupedColumns = columns
-    .reduce((acc, column) => {
-      acc[column.key] = column
-      return acc
-    }, {})
-
-  for(let key of keys){
-    if(groupedColumns[key]){
-      groupedColumns[key].visible = true
-      picked.push(groupedColumns[key])
-    }
+  for(let idx in picked){
+    picked[idx].visible = keys.includes(picked[idx].key)
   }
 
   return picked

package/src/widgets/PresetBar.vue

@@ -1,7 +1,7 @@
 <template>
 	<div :class="$style.comp" v-if="config">
 
-    <TransitionGroup name="openltr" tag="div">
+    <TransitionGroup name="openltr" tag="div" class="flex-1 flex">
 
       <div v-if="$route.hash.indexOf(this.editHash) < 0" key="panel1" class="flex-1 flex flex-col">
 
@@ -274,6 +274,7 @@
                                   @change="apply()">
                           <option value="none">None</option>
                           <option value="date">Date</option>
+                          <option value="hour">Hour</option>
                         </Dropdown>
                       </div>
                       <button type="button" @click="xAxis.splice(index, 1); apply()">

package/src/widgets/PresetSelector.vue

@@ -153,7 +153,7 @@
         <div class="w-[200px] border-r-[1px] border-text-50 overflow-y-auto">
 
           <div class="flex flex-col divide-y divide-text-50 border-b-[1px] border-text-50">
-            <button v-for="column in sortedConfigColumns"
+            <button v-for="column in filterColumns"
                     type="button"
                     :disabled="filterColumnAdded(column)"
                     class="px-6 py-3 text-left flex flex-row items-center gap-2"
@@ -478,8 +478,9 @@ export default{
 
   computed: {
 
-    sortedConfigColumns(){
+    filterColumns(){
       return JSON.parse(JSON.stringify(this.config.columns ?? []))
+          .filter(_ => !('filterable' in _) || _.filterable)
           .sort((a, b) => (a.label ?? a.key).localeCompare(b.label ?? b.key))
     },
 
@@ -632,12 +633,10 @@ export default{
         return
       }
 
-      this.confirm('Remove this preset?', {
-        onConfirm: () => {
-          this.config.presets.splice(idx, 1)
-          if(this.config.presetIdx >= this.config.presets.length)
-            this.config.presetIdx = this.config.presets.length - 1
-        }
+      this.confirm('Remove this preset?', () => {
+        this.config.presets.splice(idx, 1)
+        if(this.config.presetIdx >= this.config.presets.length)
+          this.config.presetIdx = this.config.presets.length - 1
       })
     },