Skip to content

Commit 711ea88

Browse files
author
hikki
committed
效果调整
1 parent e84a4e2 commit 711ea88

File tree

2 files changed

+24
-17
lines changed

2 files changed

+24
-17
lines changed

resources/assets/component.css

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.dlp{
1+
.dlp,.dlp *{
22
font-family: "Raleway",
33
"HelveticaNeue",
44
"Helvetica Neue",
@@ -7,10 +7,10 @@
77
sans-serif;
88
font-size: 12px!important;
99
border-spacing: 0!important;
10-
-moz-user-select: none;
11-
-webkit-user-select: none;
12-
-ms-user-select: none;
13-
user-select: none;
10+
-moz-user-select: none!important;
11+
-webkit-user-select: none!important;
12+
-ms-user-select: none!important;
13+
user-select: none!important;
1414
}
1515
.dlp i{cursor: pointer!important;}
1616
.dlp p{margin: 0!important;}
@@ -176,6 +176,8 @@
176176
#dlp-plane>div{
177177
position: relative;
178178
margin: 30px auto;
179+
animation-name: dlpFadeIn;
180+
animation-duration: .2s;
179181
}
180182
.dlp-plane-gauze{
181183
display: block;
@@ -216,4 +218,9 @@
216218
.dlp-contextmenu li:hover{
217219
background-color: #ebebeb;
218220
cursor: pointer;
221+
}
222+
223+
@keyframes dlpFadeIn {
224+
0% {opacity: 0;}
225+
100% {opacity: 1;}
219226
}

resources/assets/component.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@ class ComponentDot {
135135
};
136136

137137
constructor(name, selected, select) {
138-
this.name = name;
139-
this.DOM = document.getElementById(name);
140-
this.DOM.addEventListener("contextmenu", (e) => {
141-
e.preventDefault();
142-
});
143138
if (!Array.isArray(selected)) {
144139
console.error('Dot param selected must be array!');
145140
return;
@@ -148,6 +143,11 @@ class ComponentDot {
148143
console.error('Dot param select must be object such as {key:val,key2:val2,...} !');
149144
return;
150145
}
146+
this.name = name;
147+
this.DOM = document.getElementById(name);
148+
this.DOM.addEventListener("contextmenu", (e) => {
149+
e.preventDefault();
150+
});
151151
this.make(selected, select);
152152
this.selected_data = selected;
153153
this.select_data = selected.slice(0);
@@ -177,13 +177,13 @@ class ComponentDot {
177177
for (let i in select) {
178178
if (!select.hasOwnProperty(i)) continue;
179179
if (selected.indexOf(parseInt(i)) !== -1) {
180-
selected_dom += `<div class="dlp dlp-text dlp-label" data-id="${i}" title="${select[i]}">${select[i]}</div>`;
180+
selected_dom += `<div class="dlp-label dlp-text" data-id="${i}" title="${select[i]}">${select[i]}</div>`;
181181
continue;
182182
}
183-
select_dom += `<div class="dlp dlp-text dlp-label" data-id="${i}" title="${select[i]}">${select[i]}</div>`;
183+
select_dom += `<div class="dlp-label dlp-text" data-id="${i}" title="${select[i]}">${select[i]}</div>`;
184184
}
185185

186-
let html = `<div class="dlp-dot" ><div class="dot-top"><input type="text" class="dlp dot-search" placeholder="搜索名称"><div class="dot-selected dlp-scroll">${selected_dom}</div></div><div class="dot-body"><div class="dot-select dlp-scroll">${select_dom}</div></div></div>
186+
let html = `<div class="dlp dlp-dot" ><div class="dot-top"><input type="text" class="dot-search" placeholder="搜索名称"><div class="dot-selected dlp-scroll">${selected_dom}</div></div><div class="dot-body"><div class="dot-select dlp-scroll">${select_dom}</div></div></div>
187187
<input name="${this.name}[select]" value='${JSON.stringify(selected)}' type="hidden"><input name="${this.name}[insert]" value="[]" type="hidden"><input name="${this.name}[delete]" value="[]" type="hidden">`;
188188
this.DOM.insertAdjacentHTML('afterbegin', html);
189189
this.SELECTED_DOM = document.querySelector(`#${this.name} .dot-selected`);
@@ -282,12 +282,12 @@ class ComponentCascadeDot {
282282
};
283283

284284
constructor(name, selected, select) {
285-
this.name = name;
286-
this.DOM = document.getElementById(name);
287285
if (!Array.isArray(selected) || !Array.isArray(select)) {
288286
console.error('CascadeDot param selected and select must be array!');
289287
return;
290288
}
289+
this.name = name;
290+
this.DOM = document.getElementById(name);
291291
this.selected_data = selected;
292292
this.select_data = selected.slice(0);
293293
this.insert_data = [];
@@ -305,7 +305,7 @@ class ComponentCascadeDot {
305305
}
306306

307307
make() {
308-
let html = `<div class="dlp-dot" ><div class="dot-top"><input type="text" class="dlp dot-search" placeholder="搜索名称"><div id="${this.name}-select" class="dot-selected dlp-scroll"></div></div><div class="dot-body"><div class="dot-select dot-select-cascade dlp-scroll"></div></div></div>
308+
let html = `<div class="dlp dlp-dot"><div class="dot-top"><input type="text" class="dot-search" placeholder="搜索名称"><div id="${this.name}-select" class="dot-selected dlp-scroll"></div></div><div class="dot-body"><div class="dot-select dot-select-cascade dlp-scroll"></div></div></div>
309309
<input name="${this.name}[select]" value="[]" type="hidden"><input name="${this.name}[insert]" value="[]" type="hidden"><input name="${this.name}[delete]" value="[]" type="hidden">`;
310310
this.DOM.insertAdjacentHTML('afterbegin', html);
311311
this.DOM.addEventListener("contextmenu", (e) => {
@@ -785,7 +785,7 @@ class ComponentLine {
785785
}
786786

787787
makeTd(td, type, value, column, attributes) {
788-
var object = this;
788+
let object = this;
789789
switch (type) {
790790
case 'text':
791791
td.insertAdjacentHTML('afterbegin', `<p style="display: block;" class="dlp-text" title="${value}">${value}</p>`);

0 commit comments

Comments
 (0)