add auto import modules and language #1815
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 修复 Mock 导致请求丢失 Cookie 的问题 修复 Mock 导致 Cookie 丢失的问题，只有在 XHR.open() 周期时，自定义的 withCredentials 会被挂载，此时检查是否是未被拦截的 xhr，并挂载自定义的 withCredentials ，无则默认为 false
* fix[tagsView]:fixed visited view move to currentTag * edit the scroll regular friendly * tweak
…1267) * feat: perfect migrate to @vue/cli-service, upgrade vue babel version 1. update to @vue/[email protected], @babel/[email protected] 2. use vue-cli service replace config file in build/ and config/ 3. upgrade vue and babel configuration 4. solve the svg-sprite config problem #980 refs: #932 #1087 #980 #1056 * fix: fix breadcrumb dependency * fix: fix index template and static assets load with vue-cli 3 * fix: fix import driver.js in guide page * refactor(mock): mak mock api compatible with both web-view and webpack server 1. 把 Mockjs 功能移到 server 端中间件，同时也兼容前端直接劫持 XHR 2. dev 环境下默认作为 express 中间件通过 webpack server 提供 mock api 3. prod 构建时，默认在前端用 Mockjs 劫持 XHR benefits: - dev 开发调试时能直接看到 XHR 请求，方便调试网络，能和后端对接联调 - 避开在开发时因为 Mockjs 引起的网络 bug - prod 构建时劫持 XHR，保证本项目的 Github Pages preview 能正常显示 (逻辑和 error-log 一样) - 前后台使用的 mock 是同一份代码，不会增加维护负担 ref: [#562](#562 (comment)) * update requires the lowest version of node * add favicon * fix(TreeTable): fix `Array.prototype.concat` on custom-tree-table page
… when user clicked avatar (#1304)
# Conflicts: # src/store/index.js # src/store/modules/app.js
# Conflicts: # .env.development # .env.production # .env.staging # build/index.js # jest.config.js # mock/index.js # mock/user.js # package.json # src/components/ErrorLog/index.vue # src/components/RightPanel/index.vue # src/components/ThemePicker/index.vue # src/components/Upload/singleImage.vue # src/layout/Layout.vue # src/layout/components/AppMain.vue # src/layout/components/Navbar.vue # src/layout/components/Settings/index.vue # src/layout/components/Sidebar/index.vue # src/router/index.js # src/router/modules/charts.js # src/router/modules/components.js # src/router/modules/nested.js # src/router/modules/table.js # src/router/modules/tree-table.js # src/settings.js # src/store/index.js # src/store/modules/app.js # src/store/modules/settings.js # src/styles/element-variables.scss # src/utils/request.js # src/views/components-demo/countTo.vue # src/views/components-demo/markdown.vue # src/views/dashboard/admin/index.vue # src/views/example/components/ArticleDetail.vue # src/views/example/list.vue # src/views/login/index.vue # src/views/table/complexTable.vue # src/views/table/dragTable.vue # src/views/table/inlineEditTable.vue # src/views/tree-table/custom/index.vue # src/views/tree-table/index.vue # vue.config.js
|
你可以看一下你的 pr不是特别对，里面有很多其他多余的改动。 |
|
因为有冲突 所以我处理了下，实际文件修改不多Files changed里面能看到修改的文件 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.