From e40e487f42b569b2898e56acbe89f3dc9e4dd8b4 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Wed, 3 Mar 2021 11:49:10 -0400 Subject: [PATCH] feat: Update repository (#580) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: remove i18n (#1828) * [release] 4.1.0 * perf[Profile]: adapt the profile page to the mobile (#2020) * Revert "perf: optimize page scrolling when setting fixedHeader" This reverts commit e8e6c7e79c2488779090f00efc5f1bbfcb04bd5b. * perf[Style]: refine fixed-header style when open el-dialog * doc: add new article * chore: use mockjs in production environment * fix[sidebar.css]: remove redundant css * perf[style]: refine dashboard style in mobile (#2060) * feat[ErrorLog]: add a clear button in ErrorLog component (#2065) * fix[redirect]: fix redirect bug in vue-devtools (#2066) * perf[Tinymce]: update tinymce cdn version * fix[redirect]: fix redirect bug in vue-devtool again * docs: add support to readme for Spanish (#2070) * docs[es]: add some translation(#2080) * perf[Exapme]: set page title according to article id * perf[RightPanel]: tidy css (#2101) * feat[SvgIcon]: support import svg from url (#2052) * fix: fixed change roles bug (#2072) * perf[Breadcrumb]: do not update breadcrumbs when go to redirect page (#2086) * perf[store]: add support to sub-modules (#2047) * perf[Login]: support other query (#2013) * refactor[chore]: generate postcss.config.js instead of .postcssrc.js consistent with vue-cli * perf[Tinymce]: dynamic import tinymce(#2102) * [release] 4.2.0 * perf[Style]: refine example css * fix[Chart]: fixed chart bug in keep-alive (#2119) * Create FUNDING.yml * chore: set localhost => 127.0.0.1 (#2142) * update github ISSUE_TEMPLATE * chore: add autoprefixer to devDependencies * perf[Tinymce]: add language option (#2159) * fix[Tinymce]: fixed bug when init multiple tinymces at the same time (#2152) * feat: add tab url demo (#2114) * perf[request.js]: refine error reject (#2160) * [release] 4.2.1 * perf: default not set withCredentials * fix[ImageCropper]: removeEventListener when destroyed(#2169) * docs: fix typo (#2170) * fix: input attribute autocomplete error (#2191) * perf[PanThumb]: Replace the image tag with background-image to prevent the stretching (#2202) * docs: fix typo README.zh-CN.md (#2283) 修改错别字 * perf[clipboard.js]: remove redundant code (#2307) * bump: update axios for security vulnerability * bump: update @vue/cli-plugin-eslint version (#2327) FIx cannot find module '.../node_modules/eslint/lib/api.js/package.json' bug,see https://github.com/vuejs/vue-cli/issues/4231. * chore: allow dynamic set port * fix[complex-table]: form header sort icon is out of sync (#2382) * fix: fixed missing icons * fix: typos (#2532) Role Nmae => Role Name * docs: add awesome-project * fix[Dashboard]: fixed debounce bug (#2586) (#2597) To fixed https://github.com/PanJiaChen/vue-element-admin/issues/2586 * perf: VS Code support webpack alias file jump (#2609) * perf: optimize import file-saver way(#2347) * refactor[ImageCropper]: fix lint error (#2365) * fix: fixed numberFormatter bug https://github.com/PanJiaChen/vue-element-admin/issues/2568 * fix[example]: fixed create.vue cache error https://github.com/PanJiaChen/vue-element-admin/issues/2608 * perf[utils.js]: perf parseTime function (#2625) * perf[tagsView]: pref DEL_CACHED_VIEW and DEL_OTHERS_CACHED_VIEWS function (#2626) * fix[tagsView]: fixed DEL_OTHERS_CACHED_VIEWS bug * fix[logout]: empty tagsview when logout (#2632) * fix[TagsView]: fixed toLastView bug (#2634) * perf[SvgIcon]: change xlink:href to href(#2645) https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href * fix[TagsView]: fixed click.middle can close affixed tag bug (#2649) * docs: add job ad * docs: improved README.md (#2656) * style: fix el-date-picker css style * perf: format dropdown menu code (#2720) * perf: format inline edit table (#2725) move one format `{row}` * perf: format drag table (#2733) move one format `{row}` * perf: complex table (#2732) Move ont format `{row}` * perf: text i18n (#2739) * update 'MarkdownEditor' components name * format: space in user card (#2744) * perf: format pdf download (#2791) * perf[views/icons]: use grid (#2803) * feat: plop new generate store (#2805) * fix[icons]:fixed eslint 1 error and 2 warnings (#2835) * perf[documentation]: refine css * fix[Logout]: click blank area of ​​dropDown able to logout (#2896) Fixed clicking blank area of ​​drop-down unable to log out * perf: import mockXHR only in production (#2910) * 自动排除mock 生产环境，使用webpack的条件编译自动排除mock数据 * perf: refine Co-authored-by: 花裤衩 * perf[Menu]: remove unused menu-wrapper (#2903) * perf[complex-table]:refine code (#2825) * 解决无法删除列表的bug;优化代码； * perf: refine Co-authored-by: 花裤衩 * perf: optimize checkCapslock method (#2635) * optimize checkCapslock method * update Co-authored-by: 花裤衩 * fix[Charts]: fix charts resize in keep-alive bug (#2922) * fix[Charts]: fix charts resize in keep-alive bug * refine * fix: fixed mock server (#2929) * init * refine * update * bump: update element-ui version * fix: fixed require mock bug in production * fix: fixed redirect path regex (#2933) * perf[Mock]: set responseFake to mock-server.js(#2966) * modify 把mock/index.js中与mock-server相关的代码转移到mock-server.js中去，实现两则功能分割 * docs: improve Japanese translation (#2970) * perf: change script-loader to dependencies * fix[profile/UserCard]: fixed wrong key name (#3056) roles => role * fix:fixed parseTime bug in ie and safari(#3066) * /src/utils/index.js parseTime 添加IE浏览器（版本10以下，包括版本10）兼容。 * perf: update Co-authored-by: aisen60 Co-authored-by: 花裤衩 * perf: format component names as PascalCase (#3074) format: component names should be PascalCase * docs: add smallsticker * Update README.zh-CN.md * fix: svg support old broswer (#3085) * fixed typo (#3091) * fix: use vue-cli default source-map (#3097) cheap-module-eval-source-map * perf[Tinymce]: editor try to keep these URLs intact (#3141) * fix[element-variables]: missing space in element-variables (#3144) * fix: compatibility with vetur (#1700) * perf: change default element-ui language to english (#2741) * feat: add option to try project on CodeSandbox (#2976) * docs: add tips * perf: when tags-view scroll close the right-menu * fix[parseTime]: fixed when pass null (#3038) * fix[css]: min btn width (#3164) * docs: Improve read me files and changes in Spanish. (#3234) * [release] 4.2.2 * chore: change node-sass to dart-sass (#3040) * perf: change >>> ::v-deep * [release] 4.3.0 * docs: fix wrong link * chore: turn on the preload * refactor: change mock files to commonjs (#3246) * feat[Menu]: menu icon support el-icon(#3048) * fix[utils]: param2Obj bug when url params includes ==(#3100) * perf: remove unused showdown Co-authored-by: 花裤衩 * perf: lint code * fix[v-permission]: support dynamic set roles (#3251) * chore: update element-ui to 2.13.2 * fix[plop]: set trim => trim() (#3254) notEmpty * fix some typos * [release] 4.3.1 * bump: update to vue-cli@4 (#3028) * [release] 4.4.0 * fix[chore]: do not preload runtime.js (#3279) * perf[chore]: remove preserveWhitespace config (#3280) * perf[Tinymce]: remove useless code (#3295) * perf[permission.js]: remove useless code (#3301) * typo: replace Css with CSS (#3323) * docs: add GitAds * docs: remove gitads * docs: add vue-java-admin-dashboard-spring * perf: refine documentation button css * docs: add coupon * feat: add new sponsored * update dependencies. * fix: chart components, TODO: eslint-plugin-vue. * Update FUNDING.yml Co-authored-by: 花裤衩 Co-authored-by: toruksmakto <42709228+toruksmakto@users.noreply.github.com> Co-authored-by: Yamel Senih Co-authored-by: Yamel Senih Co-authored-by: liugq Co-authored-by: bpzhang Co-authored-by: Serge Co-authored-by: MaYuanhai <414199639@qq.com> Co-authored-by: Jessynt Co-authored-by: 肖敏 <392716797@qq.com> Co-authored-by: TinaryTree Co-authored-by: itsccn Co-authored-by: why Co-authored-by: Baskerville* Co-authored-by: Francis <31059354+FrancisSano@users.noreply.github.com> Co-authored-by: monkeycf <41945134+monkeycf@users.noreply.github.com> Co-authored-by: BradyBromley <51128276+BradyBromley@users.noreply.github.com> Co-authored-by: Phạm Ngọc Hòa Co-authored-by: bbigcd Co-authored-by: xuanzai <43233731+MikuBlog@users.noreply.github.com> Co-authored-by: flitrue <812863096@qq.com> Co-authored-by: 韬 <605682551@qq.com> Co-authored-by: 任羽飞 Co-authored-by: Kaitian Xie Co-authored-by: AndyLZC/AndyLZC.github.io <34624589+AndyLZC@users.noreply.github.com> Co-authored-by: RussXD Co-authored-by: 李小斐 <623536309@qq.com> Co-authored-by: RoBlues Co-authored-by: Shota Aratono <195194+artn@users.noreply.github.com> Co-authored-by: echofly <36875450+echofly@users.noreply.github.com> Co-authored-by: Aisen60 <1147319086@qq.com> Co-authored-by: aisen60 Co-authored-by: Alex S <50220345+sabatale@users.noreply.github.com> Co-authored-by: Aisen Co-authored-by: ntnyq Co-authored-by: garethx Co-authored-by: AiMe1991 Co-authored-by: cooper <1322849632@qq.com> Co-authored-by: Nickbing Lao Co-authored-by: Edwin Betancourt Co-authored-by: Cat73 Co-authored-by: Silentdoer <1010993610@qq.com> Co-authored-by: qige2016 <286882998@qq.com> Co-authored-by: Dihak Co-authored-by: crayymumu <854994301@qq.com> Co-authored-by: dyz <43943819+dyzsoft@users.noreply.github.com> Co-authored-by: Kerollos Magdy Co-authored-by: EdwinBetanc0urt --- .eslintrc.js | 2 +- .github/FUNDING.yml | 4 +- package.json | 68 ++++++++++--------- src/api/user.js | 26 +++---- src/components/Charts/Keyboard.vue | 2 +- src/components/Charts/LineMarker.vue | 2 +- src/components/Charts/MixChart.vue | 2 +- src/components/Tinymce/index.vue | 5 +- src/lang/index.js | 9 +-- src/layout/components/Navbar.vue | 21 +++++- src/main.js | 5 +- src/router/index.js | 25 +------ src/router/modules/ADempiere/enrollment.js | 27 ++++++++ src/utils/permission.js | 6 +- src/views/components-demo/avatar-upload.vue | 1 - src/views/components-demo/back-to-top.vue | 8 ++- src/views/components-demo/sticky.vue | 4 +- src/views/components-demo/tinymce.vue | 1 - .../dashboard/admin/components/BarChart.vue | 2 +- .../dashboard/admin/components/BoxCard.vue | 2 +- .../dashboard/admin/components/LineChart.vue | 2 +- .../dashboard/admin/components/PieChart.vue | 2 +- .../admin/components/RaddarChart.vue | 2 +- src/views/documentation/index.vue | 7 +- .../example/components/ArticleDetail.vue | 1 + src/views/excel/export-excel.vue | 2 + src/views/pdf/index.vue | 5 +- src/views/permission/role.vue | 10 ++- src/views/theme/index.vue | 4 +- vue.config.js | 11 --- 30 files changed, 149 insertions(+), 119 deletions(-) create mode 100644 src/router/modules/ADempiere/enrollment.js diff --git a/.eslintrc.js b/.eslintrc.js index c9775054..506a0f0e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, parserOptions: { - parser: 'babel-eslint', + parser: '@babel/eslint-parser', sourceType: 'module' }, env: { diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d5408027..e3a992cb 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms -patreon: panjiachen -custom: https://panjiachen.github.io/vue-element-admin-site/donate +github: [YamelSenih] +custom: [paypal.me/YamelSenih, https://adempiere.github.io/adempiere-vue-site/donate/] diff --git a/package.json b/package.json index 470ee73b..1521d8a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adempiere-vue", - "version": "4.3.1", + "version": "4.4.0", "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "contributors": [ @@ -30,17 +30,17 @@ "test:ci": "npm run lint && npm run test:unit" }, "dependencies": { - "@toast-ui/vue-editor": "^2.5.0", - "axios": "0.21.0", + "@toast-ui/vue-editor": "2.5.1", + "axios": "0.21.1", "clipboard": "2.0.6", - "codemirror": "5.58.2", - "core-js": "3.7.0", + "codemirror": "5.59.2", + "core-js": "3.8.3", "driver.js": "0.9.8", - "dropzone": "5.7.2", - "echarts": "4.9.0", - "element-ui": "2.14.1", - "file-saver": "2.0.2", - "fuse.js": "6.4.3", + "dropzone": "5.7.3", + "echarts": "5.0.2", + "element-ui": "2.15.0", + "file-saver": "2.0.5", + "fuse.js": "6.4.6", "js-cookie": "2.2.1", "jsonlint": "1.6.3", "jszip": "3.5.0", @@ -49,52 +49,53 @@ "nprogress": "0.2.0", "path-to-regexp": "6.2.0", "pinyin": "2.9.1", - "screenfull": "5.0.2", + "screenfull": "5.1.0", "script-loader": "0.7.2", - "sortablejs": "1.10.2", + "sortablejs": "1.13.0", "tui-editor": "1.4.10", "v-markdown": "^1.0.2", "vue": "2.6.12", "vue-content-loading": "^1.6.0", "vue-count-to": "1.0.13", - "vue-i18n": "8.22.1", + "vue-i18n": "8.22.4", "vue-multipane": "^0.9.5", - "vue-resize": "^0.5.0", - "vue-router": "3.4.9", + "vue-resize": "1.0.0", + "vue-router": "3.5.1", "vue-shortkey": "^3.1.7", "vue-split-panel": "^1.0.4", "vue-splitpane": "1.0.6", - "vuedraggable": "^2.24.3", - "vuex": "3.5.1", - "xlsx": "0.16.8" + "vuedraggable": "2.24.3", + "vuex": "3.6.2", + "xlsx": "0.16.9" }, "devDependencies": { - "@vue/cli-plugin-babel": "4.5.8", - "@vue/cli-plugin-eslint": "4.5.8", - "@vue/cli-plugin-pwa": "4.5.8", - "@vue/cli-plugin-unit-jest": "4.5.8", - "@vue/cli-service": "4.5.8", - "@vue/test-utils": "1.1.1", + "@babel/core": "7.12.13", + "@babel/eslint-parser": "7.12.13", + "@vue/cli-plugin-babel": "4.5.11", + "@vue/cli-plugin-eslint": "4.5.11", + "@vue/cli-plugin-pwa": "4.5.11", + "@vue/cli-plugin-unit-jest": "4.5.11", + "@vue/cli-service": "4.5.11", + "@vue/test-utils": "1.1.3", "autoprefixer": "9.8.6", - "babel-eslint": "10.1.0", "babel-jest": "26.6.3", "babel-plugin-dynamic-import-node": "2.3.3", "chalk": "4.1.0", - "chokidar": "3.4.3", + "chokidar": "3.5.1", "connect": "3.7.0", - "eslint": "7.13.0", + "eslint": "7.19.0", "eslint-plugin-vue": "6.2.2", "fs": "0.0.1-security", - "html-webpack-plugin": "4.5.0", - "husky": "4.3.0", - "lint-staged": "10.5.1", + "html-webpack-plugin": "5.0.0", + "husky": "4.3.8", + "lint-staged": "10.5.4", "mockjs": "1.1.0", "plop": "2.7.4", - "sass": "1.29.0", - "sass-loader": "10.1.0", + "sass": "1.32.6", + "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", "serve-static": "1.14.1", - "svg-sprite-loader": "5.0.0", + "svg-sprite-loader": "5.2.1", "svgo": "1.3.2", "tasksfile": "5.1.1", "vue-template-compiler": "2.6.12" @@ -111,6 +112,7 @@ "npm": ">= 3.0.0" }, "keywords": [ + "adempiere", "vue", "admin", "dashboard", diff --git a/src/api/user.js b/src/api/user.js index f16edf78..b14bdf3a 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -60,19 +60,6 @@ export function requestSessionInfo(token) { }) } -/** - * Logout from server - * @param {string} token or session UUID - */ -export function logout(token) { - return requestRest({ - url: '/user/logout', - data: { - token - } - }) -} - /** * Get User menu from server * @param {string} sessionUuid @@ -89,3 +76,16 @@ export function requestMenu({ }) .then(evaluateResponse) } + +/** + * Logout from server + * @param {string} token or session UUID + */ +export function logout(token) { + return requestRest({ + url: '/user/logout', + data: { + token + } + }) +} diff --git a/src/components/Charts/Keyboard.vue b/src/components/Charts/Keyboard.vue index 0b258f36..2f6b84ca 100644 --- a/src/components/Charts/Keyboard.vue +++ b/src/components/Charts/Keyboard.vue @@ -3,7 +3,7 @@