diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 861a79432..3bcd91b1f 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -317,8 +317,8 @@ defineExpose({ params, }); -function handleOnDataSaved(_) { - if (_.onDataSaved) _.onDataSaved(this); +function handleOnDataSaved(_, res) { + if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value }); else $props.create.onDataSaved(_); } @@ -771,6 +771,16 @@ es: color: var(--vn-text-color); } +.q-table--dark .q-table__bottom, +.q-table--dark thead, +.q-table--dark tr { + border-color: var(--vn-section-color); +} + +.q-table__container > div:first-child { + background-color: var(--vn-page-color); +} + .grid-three { display: grid; grid-template-columns: repeat(auto-fit, minmax(400px, max-content)); diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue index 31c4f2cd5..5f94c466a 100644 --- a/src/components/common/VnLocation.vue +++ b/src/components/common/VnLocation.vue @@ -12,6 +12,16 @@ const props = defineProps({ default: null, }, }); + +const locationProperties = [ + 'postcode', + (obj) => + obj.city + ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}` + : null, + (obj) => obj.country?.name, +]; + const formatLocation = (obj, properties) => { const parts = properties.map((prop) => { if (typeof prop === 'string') { @@ -29,17 +39,10 @@ const formatLocation = (obj, properties) => { return filteredParts.join(', '); }; -const locationProperties = [ - 'postcode', - (obj) => - obj.city - ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}` - : null, - (obj) => obj.country?.name, -]; const modelValue = ref( props.location ? formatLocation(props.location, locationProperties) : null ); + function showLabel(data) { const dataProperties = [ 'code', diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index ab522cfde..8c71c0997 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -406,6 +406,7 @@ watch( :skeleton="false" auto-load @on-fetch="setLogTree" + search-url="logs" >