Skip to content

Commit 7f8cbcd

Browse files
windy1114windy1114
committed
Merge branch 'requirejs_dev' of https://github.com/openjavascript/jquerycomps into requirejs_dev
Conflicts: modules/Bizs.MultiChangeLogic/0.1/MultiChangeLogic.js modules/Bizs.MultiChangeLogic/dev/MultiChangeLogic.js
2 parents d8a60c8 + 90b5fc4 commit 7f8cbcd

File tree

338 files changed

+39058
-1809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+39058
-1809
lines changed

‎config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ requirejs.config( {
6262
, 'JC.FrameUtil': 'modules/JC.FrameUtil/0.1/FrameUtil'
6363

6464
, 'JC.ImageCutter': 'modules/JC.ImageCutter/0.1/ImageCutter'
65+
, 'JC.ImageFrame': 'modules/JC.ImageFrame/0.1/ImageFrame'
6566

6667
, 'JC.LunarCalendar': 'modules/JC.LunarCalendar/0.1/LunarCalendar'
6768
, 'JC.LunarCalendar.default': 'modules/JC.LunarCalendar/0.1/LunarCalendar.default'
@@ -138,6 +139,7 @@ requirejs.config( {
138139
, 'Bizs.MultiUpload': 'modules/Bizs.MultiUpload/0.1/MultiUpload'
139140
, 'Bizs.TaskViewer': 'modules/Bizs.TaskViewer/0.1/TaskViewer'
140141
, 'Bizs.InputSelect': 'modules/Bizs.InputSelect/0.1/InputSelect'
142+
, 'Bizs.MultiChangeLogic': 'modules/Bizs.MultiChangeLogic/0.1/MultiChangeLogic'
141143

142144
, 'Bizs.CRMSchedule': 'modules/Bizs.CRMSchedule/0.1/CRMSchedule'
143145
, 'Bizs.CRMSchedulePopup': 'modules/Bizs.CRMSchedule/0.1/CRMSchedulePopup'

‎docs/docs-dev/data.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,48 @@
138138
}
139139
]
140140
}
141+
142+
, {
143+
"name": "JC.Cover"
144+
, "subtitle":"遮罩"
145+
, "desc":[
146+
"JC.Cover 遮罩层组件。用于遮盖指定元素，支持滑动动画效果。"
147+
, "支持响应式初始化, 当光标焦点 foucs 到 指定元素时, 会检查是否需要自动初始化 JC.AutoComplete 实例"
148+
]
149+
, "api":"../../docs_api/classes/JC.Cover.html"
150+
, "output": "Cover.js"
151+
, "data": [
152+
{
153+
"version":"0.1"
154+
, "require":[
155+
{
156+
"name":"JC.BaseMVC"
157+
}
158+
]
159+
}
160+
]
161+
}
141162

163+
, {
164+
"name": "JC.Rate"
165+
, "subtitle":"打分组件"
166+
, "desc":[
167+
"JC.Rate 打分组件。支持简单的评分功能，支持星形图形评分。"
168+
, "支持响应式初始化, 当光标焦点 foucs 到 指定元素时, 会检查是否需要自动初始化 JC.AutoComplete 实例"
169+
]
170+
, "api":"../../docs_api/classes/JC.Rate.html"
171+
, "output": "Rate.js"
172+
, "data": [
173+
{
174+
"version":"0.1"
175+
, "require":[
176+
{
177+
"name":"JC.BaseMVC"
178+
}
179+
]
180+
}
181+
]
182+
}
142183
/*
143184
, {
144185
"name": "JC.NSlider"

‎docs/docs-dev/tpl/Bizs.MultiDate/0.1/doc.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{{/block}}
99

1010
{{block name="body_main"}}
11-
<div class="wrap">
1211
{{include file="public/doc/body_main.tpl" htmlAttr=1 dataFormat=1}}
1312

1413
<!-- 外链形式 start -->
@@ -39,8 +38,5 @@
3938
</textArea>
4039
<!-- HTML属性 end -->
4140
42-
43-
</div>
44-
4541
{{/block}}
4642

‎docs/docs-dev/tpl/JC.Cover/0.1/demo.tpl

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{{extends file="public/demo/base.tpl"}}
2+
3+
{{block name="html_header_css" append}}
4+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
5+
{{/block}}
6+
7+
{{block name="body_main"}}
8+
{{include file="public/demo/body_main.tpl"}}
9+
10+
<div class="detail-demo">
11+
<h3 id="navmark-demo" class="detail-blockname">DEMO</h3>
12+
<div class="detail-ct detail-subdemo">
13+
<h4 id="navmark-demo1" class="detail-groupname">从script标签里面读取内容</h4>
14+
<p class="desc">
15+
从script标签里面读取遮盖内容，然后进行展示。
16+
</p>
17+
<div class="detail-subdemoview">
18+
<iframe src="{{$VIEWER_URL}}subdemo1.tpl" frameborder="0" width="100%" style=""></iframe>
19+
</div>
20+
21+
<h4 id="navmark-demo2" class="detail-groupname">遮盖inline元素、callback</h4>
22+
<p class="desc">
23+
遮盖inline元素。以及回调函数的使用示例
24+
</p>
25+
<div class="detail-subdemoview">
26+
<iframe src="{{$VIEWER_URL}}subdemo2.tpl" frameborder="0" width="100%" style=""></iframe>
27+
</div>
28+
</div>
29+
</div>
30+
<script type="text/javascript">
31+
</script>
32+
{{/block}}
33+

‎docs/docs-dev/tpl/JC.Cover/0.1/doc.tpl

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{{extends file="public/doc/base.tpl"}}
2+
3+
{{block name="html_header_css" append}}
4+
<!-- start JC style -->
5+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
6+
<!-- end JC style -->
7+
8+
{{/block}}
9+
10+
{{block name="body_main"}}
11+
{{include file="public/doc/body_main.tpl" htmlAttr=1 dataFormat=1}}
12+
13+
<!-- 外链形式 start -->
14+
<textArea class="detail-codetpl" type="text/template">
15+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
16+
17+
<script src="{{$URL_ROOT}}/modules/JC.plugins/JSON/2/JSON.js" />
18+
<script src="{{$URL_ROOT}}/modules/JC.common/0.3/common.js" />
19+
<script src="{{$URL_ROOT}}/modules/JC.BaseMVC/0.1/BaseMVC.js" />
20+
<script src="{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/{{$OUTPUT}}" />
21+
</textArea>
22+
<!-- 外链形式 end -->
23+
24+
<!-- 模块加载 start -->
25+
<textArea class="detail-codetpl" type="text/template">
26+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
27+
28+
<script>
29+
requirejs( [ "{{$COMP_NAME}}" ], function( {{$NAME}} ){
30+
});
31+
</script>
32+
</textArea>
33+
<!-- 模块加载 end -->
34+
35+
<!-- HTML属性 start -->
36+
<textArea class="detail-codetpl" type="text/template">
37+
covercnt = string, default = ""
38+
遮罩显示的文本内容
39+
40+
coverselectorcnt = string, default = ""
41+
遮罩显示的内容，显示由select指向的html
42+
43+
coverlink = string, default = ""
44+
点击cover时，跳转的地址URL
45+
46+
coverpointer = boolean default = false
47+
遮罩是否显示手型
48+
49+
coverdir = int default = 2
50+
遮罩遮盖方向，0-上、1-右、2-下、3-左
51+
52+
</textArea>
53+
<!-- HTML属性 end -->
54+
55+
<!-- 数据结构 start -->
56+
<textArea class="detail-codetpl" type="text/template">
57+
无数据结构
58+
</textArea>
59+
<!-- 数据结构 end -->
60+
61+
{{/block}}
62+

‎docs/docs-dev/tpl/JC.Cover/0.1/simple_demo.tpl

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{{extends file="public/simple_demo/base.tpl"}}
2+
3+
{{block name="html_header_css" append}}
4+
<!-- start JC style -->
5+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
6+
<!-- end JC style -->
7+
<style>
8+
.cover-demo1 {
9+
margin-left: 50px;
10+
}
11+
</style>
12+
13+
{{/block}}
14+
15+
{{block name="body_main"}}
16+
<div class="codeview-view">
17+
<div class="codeview-cssview">
18+
<textArea style="display:none;">
19+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
20+
</textArea>
21+
</div>
22+
<div class="codeview-jsview">
23+
<textArea style="display:none;"></textArea>
24+
</div>
25+
<div class="codeview-htmlview">
26+
<textArea style="display:none;"></textArea>
27+
</div>
28+
<div class="codeview-pageview nowview">
29+
<div class="">
30+
<!-- simple demo -->
31+
<dl class="cover-demo1">
32+
<dt>鼠标hover出发效果</dt>
33+
<dd>
34+
<div class="" data-cajScriptData="|script">
35+
<h2>Default:</h2>
36+
<div class="js_compCover" style="height: 200px; width: 200px; background: red;"
37+
covercnt="test" coverpointer="true" coverlink="http://www.so.com"
38+
></div>
39+
</div>
40+
</dd>
41+
</dl>
42+
</div>
43+
</div>
44+
</div>
45+
{{/block}}
46+
47+
{{block name="body_footer_js" append}}
48+
<script type="text/template" class="show-html">
49+
<dl class="cover-demo1">
50+
<dt>鼠标hover出发效果</dt>
51+
<dd>
52+
<div class="" data-cajScriptData="|script">
53+
<h2>Default:</h2>
54+
<div class="js_compCover" style="height: 200px; width: 200px; background: red;"
55+
covercnt="test" coverpointer="true" coverlink="http://www.so.com"
56+
></div>
57+
</div>
58+
</dd>
59+
</dl>
60+
</script>
61+
62+
<script type="text/javascript" class="show-js">
63+
requirejs( [ '{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/{{$OUTPUT}}' ] );
64+
65+
</script>
66+
{{/block}}

‎docs/docs-dev/tpl/JC.Cover/0.1/subdemo1.tpl

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{{extends file="public/simple_demo/base.tpl"}}
2+
3+
{{block name="html_header_css" append}}
4+
<style class="show-css">
5+
@import url( '{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' );
6+
</style>
7+
{{/block}}
8+
9+
{{block name="body_main"}}
10+
<div class="codeview-view">
11+
<div class="codeview-cssview">
12+
<textArea style="display:none;">
13+
<link href='{{$URL_ROOT}}/modules/{{$COMP_NAME}}/{{$COMP_VERSION}}/res/default/style.css' rel='stylesheet' />
14+
</textArea>
15+
</div>
16+
<div class="codeview-jsview">
17+
<textArea style="display:none;"></textArea>
18+
</div>
19+
<div class="codeview-htmlview">
20+
<textArea style="display:none;"></textArea>
21+
</div>
22+
<div class="codeview-pageview nowview">
23+
<div class="">
24+
<!-- simple demo -->
25+
<dl class="cover-demo1" style="padding: 20px;">
26+
<h2>Inner Content From Script Tag</h2>
27+
<div class="js_compCover" style="height: 200px; width: 202px; background: yellow;"
28+
coverdir="3" covercnt="" coverselectorcnt="|script" coverpointer="true" coverlink="http://www.so.com"
29+
>
30+
cover from script content
31+
<script type="text/template">
32+
<img src="http://a2.att.hudong.com/01/43/01300534088771134345433553476.png">
33+
</script>
34+
</div>
35+
</dl>
36+
</div>
37+
</div>
38+
</div>
39+
{{/block}}
40+
41+
{{block name="body_footer_js" append}}
42+
<script type="text/template" class="show-html">
43+
<div class="" data-cajScriptData="|script">
44+
<script type="text/template">
45+
<h2>Inner Content From Script Tag</h2>
46+
<div class="js_compCover" style="height: 200px; width: 202px; background: yellow;"
47+
coverdir="3" covercnt="" coverselectorcnt="|script" coverpointer="true" coverlink="http://www.so.com"
48+
>
49+
cover from script content
50+
<script type="text/template">
51+
<img src="http://a2.att.hudong.com/01/43/01300534088771134345433553476.png">
52+
&lt;/script>
53+
</div>
54+
&lt;/script>
55+
</div>
56+
</script>
57+
58+
<script type="text/javascript" class="show-js">
59+
requirejs( [ '{{$COMP_NAME}}' ] );
60+
</script>
61+
{{/block}}

0 commit comments

Comments
 (0)