Skip to content

Commit cc58b80

Browse files
otakustayotakustay
committed
Merge branch '3.1.0-dev'
2 parents 23c98ae + d3a1ac6 commit cc58b80

25 files changed

+1451
-379
lines changed

‎demo/Tip.html‎

Lines changed: 214 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,214 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="UTF-8" />
5-
<title>Button - ESUI Demo</title>
6-
<script src="loader/esl.js"></script>
7-
<script>
8-
require.config({
9-
'baseUrl': '../src',
10-
'paths': {},
11-
'packages': [
12-
{
13-
'name': 'mini-event',
14-
'location': '../dep/mini-event/1.0.0/src',
15-
'main': 'main'
16-
},
17-
{
18-
'name': 'underscore',
19-
'location': '../dep/underscore/1.5.2/src',
20-
'main': 'underscore'
21-
},
22-
{
23-
'name': 'moment',
24-
'location': '../dep/moment/2.0.1/src',
25-
'main': 'moment'
26-
},
27-
{
28-
'name': 'etpl',
29-
'location': '../dep/etpl/2.1.0/src',
30-
'main': 'main'
31-
},
32-
{
33-
'name': 'esui',
34-
'location': '../src',
35-
'main': 'main'
36-
}
37-
]
38-
});
39-
</script>
40-
<script src="../src/customShim.js"></script>
41-
<script src="jquery-1.9.1.min.js"></script>
42-
<link rel="stylesheet" href="demo.css" />
43-
<link rel="stylesheet" href="../src/css/main.css" />
44-
</head>
45-
<body>
46-
<header>Tip</header>
47-
<div class="container">
48-
<div data-ui="type:Tip;id:tip;title:写这里优先级高;content:我是内容;arrow:1" title="也可以写在这里">content也可以写在这里</div>
49-
<esui-tip data-ui="type:Tip;id:tip;title:写这里优先级高;content:我是内容;arrow:1" title="也可以写在这里"></esui-tip>
50-
51-
<br>
52-
<label id="tip-layer-label">
53-
一行字也可以绑定提示
54-
</label>
55-
<br>
56-
<br>
57-
<br>
58-
<br>
59-
<Button data-ui-id="control-tip" data-ui-type="Button">
60-
可以帮在控件上
61-
</Button>
62-
<br>
63-
<br>
64-
<Button data-ui-id="control-tip-2" data-ui-type="Button">
65-
我跟楼上的共享一个tip
66-
</Button>
67-
</div>
68-
<script>
69-
require(
70-
[
71-
'esui',
72-
'esui/Tip',
73-
'esui/TipLayer',
74-
'esui/Label'
75-
],
76-
function (ui, Tip, TipLayer) {
77-
var controls = ui.init();
78-
var tip = controls[0];
79-
80-
var onceNotice = TipLayer.onceNotice({
81-
content: '你知道了吗知道了吗知道了吗？',
82-
targetDOM: 'tip-layer-label'
83-
});
84-
85-
var tipLayer = ui.create('TipLayer', {
86-
title: '最普通的提示',
87-
content: '随便提示一下随便提示一下随便提示一下'
88-
});
89-
tipLayer.appendTo(document.body)
90-
tipLayer.render();
91-
tipLayer.attachTo({
92-
targetControl: 'control-tip',
93-
showMode: 'over',
94-
delayTime: 800,
95-
positionOpt: { top: 'top', right: 'left' }
96-
});
97-
98-
tipLayer.attachTo({
99-
targetControl: 'control-tip-2',
100-
showMode: 'click',
101-
delayTime: 300,
102-
positionOpt: { top: 'top', right: 'left' }
103-
})
104-
}
105-
)
106-
</script>
107-
</body>
108-
</html>
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>Button - ESUI Demo</title>
6+
<script src="loader/esl.js"></script>
7+
<script>
8+
require.config({
9+
'baseUrl': '../src',
10+
'paths': {},
11+
'packages': [
12+
{
13+
'name': 'mini-event',
14+
'location': '../dep/mini-event/1.0.0/src',
15+
'main': 'main'
16+
},
17+
{
18+
'name': 'underscore',
19+
'location': '../dep/underscore/1.5.2/src',
20+
'main': 'underscore'
21+
},
22+
{
23+
'name': 'moment',
24+
'location': '../dep/moment/2.0.1/src',
25+
'main': 'moment'
26+
},
27+
{
28+
'name': 'etpl',
29+
'location': '../dep/etpl/2.1.0/src',
30+
'main': 'main'
31+
},
32+
{
33+
'name': 'esui',
34+
'location': '../src',
35+
'main': 'main'
36+
}
37+
]
38+
});
39+
</script>
40+
<script src="../src/customShim.js"></script>
41+
<script src="jquery-1.9.1.min.js"></script>
42+
<link rel="stylesheet" href="demo.css" />
43+
<link rel="stylesheet" href="../src/css/main.css" />
44+
</head>
45+
<body>
46+
<header>Tip</header>
47+
<div id="container" class="container" style="margin-left:100px">
48+
<div data-ui="type:Tip;id:tip;title:写这里优先级高;content:我是内容;arrow:1" title="也可以写在这里">content也可以写在这里</div>
49+
50+
<br>
51+
<label id="tip-layer-label">
52+
一行字也可以绑定提示
53+
</label>
54+
<br>
55+
<br>
56+
<br>
57+
<br>
58+
<Button data-ui-id="control-tip" data-ui-type="Button">
59+
划过展示弹层
60+
</Button>
61+
<br>
62+
<br>
63+
<Button data-ui-id="control-tip-2" data-ui-type="Button">
64+
点击展示弹层
65+
</Button>
66+
<br>
67+
<br>
68+
<Button data-ui-id="control-tip-3" data-ui-type="Button">
69+
自动展示弹层
70+
</Button>
71+
<br>
72+
<br>
73+
<Button data-ui-id="control-tip-4" data-ui-type="Button">
74+
定制展示弹层
75+
</Button>
76+
<br>
77+
<br>
78+
<p>TipLayer支持多个元素共享，但不适用showMode为auto的绑定</p>
79+
<Button data-ui-id="control-tip-3-1" data-ui-type="Button">
80+
我们跟第三个按钮共享一个tip
81+
</Button>
82+
</div>
83+
<script>
84+
require(
85+
[
86+
'esui',
87+
'esui/Tip',
88+
'esui/TipLayer',
89+
'esui/Label'
90+
],
91+
function (ui, Tip, TipLayer) {
92+
var controls = ui.init();
93+
/**
94+
* 场景1：over
95+
*/
96+
var tipLayer1 = ui.create('TipLayer', {
97+
title: 'over模式弹层',
98+
content: 'over模式下的交互是：<br>'
99+
+ '鼠标划过目标元素，弹层出现；鼠标脱离目标元素弹层消失'
100+
});
101+
tipLayer1.appendTo(document.body)
102+
tipLayer1.render();
103+
104+
tipLayer1.attachTo({
105+
targetControl: 'control-tip',
106+
showMode: 'over',
107+
delayTime: 800,
108+
positionOpt: {top: 'top', right: 'left'}
109+
});
110+
111+
112+
/**
113+
* 场景2：click
114+
*/
115+
var tipLayer2 = ui.create('TipLayer', {
116+
title: 'click模式弹层',
117+
content: 'click模式下的交互是：<br>'
118+
+ '点击目标元素，弹层出现；点击layer及目标元素以外区域，弹层消失'
119+
});
120+
tipLayer2.appendTo(document.body)
121+
tipLayer2.render();
122+
123+
tipLayer2.attachTo({
124+
targetControl: 'control-tip-2',
125+
showMode: 'click',
126+
delayTime: 300,
127+
positionOpt: { top: 'top', right: 'left' }
128+
});
129+
130+
131+
/**
132+
* 场景3：auto
133+
*/
134+
var tipLayer3 = ui.create('TipLayer', {
135+
title: 'auto模式弹层',
136+
content: 'auto模式下的交互是：<br>'
137+
+ '弹层自动出现；并根据用户配置的showDuration决定：<br>'
138+
+ '1. 经过showDuration的时间后自动关闭<br>'
139+
+ '2. 点击外部执行关闭 '
140+
+ '之后，点击目标元素，展示弹层'
141+
});
142+
tipLayer3.appendTo(document.body)
143+
tipLayer3.render();
144+
145+
tipLayer3.attachTo({
146+
targetControl: 'control-tip-3',
147+
showMode: 'over',
148+
// showDuration: 3600,
149+
positionOpt: {top: 'top', right: 'left'}
150+
});
151+
152+
/**
153+
* 场景4：把一个已经生成的TipLayer共享给另一个元素
154+
*/
155+
tipLayer3.attachTo({
156+
targetControl: 'control-tip-3-1',
157+
showMode: 'over',
158+
positionOpt: {top: 'top', right: 'left'}
159+
});
160+
161+
// 共享给好多好多元素
162+
var container = document.getElementById('container');
163+
var i = 20;
164+
while (i > 0) {
165+
var dom = document.createElement('div');
166+
dom.id = i;
167+
dom.setAttribute('class', 'ui-button');
168+
container.appendChild(dom);
169+
tipLayer3.attachTo({
170+
targetDOM: dom,
171+
showMode: 'over',
172+
delayTime: 800,
173+
positionOpt: {top: 'top', right: 'left'}
174+
});
175+
i--;
176+
}
177+
178+
/**
179+
* 场景4：manual
180+
*/
181+
var tipLayer4 = ui.create('TipLayer', {
182+
title: 'manual模式弹层',
183+
content: 'manual模式下的交互是：随你自己搞'
184+
});
185+
tipLayer4.appendTo(document.body)
186+
tipLayer4.render();
187+
188+
ui.get('control-tip-4').on(
189+
'click',
190+
function () {
191+
tipLayer4.show(this.main, {top: 'top', right: 'left'});
192+
}
193+
);
194+
195+
tipLayer4.helper.addDOMEvent(
196+
ui.get('control-tip-4').main,
197+
'mouseout',
198+
function () {
199+
this.hide();
200+
}
201+
);
202+
203+
var tip = controls[0];
204+
205+
206+
var onceNotice = TipLayer.onceNotice({
207+
content: '你知道了吗知道了吗知道了吗？',
208+
targetDOM: 'tip-layer-label'
209+
});
210+
}
211+
)
212+
</script>
213+
</body>
214+
</html>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "esui",
3-
"version": "3.1.0-beta.6",
3+
"version": "3.1.0",
44
"maintainers": [
55
{
66
"name": "otakustay",

‎src/Calendar.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,20 @@ define(
180180
autoHideLayer: false
181181
};
182182

183+
u.extend(properties, options);
184+
183185
if (options.autoHideLayer === 'false') {
184-
options.autoHideLayer = false;
186+
properties.autoHideLayer = false;
185187
}
186188

187-
u.extend(properties, options);
188-
189189
if (lib.isInput(this.main)) {
190190
this.helper.extractOptionsFromInput(this.main, properties);
191191
}
192192

193193
// parseValue 需要用到 paramFormat
194194
this.paramFormat = properties.paramFormat;
195195

196-
if (properties.value) {
196+
if (options.value) {
197197
properties.rawValue = this.parseValue(properties.value);
198198
}
199199

‎src/Control.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ define(
8787
*
8888
* 完成初始化
8989
*/
90-
this.fire('init');
90+
this.fire('init', {options: options});
9191
}
9292

9393
/**

‎src/Dialog.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,24 +447,24 @@ define(
447447
roles: {}
448448
};
449449

450+
lib.extend(properties, options);
451+
450452
if (options.closeOnHide === 'false') {
451-
options.closeOnHide = false;
453+
properties.closeOnHide = false;
452454
}
453455

454456
if (options.closeButton === 'false') {
455-
options.closeButton = false;
457+
properties.closeButton = false;
456458
}
457459

458460
if (options.mask === 'false') {
459-
options.mask = false;
461+
properties.mask = false;
460462
}
461463

462464
if (options.needFoot === 'false') {
463-
options.needFoot = false;
465+
properties.needFoot = false;
464466
}
465467

466-
lib.extend(properties, options);
467-
468468
if (properties.needFoot) {
469469
if (!properties.foot) {
470470
properties.foot = properties.defaultFoot;

0 commit comments

Comments
 (0)