From 4661edf7f07f6003195ebff8d3c3caaeb3567b87 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期日, 23 四月 2023 14:55:46 +0800
Subject: [PATCH] !712 修复路由跳转被阻止时vue-router内部产生报错信息问题 Merge pull request !712 from 爱吃猫的鱼/master
---
ruoyi-ui/src/utils/index.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
index 49897c9..9679e75 100644
--- a/ruoyi-ui/src/utils/index.js
+++ b/ruoyi-ui/src/utils/index.js
@@ -1,3 +1,5 @@
+import { parseTime } from './ruoyi'
+
/**
* 表格时间格式化
*/
@@ -379,10 +381,10 @@
// 下划转驼峰
export function camelCase(str) {
- return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+ return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase())
}
export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
}
-
\ No newline at end of file
+
--
Gitblit v1.9.2