+
, mapping: Record {
+export const fittingString = (str: string, maxWidth: number, fontSize: number): string => {
if (!str) {
return '';
}
@@ -200,3 +200,24 @@ export const fittingString = (str: string, maxWidth: number, fontSize: number) =
export const isEmptyString = (str: any): boolean => {
return str === '' || str === undefined || str === null;
};
+
+/**
+ * 获取 git 仓库的 url
+ *
+ * @param {string} url - the url of the git repository
+ * @param {string} branch - the branch of the repository
+ * @return {string} the url of the repository
+ *
+ * If `branch` is given, the url will be in the format of 'http://gitlab.com/user/repo/tree/branch'.
+ * Otherwise, the url will be in the format of 'http://gitlab.com/user/repo'.
+ */
+export const getGitUrl = (url: string, branch: string): string => {
+ if (!url) {
+ return '';
+ }
+ const gitUrl = url.replace(/\.git$/, '');
+ if (branch) {
+ return `${gitUrl}/tree/${branch}`;
+ }
+ return gitUrl;
+};
diff --git a/react-ui/src/utils/ui.tsx b/react-ui/src/utils/ui.tsx
index 7625a771..9034a67b 100644
--- a/react-ui/src/utils/ui.tsx
+++ b/react-ui/src/utils/ui.tsx
@@ -10,8 +10,20 @@ import { history } from '@umijs/max';
import { Modal, message, type ModalFuncProps, type UploadFile } from 'antd';
import { closeAllModals } from './modal';
-// 自定义 Confirm 弹框
-export function modalConfirm({ title, content, onOk, ...rest }: ModalFuncProps) {
+type ModalConfirmProps = ModalFuncProps & {
+ isDelete?: boolean;
+};
+
+// 自定义删除 Confirm 弹框
+export function modalConfirm({
+ title,
+ content,
+ okText = '确认',
+ cancelText = '取消',
+ isDelete = true,
+ onOk,
+ ...rest
+}: ModalConfirmProps) {
Modal.confirm({
...rest,
width: 600,
@@ -19,7 +31,11 @@ export function modalConfirm({ title, content, onOk, ...rest }: ModalFuncProps)
title: (
})
),
content: content && 3.6.0
-
- cn.hutool
- hutool-all
- 5.8.5
-
+
+
+
+
+
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index b34af361..8f0eecbb 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.platform.service.impl;
-import cn.hutool.core.util.StrUtil;
+//import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -1216,9 +1216,9 @@ public class ModelsServiceImpl implements ModelsService {
modelMetaVo.setMetrics(result);
}
- void test(){
- String str = "Hello, Hutool!";
- System.out.println(StrUtil.isEmpty(str)); // 判断字符串是否为空
- System.out.println(StrUtil.sub(str, 0, 5));
- }
+// void test(){
+// String str = "Hello, Hutool!";
+// System.out.println(StrUtil.isEmpty(str)); // 判断字符串是否为空
+// System.out.println(StrUtil.sub(str, 0, 5));
+// }
}
),
content: content && {content}
,
- okText: '确认',
- cancelText: '取消',
+ okText: okText,
+ cancelText: cancelText,
onOk: onOk,
});
}
diff --git a/ruoyi-modules/management-platform/pom.xml b/ruoyi-modules/management-platform/pom.xml
index cee6c681..528501b0 100644
--- a/ruoyi-modules/management-platform/pom.xml
+++ b/ruoyi-modules/management-platform/pom.xml
@@ -243,11 +243,11 @@