diff --git a/yudao-ui-admin/build/index.js b/yudao-ui-admin/build/index.js index 0c57de2aad..520489588b 100644 --- a/yudao-ui-admin/build/index.js +++ b/yudao-ui-admin/build/index.js @@ -12,8 +12,8 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) { const port = 9526 const publicPath = config.publicPath - var connect = require('connect') - var serveStatic = require('serve-static') + const connect = require('connect') + const serveStatic = require('serve-static') const app = connect() app.use( diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json index 96463a8f57..0bf0ed7b83 100644 --- a/yudao-ui-admin/package.json +++ b/yudao-ui-admin/package.json @@ -89,8 +89,8 @@ "fs-extra": "^8.1.0", "lint-staged": "10.5.3", "runjs": "4.4.2", - "sass": "1.32.13", - "sass-loader": "10.1.1", + "sass": "1.56.0", + "sass-loader": "13.1.0", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", "terser-webpack-plugin": "^4.2.3", diff --git a/yudao-ui-admin/src/components/Breadcrumb/index.vue b/yudao-ui-admin/src/components/Breadcrumb/index.vue index 85cde81c0f..f0129a4c15 100644 --- a/yudao-ui-admin/src/components/Breadcrumb/index.vue +++ b/yudao-ui-admin/src/components/Breadcrumb/index.vue @@ -2,7 +2,7 @@ - {{ item.meta.title }} + {{ item.meta.title }} {{ item.meta.title }} diff --git a/yudao-ui-admin/src/components/Crontab/day.vue b/yudao-ui-admin/src/components/Crontab/day.vue index fe3eaf0c4c..d6c74fade5 100644 --- a/yudao-ui-admin/src/components/Crontab/day.vue +++ b/yudao-ui-admin/src/components/Crontab/day.vue @@ -103,25 +103,25 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'day', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'day', this.averageTotal); } }, // 最近工作日值变化时 workdayChange() { - if (this.radioValue == '5') { + if (this.radioValue === '5') { this.$emit('update', 'day', this.workdayCheck + 'W'); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '7') { + if (this.radioValue === '7') { this.$emit('update', 'day', this.checkboxString); } } @@ -148,13 +148,12 @@ export default { }, // 计算工作日格式 workdayCheck: function () { - const workday = this.checkNum(this.workday, 1, 31) - return workday; + return this.checkNum(this.workday, 1, 31); }, // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } diff --git a/yudao-ui-admin/src/components/Crontab/hour.vue b/yudao-ui-admin/src/components/Crontab/hour.vue index 4b1f1fcdb3..3b890273b6 100644 --- a/yudao-ui-admin/src/components/Crontab/hour.vue +++ b/yudao-ui-admin/src/components/Crontab/hour.vue @@ -68,19 +68,19 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '2') { + if (this.radioValue === '2') { this.$emit('update', 'hour', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'hour', this.averageTotal); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'hour', this.checkboxString); } } @@ -107,7 +107,7 @@ export default { // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } diff --git a/yudao-ui-admin/src/components/Crontab/index.vue b/yudao-ui-admin/src/components/Crontab/index.vue index 3963df28e6..f0bc856929 100644 --- a/yudao-ui-admin/src/components/Crontab/index.vue +++ b/yudao-ui-admin/src/components/Crontab/index.vue @@ -143,8 +143,8 @@ export default { props: ["expression", "hideComponent"], methods: { shouldHide(key) { - if (this.hideComponent && this.hideComponent.includes(key)) return false; - return true; + return !(this.hideComponent && this.hideComponent.includes(key)); + }, resolveExp() { // 反解析 表达式 @@ -215,10 +215,10 @@ export default { insValue = 4; this.$refs[refName].checkboxList = value.split(","); } - } else if (name == "day") { + } else if (name === "day") { if (value === "*") { insValue = 1; - } else if (value == "?") { + } else if (value === "?") { insValue = 2; } else if (value.indexOf("-") > -1) { let indexArr = value.split("-"); @@ -246,10 +246,10 @@ export default { this.$refs[refName].checkboxList = value.split(","); insValue = 7; } - } else if (name == "week") { + } else if (name === "week") { if (value === "*") { insValue = 1; - } else if (value == "?") { + } else if (value === "?") { insValue = 2; } else if (value.indexOf("-") > -1) { let indexArr = value.split("-"); @@ -275,10 +275,10 @@ export default { this.$refs[refName].checkboxList = value.split(","); insValue = 6; } - } else if (name == "year") { - if (value == "") { + } else if (name === "year") { + if (value === "") { insValue = 1; - } else if (value == "*") { + } else if (value === "*") { insValue = 2; } else if (value.indexOf("-") > -1) { insValue = 3; @@ -343,7 +343,7 @@ export default { obj.month + " " + obj.week + - (obj.year == "" ? "" : " " + obj.year); + (obj.year === "" ? "" : " " + obj.year); return str; }, }, diff --git a/yudao-ui-admin/src/components/Crontab/min.vue b/yudao-ui-admin/src/components/Crontab/min.vue index 43cab900d3..71a1fc17b4 100644 --- a/yudao-ui-admin/src/components/Crontab/min.vue +++ b/yudao-ui-admin/src/components/Crontab/min.vue @@ -69,19 +69,19 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '2') { + if (this.radioValue === '2') { this.$emit('update', 'min', this.cycleTotal, 'min'); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'min', this.averageTotal, 'min'); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'min', this.checkboxString, 'min'); } }, @@ -109,8 +109,8 @@ export default { // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } - \ No newline at end of file + diff --git a/yudao-ui-admin/src/components/Crontab/month.vue b/yudao-ui-admin/src/components/Crontab/month.vue index fd0ac384fb..2539935e07 100644 --- a/yudao-ui-admin/src/components/Crontab/month.vue +++ b/yudao-ui-admin/src/components/Crontab/month.vue @@ -68,19 +68,19 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '2') { + if (this.radioValue === '2') { this.$emit('update', 'month', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'month', this.averageTotal); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'month', this.checkboxString); } } @@ -107,7 +107,7 @@ export default { // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } diff --git a/yudao-ui-admin/src/components/Crontab/result.vue b/yudao-ui-admin/src/components/Crontab/result.vue index aea6e0e461..605c8c9ff9 100644 --- a/yudao-ui-admin/src/components/Crontab/result.vue +++ b/yudao-ui-admin/src/components/Crontab/result.vue @@ -126,7 +126,7 @@ export default { // 如果到达最大值时 if (nDay > DDate[DDate.length - 1]) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -141,9 +141,9 @@ export default { // 如果到达最大值时 if (nHour > hDate[hDate.length - 1]) { resetHour(); - if (Di == DDate.length - 1) { + if (Di === DDate.length - 1) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -158,7 +158,7 @@ export default { continue goMonth; } // 如果日期规则中有值时 - if (this.dayRule == 'lastDay') { + if (this.dayRule === 'lastDay') { // 如果不是合法日期则需要将前将日期调到合法日期即月末最后一天 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { @@ -168,7 +168,7 @@ export default { thisDD = DD < 10 ? '0' + DD : DD; } } - } else if (this.dayRule == 'workDay') { + } else if (this.dayRule === 'workDay') { // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { @@ -179,7 +179,7 @@ export default { // 获取达到条件的日期是星期X let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week'); // 当星期日时 - if (thisWeek == 1) { + if (thisWeek === 1) { // 先找下一个日，并判断是否为月底 DD++; thisDD = DD < 10 ? '0' + DD : DD; @@ -187,7 +187,7 @@ export default { if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { DD -= 3; } - } else if (thisWeek == 7) { + } else if (thisWeek === 7) { // 当星期6时只需判断不是1号就可进行操作 if (this.dayRuleSup !== 1) { DD--; @@ -195,16 +195,16 @@ export default { DD += 2; } } - } else if (this.dayRule == 'weekDay') { + } else if (this.dayRule === 'weekDay') { // 如果指定了是星期几 // 获取当前日期是属于星期几 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); // 校验当前星期是否在星期池（dayRuleSup）中 if (this.dayRuleSup.indexOf(thisWeek) < 0) { // 如果到达最大值时 - if (Di == DDate.length - 1) { + if (Di === DDate.length - 1) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -212,7 +212,7 @@ export default { } continue; } - } else if (this.dayRule == 'assWeek') { + } else if (this.dayRule === 'assWeek') { // 如果指定了是第几周的星期几 // 获取每月1号是属于星期几 let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); @@ -221,7 +221,7 @@ export default { } else { DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1; } - } else if (this.dayRule == 'lastWeek') { + } else if (this.dayRule === 'lastWeek') { // 如果指定了每月最后一个星期几 // 校验并调整如果是2月30号这种日期传进来时需调整至正常月底 if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { @@ -249,11 +249,11 @@ export default { // 如果到达最大值时 if (nMin > mDate[mDate.length - 1]) { resetMin(); - if (hi == hDate.length - 1) { + if (hi === hDate.length - 1) { resetHour(); - if (Di == DDate.length - 1) { + if (Di === DDate.length - 1) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -270,13 +270,13 @@ export default { // 如果到达最大值时 if (nSecond > sDate[sDate.length - 1]) { resetSecond(); - if (mi == mDate.length - 1) { + if (mi === mDate.length - 1) { resetMin(); - if (hi == hDate.length - 1) { + if (hi === hDate.length - 1) { resetHour(); - if (Di == DDate.length - 1) { + if (Di === DDate.length - 1) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -297,17 +297,17 @@ export default { nums++; } // 如果条数满了就退出循环 - if (nums == 5) break goYear; + if (nums === 5) break goYear; // 如果到达最大值时 - if (si == sDate.length - 1) { + if (si === sDate.length - 1) { resetSecond(); - if (mi == mDate.length - 1) { + if (mi === mDate.length - 1) { resetMin(); - if (hi == hDate.length - 1) { + if (hi === hDate.length - 1) { resetHour(); - if (Di == DDate.length - 1) { + if (Di === DDate.length - 1) { resetDay(); - if (Mi == MDate.length - 1) { + if (Mi === MDate.length - 1) { resetMonth(); continue goYear; } @@ -326,7 +326,7 @@ export default { }//goMonth } // 判断100年内的结果条数 - if (resultArr.length == 0) { + if (resultArr.length === 0) { this.resultList = ['没有达到条件的结果！']; } else { this.resultList = resultArr; @@ -378,23 +378,23 @@ export default { // 获取"日"数组-主要为日期规则 getWeekArr(rule) { // 只有当日期规则的两个值均为“”时则表达日期是有选项的 - if (this.dayRule == '' && this.dayRuleSup == '') { + if (this.dayRule === '' && this.dayRuleSup === '') { if (rule.indexOf('-') >= 0) { this.dayRule = 'weekDay'; this.dayRuleSup = this.getCycleArr(rule, 7, false) } else if (rule.indexOf('#') >= 0) { this.dayRule = 'assWeek'; - let matchRule = rule.match(/[0-9]{1}/g); + let matchRule = rule.match(/[0-9]/g); this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])]; this.dateArr[3] = [1]; - if (this.dayRuleSup[1] == 7) { + if (this.dayRuleSup[1] === 7) { this.dayRuleSup[1] = 0; } } else if (rule.indexOf('L') >= 0) { this.dayRule = 'lastWeek'; this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]); this.dateArr[3] = [31]; - if (this.dayRuleSup == 7) { + if (this.dayRuleSup === 7) { this.dayRuleSup = 0; } } else if (rule !== '*' && rule !== '?') { @@ -425,7 +425,7 @@ export default { } else if (rule !== '*' && rule !== '?') { this.dateArr[3] = this.getAssignArr(rule) this.dayRuleSup = 'null'; - } else if (rule == '*') { + } else if (rule === '*') { this.dayRuleSup = 'null'; } }, @@ -504,7 +504,7 @@ export default { } for (let i = min; i <= max; i++) { let add = 0; - if (status == false && i % limit == 0) { + if (status === false && i % limit === 0) { add = limit; } arr.push(Math.round(i % limit + add)) @@ -532,9 +532,9 @@ export default { let s = time.getSeconds(); let week = time.getDay(); // 如果传递了type的话 - if (type == undefined) { + if (type === undefined) { return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); - } else if (type == 'week') { + } else if (type === 'week') { // 在quartz中 1为星期日 return week + 1; } diff --git a/yudao-ui-admin/src/components/Crontab/second.vue b/yudao-ui-admin/src/components/Crontab/second.vue index e7b776171d..0b5df29c7e 100644 --- a/yudao-ui-admin/src/components/Crontab/second.vue +++ b/yudao-ui-admin/src/components/Crontab/second.vue @@ -68,19 +68,19 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '2') { + if (this.radioValue === '2') { this.$emit('update', 'second', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'second', this.averageTotal); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'second', this.checkboxString); } } @@ -110,7 +110,7 @@ export default { // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } diff --git a/yudao-ui-admin/src/components/Crontab/week.vue b/yudao-ui-admin/src/components/Crontab/week.vue index 1cec700e8b..c84f3b3b58 100644 --- a/yudao-ui-admin/src/components/Crontab/week.vue +++ b/yudao-ui-admin/src/components/Crontab/week.vue @@ -144,25 +144,25 @@ export default { // 周期两个值变化时 cycleChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'week', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'week', this.averageTotal); } }, // 最近工作日值变化时 weekdayChange() { - if (this.radioValue == '5') { + if (this.radioValue === '5') { this.$emit('update', 'week', this.weekday + 'L'); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '6') { + if (this.radioValue === '6') { this.$emit('update', 'week', this.checkboxString); } }, @@ -195,7 +195,7 @@ export default { // 计算勾选的checkbox值合集 checkboxString: function () { let str = this.checkboxList.join(); - return str == '' ? '*' : str; + return str === '' ? '*' : str; } } } diff --git a/yudao-ui-admin/src/components/Crontab/year.vue b/yudao-ui-admin/src/components/Crontab/year.vue index 5487a6c7fd..2c8eec327f 100644 --- a/yudao-ui-admin/src/components/Crontab/year.vue +++ b/yudao-ui-admin/src/components/Crontab/year.vue @@ -79,19 +79,19 @@ export default { }, // 周期两个值变化时 cycleChange() { - if (this.radioValue == '3') { + if (this.radioValue === '3') { this.$emit('update', 'year', this.cycleTotal); } }, // 平均两个值变化时 averageChange() { - if (this.radioValue == '4') { + if (this.radioValue === '4') { this.$emit('update', 'year', this.averageTotal); } }, // checkbox值变化时 checkboxChange() { - if (this.radioValue == '5') { + if (this.radioValue === '5') { this.$emit('update', 'year', this.checkboxString); } } diff --git a/yudao-ui-admin/src/components/PanThumb/index.vue b/yudao-ui-admin/src/components/PanThumb/index.vue index 1bcf41709c..38a2fafe88 100644 --- a/yudao-ui-admin/src/components/PanThumb/index.vue +++ b/yudao-ui-admin/src/components/PanThumb/index.vue @@ -108,7 +108,6 @@ export default { .pan-info p a { display: block; - color: #333; width: 80px; height: 80px; background: rgba(255, 255, 255, 0.3); diff --git a/yudao-ui-admin/src/components/RightToolbar/index.vue b/yudao-ui-admin/src/components/RightToolbar/index.vue index a6cd871e2c..4a9bcb95a2 100644 --- a/yudao-ui-admin/src/components/RightToolbar/index.vue +++ b/yudao-ui-admin/src/components/RightToolbar/index.vue @@ -62,7 +62,7 @@ export default { }, // 右侧列表元素变化 dataChange(data) { - for (var item in this.columns) { + for (let item in this.columns) { const key = this.columns[item].key; this.columns[item].visible = !data.includes(key); } diff --git a/yudao-ui-admin/src/components/TopNav/index.vue b/yudao-ui-admin/src/components/TopNav/index.vue index c9862433be..483a9f3fc1 100644 --- a/yudao-ui-admin/src/components/TopNav/index.vue +++ b/yudao-ui-admin/src/components/TopNav/index.vue @@ -69,7 +69,7 @@ export default { childrenMenus() { const childrenMenus = []; this.routers.map((router) => { - for (var item in router.children) { + for (let item in router.children) { if (router.children[item].parentPath === undefined) { if(router.path === "/") { router.children[item].path = "/" + router.children[item].path; @@ -135,10 +135,10 @@ export default { }, // 当前激活的路由 activeRoutes(key) { - var routes = []; + const routes = [] if (this.childrenMenus && this.childrenMenus.length > 0) { this.childrenMenus.map((item) => { - if (key == item.parentPath || (key == "index" && "" == item.path)) { + if (key === item.parentPath || (key === "index" && "" === item.path)) { routes.push(item); } }); diff --git a/yudao-ui-admin/src/components/Verifition/Verify.vue b/yudao-ui-admin/src/components/Verifition/Verify.vue index 19698782f4..b40682d69a 100644 --- a/yudao-ui-admin/src/components/Verifition/Verify.vue +++ b/yudao-ui-admin/src/components/Verifition/Verify.vue @@ -440,7 +440,6 @@ export default { right: 0; top: 0; bottom: 0; - background-size: cover; z-index: 9999; background-image: url("data:image/png;base64,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"); background-size: contain; diff --git a/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue b/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue index aa8c16f9df..72a71d9aa2 100644 --- a/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue +++ b/yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue @@ -58,7 +58,7 @@ * VerifyPoints * @description 点选 * */ -import { resetSize, _code_chars, _code_color1, _code_color2 } from './../utils/util' +import { resetSize } from './../utils/util' import { aesEncrypt } from '@/utils/ase' import { reqGet, reqCheck } from './../api/index' @@ -167,7 +167,7 @@ export default { setTimeout(() => { // var flag = this.comparePos(this.fontPos, this.checkPosArr); // 发送后端请求 - var captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify(this.checkPosArr), this.secretKey) : this.backToken + '---' + JSON.stringify(this.checkPosArr) + const captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify(this.checkPosArr), this.secretKey) : this.backToken + '---' + JSON.stringify(this.checkPosArr) const data = { captchaType: this.captchaType, 'pointJson': this.secretKey ? aesEncrypt(JSON.stringify(this.checkPosArr), this.secretKey) : JSON.stringify(this.checkPosArr), @@ -205,8 +205,8 @@ export default { // 获取坐标 getMousePos: function(obj, e) { - var x = e.offsetX - var y = e.offsetY + const x = e.offsetX + const y = e.offsetY return { x, y } }, // 创建坐标点 @@ -253,7 +253,7 @@ export default { }, // 坐标转换函数 pointTransfrom(pointArr, imgSize) { - var newPointArr = pointArr.map(p => { + const newPointArr = pointArr.map(p => { const x = Math.round(310 * p.x / parseInt(imgSize.imgWidth)) const y = Math.round(155 * p.y / parseInt(imgSize.imgHeight)) return { x, y } diff --git a/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue b/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue index b75db24ce3..0437e26056 100644 --- a/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue +++ b/yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue @@ -193,7 +193,7 @@ export default { this.$parent.$emit('ready', this) }) - var _this = this + const _this = this window.removeEventListener('touchmove', function(e) { _this.move(e) @@ -228,11 +228,12 @@ export default { // 鼠标按下 start: function(e) { + let x e = e || window.event if (!e.touches) { // 兼容PC端 - var x = e.clientX + x = e.clientX } else { // 兼容移动端 - var x = e.touches[0].pageX + x = e.touches[0].pageX } this.startLeft = Math.floor(x - this.barArea.getBoundingClientRect().left) this.startMoveTime = +new Date() // 开始滑动的时间 @@ -247,15 +248,16 @@ export default { }, // 鼠标移动 move: function(e) { + let x e = e || window.event if (this.status && this.isEnd === false) { if (!e.touches) { // 兼容PC端 - var x = e.clientX + x = e.clientX } else { // 兼容移动端 - var x = e.touches[0].pageX + x = e.touches[0].pageX } - var bar_area_left = this.barArea.getBoundingClientRect().left - var move_block_left = x - bar_area_left // 小方块相对于父元素的left值 + const bar_area_left = this.barArea.getBoundingClientRect().left + let move_block_left = x - bar_area_left // 小方块相对于父元素的left值 if (move_block_left >= this.barArea.offsetWidth - parseInt(parseInt(this.blockSize.width) / 2) - 2) { move_block_left = this.barArea.offsetWidth - parseInt(parseInt(this.blockSize.width) / 2) - 2 } @@ -271,10 +273,10 @@ export default { // 鼠标松开 end: function() { this.endMovetime = +new Date() - var _this = this + const _this = this // 判断是否重合 if (this.status && this.isEnd === false) { - var moveLeftDistance = parseInt((this.moveBlockLeft || '').replace('px', '')) + const moveLeftDistance = parseInt((this.moveBlockLeft || '').replace('px', '')) moveLeftDistance = moveLeftDistance * 310 / parseInt(this.setSize.imgWidth) const data = { captchaType: this.captchaType, @@ -297,7 +299,10 @@ export default { } this.passFlag = true this.tipWords = `${((this.endMovetime - this.startMoveTime) / 1000).toFixed(2)}s验证成功` - var captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }), this.secretKey) : this.backToken + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }) + const captchaVerification = this.secretKey ? aesEncrypt(this.backToken + '---' + JSON.stringify({ + x: moveLeftDistance, + y: 5.0 + }), this.secretKey) : this.backToken + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }) setTimeout(() => { this.tipWords = '' this.$parent.closeBox() diff --git a/yudao-ui-admin/src/components/Verifition/utils/axios.js b/yudao-ui-admin/src/components/Verifition/utils/axios.js index 40ba2de78e..2f960bb541 100644 --- a/yudao-ui-admin/src/components/Verifition/utils/axios.js +++ b/yudao-ui-admin/src/components/Verifition/utils/axios.js @@ -21,8 +21,7 @@ service.interceptors.request.use( // response interceptor service.interceptors.response.use( response => { - const res = response.data - return res + return response.data }, error => { } diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js index 447a99b311..979f5c72bc 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js @@ -49,14 +49,14 @@ export default function ContextPadProvider( } eventBus.on("create.end", 250, function(event) { - var context = event.context, - shape = context.shape; + const context = event.context, + shape = context.shape if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) { return; } - var entries = contextPad.getEntries(shape); + const entries = contextPad.getEntries(shape) if (entries.replace) { entries.replace.action.click(event, shape); @@ -81,7 +81,7 @@ ContextPadProvider.$inject = [ ]; ContextPadProvider.prototype.getContextPadEntries = function(element) { - var contextPad = this._contextPad, + const contextPad = this._contextPad, modeling = this._modeling, elementFactory = this._elementFactory, connect = this._connect, @@ -90,15 +90,15 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { canvas = this._canvas, rules = this._rules, autoPlace = this._autoPlace, - translate = this._translate; + translate = this._translate - var actions = {}; + const actions = {} if (element.type === "label") { return actions; } - var businessObject = element.businessObject; + const businessObject = element.businessObject function startConnect(event, element) { connect.start(event, element); @@ -109,21 +109,21 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { } function getReplaceMenuPosition(element) { - var Y_OFFSET = 5; + const Y_OFFSET = 5 - var diagramContainer = canvas.getContainer(), - pad = contextPad.getPad(element).html; + const diagramContainer = canvas.getContainer(), + pad = contextPad.getPad(element).html - var diagramRect = diagramContainer.getBoundingClientRect(), - padRect = pad.getBoundingClientRect(); + const diagramRect = diagramContainer.getBoundingClientRect(), + padRect = pad.getBoundingClientRect() - var top = padRect.top - diagramRect.top; - var left = padRect.left - diagramRect.left; + const top = padRect.top - diagramRect.top + const left = padRect.left - diagramRect.left - var pos = { + const pos = { x: left, y: top + padRect.height + Y_OFFSET - }; + } return pos; } @@ -145,19 +145,19 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { } function appendStart(event, element) { - var shape = elementFactory.createShape(assign({ type: type }, options)); + const shape = elementFactory.createShape(assign({ type: type }, options)) create.start(event, shape, { source: element }); } - var append = autoPlace + const append = autoPlace ? function(event, element) { - var shape = elementFactory.createShape(assign({ type: type }, options)); + const shape = elementFactory.createShape(assign({ type: type }, options)) - autoPlace.append(element, shape); - } - : appendStart; + autoPlace.append(element, shape) + } + : appendStart return { group: "model", @@ -182,7 +182,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { } if (isAny(businessObject, ["bpmn:Lane", "bpmn:Participant"]) && isExpanded(businessObject)) { - var childLanes = getChildLanes(element); + const childLanes = getChildLanes(element) assign(actions, { "lane-insert-above": { @@ -302,9 +302,9 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { title: translate("Change type"), action: { click: function(event, element) { - var position = assign(getReplaceMenuPosition(element), { + const position = assign(getReplaceMenuPosition(element), { cursor: { x: event.x, y: event.y } - }); + }) popupMenu.open(element, "bpmn-replace", position); } @@ -350,7 +350,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { } // delete element entry, only show if allowed by rules - var deleteAllowed = rules.allowed("elements.delete", { elements: [element] }); + let deleteAllowed = rules.allowed('elements.delete', { elements: [element] }) if (isArray(deleteAllowed)) { // was the element returned as a deletion candidate? @@ -376,10 +376,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) { // helpers ///////// function isEventType(eventBo, type, definition) { - var isType = eventBo.$instanceOf(type); - var isDefinition = false; + const isType = eventBo.$instanceOf(type) + let isDefinition = false - var definitions = eventBo.eventDefinitions || []; + const definitions = eventBo.eventDefinitions || [] forEach(definitions, function(def) { if (def.$type === definition) { isDefinition = true; diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js index 1287e04178..48618f597b 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js @@ -1,12 +1,12 @@ "use strict"; -var some = require("min-dash").some; +const some = require('min-dash').some -var ALLOWED_TYPES = { - FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"], - Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"], - Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"] -}; +const ALLOWED_TYPES = { + FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'], + Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'], + Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'] +} function is(element, type) { return element && typeof element.$instanceOf === "function" && element.$instanceOf(type); @@ -32,8 +32,8 @@ function anyType(element, types) { } function isAllowed(propName, propDescriptor, newElement) { - var name = propDescriptor.name, - types = ALLOWED_TYPES[name.replace(/activiti:/, "")]; + const name = propDescriptor.name, + types = ALLOWED_TYPES[name.replace(/activiti:/, '')] return name === propName && anyType(newElement, types); } @@ -42,8 +42,8 @@ function ActivitiModdleExtension(eventBus) { eventBus.on( "property.clone", function(context) { - var newElement = context.newElement, - propDescriptor = context.propertyDescriptor; + const newElement = context.newElement, + propDescriptor = context.propertyDescriptor this.canCloneProperty(newElement, propDescriptor); }, diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js index a55236a3ab..77699c921c 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js @@ -1,17 +1,17 @@ "use strict"; -var isFunction = require("min-dash").isFunction, - isObject = require("min-dash").isObject, - some = require("min-dash").some; +const isFunction = require('min-dash').isFunction, + isObject = require('min-dash').isObject, + some = require('min-dash').some -var WILDCARD = "*"; +const WILDCARD = '*' function CamundaModdleExtension(eventBus) { - var self = this; + const self = this eventBus.on("moddleCopy.canCopyProperty", function(context) { - var property = context.property, - parent = context.parent; + const property = context.property, + parent = context.parent return self.canCopyProperty(property, parent); }); @@ -45,14 +45,14 @@ CamundaModdleExtension.prototype.canCopyProperty = function(property, parent) { CamundaModdleExtension.prototype.canHostInputOutput = function(parent) { // allowed in camunda:Connector - var connector = getParent(parent, "camunda:Connector"); + const connector = getParent(parent, 'camunda:Connector') if (connector) { return true; } // special rules inside bpmn:FlowNode - var flowNode = getParent(parent, "bpmn:FlowNode"); + const flowNode = getParent(parent, 'bpmn:FlowNode') if (!flowNode) { return false; @@ -62,15 +62,13 @@ CamundaModdleExtension.prototype.canHostInputOutput = function(parent) { return false; } - if (is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent")) { - return false; - } + return !(is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent")); + - return true; }; CamundaModdleExtension.prototype.canHostConnector = function(parent) { - var serviceTaskLike = getParent(parent, "camunda:ServiceTaskLike"); + const serviceTaskLike = getParent(parent, 'camunda:ServiceTaskLike') if (is(serviceTaskLike, "bpmn:MessageEventDefinition")) { // only allow on throw and end events @@ -81,13 +79,13 @@ CamundaModdleExtension.prototype.canHostConnector = function(parent) { }; CamundaModdleExtension.prototype.canHostIn = function(parent) { - var callActivity = getParent(parent, "bpmn:CallActivity"); + const callActivity = getParent(parent, 'bpmn:CallActivity') if (callActivity) { return true; } - var signalEventDefinition = getParent(parent, "bpmn:SignalEventDefinition"); + const signalEventDefinition = getParent(parent, 'bpmn:SignalEventDefinition') if (signalEventDefinition) { // only allow on throw and end events @@ -129,9 +127,9 @@ function getParent(element, type) { function isAllowedInParent(property, parent) { // (1) find property descriptor - var descriptor = property.$type && property.$model.getTypeDescriptor(property.$type); + const descriptor = property.$type && property.$model.getTypeDescriptor(property.$type) - var allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn; + const allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn if (!allowedIn || isWildcard(allowedIn)) { return true; diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js index 4689024bda..b4ee875482 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js @@ -1,12 +1,12 @@ "use strict"; -var some = require("min-dash").some; +const some = require('min-dash').some -var ALLOWED_TYPES = { - FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"], - Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"], - Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"] -}; +const ALLOWED_TYPES = { + FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'], + Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'], + Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'] +} function is(element, type) { return element && typeof element.$instanceOf === "function" && element.$instanceOf(type); @@ -32,8 +32,8 @@ function anyType(element, types) { } function isAllowed(propName, propDescriptor, newElement) { - var name = propDescriptor.name, - types = ALLOWED_TYPES[name.replace(/flowable:/, "")]; + const name = propDescriptor.name, + types = ALLOWED_TYPES[name.replace(/flowable:/, '')] return name === propName && anyType(newElement, types); } @@ -42,8 +42,8 @@ function FlowableModdleExtension(eventBus) { eventBus.on( "property.clone", function(context) { - var newElement = context.newElement, - propDescriptor = context.propertyDescriptor; + const newElement = context.newElement, + propDescriptor = context.propertyDescriptor this.canCloneProperty(newElement, propDescriptor); }, diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js index f67cff951b..2967c33fec 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js @@ -10,18 +10,18 @@ F.prototype = PaletteProvider.prototype; // 核心，将父类的原型赋值给 // 利用中介函数重写原型链方法 F.prototype.getPaletteEntries = function() { - var actions = {}, + const actions = {}, create = this._create, elementFactory = this._elementFactory, spaceTool = this._spaceTool, lassoTool = this._lassoTool, handTool = this._handTool, globalConnect = this._globalConnect, - translate = this._translate; + translate = this._translate function createAction(type, group, className, title, options) { function createListener(event) { - var shape = elementFactory.createShape(assign({ type: type }, options)); + const shape = elementFactory.createShape(assign({ type: type }, options)) if (options) { shape.businessObject.di.isExpanded = options.isExpanded; @@ -30,7 +30,7 @@ F.prototype.getPaletteEntries = function() { create.start(event, shape); } - var shortType = type.replace(/^bpmn:/, ""); + const shortType = type.replace(/^bpmn:/, '') return { group: group, @@ -44,19 +44,19 @@ F.prototype.getPaletteEntries = function() { } function createSubprocess(event) { - var subProcess = elementFactory.createShape({ - type: "bpmn:SubProcess", + const subProcess = elementFactory.createShape({ + type: 'bpmn:SubProcess', x: 0, y: 0, isExpanded: true - }); + }) - var startEvent = elementFactory.createShape({ - type: "bpmn:StartEvent", + const startEvent = elementFactory.createShape({ + type: 'bpmn:StartEvent', x: 40, y: 82, parent: subProcess - }); + }) create.start(event, [subProcess, startEvent], { hints: { diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js index e0c32380c2..a4d40f12bd 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js @@ -19,18 +19,18 @@ export default function PaletteProvider(palette, create, elementFactory, spaceTo PaletteProvider.$inject = ["palette", "create", "elementFactory", "spaceTool", "lassoTool", "handTool", "globalConnect", "translate"]; PaletteProvider.prototype.getPaletteEntries = function() { - var actions = {}, + const actions = {}, create = this._create, elementFactory = this._elementFactory, spaceTool = this._spaceTool, lassoTool = this._lassoTool, handTool = this._handTool, globalConnect = this._globalConnect, - translate = this._translate; + translate = this._translate function createAction(type, group, className, title, options) { function createListener(event) { - var shape = elementFactory.createShape(assign({ type: type }, options)); + const shape = elementFactory.createShape(assign({ type: type }, options)) if (options) { shape.businessObject.di.isExpanded = options.isExpanded; @@ -39,7 +39,7 @@ PaletteProvider.prototype.getPaletteEntries = function() { create.start(event, shape); } - var shortType = type.replace(/^bpmn:/, ""); + const shortType = type.replace(/^bpmn:/, '') return { group: group, @@ -53,19 +53,19 @@ PaletteProvider.prototype.getPaletteEntries = function() { } function createSubprocess(event) { - var subProcess = elementFactory.createShape({ - type: "bpmn:SubProcess", + const subProcess = elementFactory.createShape({ + type: 'bpmn:SubProcess', x: 0, y: 0, isExpanded: true - }); + }) - var startEvent = elementFactory.createShape({ - type: "bpmn:StartEvent", + const startEvent = elementFactory.createShape({ + type: 'bpmn:StartEvent', x: 40, y: 82, parent: subProcess - }); + }) create.start(event, [subProcess, startEvent], { hints: { diff --git a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue index fecb42b09c..a032067cdc 100644 --- a/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue +++ b/yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue @@ -76,7 +76,7 @@ export default { if (!value) { return; } - if (!value.match(/[a-zA-Z_][\-_.0-9_a-zA-Z$]*/)) { + if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) { console.log('key 不满足 XML NCName 规则，所以不进行赋值'); return; } diff --git a/yudao-ui-admin/src/components/generator/js.js b/yudao-ui-admin/src/components/generator/js.js index 6f3c186811..f160593769 100644 --- a/yudao-ui-admin/src/components/generator/js.js +++ b/yudao-ui-admin/src/components/generator/js.js @@ -1,5 +1,5 @@ import { isArray } from 'util' -import { exportDefault, titleCase, deepClone } from '@/utils/index' +import { exportDefault, titleCase, deepClone } from '@/utils' import ruleTrigger from './ruleTrigger' const units = { diff --git a/yudao-ui-admin/src/directive/dialog/drag.js b/yudao-ui-admin/src/directive/dialog/drag.js index 83f8b65881..a19ae9afbe 100644 --- a/yudao-ui-admin/src/directive/dialog/drag.js +++ b/yudao-ui-admin/src/directive/dialog/drag.js @@ -5,7 +5,7 @@ export default { bind(el, binding, vnode, oldVnode) { const value = binding.value - if (value == false) return + if (value === false) return // 获取拖拽内容头部 const dialogHeaderEl = el.querySelector('.el-dialog__header'); const dragDom = el.querySelector('.el-dialog'); @@ -16,7 +16,7 @@ export default { dragDom.style.marginTop = 0; let width = dragDom.style.width; if (width.includes('%')) { - width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100); + width = +document.body.clientWidth * (+width.replace(/%/g, '') / 100); } else { width = +width.replace(/\px/g, ''); } @@ -32,12 +32,12 @@ export default { // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px if (sty.left.includes('%')) { - styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100); - styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100); + styL = +document.body.clientWidth * (+sty.left.replace(/%/g, '') / 100); + styT = +document.body.clientHeight * (+sty.top.replace(/%/g, '') / 100); } else { styL = +sty.left.replace(/\px/g, ''); styT = +sty.top.replace(/\px/g, ''); - }; + } // 鼠标拖拽事件 document.onmousemove = function (e) { diff --git a/yudao-ui-admin/src/plugins/tab.js b/yudao-ui-admin/src/plugins/tab.js index cade9f75ca..00fd8fc0de 100644 --- a/yudao-ui-admin/src/plugins/tab.js +++ b/yudao-ui-admin/src/plugins/tab.js @@ -56,7 +56,7 @@ export default { }, // 添加tab页签 openPage(title, url, params) { - var obj = { path: url, meta: { title: title } } + const obj = { path: url, meta: { title: title } } store.dispatch('tagsView/addView', obj); return router.push({ path: url, query: params }); }, diff --git a/yudao-ui-admin/src/store/modules/permission.js b/yudao-ui-admin/src/store/modules/permission.js index caf99d59f1..4b53f7d8df 100644 --- a/yudao-ui-admin/src/store/modules/permission.js +++ b/yudao-ui-admin/src/store/modules/permission.js @@ -86,7 +86,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { } function filterChildren(childrenMap, lastRouter = false) { - var children = [] + let children = [] childrenMap.forEach((el, index) => { if (el.children && el.children.length) { if (el.component === 'ParentView' && !lastRouter) { diff --git a/yudao-ui-admin/src/store/modules/user.js b/yudao-ui-admin/src/store/modules/user.js index 7981df71c3..2e4ce999c2 100644 --- a/yudao-ui-admin/src/store/modules/user.js +++ b/yudao-ui-admin/src/store/modules/user.js @@ -1,4 +1,4 @@ -import {login, logout, getInfo, socialLogin, socialBindLogin, smsLogin} from '@/api/login' +import {login, logout, getInfo, socialLogin, smsLogin} from '@/api/login' import {setToken, removeToken} from '@/utils/auth' const user = { diff --git a/yudao-ui-admin/src/utils/index.js b/yudao-ui-admin/src/utils/index.js index 075fd5af4a..7a71498b52 100644 --- a/yudao-ui-admin/src/utils/index.js +++ b/yudao-ui-admin/src/utils/index.js @@ -4,14 +4,14 @@ import { parseTime } from './ruoyi' * 表格时间格式化 */ export function formatDate(cellValue) { - if (cellValue == null || cellValue == "") return ""; - var date = new Date(cellValue) - var year = date.getFullYear() - var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() - var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() - var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + if (cellValue == null || cellValue === "") return ""; + const date = new Date(cellValue) + const year = date.getFullYear() + const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + const hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + const seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds } @@ -78,13 +78,13 @@ export function getQueryObject(url) { } /** - * @param {string} input value - * @returns {number} output value + * @param str + * @param str */ export function byteLength(str) { // returns the byte length of an utf8 string let s = str.length - for (var i = str.length - 1; i >= 0; i--) { + for (let i = str.length - 1; i >= 0; i--) { const code = str.charCodeAt(i) if (code > 0x7f && code <= 0x7ff) s++ else if (code > 0x7ff && code <= 0xffff) s += 2 @@ -136,8 +136,7 @@ export function param2Obj(url) { const index = v.indexOf('=') if (index !== -1) { const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val + obj[name] = v.substring(index + 1, v.length) } }) return obj @@ -330,7 +329,7 @@ export function createUniqueString() { /** * Check if an element has a class - * @param {HTMLElement} elm + * @param ele * @param {string} cls * @returns {boolean} */ @@ -340,7 +339,7 @@ export function hasClass(ele, cls) { /** * Add class to element - * @param {HTMLElement} elm + * @param ele * @param {string} cls */ export function addClass(ele, cls) { @@ -349,7 +348,7 @@ export function addClass(ele, cls) { /** * Remove class from element - * @param {HTMLElement} elm + * @param ele * @param {string} cls */ export function removeClass(ele, cls) { diff --git a/yudao-ui-admin/src/utils/permission.js b/yudao-ui-admin/src/utils/permission.js index 1730e332c8..2c11f8a35b 100644 --- a/yudao-ui-admin/src/utils/permission.js +++ b/yudao-ui-admin/src/utils/permission.js @@ -15,10 +15,8 @@ export function checkPermi(value) { return all_permission === permission || permissionDatas.includes(permission) }) - if (!hasPermission) { - return false - } - return true + return hasPermission; + } else { console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) return false @@ -40,12 +38,10 @@ export function checkRole(value) { return super_admin === role || permissionRoles.includes(role) }) - if (!hasRole) { - return false - } - return true + return hasRole; + } else { console.error(`need roles! Like checkRole="['admin','editor']"`) return false } -} \ No newline at end of file +} diff --git a/yudao-ui-admin/src/utils/request.js b/yudao-ui-admin/src/utils/request.js index b42cffd013..525155fe4f 100644 --- a/yudao-ui-admin/src/utils/request.js +++ b/yudao-ui-admin/src/utils/request.js @@ -49,12 +49,12 @@ service.interceptors.request.use(config => { let url = config.url + '?'; for (const propName of Object.keys(config.params)) { const value = config.params[propName]; - var part = encodeURIComponent(propName) + "="; + const part = encodeURIComponent(propName) + '=' if (value !== null && typeof(value) !== "undefined") { if (typeof value === 'object') { for (const key of Object.keys(value)) { let params = propName + '[' + key + ']'; - var subPart = encodeURIComponent(params) + "="; + const subPart = encodeURIComponent(params) + '=' url += subPart + encodeURIComponent(value[key]) + "&"; } } else { diff --git a/yudao-ui-admin/src/utils/ruoyi.js b/yudao-ui-admin/src/utils/ruoyi.js index 5920e39af2..fd5d109507 100644 --- a/yudao-ui-admin/src/utils/ruoyi.js +++ b/yudao-ui-admin/src/utils/ruoyi.js @@ -18,7 +18,7 @@ export function parseTime(time, pattern) { if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { time = parseInt(time) } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),''); + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),''); } if ((typeof time === 'number') && (time.toString().length === 10)) { time = time * 1000 @@ -34,7 +34,7 @@ export function parseTime(time, pattern) { s: date.getSeconds(), a: date.getDay() } - const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { let value = formatObj[key] // Note: getDay() returns 0 on Sunday if (key === 'a') { @@ -102,9 +102,11 @@ export function addBeginAndEndTime(params, dateRange, propName) { // 字符串格式化(%s ) export function sprintf(str) { - var args = arguments, flag = true, i = 1; + const args = arguments + let flag = true + const i = 1 str = str.replace(/%s/g, function () { - var arg = args[i++]; + const arg = args[i++] if (typeof arg === 'undefined') { flag = false; return ''; @@ -116,7 +118,7 @@ export function sprintf(str) { // 转换字符串，undefined,null等转化为"" export function praseStrEmpty(str) { - if (!str || str == "undefined" || str == "null") { + if (!str || str === "undefined" || str === "null") { return ""; } return str; @@ -244,7 +246,7 @@ export function getPath(path) { * @returns */ export function divide(divisor, dividend) { - if(divisor == null || dividend == null || dividend == 0){ + if(divisor == null || dividend == null || dividend === 0){ return null; } return Math.floor(divisor/dividend*100)/100; diff --git a/yudao-ui-admin/src/utils/scroll-to.js b/yudao-ui-admin/src/utils/scroll-to.js index c5d8e04e07..132c65c11d 100644 --- a/yudao-ui-admin/src/utils/scroll-to.js +++ b/yudao-ui-admin/src/utils/scroll-to.js @@ -8,8 +8,10 @@ Math.easeInOutQuad = function(t, b, c, d) { } // requestAnimationFrame for Smart Animating http://goo.gl/sx5sts -var requestAnimFrame = (function() { - return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } +const requestAnimFrame = (function() { + return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { + window.setTimeout(callback, 1000 / 60) + } })() /** @@ -37,11 +39,11 @@ export function scrollTo(to, duration, callback) { const increment = 20 let currentTime = 0 duration = (typeof (duration) === 'undefined') ? 500 : duration - var animateScroll = function() { + const animateScroll = function() { // increment the time currentTime += increment // find the value with the quadratic in-out easing function - var val = Math.easeInOutQuad(currentTime, start, change, duration) + const val = Math.easeInOutQuad(currentTime, start, change, duration) // move the document.body move(val) // do the animation unless its over diff --git a/yudao-ui-admin/src/utils/validate.js b/yudao-ui-admin/src/utils/validate.js index adfa254250..60f9cb1f36 100644 --- a/yudao-ui-admin/src/utils/validate.js +++ b/yudao-ui-admin/src/utils/validate.js @@ -56,7 +56,7 @@ export function validAlphabets(str) { * @returns {Boolean} */ export function validEmail(email) { - const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ + const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ return reg.test(email) } @@ -65,10 +65,8 @@ export function validEmail(email) { * @returns {Boolean} */ export function isString(str) { - if (typeof str === 'string' || str instanceof String) { - return true - } - return false + return typeof str === 'string' || str instanceof String; + } /** diff --git a/yudao-ui-admin/src/views/bpm/definition/index.vue b/yudao-ui-admin/src/views/bpm/definition/index.vue index 0284fbd2f7..0ef67b2a3d 100644 --- a/yudao-ui-admin/src/views/bpm/definition/index.vue +++ b/yudao-ui-admin/src/views/bpm/definition/index.vue @@ -76,7 +76,6 @@