akira
/
SvnAdminV2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

解决对话框提示信息过长溢出的问题

master
witersen 3 years ago
parent
f7a9c49681
commit
c416ed6361
5 changed files with 309 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      01.web/.gitignore
  2. 94
      01.web/src/views/repositoryGroup/index.vue
  3. 114
      01.web/src/views/repositoryInfo/index.vue
  4. 101
      01.web/src/views/repositoryUser/index.vue
  5. 6
      README.md

7
01.web/.gitignore vendored
Unescape View File

@ -0,0 +1,7 @@
.idea
.idea/
.DS_Store
node_modules/
.project
src/config/*.tmp
src/config/env.js

94
01.web/src/views/repositoryGroup/index.vue
Unescape View File

@ -515,8 +515,98 @@ export default {
DelGroup(svn_group_name) { DelGroup(svn_group_name) {
var that = this; var that = this;
that.$Modal.confirm({ that.$Modal.confirm({
title: "删除SVN分组 - " + svn_group_name, render: (h) => {
content: "确定要删除该用户吗？<br/>该操作不可逆！", 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:
"确定要删除该分组吗？<br/>将会从所有仓库和分组下将该分组移除！<br/>该操作不可逆！",
},
}),
]
),
]);
},
onOk: () => { onOk: () => {
var data = { var data = {
svn_group_name: svn_group_name, svn_group_name: svn_group_name,

114
01.web/src/views/repositoryInfo/index.vue
Unescape View File

@ -197,10 +197,14 @@
> >
</Breadcrumb> </Breadcrumb>
</Col> </Col>
<Col span="1"> <Col span="1"> </Col>
</Col>
<Col span="8"> <Col span="8">
<Tooltip style="width:100%" max-width="450" :content="tempCheckout" placement="bottom"> <Tooltip
style="width: 100%"
max-width="450"
:content="tempCheckout"
placement="bottom"
>
<Input readonly v-model="tempCheckout"> <Input readonly v-model="tempCheckout">
<Button slot="append" icon="md-copy" @click="CopyCheckout" <Button slot="append" icon="md-copy" @click="CopyCheckout"
>复制</Button >复制</Button
@ -387,7 +391,12 @@
</TabPane> </TabPane>
</Tabs> </Tabs>
</Card> </Card>
<Tooltip style="width:100%" max-width="450" :content="currentRepTreePriPath" placement="bottom"> <Tooltip
style="width: 100%"
max-width="450"
:content="currentRepTreePriPath"
placement="bottom"
>
<Input v-model="currentRepTreePriPath"> <Input v-model="currentRepTreePriPath">
<span slot="prepend">当前路径:</span> <span slot="prepend">当前路径:</span>
</Input> </Input>
@ -1976,6 +1985,7 @@ export default {
tooltip: true, tooltip: true,
fixed: "left", fixed: "left",
width: 170, width: 170,
// width:80
}, },
{ {
title: "信息", title: "信息",
@ -3430,9 +3440,101 @@ export default {
DelRep(rep_name) { DelRep(rep_name) {
var that = this; var that = this;
that.$Modal.confirm({ that.$Modal.confirm({
title: "删除仓库 - " + rep_name, // title: "删除仓库 - " + rep_name,
content: // content:
// "确定要删除该仓库吗？<br/>该操作不可逆！<br/>如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！",
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:
"确定要删除该仓库吗？<br/>该操作不可逆！<br/>如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！", "确定要删除该仓库吗？<br/>该操作不可逆！<br/>如果该仓库有正在进行的网络传输，可能会删除失败，请注意提示信息！",
},
}),
]
),
]);
},
onOk: () => { onOk: () => {
var data = { var data = {
rep_name: rep_name, rep_name: rep_name,

101
01.web/src/views/repositoryUser/index.vue
Unescape View File

@ -107,9 +107,7 @@
></Input> ></Input>
</FormItem> </FormItem>
<FormItem label="备注"> <FormItem label="备注">
<Input <Input v-model="formCreateUser.svn_user_note"></Input>
v-model="formCreateUser.svn_user_note"
></Input>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button <Button
@ -235,7 +233,7 @@ export default {
formCreateUser: { formCreateUser: {
svn_user_name: "", svn_user_name: "",
svn_user_pass: "", svn_user_pass: "",
svn_user_note:"" svn_user_note: "",
}, },
//编辑用户 //编辑用户
formEditUser: { formEditUser: {
@ -556,9 +554,98 @@ export default {
DelUser(index, svn_user_name) { DelUser(index, svn_user_name) {
var that = this; var that = this;
that.$Modal.confirm({ that.$Modal.confirm({
title: "删除SVN用户 - " + svn_user_name, render: (h) => {
content: return h("div", [
"确定要删除该用户吗？<br/>将会从所有仓库和分组下将该用户移除<br/>该操作不可逆！", 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:
"确定要删除该用户吗？<br/>将会从所有仓库和分组下将该用户移除！<br/>该操作不可逆！",
},
}),
]
),
]);
},
onOk: () => { onOk: () => {
var data = { var data = {
svn_user_name: svn_user_name, svn_user_name: svn_user_name,

6
README.md
Unescape View File

@ -218,9 +218,7 @@ php install.php
## 三、手动升级 ## 三、手动升级
（程序升级的过程就是替换代码而已，只不过代码包的配置文件中可能包含了用户关于数据库连接等的配置参数，不影响仓库数据，因为所处目录不同） PS: 如果之前在配置文件 $path/config/database.php 中手动切换了MySQL数据库，升级后还需要重配置数据库信息
所以如果之前在配置文件 $path/config/database.php 中手动切换了MySQL数据库，升级后还需要重配置数据库信息
### 3.1、docker用户 ### 3.1、docker用户
@ -253,7 +251,7 @@ php server/svnadmind.php stop
``` ```
cd /var/www/html/ cd /var/www/html/
#请自行打包备份当前代码（代码包意义不大，包含一些程序运行配置参数，与svn仓库影响不大，还是建议备份） tar -czvf backup.tar.gz .* --remove-files
``` ```
- 部署新版本代码 - 部署新版本代码
``` ```

Write Preview
Loading…
Cancel
Save