diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 6cd62d83e..da4687d32 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -5,8 +5,10 @@ import { dashIfEmpty } from 'src/filters';
/* basic input */
import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectCache from 'components/common/VnSelectCache.vue';
import VnInput from 'components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
import VnComponent from 'components/common/VnComponent.vue';
const model = defineModel(undefined, { required: true });
@@ -41,11 +43,23 @@ const $props = defineProps({
},
});
+const defaultSelect = {
+ attrs: {
+ row: $props.row,
+ disable: !$props.isEditable,
+ class: 'fit',
+ },
+ forceAttrs: {
+ label: $props.showLabel && $props.column.label,
+ },
+};
+
const defaultComponents = {
input: {
component: markRaw(VnInput),
attrs: {
disable: !$props.isEditable,
+ class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
@@ -55,6 +69,7 @@ const defaultComponents = {
component: markRaw(VnInput),
attrs: {
disable: !$props.isEditable,
+ class: 'fit',
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
@@ -66,6 +81,16 @@ const defaultComponents = {
readonly: true,
disable: !$props.isEditable,
style: 'min-width: 125px',
+ class: 'fit',
+ },
+ forceAttrs: {
+ label: $props.showLabel && $props.column.label,
+ },
+ },
+ time: {
+ component: markRaw(VnInputTime),
+ attrs: {
+ disable: !$props.isEditable,
},
forceAttrs: {
label: $props.showLabel && $props.column.label,
@@ -77,7 +102,7 @@ const defaultComponents = {
const defaultAttrs = {
disable: !$props.isEditable,
'model-value': Boolean(prop),
- class: 'no-padding',
+ class: 'no-padding fit',
};
if (typeof prop == 'number') {
@@ -91,13 +116,12 @@ const defaultComponents = {
},
},
select: {
+ component: markRaw(VnSelectCache),
+ ...defaultSelect,
+ },
+ rawSelect: {
component: markRaw(VnSelect),
- attrs: {
- disable: !$props.isEditable,
- },
- forceAttrs: {
- label: $props.showLabel && $props.column.label,
- },
+ ...defaultSelect,
},
icon: {
component: markRaw(QIcon),
@@ -134,7 +158,7 @@ const col = computed(() => {
const components = computed(() => $props.components ?? defaultComponents);
-
+
- {{ column?.label }}
-
-
+import { ref } from 'vue';
+import { useArrayData } from 'composables/useArrayData';
+const model = defineModel({ type: Object, required: true });
+const $props = defineProps({
+ name: {
+ type: String,
+ default: '',
+ },
+ label: {
+ type: String,
+ default: undefined,
+ },
+ dataKey: {
+ type: String,
+ required: true,
+ },
+ searchUrl: {
+ type: String,
+ default: 'params',
+ },
+ vertical: {
+ type: Boolean,
+ default: false,
+ },
+});
+const hover = ref();
+const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
+
+async function orderBy(name, direction) {
+ if (!name) return;
+ switch (direction) {
+ case 'DESC':
+ direction = undefined;
+ break;
+ case undefined:
+ direction = 'ASC';
+ break;
+ case 'ASC':
+ direction = 'DESC';
+ break;
+ }
+ if (!direction) return await arrayData.deleteOrder(name);
+ await arrayData.addOrder(name, direction);
+}
+
+defineExpose({ orderBy });
+
+
+
+
{{ label }}
+
+
+ {{ model?.index }}
+
+
+
+
+
-
@@ -223,41 +292,48 @@ defineExpose({
:limit="20"
ref="CrudModelRef"
:search-url="searchUrl"
- :disable-infinite-scroll="mode == TABLE_MODE"
+ :disable-infinite-scroll="isTableMode"
@save-changes="reload"
- :has-subtoolbar="isEditable"
+ :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
>
+
+
+
-
+
-
+
-
-
+
+
@@ -308,15 +400,18 @@ defineExpose({
-
+
+
+
@@ -395,15 +490,15 @@ defineExpose({
:class="$props.cardClass"
>
@@ -412,14 +507,20 @@ defineExpose({
stopEventPropagation($event)
"
>
-
+ >
+
+
@@ -477,6 +578,7 @@ defineExpose({
default="input"
v-model="data[column.name]"
:show-label="true"
+ component-prop="columnCreate"
/>
@@ -487,8 +589,12 @@ defineExpose({
en:
status: Status
+ table view: Table view
+ grid view: Grid view
es:
status: Estados
+ table view: Vista en tabla
+ grid view: Vista en cuadrícula
+
+
+ es:
+ Check the columns you want to see: Marca las columnas que quieres ver
+ Visible columns: Columnas visibles
+ Tick all: Marcar todas
+
diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7aa696a07..a4e4afafe 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -52,7 +52,7 @@ const toggleMarkAll = (val) => {
const getConfig = async (url, filter) => {
const response = await axios.get(url, {
- params: { filter: filter },
+ params: { filter: JSON.stringify(filter) },
});
return response.data && response.data.length > 0 ? response.data[0] : null;
};
@@ -60,7 +60,7 @@ const getConfig = async (url, filter) => {
const fetchViewConfigData = async () => {
try {
const userConfigFilter = {
- where: { tableCode: $props.tableCode, userFk: user.id },
+ where: { tableCode: $props.tableCode, userFk: user.value.id },
};
const userConfig = await getConfig('UserConfigViews', userConfigFilter);
@@ -74,8 +74,14 @@ const fetchViewConfigData = async () => {
const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
if (defaultConfig) {
+ // Si el backend devuelve una configuración por defecto la usamos
setUserConfigViewData(defaultConfig.columns);
return;
+ } else {
+ // Si no hay configuración por defecto mostramos todas las columnas
+ const defaultColumns = {};
+ $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+ setUserConfigViewData(defaultColumns);
}
} catch (err) {
console.err('Error fetching config view data', err);
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..02226e497 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -18,7 +18,7 @@ watchEffect(() => {
(matched) => Object.keys(matched.meta).length
);
breadcrumbs.value.length = 0;
-
+ if (!matched.value[0]) return;
if (matched.value[0].name != 'Dashboard') {
root.value = useCamelCase(matched.value[0].path.substring(1).toLowerCase());
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 8517525df..17fa74317 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,6 +1,6 @@
{},
},
value: {
- type: [Object, Number, String],
+ type: [Object, Number, String, Boolean],
default: () => {},
},
});
@@ -54,7 +54,6 @@ function toValueAttrs(attrs) {
v-bind="mix(toComponent).attrs"
v-on="mix(toComponent).event ?? {}"
v-model="model"
- class="fit"
/>
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 769ba9959..c42de6690 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -273,6 +273,10 @@ function shouldRenderButton(button, isExternal = false) {
if (button.name == 'download') return true;
return button.external === isExternal;
}
+
+defineExpose({
+ dmsRef,
+});
-
+
+
+ {{ t('Upload file') }}
+
+
-
-
-es:
- Cancel: Cancelar
-
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 61436b7e8..19765b1f7 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -49,6 +49,7 @@ const filter = {
'changedModelId',
'changedModelValue',
'description',
+ 'summaryId',
],
include: [
{
@@ -459,12 +460,12 @@ onUnmounted(() => {
:style="{
backgroundColor: useColor(modelLog.model),
}"
- :title="modelLog.model"
+ :title="`${modelLog.model} #${modelLog.id}`"
>
{{ t(modelLog.modelI18n) }}
- #{{ modelLog.id }}#{{ modelLog.summaryId }}
{{ modelLog.showValue }}
diff --git a/src/components/common/VnPopup.vue b/src/components/common/VnPopup.vue
new file mode 100644
index 000000000..7dcb08f53
--- /dev/null
+++ b/src/components/common/VnPopup.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+ {{ content }}
+
+
+
+
+
diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
new file mode 100644
index 000000000..cfd948d5f
--- /dev/null
+++ b/src/components/common/VnProgressModal.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+ {{ t('Progress') }}
+
+
+
+
+
+
{{ t('Total progress') }}:
+
+
+
+
+ {{ progressLabel }}
+
+
+
+
+