diff --git a/package.json b/package.json index 3c2622d..ebbb62d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@fortawesome/vue-fontawesome": "^2.0.0", "@moefe/vue-aplayer": "^2.0.0-beta.5", "ant-design-vue": "^1.6.5", - "axios": "0.18.1", + "axios": "0.21.1", "clipboard": "^2.0.6", "cropperjs": "^1.5.6", "e-vue-contextmenu": "^0.1.3", @@ -28,7 +28,7 @@ "gsap": "^3.2.6", "highlightjs-line-numbers.js": "^2.7.0", "htmlhint": "^0.13.0", - "jquery": "^1.12.4", + "jquery": "^3.5.0", "jquery-contextmenu": "^2.9.1", "jquery.fancytree": "^2.35.0", "js-cookie": "2.2.0", diff --git a/src/components/Icon/Icon.vue b/src/components/Icon/Icon.vue index c0b7c3f..1d51394 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_a3e60q05qwc.js' + scriptUrl: '//at.alicdn.com/t/font_2024484_dczwxweaavk.js' }) // 把此段代码贴到iconfont项目页面的控制台中, 以获取图标列表 @@ -16,7 +16,7 @@ const IconFont = Icon.createFromIconfontCN({ // console.log(iconNames.slice(80,160)) export const iconFonts = { - list: ["zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui", + list: ["iso", "zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui", "maren", "zhutou", "qie", "youling", "apple-fill", "attachment", "android-fill", "apple", "download", "arrow-up-circle", "arrow-right-circle", "arrow-down", "ashbin", "add", "file_music", "menu", "role", "jiaoseguanli", "yemianshezhi", "drop_down", "yuandian", "tag", "service-directory", "fabu", "wailian", "bianji-", "WEBSITE", "wangzhanguanli", "Up", "up", "fenlei", "guanlizhuanjiawenzhang", "pifu", "tuichudenglu", "shezhi", "wangzhan", "huaban", "yunshezhi", "UserSettings", "blogger", "biaoqian", "myself", "guidang", "quxiaoyulan1-copy", "yulan-copy", "quxiaoyulan1", "yulan"] } diff --git a/src/components/Icon/IconFile.vue b/src/components/Icon/IconFile.vue index 794555e..254f431 100644 --- a/src/components/Icon/IconFile.vue +++ b/src/components/Icon/IconFile.vue @@ -34,7 +34,7 @@ -
+
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index e734f65..9b62687 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -2949,7 +2949,7 @@ export default { this.$emit("selectedFile", selectFile) return } - if (row.contentType.indexOf('image') > -1) { + if (row.contentType.startsWith('image')) { // 图片 this.imagePreviewVisible = true this.imagePreviewRow = row diff --git a/src/components/preview/ImageViewer.vue b/src/components/preview/ImageViewer.vue index e8948ca..04a8f5c 100644 --- a/src/components/preview/ImageViewer.vue +++ b/src/components/preview/ImageViewer.vue @@ -88,7 +88,7 @@ const findIndex = this.fileList.findIndex(file => file.id === this.file.id) this.fileList.forEach((element,index) => { if(index < findIndex + 5 && index > findIndex - 5 ) { - if(!element.isFolder && element.contentType.indexOf('image') > -1){ + if(!element.isFolder && element.contentType.startsWith('image')){ let url = fileConfig.previewUrl(this.$store.state.user.name, element) if(this.shareId){ url = fileConfig.publicPreviewUrl(element.id); diff --git a/src/utils/file-type.js b/src/utils/file-type.js index 782c75f..6d75b3f 100644 --- a/src/utils/file-type.js +++ b/src/utils/file-type.js @@ -76,3 +76,4 @@ iconClass.set('bat','file-bat') iconClass.set('swift','file-swift') iconClass.set('yml','file-yml') iconClass.set('plist','file-plist') +iconClass.set('iso','iso') diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue index 3bf95fd..65e5778 100644 --- a/src/views/public/share/shareList.vue +++ b/src/views/public/share/shareList.vue @@ -886,7 +886,7 @@ this.$router.push(`/s?s=${this.shareId}&vmode=${this.vmode}`) this.accessShareOpenDir(row.id) } else { - if(row.contentType.indexOf('image') > -1){ + if(row.contentType.startsWith('image')){ // 图片 this.imagePreviewVisible = true this.imagePreviewRow = row