diff --git a/package.json b/package.json index 9240ffc..4932553 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jmal-cloud-view", - "version": "2.0.0", + "version": "2.0.1", "description": "jmal cloud", "author": "Jmal ", "license": "MIT", diff --git a/src/components/Icon/Icon.vue b/src/components/Icon/Icon.vue index 4f58752..18032f1 100644 --- a/src/components/Icon/Icon.vue +++ b/src/components/Icon/Icon.vue @@ -5,7 +5,7 @@ import { Icon } from 'ant-design-vue' const IconFont = Icon.createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/font_2024484_3jr9049cc2f.js' + scriptUrl: '//at.alicdn.com/t/font_2024484_enjqo8y5nla.js' }) export default { diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index d53ab91..cc3486d 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -43,7 +43,7 @@
-
+
- 新建文档 + 写文章
  • @@ -105,8 +105,33 @@ - - + + + + + + + + + 名称 + + + + + + 大小 + + + + + + 日期 + + + + + +
  • @@ -1670,7 +1695,7 @@ export default { that.newTextFileDialog = false }, 200) }).catch(() => { - + this.createTextFileLoading = false }) } @@ -1736,6 +1761,8 @@ export default { } }) } + // 加载顶部的排序下拉框 + }, // 请求之前的准备 beforeLoadData(onLoad) { @@ -1948,8 +1975,10 @@ export default { } }, addClass(el, className) { - const str = el.className - el.className = el.className + " " + className + if(el){ + const str = el.className + el.className = el.className + " " + className + } }, getSummaries(param) { // 合计 @@ -2358,7 +2387,7 @@ export default { this.sortChangeOfMenu('size', 5) break case 'orderUpdateDate': - this.sortChangeOfMenu('update', 6) + this.sortChangeOfMenu('updateDate', 6) break case 'refresh': this.getFileList() diff --git a/src/main.js b/src/main.js index 7e1ba90..6233bb9 100644 --- a/src/main.js +++ b/src/main.js @@ -104,6 +104,13 @@ new Vue({ store, render: h => h(App), }) +import config from '../package.json' +console.log( + `%c jmal-cloud-view %c v${config.version} %c`, + 'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px; color: #fff', + 'background:#409eff ; padding: 1px; border-radius: 0 3px 3px 0; color: #fff', + 'background:transparent' +) if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) { Vue.prototype.$pc = false diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss index 377dfc0..a17a40a 100644 --- a/src/styles/home-index.scss +++ b/src/styles/home-index.scss @@ -191,7 +191,7 @@ color: "#19ACF9" } -.searchClass{ +.search-class{ float: right; width: 40%; display: flex; @@ -199,10 +199,14 @@ .el-input { width: 235px; } - .vmode{ + .sort{ padding: 5px 10px; margin-left: 5px; } + .vmode{ + padding: 5px 10px; + margin-left: -5px; + } } //.grid { diff --git a/src/styles/index.scss b/src/styles/index.scss index a4d9a00..6367c01 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,3 +159,16 @@ div:focus { width: 6px!important; } } +.al-file-sort-item { + .al-file-sort-item-icon { + font-weight: 600; + } +} +.al-file-sort-item.active { + color: #40a9ff; +} + +.al-file-sort-item:not(.active) .al-file-sort-item-icon { + visibility: hidden; +} + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 93b4cf9..1a35d04 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -33,8 +33,8 @@ export default { }, { label: '刷新', operation: 'refresh'}, { divider: true, operation: 'divider' }, + { label: '写文章', operation: 'createMarkdownFile'}, { label: '新建文件', operation: 'createTextFile'}, - { label: '新建文档', operation: 'createMarkdownFile'}, ] } }, diff --git a/src/views/setting/cloudManager.vue b/src/views/setting/cloudManager.vue index 79bad1a..9b701f5 100644 --- a/src/views/setting/cloudManager.vue +++ b/src/views/setting/cloudManager.vue @@ -39,7 +39,7 @@ export default { return { title: '网盘管理', syncLoading: false, - webpEnabled: false + webpEnabled: true } }, mounted() { diff --git a/src/views/setting/sys/roleManager.vue b/src/views/setting/sys/roleManager.vue index d47d5a5..864a772 100644 --- a/src/views/setting/sys/roleManager.vue +++ b/src/views/setting/sys/roleManager.vue @@ -245,7 +245,6 @@ export default { // 分配权限 authorization(roleId) { const req = require.context('@/icons/svg', false, /\.svg$/) - console.log(req) this.dialogAuthVisible = true const findIndex = this.dataList.findIndex(data => data.id === roleId) const role = this.dataList[findIndex]