Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: o2team/xcel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.4.0
Choose a base ref
...
head repository: o2team/xcel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 75 files changed
  • 1 contributor

Commits on May 15, 2017

  1. Update README.md

    JChehe authored May 15, 2017
    Copy the full SHA
    87aeb68 View commit details

Commits on Jun 2, 2017

  1. 增加 eslint

    JChehe committed Jun 2, 2017
    Copy the full SHA
    bf0bb0e View commit details
  2. Copy the full SHA
    e4e14fa View commit details

Commits on Jun 3, 2017

  1. Update README.md

    JChehe authored Jun 3, 2017
    Copy the full SHA
    d37b04b View commit details
  2. Copy the full SHA
    a93f8c6 View commit details

Commits on Jun 16, 2017

  1. 增加开源协议

    JChehe committed Jun 16, 2017
    Copy the full SHA
    f86d6d8 View commit details
  2. Copy the full SHA
    128366e View commit details
  3. update README.md

    JChehe committed Jun 16, 2017
    Copy the full SHA
    0533384 View commit details

Commits on Jun 29, 2017

  1. Copy the full SHA
    ff7e9dc View commit details
  2. Copy the full SHA
    5375ef9 View commit details
  3. Copy the full SHA
    f3d4e04 View commit details

Commits on Jun 15, 2018

  1. fix: 根级别 getters 为空,所以不必引入

    [vuex] getters should be function but "getters.default" is {}.
    JChehe committed Jun 15, 2018
    Copy the full SHA
    c5c3e2d View commit details
  2. Copy the full SHA
    11798d3 View commit details

Commits on Jun 16, 2018

  1. Delete uniqueTag.vue

    JChehe authored Jun 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d547dc3 View commit details

Commits on Jun 18, 2018

  1. fix: 修复一些小问题

    1. 缩进问题
    2. CSS 属性拼写错误
    3. v-for 加 key 属性
    4. 增加 .eslintignore
    JChehe committed Jun 18, 2018
    Copy the full SHA
    0d7a92e View commit details

Commits on Jun 23, 2018

  1. feat: 替换新 icon

    JChehe committed Jun 23, 2018
    Copy the full SHA
    a176417 View commit details
Showing with 5,240 additions and 4,501 deletions.
  1. +11 −2 .babelrc
  2. +15 −0 .editorconfig
  3. +1 −0 .eslintignore
  4. +9 −0 .eslintrc
  5. +674 −0 LICENSE
  6. +28 −23 README.md
  7. +7 −8 app/crashTempate.js
  8. +62 −69 app/electron.js
  9. BIN app/icons/icon.icns
  10. BIN app/icons/icon.ico
  11. BIN app/icons/icon.png
  12. +224 −217 app/ipcMainSets.js
  13. +8 −8 app/main.ejs
  14. +146 −150 app/menuTemplate.js
  15. +3 −3 app/package.json
  16. +57 −59 app/src/App.vue
  17. +161 −157 app/src/background/excelUtils.js
  18. +159 −128 app/src/background/filterUtils.js
  19. +32 −37 app/src/background/generateHTMLString.js
  20. +8 −3 app/src/background/index.html
  21. +166 −169 app/src/background/index.js
  22. +66 −63 app/src/components/FirstScreenPageView.vue
  23. +133 −136 app/src/components/FirstScreenPageView/ColSelDialog.vue
  24. +155 −157 app/src/components/FirstScreenPageView/ExcelDisplay.vue
  25. +180 −180 app/src/components/FirstScreenPageView/FilterFormDoubleColsRange.vue
  26. +149 −152 app/src/components/FirstScreenPageView/FilterFormMultiCalc.vue
  27. +127 −126 app/src/components/FirstScreenPageView/FilterFormSingleLogic.vue
  28. +128 −134 app/src/components/FirstScreenPageView/FilterFormUnique.vue
  29. +227 −230 app/src/components/FirstScreenPageView/FilterPanel.vue
  30. +61 −67 app/src/components/FirstScreenPageView/FilterTag.vue
  31. +42 −42 app/src/components/FirstScreenPageView/FilterTagList.vue
  32. +36 −35 app/src/components/FirstScreenPageView/GroupSelect.vue
  33. +98 −91 app/src/components/FirstScreenPageView/SheetOfExcel.vue
  34. +51 −0 app/src/components/FirstScreenPageView/UniqueTag.vue
  35. +0 −51 app/src/components/FirstScreenPageView/uniqueTag.vue
  36. +44 −41 app/src/components/InstructionsPageView.vue
  37. +208 −184 app/src/components/InstructionsPageView/Instructions.vue
  38. +1 −0 app/src/components/assets/svg/xcel_logo.svg
  39. BIN app/src/components/assets/xcel_logo.png
  40. +149 −148 app/src/components/common/FileList.vue
  41. +228 −231 app/src/components/common/Footer.vue
  42. +84 −84 app/src/components/common/Header.vue
  43. +76 −73 app/src/components/common/Loading.vue
  44. +126 −123 app/src/components/common/SideBar.vue
  45. +186 −194 app/src/components/common/UpdateDialog.vue
  46. +65 −68 app/src/components/common/WindowTop.vue
  47. +7 −5 app/src/main.js
  48. +13 −13 app/src/routes.js
  49. +30 −28 app/src/store/actions.js
  50. +13 −13 app/src/store/index.js
  51. +72 −71 app/src/store/modules/clientUpdate.js
  52. +57 −57 app/src/store/modules/excel.js
  53. +83 −82 app/src/store/modules/file.js
  54. +127 −132 app/src/store/modules/filter.js
  55. +23 −23 app/src/store/modules/programWindow.js
  56. +27 −29 app/src/store/modules/unique.js
  57. +1 −1 app/src/store/mutation-types.js
  58. +2 −3 app/src/update/index.css
  59. +2 −36 app/src/update/index.html
  60. +29 −0 app/src/update/index.js
  61. +82 −80 app/src/utils/ExcelSet.js
  62. +36 −38 app/src/utils/appInfo.js
  63. +32 −33 app/src/utils/localStorageSet.js
  64. +18 −18 app/src/utils/openExternal.js
  65. BIN build/icon.icns
  66. BIN build/icon.ico
  67. BIN build/icon.png
  68. +5 −5 config.js
  69. +28 −21 package.json
  70. +15 −9 tasks/release.js
  71. +12 −12 tasks/runner.js
  72. +0 −46 tasks/vue/route.js
  73. +0 −11 tasks/vue/route.template.txt
  74. +0 −4 tasks/vue/routes.template.txt
  75. +135 −88 webpack.config.js
13 changes: 11 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{
"presets": ["es2015", "stage-0"],
"plugins": ["transform-runtime"]
"presets": [
"es2015",
"stage-2"
],
"plugins": ["transform-runtime"],
"comments": false,
"env": {
"test": {
"plugins": ["istanbul"]
}
}
}
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# http://editorconfig.org

root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
insert_final_newline = false
trim_trailing_whitespace = false
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*.ejs
9 changes: 9 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "eslint-config-o2team",
"plugins": [
"vue"
],
"rules": {
"no-multiple-empty-lines": [ 1,{ "max": 1 } ]
}
}
Loading