diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index d6e700db..951d8ca8 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -46,6 +46,15 @@ https://github.com/vuetifyjs/vuetify/releases/tag/v2.0.0#user-content-upgrade-gu Just got client to load without error to main page. *** Next up is to fire up server then test client applying fixes as required to bring back to last known state Also add vuex plugin or router whichever I hadn't done yet through the vue ui client (may need to remove the old reference) + +VDataTable Options prop replaces Pagination prop, documented here (only): +https://github.com/vuetifyjs/vuetify/blob/a476b985ceda80c61e8a12346afa62b1625a63f7/packages/vuetify/src/components/VData/VData.ts +https://github.com/vuetifyjs/vuetify/blob/6a3b32d967ca505b6c8d244468a4a96aca381ac4/packages/vuetify/src/components/VDataTable/__tests__/VDataTable.spec.ts + +move into Options object these things: + :rows-per-page-items="rowsPerPageItems" + :rows-per-page-text="lt('RowsPerPage')" + select-all ================================================= diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json index 155fee5d..ac0e3cbf 100644 --- a/ayanova/package-lock.json +++ b/ayanova/package-lock.json @@ -3414,49 +3414,6 @@ "dev": true, "requires": { "@vue/cli-shared-utils": "^4.0.5" - }, - "dependencies": { - "@vue/cli-shared-utils": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.0.5.tgz", - "integrity": "sha512-NlNZ4Dx5QcP5uO5fCOLgkN2tbhNan5EcptPvXawW/md18cIpMlKbph6L6lEfJj8vrSvTUf2i/FyoFSh1rV53hw==", - "dev": true, - "requires": { - "@hapi/joi": "^15.0.1", - "chalk": "^2.4.1", - "execa": "^1.0.0", - "launch-editor": "^2.2.1", - "lru-cache": "^5.1.1", - "node-ipc": "^9.1.1", - "open": "^6.3.0", - "ora": "^3.4.0", - "request": "^2.87.0", - "request-promise-native": "^1.0.7", - "semver": "^6.1.0", - "string.prototype.padstart": "^3.0.0" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - } } }, "@vue/cli-plugin-unit-jest": { @@ -18414,11 +18371,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-router": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", - "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==" - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", diff --git a/ayanova/package.json b/ayanova/package.json index b3c977da..d7df9c3f 100644 --- a/ayanova/package.json +++ b/ayanova/package.json @@ -19,9 +19,9 @@ "register-service-worker": "^1.6.2", "typeface-roboto": "0.0.54", "vue": "^2.6.10", - "vue-router": "^3.1.3", + "vuex": "^3.0.1", "vuetify": "^2.1.6", - "vuetify-dialog": "^0.3.8", + "vuetify-dialog": "^0.3.8", "vuex-persistedstate": "^2.5.4" }, "devDependencies": { @@ -31,6 +31,7 @@ "@vue/cli-plugin-e2e-cypress": "^4.0.5", "@vue/cli-plugin-eslint": "^4.0.5", "@vue/cli-plugin-pwa": "^4.0.5", + "@vue/cli-plugin-router": "^4.0.5", "@vue/cli-plugin-unit-jest": "^4.0.5", "@vue/cli-plugin-vuex": "^4.0.5", "@vue/cli-service": "^4.0.5", diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue index ba69afd9..1a28bf70 100644 --- a/ayanova/src/components/inventorywidgetlist.vue +++ b/ayanova/src/components/inventorywidgetlist.vue @@ -39,13 +39,15 @@ :headers="headers" :items="Items" item-key="id" - :pagination.sync="localFormSettings.pagination" - :total-items="totalItems" + :options.sync="localFormSettings.pagination" + :server-items-length="totalItems" :loading="loading" - :rows-per-page-items="rowsPerPageItems" - :rows-per-page-text="lt('RowsPerPage')" + show-select class="elevation-1" - select-all + :footer-props="{ + itemsPerPageOptions: rowsPerPageItems, + itemsPerPageText: lt('RowsPerPage') + }" >