From c416ed6361862c950f05a3fb8c7802f4115fd874 Mon Sep 17 00:00:00 2001
From: witersen <1801168257@qq.com>
Date: Thu, 4 Aug 2022 00:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=B9=E8=AF=9D=E6=A1=86?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E8=BF=87=E9=95=BF=E6=BA=A2?=
=?UTF-8?q?=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
01.web/.gitignore | 7 ++
01.web/src/views/repositoryGroup/index.vue | 94 ++++++++++++++-
01.web/src/views/repositoryInfo/index.vue | 126 +++++++++++++++++++--
01.web/src/views/repositoryUser/index.vue | 101 +++++++++++++++--
README.md | 6 +-
5 files changed, 309 insertions(+), 25 deletions(-)
create mode 100644 01.web/.gitignore
diff --git a/01.web/.gitignore b/01.web/.gitignore
new file mode 100644
index 0000000..a5a64e8
--- /dev/null
+++ b/01.web/.gitignore
@@ -0,0 +1,7 @@
+.idea
+.idea/
+.DS_Store
+node_modules/
+.project
+src/config/*.tmp
+src/config/env.js
\ No newline at end of file
diff --git a/01.web/src/views/repositoryGroup/index.vue b/01.web/src/views/repositoryGroup/index.vue
index 03189b2..ed9e805 100644
--- a/01.web/src/views/repositoryGroup/index.vue
+++ b/01.web/src/views/repositoryGroup/index.vue
@@ -515,8 +515,98 @@ export default {
DelGroup(svn_group_name) {
var that = this;
that.$Modal.confirm({
- title: "删除SVN分组 - " + svn_group_name,
- content: "确定要删除该用户吗？
该操作不可逆！",
+ render: (h) => {
+ return h("div", [
+ h(
+ "div",
+ {
+ class: { "modal-title": true },
+ style: {
+ display: "flex",
+ height: "42px",
+ alignItems: "center",
+ },
+ },
+ [
+ h("Icon", {
+ props: {
+ type: "ios-help-circle",
+ },
+ style: {
+ width: "28px",
+ height: "28px",
+ fontSize: "28px",
+ color: "#f90",
+ },
+ }),
+ h(
+ "tooltip",
+ {
+ props: {
+ transfer: true,
+ placement: "bottom",
+ "max-width": "400",
+ },
+ },
+ [
+ h("span", {
+ style: {
+ marginLeft: "12px",
+ fontSize: "16px",
+ color: "#17233d",
+ fontWeight: 500,
+ whiteSpace: "nowrap",
+ overflow: "hidden",
+ textOverflow: "ellipsis",
+ width: "285px",
+ display: "inline-block",
+ },
+ domProps: {
+ innerHTML: "删除SVN分组 - " + svn_group_name,
+ },
+ }),
+ h(
+ "div",
+ {
+ slot: "content",
+ style: {
+ fontSize: "10px",
+ },
+ },
+ [
+ h(
+ "p",
+ {
+ style: {
+ fontSize: "15px",
+ },
+ },
+ "删除SVN分组 - " + svn_group_name
+ ),
+ ]
+ ),
+ ]
+ ),
+ ]
+ ),
+ h(
+ "div",
+ {
+ class: { "modal-content": true },
+ style: { paddingLeft: "40px" },
+ },
+ [
+ h("p", {
+ style: { marginBottom: "15px" },
+ domProps: {
+ innerHTML:
+ "确定要删除该分组吗？
将会从所有仓库和分组下将该分组移除！
该操作不可逆！",
+ },
+ }),
+ ]
+ ),
+ ]);
+ },
onOk: () => {
var data = {
svn_group_name: svn_group_name,
diff --git a/01.web/src/views/repositoryInfo/index.vue b/01.web/src/views/repositoryInfo/index.vue
index 53f63e2..61de818 100644
--- a/01.web/src/views/repositoryInfo/index.vue
+++ b/01.web/src/views/repositoryInfo/index.vue
@@ -197,15 +197,19 @@
>
-
-
+
-
-
-
-
+
+
+
+
@@ -387,7 +391,12 @@
-
+
当前路径:
@@ -1976,6 +1985,7 @@ export default {
tooltip: true,
fixed: "left",
width: 170,
+ // width:80
},
{
title: "信息",
@@ -3430,9 +3440,101 @@ export default {
DelRep(rep_name) {
var that = this;
that.$Modal.confirm({
- title: "删除仓库 - " + rep_name,
- content:
- "确定要删除该仓库吗？
该操作不可逆！
如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！",
+ // title: "删除仓库 - " + rep_name,
+ // content:
+ // "确定要删除该仓库吗？
该操作不可逆！
如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！",
+ render: (h) => {
+ return h("div", [
+ h(
+ "div",
+ {
+ class: { "modal-title": true },
+ style: {
+ display: "flex",
+ height: "42px",
+ alignItems: "center",
+ },
+ },
+ [
+ h("Icon", {
+ props: {
+ type: "ios-help-circle",
+ },
+ style: {
+ width: "28px",
+ height: "28px",
+ fontSize: "28px",
+ color: "#f90",
+ },
+ }),
+ h(
+ "tooltip",
+ {
+ props: {
+ transfer: true,
+ placement: "bottom",
+ "max-width": "400",
+ },
+ },
+ [
+ h("span", {
+ style: {
+ marginLeft: "12px",
+ fontSize: "16px",
+ color: "#17233d",
+ fontWeight: 500,
+ whiteSpace: "nowrap",
+ overflow: "hidden",
+ textOverflow: "ellipsis",
+ width: "285px",
+ display: "inline-block",
+ },
+ domProps: {
+ innerHTML: "删除仓库 - " + rep_name,
+ },
+ }),
+ h(
+ "div",
+ {
+ slot: "content",
+ style: {
+ fontSize: "10px",
+ },
+ },
+ [
+ h(
+ "p",
+ {
+ style: {
+ fontSize: "15px",
+ },
+ },
+ "删除仓库 - " + rep_name
+ ),
+ ]
+ ),
+ ]
+ ),
+ ]
+ ),
+ h(
+ "div",
+ {
+ class: { "modal-content": true },
+ style: { paddingLeft: "40px" },
+ },
+ [
+ h("p", {
+ style: { marginBottom: "15px" },
+ domProps: {
+ innerHTML:
+ "确定要删除该仓库吗？
该操作不可逆！
如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！",
+ },
+ }),
+ ]
+ ),
+ ]);
+ },
onOk: () => {
var data = {
rep_name: rep_name,
diff --git a/01.web/src/views/repositoryUser/index.vue b/01.web/src/views/repositoryUser/index.vue
index 98432cb..bd7561b 100644
--- a/01.web/src/views/repositoryUser/index.vue
+++ b/01.web/src/views/repositoryUser/index.vue
@@ -107,9 +107,7 @@
>
-
+
将会从所有仓库和分组下将该用户移除
该操作不可逆！",
+ render: (h) => {
+ return h("div", [
+ h(
+ "div",
+ {
+ class: { "modal-title": true },
+ style: {
+ display: "flex",
+ height: "42px",
+ alignItems: "center",
+ },
+ },
+ [
+ h("Icon", {
+ props: {
+ type: "ios-help-circle",
+ },
+ style: {
+ width: "28px",
+ height: "28px",
+ fontSize: "28px",
+ color: "#f90",
+ },
+ }),
+ h(
+ "tooltip",
+ {
+ props: {
+ transfer: true,
+ placement: "bottom",
+ "max-width": "400",
+ },
+ },
+ [
+ h("span", {
+ style: {
+ marginLeft: "12px",
+ fontSize: "16px",
+ color: "#17233d",
+ fontWeight: 500,
+ whiteSpace: "nowrap",
+ overflow: "hidden",
+ textOverflow: "ellipsis",
+ width: "285px",
+ display: "inline-block",
+ },
+ domProps: {
+ innerHTML: "删除SVN用户 - " + svn_user_name,
+ },
+ }),
+ h(
+ "div",
+ {
+ slot: "content",
+ style: {
+ fontSize: "10px",
+ },
+ },
+ [
+ h(
+ "p",
+ {
+ style: {
+ fontSize: "15px",
+ },
+ },
+ "删除SVN用户 - " + svn_user_name
+ ),
+ ]
+ ),
+ ]
+ ),
+ ]
+ ),
+ h(
+ "div",
+ {
+ class: { "modal-content": true },
+ style: { paddingLeft: "40px" },
+ },
+ [
+ h("p", {
+ style: { marginBottom: "15px" },
+ domProps: {
+ innerHTML:
+ "确定要删除该用户吗？
将会从所有仓库和分组下将该用户移除！
该操作不可逆！",
+ },
+ }),
+ ]
+ ),
+ ]);
+ },
onOk: () => {
var data = {
svn_user_name: svn_user_name,
diff --git a/README.md b/README.md
index 87e8bd1..7d49790 100644
--- a/README.md
+++ b/README.md
@@ -218,9 +218,7 @@ php install.php
## 三、手动升级
-（程序升级的过程就是替换代码而已，只不过代码包的配置文件中可能包含了用户关于数据库连接等的配置参数，不影响仓库数据，因为所处目录不同）
-
-所以如果之前在配置文件 $path/config/database.php 中手动切换了MySQL数据库，升级后还需要重配置数据库信息
+PS: 如果之前在配置文件 $path/config/database.php 中手动切换了MySQL数据库，升级后还需要重配置数据库信息
### 3.1、docker用户
@@ -253,7 +251,7 @@ php server/svnadmind.php stop
```
cd /var/www/html/
-#请自行打包备份当前代码（代码包意义不大，包含一些程序运行配置参数，与svn仓库影响不大，还是建议备份）
+tar -czvf backup.tar.gz .* --remove-files
```
- 部署新版本代码
```