diff --git a/jero-web/src/utils/authFilter.js b/jero-web/src/utils/authFilter.js index 43b33118..3bc260fe 100644 --- a/jero-web/src/utils/authFilter.js +++ b/jero-web/src/utils/authFilter.js @@ -71,7 +71,7 @@ function globalDisabledAuth (code) { // 设置全局配置是否有命中 let gFlag = false// 禁用命中 let invalidFlag = false// 无效命中 - if (allPermissionList != null && allPermissionList !== '' && allPermissionList !== undefined && allPermissionList.length > 0) { + if (allPermissionList != null && allPermissionList != '' && allPermissionList !== undefined && allPermissionList.length > 0) { for (const itemG of allPermissionList) { if (code === itemG.action) { if (itemG.status + '' === '0') { diff --git a/jero-web/src/utils/hasPermission.js b/jero-web/src/utils/hasPermission.js index 997a9177..98ef49af 100644 --- a/jero-web/src/utils/hasPermission.js +++ b/jero-web/src/utils/hasPermission.js @@ -84,7 +84,7 @@ export function filterGlobalPermission (el, binding) { } // 设置全局配置是否有命中 let invalidFlag = false// 无效命中 - if (allPermissionList != null && allPermissionList !== '' && allPermissionList !== undefined && allPermissionList.length > 0) { + if (allPermissionList != null && allPermissionList != '' && allPermissionList !== undefined && allPermissionList.length > 0) { for (const itemG of allPermissionList) { if (binding.value === itemG.action) { if (itemG.status + '' !== '0') { diff --git a/jero-web/src/views/demo/ImagCropper.vue b/jero-web/src/views/demo/ImagCropper.vue index ccb54b1e..d053693c 100644 --- a/jero-web/src/views/demo/ImagCropper.vue +++ b/jero-web/src/views/demo/ImagCropper.vue @@ -37,7 +37,8 @@
- + @@ -57,10 +58,9 @@

截图框大小

-
+
- +
@@ -69,7 +69,7 @@

中等大小

- +
@@ -78,7 +78,7 @@

迷你大小

- +
@@ -87,7 +87,7 @@

固定为100宽度

- +
@@ -96,7 +96,7 @@

固定为100高度

- +
@@ -114,7 +114,7 @@
- 类似css background属性设置 设置不符合规范不生效, 参照文档说明 + 类似css background属性设置 设置不符合规范不生效, 参照文档说明
@@ -300,7 +300,7 @@ export default { finish (type) { if (type === 'blob') { this.$refs.cropper.getCropBlob(data => { - var img = window.URL.createObjectURL(data) + const img = window.URL.createObjectURL(data) this.model = true this.modelSrc = img }) @@ -313,9 +313,9 @@ export default { }, // 实时预览函数 realTime (data) { - var previews = data - var h = 0.5 - var w = 0.2 + const previews = data + const h = 0.5 + const w = 0.2 this.previewStyle1 = { width: previews.w + 'px', @@ -352,13 +352,13 @@ export default { this.previews = data }, - finish2 (type) { + finish2 () { this.$refs.cropper2.getCropData(data => { this.model = true this.modelSrc = data }) }, - finish3 (type) { + finish3 () { this.$refs.cropper3.getCropData(data => { this.model = true this.modelSrc = data @@ -370,7 +370,7 @@ export default { this.$refs.cropper.getCropBlob(data => { this.downImg = window.URL.createObjectURL(data) if (window.navigator.msSaveBlob) { - var blobObject = new Blob([data]) + const blobObject = new Blob([data]) window.navigator.msSaveBlob(blobObject, 'demo.png') } else { this.$nextTick(() => { @@ -382,7 +382,7 @@ export default { this.$refs.cropper.getCropData(data => { this.downImg = data if (window.navigator.msSaveBlob) { - var blobObject = new Blob([data]) + const blobObject = new Blob([data]) window.navigator.msSaveBlob(blobObject, 'demo.png') } else { this.$nextTick(() => { @@ -396,12 +396,12 @@ export default { uploadImg (e, num) { // 上传图片 // this.option.img - var file = e.target.files[0] + const file = e.target.files[0] if (!/\.(gif|jpg|jpeg|png|bmp|GIF|JPG|PNG)$/.test(e.target.value)) { alert('图片类型必须是.gif,jpeg,jpg,png,bmp中的一种') return false } - var reader = new FileReader() + const reader = new FileReader() reader.onload = e => { let data if (typeof e.target.result === 'object') { @@ -428,13 +428,10 @@ export default { this.option.cropData = data } }, - components: { - VueCropper - }, mounted () { this.changeImg() - var list = [].slice.call(document.querySelectorAll('pre code')) - list.forEach((val, index) => { + const list = [].slice.call(document.querySelectorAll('pre code')) + list.forEach((val) => { hljs.highlightBlock(val) }) } @@ -442,172 +439,171 @@ export default { diff --git a/jero-web/src/views/demo/ImagPreview.vue b/jero-web/src/views/demo/ImagPreview.vue index 0d1bb9a1..e0806b64 100644 --- a/jero-web/src/views/demo/ImagPreview.vue +++ b/jero-web/src/views/demo/ImagPreview.vue @@ -14,10 +14,10 @@