Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos

src/components/VnTable/VnTable.vue

@@ -500,7 +500,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         <QCard
                             bordered
                             flat
-                            class="row no-wrap justify-between cursor-pointer"
+                            class="row no-wrap justify-between cursor-pointer q-pa-sm"
                             @click="
                                 (_, row) => {
                                     $props.rowClick && $props.rowClick(row);
@@ -581,7 +581,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             <!-- Actions -->
                             <QCardSection
                                 v-if="colsMap.tableActions"
-                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
                                 @click="stopEventPropagation($event)"
                             >
                                 <QBtn
@@ -807,12 +806,15 @@ es:
 
 .grid-two {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
-    max-width: 100%;
-    margin: 0 auto;
-    overflow: scroll;
-    white-space: wrap;
-    width: 100%;
+    grid-template-columns: 2fr 2fr;
+    .vn-label-value {
+        flex-direction: column;
+        white-space: nowrap;
+        .fields {
+            display: flex;
+        }
+    }
+    white-space: nowrap;
 }
 
 .w-80 {

src/components/ui/VnPaginate.vue

@@ -123,7 +123,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    }
+    },
 );
 
 watch(
@@ -132,12 +132,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    ([url, filter]) => mounted.value && fetch({ url, filter }),
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -198,7 +198,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !props.url) return done(false);
+    if (store.data.length === 0 || !arrayData.store.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 

src/pages/Order/Card/OrderCatalog.vue

@@ -22,7 +22,6 @@ const catalogParams = {
 };
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
-    limit: 50,
     userParams: catalogParams,
 });
 const store = arrayData.store;
@@ -66,7 +65,7 @@ function extractValueTags(items) {
             .filter((k) => /^value\d+$/.test(k))
             .map((v) => x[v])
             .filter((v) => v)
-            .sort()
+            .sort(),
     );
     tagValue.value = resultValueTags;
 }
@@ -76,7 +75,7 @@ watch(
     (val) => {
         extractTags(val);
     },
-    { immediate: true }
+    { immediate: true },
 );
 </script>