diff --git a/package.json b/package.json index 9d0aa227..483106d3 100644 --- a/package.json +++ b/package.json @@ -44,77 +44,78 @@ "url": "https://github.com/PanJiaChen/vue-element-admin/issues" }, "dependencies": { - "@adempiere/grpc-access-client": "^1.1.8", - "@adempiere/grpc-data-client": "^2.2.5", - "@adempiere/grpc-dictionary-client": "^1.3.9", - "@adempiere/grpc-enrollment-client": "^1.0.7", - "@adempiere/grpc-pos-client": "^1.0.8", - "autoprefixer": "^9.5.1", - "axios": "0.18.0", - "clipboard": "2.0.4", - "codemirror": "5.45.0", - "driver.js": "0.9.5", - "dropzone": "5.5.1", - "echarts": "4.2.1", - "element-ui": "2.13.0", - "file-saver": "2.0.1", - "fuse.js": "3.4.4", - "js-cookie": "2.2.0", + "@adempiere/grpc-access-client": "^1.1.9", + "@adempiere/grpc-data-client": "^2.2.6", + "@adempiere/grpc-dictionary-client": "^1.4.0", + "@adempiere/grpc-enrollment-client": "^1.0.8", + "@adempiere/grpc-pos-client": "^1.0.9", + "axios": "0.19.2", + "clipboard": "2.0.6", + "codemirror": "5.53.2", + "core-js": "^3.6.5", + "driver.js": "0.9.8", + "dropzone": "5.7.0", + "echarts": "4.7.0", + "element-ui": "2.13.1", + "file-saver": "2.0.2", + "fuse.js": "5.2.3", + "js-cookie": "2.2.1", "jsonlint": "1.6.3", - "jszip": "3.2.1", + "jszip": "3.4.0", "mime-type": "^3.0.7", "moment": "^2.24.0", - "normalize.css": "7.0.0", + "normalize.css": "8.0.1", "nprogress": "0.2.0", - "path-to-regexp": "2.4.0", - "screenfull": "4.2.0", - "showdown": "1.9.0", - "sortablejs": "1.10.1", + "path-to-regexp": "6.1.0", + "screenfull": "5.0.2", + "script-loader": "0.7.2", + "showdown": "1.9.1", + "sortablejs": "1.10.2", "tui-editor": "1.4.10", "v-markdown": "^1.0.2", - "vue": "2.6.10", + "vue": "2.6.11", "vue-count-to": "1.0.13", - "vue-i18n": "7.3.2", + "vue-i18n": "8.17.4", "vue-multipane": "^0.9.5", - "vue-resize": "^0.4.5", - "vue-router": "3.0.4", + "vue-resize": "^0.5.0", + "vue-router": "3.1.6", "vue-shortkey": "^3.1.7", "vue-split-panel": "^1.0.4", - "vue-splitpane": "1.0.4", + "vue-splitpane": "1.0.6", "vuedraggable": "^2.23.2", - "vuex": "3.1.0", - "xlsx": "0.14.1" + "vuex": "3.3.0", + "xlsx": "0.15.6" }, "devDependencies": { - "@babel/core": "7.0.0", - "@babel/register": "7.0.0", - "@vue/cli-plugin-babel": "3.5.3", - "@vue/cli-plugin-eslint": "3.5.1", - "@vue/cli-plugin-unit-jest": "^3.7.0", - "@vue/cli-service": "3.5.3", - "@vue/test-utils": "1.0.0-beta.29", + "@babel/core": "7.9.0", + "@babel/register": "7.9.0", + "@vue/cli-plugin-babel": "4.3.1", + "@vue/cli-plugin-eslint": "4.3.1", + "@vue/cli-plugin-unit-jest": "^4.3.1", + "@vue/cli-service": "4.3.1", + "@vue/test-utils": "1.0.0-beta.33", + "autoprefixer": "^9.7.6", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "^8.0.1", - "babel-jest": "^24.8.0", - "chalk": "2.4.2", - "chokidar": "2.1.5", - "connect": "3.6.6", - "eslint": "^4.10.0", - "eslint-plugin-vue": "5.2.2", - "html-webpack-plugin": "3.2.0", - "husky": "1.3.1", - "lint-staged": "8.1.5", - "mockjs": "1.0.1-beta3", - "node-sass": "^4.9.0", - "plop": "2.3.0", - "runjs": "^4.3.2", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.0", - "vue-template-compiler": "2.6.10" + "babel-eslint": "^10.1.0", + "babel-jest": "^25.5.1", + "chalk": "4.0.0", + "chokidar": "3.4.0", + "connect": "3.7.0", + "eslint": "^6.8.0", + "eslint-plugin-vue": "6.2.2", + "html-webpack-plugin": "4.2.1", + "husky": "4.2.5", + "lint-staged": "10.2.0", + "mockjs": "1.1.0", + "node-sass": "^4.14.0", + "plop": "2.6.0", + "runjs": "^4.4.2", + "sass-loader": "^8.0.2", + "script-ext-html-webpack-plugin": "2.1.4", + "serve-static": "^1.14.1", + "svg-sprite-loader": "4.2.7", + "svgo": "1.3.2", + "vue-template-compiler": "2.6.11" }, "engines": { "node": ">=8.9", diff --git a/src/components/ADempiere/ContextMenu/index.vue b/src/components/ADempiere/ContextMenu/index.vue index 45218c30..5497b8b6 100644 --- a/src/components/ADempiere/ContextMenu/index.vue +++ b/src/components/ADempiere/ContextMenu/index.vue @@ -62,11 +62,10 @@ export default { return this.$store.state.app.device === 'mobile' }, templateDevice() { - let template = 'contextMenuDesktop' if (this.isMobile) { - template = 'contextMenuMobile' + return () => import('@/components/ADempiere/ContextMenu/contextMenuMobile') } - return () => import(`@/components/ADempiere/ContextMenu/${template}`) + return () => import('@/components/ADempiere/ContextMenu/contextMenuDesktop') } } } diff --git a/src/components/ADempiere/Dashboard/index.vue b/src/components/ADempiere/Dashboard/index.vue index 31e9134a..db36000a 100644 --- a/src/components/ADempiere/Dashboard/index.vue +++ b/src/components/ADempiere/Dashboard/index.vue @@ -24,7 +24,6 @@