diff --git a/src/auth/router.js b/src/auth/router.js index 46d127a..48ce281 100644 --- a/src/auth/router.js +++ b/src/auth/router.js @@ -73,35 +73,37 @@ const hasPermission = (requiredPermissions = []) => { ); }; -router.beforeEach((to, from, next) => { - if (to.meta.title) { - document.title = to.meta.title; - } +// router.beforeEach((to, from, next) => { +// if (to.meta.title) { +// document.title = to.meta.title; +// } - // if (to.matched.some((record) => record.meta.requiresAuth)) { - if (!isAuthenticated()) { - next({ - path: "/login", - query: { redirect: to.fullPath }, - }); +// console.log(to, from); - return; - } +// // if (to.matched.some((record) => record.meta.requiresAuth)) { +// if (!isAuthenticated()) { +// next({ +// path: "/login", +// }); - // const requiredPermissions = to.meta.permissions || []; +// return; +// } - // if (requiredPermissions.length > 0 && !hasPermission(requiredPermissions)) { - // next({ path: "/unauthorized" }); +// // const requiredPermissions = to.meta.permissions || []; - // return; - // } - // } +// // if (requiredPermissions.length > 0 && !hasPermission(requiredPermissions)) { +// // next({ path: "/unauthorized" }); - // if (to.matched.some((record) => record.meta.guest) && isAuthenticated()) { - // next({ path: "/" }); +// // return; +// // } +// // } - // return; - // } +// // if (to.matched.some((record) => record.meta.guest) && isAuthenticated()) { +// // next({ path: "/" }); - next(); -}); +// // return; +// // } + +// next(); +// return; +// }); diff --git a/src/components/Button/index.vue b/src/components/Button/index.vue index ea5f0f8..dfd9541 100644 --- a/src/components/Button/index.vue +++ b/src/components/Button/index.vue @@ -7,6 +7,7 @@ :type="type" :disable="loading || disabled" :text-color="textColor" + :full-width="fullWidth" /> diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue index d77621c..949a735 100644 --- a/src/components/Table/index.vue +++ b/src/components/Table/index.vue @@ -6,7 +6,6 @@ :columns="columns" :row-key="rowKey" :loading="loading" - row-key="name" flat bordered virtual-scroll @@ -24,7 +23,7 @@
- Mostrando {{ pagination.currentPage }} de - {{ pagination.totalItems }} + Total: {{ pagination.total }}
@@ -61,6 +57,11 @@ export default { required: false, default: "name", }, + rowKey: { + type: String, + required: false, + default: "id", + }, title: { type: String, required: false, @@ -86,6 +87,7 @@ export default { return { columns: props.columns, rows: props.rows, + rowKey: props.rowKey, }; }, }; diff --git a/src/components/TextField/index.vue b/src/components/TextField/index.vue index de754e1..2e46e99 100644 --- a/src/components/TextField/index.vue +++ b/src/components/TextField/index.vue @@ -1,5 +1,5 @@