@@ -395,15 +505,15 @@ defineExpose({
:class="$props.cardClass"
>
@@ -412,14 +522,20 @@ defineExpose({
stopEventPropagation($event)
"
>
-
+ >
+
+
@@ -477,6 +593,7 @@ defineExpose({
default="input"
v-model="data[column.name]"
:show-label="true"
+ component-prop="columnCreate"
/>
@@ -487,8 +604,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:
+ Open date: Abrir fecha
+
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 5c84951cb..adb6ef68c 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,14 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-es:
- Cancel: Cancelar
+ es:
+ Open time: Abrir tiempo
+, nextTick
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/VnSelect.vue b/src/components/common/VnSelect.vue
index 52cb68438..3cba466a3 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -61,6 +61,10 @@ const $props = defineProps({
type: Boolean,
default: false,
},
+ useLike: {
+ type: Boolean,
+ default: true,
+ },
});
const { t } = useI18n();
@@ -71,6 +75,7 @@ const myOptions = ref([]);
const myOptionsOriginal = ref([]);
const vnSelectRef = ref();
const dataRef = ref();
+const lastVal = ref();
const value = computed({
get() {
@@ -81,14 +86,31 @@ const value = computed({
},
});
+watch(options, (newValue) => {
+ setOptions(newValue);
+});
+
+watch(modelValue, (newValue) => {
+ if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+ fetchFilter(newValue);
+});
+
+onMounted(() => {
+ setOptions(options.value);
+ if ($props.url && $props.modelValue && !findKeyInOptions())
+ fetchFilter($props.modelValue);
+ if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
+
+function findKeyInOptions() {
+ if (!$props.options) return;
+ return filter($props.modelValue, $props.options)?.length;
+}
+
function setOptions(data) {
myOptions.value = JSON.parse(JSON.stringify(data));
myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
}
-onMounted(() => {
- setOptions(options.value);
- if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
-});
function filter(val, options) {
const search = val.toString().toLowerCase();
@@ -103,7 +125,8 @@ function filter(val, options) {
});
}
- const id = row.id;
+ if (!row) return;
+ const id = row[$props.optionValue];
const optionLabel = String(row[$props.optionLabel]).toLowerCase();
return id == search || optionLabel.includes(search);
@@ -114,19 +137,28 @@ async function fetchFilter(val) {
if (!$props.url || !dataRef.value) return;
const { fields, sortBy, limit } = $props;
- let key = optionLabel.value;
+ let key = optionFilter.value ?? optionLabel.value;
- if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
+ if (new RegExp(/\d/g).test(val)) key = optionValue.value;
- const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
+ const defaultWhere = $props.useLike
+ ? { [key]: { like: `%${val}%` } }
+ : { [key]: val };
+ const where = { ...(val ? defaultWhere : {}), ...$props.where };
const fetchOptions = { where, order: sortBy, limit };
if (fields) fetchOptions.fields = fields;
return dataRef.value.fetch(fetchOptions);
}
async function filterHandler(val, update) {
- if (!$props.defaultFilter) return update();
+ if (!val && lastVal.value === val) {
+ lastVal.value = val;
+ return update();
+ }
+ lastVal.value = val;
let newOptions;
+
+ if (!$props.defaultFilter) return update();
if ($props.url) {
newOptions = await fetchFilter(val);
} else newOptions = filter(val, myOptionsOriginal.value);
@@ -142,19 +174,6 @@ async function filterHandler(val, update) {
}
);
}
-
-watch(options, (newValue) => {
- setOptions(newValue);
-});
-
-watch(modelValue, (newValue) => {
- if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
- fetchFilter(newValue);
-});
-
-onMounted(async () => {
- if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
-});
diff --git a/src/components/common/VnSelectCache.vue b/src/components/common/VnSelectCache.vue
new file mode 100644
index 000000000..a9acd7b9f
--- /dev/null
+++ b/src/components/common/VnSelectCache.vue
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..7792ed2cd 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -46,7 +46,7 @@ let arrayData;
let store;
let entity;
const isLoading = ref(false);
-
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
defineExpose({ getData });
onBeforeMount(async () => {
@@ -56,12 +56,19 @@ onBeforeMount(async () => {
skip: 0,
});
store = arrayData.store;
- entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+ entity = computed(() => {
+ const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+ if (data) emit('onFetch', data);
+ return data;
+ });
+
// It enables to load data only once if the module is the same as the dataKey
- if ($props.dataKey !== route.meta.moduleName || !route.params.id) await getData();
+ if (!isSameDataKey.value || !route.params.id) await getData();
watch(
() => [$props.url, $props.filter],
- async () => await getData()
+ async () => {
+ if (!isSameDataKey.value) await getData();
+ }
);
});
@@ -77,14 +84,50 @@ async function getData() {
isLoading.value = false;
}
}
+
+function getValueFromPath(path) {
+ if (!path) return;
+ const keys = path.toString().split('.');
+ let current = entity.value;
+
+ for (const key of keys) {
+ if (current[key] === undefined) return undefined;
+ else current = current[key];
+ }
+ return current;
+}
+
const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+ route.matched[1].path.split('/').length > 2
+ ? route.matched[1].redirect
+ : route.matched[1].children[0].redirect
+);