Skip to content

Commit c815e8c

Browse files
committed
修复测试和DEMO
1 parent d2a3551 commit c815e8c

File tree

5 files changed

+1763
-20
lines changed

5 files changed

+1763
-20
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
node_modules
22
lib
3-
dep
3+
dep

demo/ActionPanel.html

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,39 @@
77
<script>
88
require.config({
99
packages: [
10-
{
11-
name: 'esui',
12-
location: '../dep/esui/src',
13-
main: 'main'
14-
},
1510
{
1611
name: 'er',
17-
location: '../dep/er/src',
12+
location: '../dep/er/3.1.0-alpha.8/src',
1813
main: 'main'
1914
},
2015
{
21-
name: 'ef',
22-
location: '../src'
16+
name: 'esui',
17+
location: '../dep/esui/3.1.0-alpha.8/src',
18+
main: 'main'
2319
},
2420
{
2521
name: 'underscore',
26-
location: '../dep/underscore/src',
22+
location: '../dep/underscore/1.5.2/src',
2723
main: 'underscore'
2824
},
25+
{
26+
name: 'etpl',
27+
location: '../dep/etpl/2.1.0/src',
28+
main: 'main'
29+
},
2930
{
3031
name: 'mini-event',
31-
location: '../dep/mini-event/src',
32+
location: '../dep/mini-event/1.0.0/src',
33+
main: 'main'
34+
},
35+
{
36+
name: 'moment',
37+
location: '../dep/moment/2.0.1/src',
38+
main: 'moment'
39+
},
40+
{
41+
name: 'ef',
42+
location: '../src',
3243
main: 'main'
3344
}
3445
]
@@ -48,25 +59,25 @@
4859
ui.init(document.body);
4960
var panel = ui.get('panel');
5061
panel.on(
51-
'actionloaded',
62+
'actionloaded',
5263
function () {
5364
console.log('load', this.action);
5465
}
5566
);
5667
panel.on(
57-
'actionloadfail',
68+
'actionloadfail',
5869
function (e) {
5970
console.log('fail', e.reason);
6071
}
6172
);
6273
panel.on(
63-
'actionloadabort',
74+
'actionloadabort',
6475
function (e) {
6576
console.log('abort', this.action);
6677
}
6778
);
6879
panel.on(
69-
'action@test',
80+
'action@test',
7081
function (e) {
7182
console.log('test', e);
7283
e.preventDefault();

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22
"name": "ef",
33
"version": "3.1.0-alpha.3",
44
"maintainers": [
5-
{ "name": "otakustay", "email": "[email protected]" }
5+
{
6+
"name": "otakustay",
7+
"email": "[email protected]"
8+
}
69
],
710
"dependencies": {
811
"er": "3.1.x",
912
"esui": ">=3.1.0-alpha.5",
1013
"underscore": "1.5.x",
11-
"mini-event": ">=0.9.0"
14+
"mini-event": "1.x",
15+
"etpl": "2.x",
16+
"moment": "2.x"
1217
},
1318
"main": "main",
1419
"description": "EF是ER与ESUI整合而成的高效率业务系统开发框架。",

0 commit comments

Comments
 (0)