Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf4eb5cf

Browse files
author
minjk-bl
committed
Edit AlertModal to show details
1 parent5a98510 commitf4eb5cf

File tree

5 files changed

+37
-9
lines changed

5 files changed

+37
-9
lines changed

‎visualpython/css/component/alertModal.css‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
top:50%;
1414
transform:translate(-50%,-50%);
1515
width:400px;
16-
height:150px;
16+
height:170px;
1717
padding:15px;
1818
background-color:var(--vp-background-color);
1919
box-shadow:02px2px0rgba(0,0,0,0.14),03px1px-2pxrgba(0,0,0,0.12),01px5px0rgba(0,0,0,0.2);
@@ -59,10 +59,23 @@
5959
font-size:13px;
6060
font-weight:700;
6161
}
62+
.vp-alertModal-detailStr {
63+
color:var(--vp-primary-text);
64+
background-color:var(--vp-light-gray-color);
65+
border-radius:5px;
66+
padding:10px;
67+
border:0.25px solidvar(--vp-grid-line-color);
68+
height:60px;
69+
}
70+
.vp-alertModal-detailStr>pre {
71+
border:0px;
72+
padding:0px;
73+
}
6274
.vp-alertModal-style-flex-column-evenly {
6375
display: flex;
6476
flex-direction: column;
6577
justify-content: space-evenly;
78+
row-gap:3px;
6679
}
6780
.vp-alertModal-style-flex-row-center {
6881
display: flex;

‎visualpython/css/root.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
src: url(../fonts/consola.ttf) format("font-truetype");
4444
}
4545
/* font style */
46-
.vp-primary {
47-
color:var(--vp-font-highlight);
46+
.vp-primary-text {
47+
color:var(--vp-font-primary);
4848
}
4949
.vp-orange-text {
5050
color:var(--vp-font-highlight);

‎visualpython/html/component/alertModal.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
vp-alertModal-style-text-center
2525
vp-alertModal-style-font-weight-700">
2626

27+
</div>
28+
<divclass="vp-alertModal-detailStr vp-scrollbar">
29+
2730
</div>
2831
<divclass="vp-alertModal-style-flex-row-center">
2932
<inputclass="vp-alertModal-yes

‎visualpython/js/com/component/AlertModal.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@ define([
2121

2222
/**
2323
* AlertModal
24+
* com_util.renderAlertModal(title, detail);
25+
* - title: string
26+
* - detail: object
27+
* - content: string
28+
* - type: text / code
2429
*/
2530
classAlertModalextendsComponent{
26-
constructor(title,detail=''){
31+
constructor(title,detail={content:'',type:'text'}){
2732
super($('body'),{title:title,detail:detail});
2833
}
2934

@@ -44,9 +49,16 @@ define([
4449

4550
// set title
4651
$(this.wrapSelector('.vp-alertModal-titleStr')).text(this.state.title);
47-
// set detail as tooltip
48-
if(this.state.detail){
49-
$(this.wrapSelector('.vp-alertModal-titleStr')).attr({title:this.state.detail});
52+
// set detail
53+
let{ content='', type='text'}=this.state.detail;
54+
if(content!==''){
55+
if(type==='code'){
56+
$(this.wrapSelector('.vp-alertModal-detailStr')).html('<pre>'+content+'</pre>')
57+
}else{
58+
$(this.wrapSelector('.vp-alertModal-detailStr')).text(content);
59+
}
60+
}else{
61+
$(this.wrapSelector('.vp-alertModal-detailStr')).hide();
5062
}
5163
}
5264

‎visualpython/js/m_apps/Snippets.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ define([
525525
// vp-multilang for success message
526526
com_util.renderSuccessMessage('Successfully removed!');
527527
}).catch(function(err){
528-
com_util.renderAlertModal('Failed to remove data...',err);
528+
com_util.renderAlertModal('Failed to remove data...',{content:err});
529529
// load again
530530
that.loadUdfList();
531531
}).finally(function(){
@@ -543,7 +543,7 @@ define([
543543
// vp-multilang for success message
544544
com_util.renderSuccessMessage('Successfully removed!');
545545
}).catch(function(err){
546-
com_util.renderAlertModal('Failed to remove data...',err);
546+
com_util.renderAlertModal('Failed to remove data...',{content:err});
547547
// load again
548548
that.loadUdfList();
549549
}).finally(function(){

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp