quasar-ui-danx 0.0.33 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/ActionTable/ActionTable.vue

@@ -57,7 +57,9 @@
         >
           <RenderComponent
               v-if="rowProps.col.component"
-              :row-props="rowProps"
+              :params="[rowProps.row]"
+              :component="rowProps.col.component"
+              :text="rowProps.value"
               @action="$emit('action', $event)"
           />
           <div v-else-if="rowProps.col.fieldList">

package/src/components/ActionTable/Form/Fields/DateRangeField.vue

@@ -87,16 +87,21 @@ function toQDateValue(val) {
 }
 
 const dateRangeValue = computed(() => {
-  let range = dateRange.value;
+  let range;
 
-  if (typeof range === 'string') {
+  if (typeof dateRange.value === 'string') {
     range = {
-      from: range,
-      to: range
+      from: dateRange.value,
+      to: dateRange.value
+    };
+  } else if (dateRange.value) {
+    range = {
+      from: dateRange.value.from,
+      to: dateRange.value.to
     };
   }
 
-  if (range?.from && range?.to && props.withTime) {
+  if (range?.from && range?.to && props.withTime && !range.from.includes('00:00:00')) {
     range.from += ' 00:00:00';
     range.to += ' 23:59:59';
   }

package/src/components/ActionTable/RenderComponent.vue

@@ -1,22 +1,37 @@
 <template>
   <Component
-    :is="component.is"
-    v-bind="component.props"
-    @action="$emit('action', $event)"
-  >{{ component.value || component.props?.text || rowProps.value }}</Component>
+      :is="resolvedComponent.is"
+      v-bind="{...resolvedComponent.props, ...overrideProps}"
+      @action="$emit('action', $event)"
+  >{{ resolvedComponent.value || resolvedComponent.props?.text || text }}</Component>
 </template>
 <script setup>
-import { computed } from "vue";
+import { computed } from 'vue';
 
-defineEmits(["action"]);
+defineEmits(['action']);
 const props = defineProps({
-  rowProps: {
-    type: Object,
+  component: {
+    type: [Function, Object],
     required: true
+  },
+  params: {
+    type: Array,
+    default: () => []
+  },
+  text: {
+    type: String,
+    default: ''
+  },
+  overrideProps: {
+    type: Object,
+    default: () => ({})
   }
 });
 
-const component = computed(() => {
-  return props.rowProps.col.component(props.rowProps.row);
+const resolvedComponent = computed(() => {
+  if (typeof props.component === 'function') {
+    return props.component(...props.params);
+  }
+  return props.component;
 });
 </script>