From d130ad70d4bbd209a95b386b2494a45b68206150 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 16 Jan 2025 08:39:04 +0100 Subject: [PATCH] fix: refs #6972 fix components --- src/boot/defaults/qBtn.js | 30 ++++++++++++++++++++++++++++++ src/boot/defaults/qInput.js | 19 +++++++++++++++++++ src/boot/defaults/qList.js | 4 ++++ src/boot/defaults/qScrollArea.js | 19 +++++++++++++++++++ src/boot/defaults/qSelect.js | 14 +++++++++++++- src/boot/defaults/qTable.js | 18 ++++++++++++++++++ src/boot/quasar.defaults.js | 4 ++++ src/components/CrudModel.vue | 9 +++------ src/components/LeftMenu.vue | 2 +- 9 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 src/boot/defaults/qBtn.js create mode 100644 src/boot/defaults/qList.js create mode 100644 src/boot/defaults/qScrollArea.js diff --git a/src/boot/defaults/qBtn.js b/src/boot/defaults/qBtn.js new file mode 100644 index 000000000..896457ad2 --- /dev/null +++ b/src/boot/defaults/qBtn.js @@ -0,0 +1,30 @@ +import { QBtn } from 'quasar'; +import { QBtnGroup } from 'quasar'; +QBtn.props.size = { + type: QBtn.props.size, + default: 'md', +}; +QBtn.props.flat = { + type: QBtn.props.flat, + default: false, +}; +// QBtnGroup.props.class = { +// type: QBtn.props.class, +// default: ['q-gutter-x-sm'], +// }; +// QBtnGroup.props.style = { +// type: QBtn.props.style, +// default: 'column-gap: 10px', +// }; +QBtnGroup.props.push = { + type: QBtn.props.push, + default: true, +}; +// QTable.props.columns = { +// type: QTable.props.columns, +// align: 'right', +// format: (value) => `${value}*`, +// }; +// QTable.props.noDataLabel = { +// default: 'asd', +// }; diff --git a/src/boot/defaults/qInput.js b/src/boot/defaults/qInput.js index 299b98718..d52ce9728 100644 --- a/src/boot/defaults/qInput.js +++ b/src/boot/defaults/qInput.js @@ -1,4 +1,23 @@ import { QInput } from 'quasar'; +// import setDefault from './setDefault'; +QInput.props.outlined = { + type: QInput.props.outlined, + default: false, +}; +QInput.props.dense = { + type: QInput.props.dense, + default: false, +}; +QInput.props.stackLabel = { + type: QInput.props.stackLabel, + default: true, +}; +QInput.props.hideBottomSpace = { + type: QInput.props.hideBottomSpace, + default: true, +}; + +// setDefault(QInput, 'outlined', false); (preguntar jsegarra) import setDefault from './setDefault'; setDefault(QInput, 'dense', true); diff --git a/src/boot/defaults/qList.js b/src/boot/defaults/qList.js new file mode 100644 index 000000000..7d95d183e --- /dev/null +++ b/src/boot/defaults/qList.js @@ -0,0 +1,4 @@ +import { QList } from 'quasar'; +import setDefault from './setDefault'; + +setDefault(QList, 'dense', true); diff --git a/src/boot/defaults/qScrollArea.js b/src/boot/defaults/qScrollArea.js new file mode 100644 index 000000000..25c61b649 --- /dev/null +++ b/src/boot/defaults/qScrollArea.js @@ -0,0 +1,19 @@ +import { QScrollArea } from 'quasar'; +// QScrollArea.props.visible = { +// type: QScrollArea.props.visible, +// default: true, +// }; +// QScrollArea.props.contentStyle = { +// type: QScrollArea.props.contentStyle, +// default: { +// width: '100%', +// height: '100%', +// borderRadius: '25px', +// background: 'red', +// opacity: 1, +// }, +// }; +// QScrollArea.props.class = { +// type: QScrollArea.props.class, +// default: ['fit text-grey-8'], +// }; diff --git a/src/boot/defaults/qSelect.js b/src/boot/defaults/qSelect.js index be0ba048a..a925d607e 100644 --- a/src/boot/defaults/qSelect.js +++ b/src/boot/defaults/qSelect.js @@ -1,4 +1,16 @@ -import { QSelect } from 'quasar'; import setDefault from './setDefault'; +import { QSelect } from 'quasar'; + +QSelect.props.optionLabel = { + type: QSelect.props.optionLabel, + default: 'name', +}; +QSelect.props.optionValue = { + type: QSelect.props.optionValue, + default: 'id', +}; + +// setDefault(QSelect, 'optionValue', 'id'); +// setDefault(QSelect, 'optionLabel', 'name'); setDefault(QSelect, 'dense', true); diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js index 8902d4266..b4fd5a835 100644 --- a/src/boot/defaults/qTable.js +++ b/src/boot/defaults/qTable.js @@ -1,5 +1,23 @@ import { QTable } from 'quasar'; + import setDefault from './setDefault'; setDefault(QTable, 'pagination', { rowsPerPage: 0 }); setDefault(QTable, 'hidePagination', true); +QTable.props.columns = { + type: QTable.props.columns, + align: 'right', + format: (value) => `${value}*`, +}; +QTable.props.noDataLabel = { + default: 'asd', +}; + +// setDefault(QTable, "noDataLabel", t('globalfs.noResults')); +setDefault(QTable, 'gridHeader', true); +setDefault(QTable, 'color', 'red-8'); +setDefault(QTable, 'pagination', { rowsPerPage: 25 }); +setDefault(QTable, 'rowKey', 'id'); +// setDefault(QTable, 'columns', (data) => { +// console.log(this); +// }); diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js index 9638e2057..4b327e021 100644 --- a/src/boot/quasar.defaults.js +++ b/src/boot/quasar.defaults.js @@ -1,3 +1,7 @@ export * from './defaults/qTable'; export * from './defaults/qInput'; export * from './defaults/qSelect'; +export * from './defaults/qBtn'; +export * from './defaults/qDrawer'; +export * from './defaults/qList'; +export * from './defaults/qScrollArea'; diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index 940b72ff0..c4ad00d6d 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -303,12 +303,9 @@ watch(formUrl, async () => { > - - - + + +