tao_form 0.1.9 → 0.1.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/locales/tao_form/components/date_range_picker/en.yml +5 -0
- data/config/locales/tao_form/components/date_range_picker/zh-CN.yml +7 -0
- data/lib/assets/javascripts/tao/form/fields/checkbox.coffee +2 -1
- data/lib/assets/javascripts/tao/form/fields/index.coffee +1 -0
- data/lib/assets/javascripts/tao/form/fields/moment_picker/element.coffee +1 -1
- data/lib/assets/javascripts/tao/form/fields/moment_picker/result.coffee +1 -1
- data/lib/assets/javascripts/tao/form/fields/moment_picker/segment_list.coffee +1 -1
- data/lib/assets/javascripts/tao/form/fields/radio.coffee +1 -1
- data/lib/assets/javascripts/tao/form/fields/select/element.coffee +3 -3
- data/lib/assets/javascripts/tao/form/fields/select/list.coffee +8 -3
- data/lib/assets/javascripts/tao/form/fields/select/multiple_result.coffee +4 -4
- data/lib/assets/javascripts/tao/form/fields/select/result.coffee +5 -5
- data/lib/assets/javascripts/tao/form/fields/switch.coffee +1 -1
- data/lib/assets/javascripts/tao/form/index.coffee +1 -7
- data/lib/assets/javascripts/tao/form/mobile/fields/index.coffee +1 -0
- data/lib/assets/javascripts/tao/form/mobile/fields/moment_picker/element.coffee +2 -2
- data/lib/assets/javascripts/tao/form/mobile/fields/moment_picker/segment_list.coffee +1 -1
- data/lib/assets/javascripts/tao/form/mobile/fields/select/element.coffee +13 -4
- data/lib/assets/javascripts/tao/form/mobile/fields/select/list.coffee +0 -8
- data/lib/assets/javascripts/tao/form/mobile/index.coffee +1 -0
- data/lib/assets/javascripts/tao/form/shared/element/base.coffee +6 -2
- data/lib/assets/javascripts/tao/form/shared/fields/checkbox.coffee +5 -1
- data/lib/assets/javascripts/tao/form/shared/fields/date_range_picker.coffee +75 -0
- data/lib/assets/javascripts/tao/form/shared/fields/datetime_picker.coffee +16 -6
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/element/base.coffee +30 -13
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/result/base.coffee +2 -2
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segment_list/base.coffee +5 -5
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/base.coffee +2 -0
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/date_segment.coffee +12 -3
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/hour_segment.coffee +1 -1
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/minute_segment.coffee +1 -1
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/month_segment.coffee +2 -2
- data/lib/assets/javascripts/tao/form/shared/fields/moment_picker/segments/year_segment.coffee +3 -3
- data/lib/assets/javascripts/tao/form/shared/fields/radio.coffee +5 -1
- data/lib/assets/javascripts/tao/form/shared/fields/select/element/base.coffee +24 -20
- data/lib/assets/javascripts/tao/form/shared/fields/select/list/base.coffee +21 -3
- data/lib/assets/javascripts/tao/form/shared/fields/select/models/data_provider.coffee +0 -8
- data/lib/assets/javascripts/tao/form/shared/fields/select/multiple_result/base.coffee +17 -8
- data/lib/assets/javascripts/tao/form/shared/fields/select/result/base.coffee +5 -5
- data/lib/assets/javascripts/tao/form/shared/fields/switch.coffee +5 -1
- data/lib/assets/javascripts/tao/form/shared/init.coffee +23 -0
- data/lib/assets/stylesheets/tao/form/fields/checkbox.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/date_range_picker.scss +20 -0
- data/lib/assets/stylesheets/tao/form/fields/datetime_picker.scss +3 -3
- data/lib/assets/stylesheets/tao/form/fields/index.scss +1 -0
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/index.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segment_list.scss +2 -2
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segments/date_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segments/hour_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segments/minute_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segments/month_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/moment_picker/segments/year_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/radio.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/select/index.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/select/list.scss +2 -8
- data/lib/assets/stylesheets/tao/form/fields/select/multiple_result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/fields/select/result.scss +2 -2
- data/lib/assets/stylesheets/tao/form/fields/switch.scss +6 -4
- data/lib/assets/stylesheets/tao/form/inputs/boolean.scss +1 -1
- data/lib/assets/stylesheets/tao/form/layouts/default.scss +4 -4
- data/lib/assets/stylesheets/tao/form/mobile/fields/date_range_picker.scss +18 -0
- data/lib/assets/stylesheets/tao/form/mobile/fields/datetime_picker.scss +3 -3
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/index.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segment_list.scss +2 -2
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segments/date_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segments/hour_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segments/minute_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segments/month_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/moment_picker/segments/year_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/select/index.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/select/list.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/select/multiple_result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/fields/select/result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/inputs/boolean.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/inputs/group.scss +1 -1
- data/lib/assets/stylesheets/tao/form/mobile/layout.scss +2 -2
- data/lib/assets/stylesheets/tao/form/reset.scss +1 -0
- data/lib/assets/stylesheets/tao/form/shared/fields/_checkbox.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/_radio.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/_switch.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/_result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/_segment_list.scss +2 -2
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/segments/_date_segment.scss +8 -2
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/segments/_hour_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/segments/_minute_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/segments/_month_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/moment_picker/segments/_year_segment.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/fields/select/_list.scss +6 -2
- data/lib/assets/stylesheets/tao/form/shared/fields/select/_multiple_result.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/inputs/_boolean.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/inputs/_group.scss +1 -1
- data/lib/assets/stylesheets/tao/form/shared/inputs/_text.scss +3 -3
- data/lib/tao_form/components.rb +1 -0
- data/lib/tao_form/components/check_box_component.rb +4 -0
- data/lib/tao_form/components/date_picker_component.rb +6 -0
- data/lib/tao_form/components/date_range_picker_component.rb +64 -0
- data/lib/tao_form/components/datetime_picker_component.rb +7 -1
- data/lib/tao_form/components/form_component.rb +2 -2
- data/lib/tao_form/components/moment_picker/base.rb +13 -4
- data/lib/tao_form/components/moment_picker/result_component.rb +13 -2
- data/lib/tao_form/components/moment_picker/segment_list_component.rb +18 -4
- data/lib/tao_form/components/moment_picker/segments/base.rb +1 -1
- data/lib/tao_form/components/moment_picker/segments/date_segment_component.rb +4 -1
- data/lib/tao_form/components/moment_picker/segments/hour_segment_component.rb +4 -1
- data/lib/tao_form/components/moment_picker/segments/minute_segment_component.rb +4 -1
- data/lib/tao_form/components/moment_picker/segments/month_segment_component.rb +8 -0
- data/lib/tao_form/components/moment_picker/segments/year_segment_component.rb +4 -1
- data/lib/tao_form/components/month_picker_component.rb +6 -0
- data/lib/tao_form/components/radio_button_component.rb +4 -0
- data/lib/tao_form/components/select/list_component.rb +1 -1
- data/lib/tao_form/components/select/multiple_result_component.rb +1 -1
- data/lib/tao_form/components/select/result_component.rb +1 -1
- data/lib/tao_form/components/select_component.rb +8 -1
- data/lib/tao_form/components/switch_component.rb +6 -0
- data/lib/tao_form/components/time_picker_component.rb +5 -1
- data/lib/tao_form/inputs.rb +1 -0
- data/lib/tao_form/inputs/date_range_input.rb +28 -0
- data/lib/tao_form/inputs/date_time_input.rb +1 -1
- data/lib/tao_form/inputs/string_input.rb +46 -6
- data/lib/tao_form/version.rb +1 -1
- data/lib/views/components/tao_form/components/_date_range_picker.html.erb +7 -0
- data/lib/views/components/tao_form/components/_moment_picker.html+mobile.erb +3 -3
- data/lib/views/components/tao_form/components/_select.html+mobile.erb +8 -7
- data/lib/views/components/tao_form/components/_switch.html.erb +1 -1
- data/lib/views/components/tao_form/components/select/_result.html.erb +1 -1
- metadata +31 -11
- data/config/locales/tao_form/components/datetime/en.yml +0 -5
- data/config/locales/tao_form/components/datetime/zh-CN.yml +0 -5
- data/lib/views/components/tao_form/components/_select.html.erb +0 -4
@@ -16,12 +16,12 @@ class Tao.Form.Select.ResultBase extends TaoComponent
|
|
16
16
|
|
17
17
|
_bind: ->
|
18
18
|
@on 'click', 'select', =>
|
19
|
-
@
|
19
|
+
@namespacedTrigger 'activeClick'
|
20
20
|
false
|
21
21
|
|
22
22
|
@on 'click', '.link-clear', (e) =>
|
23
23
|
return if @disabled
|
24
|
-
@
|
24
|
+
@clearSelected() && @namespacedTrigger('clear')
|
25
25
|
false
|
26
26
|
|
27
27
|
selectOption: (option) ->
|
@@ -40,6 +40,9 @@ class Tao.Form.Select.ResultBase extends TaoComponent
|
|
40
40
|
@jq.find('.selected-text').text ''
|
41
41
|
true
|
42
42
|
|
43
|
+
clearSelected: ->
|
44
|
+
@unselectOption()
|
45
|
+
|
43
46
|
_setSelectedOption: (option) ->
|
44
47
|
@field.find('option:selected').prop 'selected', false
|
45
48
|
return unless option
|
@@ -52,6 +55,3 @@ class Tao.Form.Select.ResultBase extends TaoComponent
|
|
52
55
|
$option = $('<option>', test: option.text, value: option.value).appendTo(@field)
|
53
56
|
@field.trigger 'tao:addOption', option, $option
|
54
57
|
$option
|
55
|
-
|
56
|
-
clear: ->
|
57
|
-
@unselectOption()
|
@@ -9,10 +9,14 @@ class Tao.Form.SwitchBase extends TaoComponent
|
|
9
9
|
@_bind()
|
10
10
|
|
11
11
|
_bind: ->
|
12
|
+
@on 'change', 'input[type=checkbox]', (e) =>
|
13
|
+
@namespacedTrigger 'change'
|
14
|
+
null
|
15
|
+
|
12
16
|
@on 'click', '.switch-wrapper', (e) =>
|
13
17
|
if @field.is(':enabled')
|
14
18
|
@_toggleChecked()
|
15
|
-
@
|
19
|
+
@namespacedTrigger 'change'
|
16
20
|
false
|
17
21
|
|
18
22
|
_disconnected: ->
|
@@ -0,0 +1,23 @@
|
|
1
|
+
Tao.Application.initializer 'moment', (app) ->
|
2
|
+
if moment? && app.locale
|
3
|
+
moment.locale(app.locale.toLowerCase())
|
4
|
+
|
5
|
+
if moment?.tz? && app.timeZone
|
6
|
+
moment.tz.setDefault(app.timeZone)
|
7
|
+
|
8
|
+
Tao.AttributeManager.registerAttribute 'moment',
|
9
|
+
get: (element, name, options) ->
|
10
|
+
value = element.getAttribute name
|
11
|
+
if _.isString value
|
12
|
+
try
|
13
|
+
moment value
|
14
|
+
catch e
|
15
|
+
options.default || null
|
16
|
+
else
|
17
|
+
options.default || null
|
18
|
+
set: (element, name, val, options) ->
|
19
|
+
val = try
|
20
|
+
val.format()
|
21
|
+
catch e
|
22
|
+
''
|
23
|
+
element.setAttribute name, val
|
@@ -0,0 +1,20 @@
|
|
1
|
+
@import 'tao/form/globals';
|
2
|
+
|
3
|
+
.tao-date-range-picker {
|
4
|
+
display: inline-flex;
|
5
|
+
width: 23rem;
|
6
|
+
align-items: center;
|
7
|
+
|
8
|
+
.start-date-picker.tao-moment-picker,
|
9
|
+
.end-date-picker.tao-moment-picker {
|
10
|
+
flex: 1 1 auto;
|
11
|
+
width: 50%;
|
12
|
+
}
|
13
|
+
|
14
|
+
.to {
|
15
|
+
font-size: 0.875rem;
|
16
|
+
color: $lightest-grey-color;
|
17
|
+
margin: 0 0.5rem;
|
18
|
+
}
|
19
|
+
|
20
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
@import 'tao/form/globals';
|
2
2
|
|
3
|
-
tao-datetime-picker {
|
3
|
+
.tao-datetime-picker {
|
4
4
|
display: inline-flex;
|
5
5
|
width: $form-field-width;
|
6
6
|
|
@@ -8,13 +8,13 @@ tao-datetime-picker {
|
|
8
8
|
display: none;
|
9
9
|
}
|
10
10
|
|
11
|
-
tao-date-picker.moment-picker {
|
11
|
+
.tao-date-picker.tao-moment-picker {
|
12
12
|
flex: 0 0 auto;
|
13
13
|
width: 11rem;
|
14
14
|
margin-right: 0.5rem;
|
15
15
|
}
|
16
16
|
|
17
|
-
tao-time-picker.moment-picker {
|
17
|
+
.tao-time-picker.tao-moment-picker {
|
18
18
|
flex: 1 1 auto;
|
19
19
|
width: auto;
|
20
20
|
}
|
@@ -3,7 +3,7 @@
|
|
3
3
|
|
4
4
|
$select-list-offset: 0.375rem;
|
5
5
|
|
6
|
-
tao-moment-picker-segment-list {
|
6
|
+
.tao-moment-picker-segment-list {
|
7
7
|
display: none;
|
8
8
|
flex-direction: column;
|
9
9
|
position: absolute;
|
@@ -37,7 +37,7 @@ tao-moment-picker-segment-list {
|
|
37
37
|
}
|
38
38
|
|
39
39
|
.segments {
|
40
|
-
.segment {
|
40
|
+
.tao-moment-picker-segment {
|
41
41
|
margin: 0 0.5rem;
|
42
42
|
padding: 0.5rem 0;
|
43
43
|
|
@@ -1,13 +1,13 @@
|
|
1
1
|
@import 'tao/form/globals';
|
2
2
|
@import 'tao/form/shared/fields/select/list';
|
3
3
|
|
4
|
-
tao-select-list {
|
4
|
+
.tao-select-list {
|
5
5
|
display: none;
|
6
6
|
flex-direction: column;
|
7
7
|
position: absolute;
|
8
8
|
top: 100%;
|
9
9
|
left: 0;
|
10
|
-
min-width:
|
10
|
+
min-width: 100%;
|
11
11
|
border: 1px solid $border-color;
|
12
12
|
box-shadow: 0 0 6px 0 rgba(0,0,0,0.2);
|
13
13
|
z-index: $z-index-popover;
|
@@ -51,11 +51,5 @@ tao-select-list {
|
|
51
51
|
.options-list {
|
52
52
|
display: flex;
|
53
53
|
flex-direction: column;
|
54
|
-
|
55
|
-
.option {
|
56
|
-
&:hover {
|
57
|
-
background: $grey-bg-color;
|
58
|
-
}
|
59
|
-
}
|
60
54
|
}
|
61
55
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
@import 'tao/form/globals';
|
2
2
|
|
3
|
-
tao-select-result {
|
3
|
+
.tao-select-result {
|
4
4
|
display: flex;
|
5
5
|
align-items: center;
|
6
6
|
justify-content: space-between;
|
@@ -92,7 +92,7 @@ tao-select-result {
|
|
92
92
|
display: flex;
|
93
93
|
}
|
94
94
|
|
95
|
-
.icon-
|
95
|
+
.arrow-icon-wrapper {
|
96
96
|
display: none;
|
97
97
|
}
|
98
98
|
}
|
@@ -1,12 +1,14 @@
|
|
1
1
|
@import 'tao/form/globals';
|
2
2
|
@import 'tao/form/shared/fields/switch';
|
3
3
|
|
4
|
-
tao-switch {
|
4
|
+
.tao-switch {
|
5
5
|
.switch-wrapper {
|
6
|
+
outline: none;
|
7
|
+
|
6
8
|
&:focus {
|
7
|
-
|
8
|
-
|
9
|
-
|
9
|
+
.switch-toggle {
|
10
|
+
box-shadow: 0px 0px 4px 0px rgba(#4A90E2, 0.5);
|
11
|
+
}
|
10
12
|
}
|
11
13
|
}
|
12
14
|
}
|
@@ -33,10 +33,6 @@
|
|
33
33
|
align-content: flex-start;
|
34
34
|
margin: 0 0 0.75rem 0;
|
35
35
|
|
36
|
-
&.hidden {
|
37
|
-
display: none;
|
38
|
-
}
|
39
|
-
|
40
36
|
&:last-child {
|
41
37
|
margin-bottom: 0;
|
42
38
|
}
|
@@ -80,6 +76,10 @@
|
|
80
76
|
color: $text-color;
|
81
77
|
}
|
82
78
|
|
79
|
+
.input-field {
|
80
|
+
font-size: $form-field-font-size;
|
81
|
+
}
|
82
|
+
|
83
83
|
& > .bottom-hint {
|
84
84
|
display: block;
|
85
85
|
color: $lighter-grey-color;
|
@@ -0,0 +1,18 @@
|
|
1
|
+
@import 'tao/form/mobile/globals';
|
2
|
+
|
3
|
+
.tao-date-range-picker {
|
4
|
+
display: inline-block;
|
5
|
+
|
6
|
+
.start-date-picker.tao-moment-picker,
|
7
|
+
.end-date-picker.tao-moment-picker {
|
8
|
+
display: block;
|
9
|
+
}
|
10
|
+
|
11
|
+
.to {
|
12
|
+
display: block;
|
13
|
+
font-size: 0.875rem;
|
14
|
+
color: $lightest-grey-color;
|
15
|
+
padding: 0 0.75rem 0 0;
|
16
|
+
text-align: right;
|
17
|
+
}
|
18
|
+
}
|
@@ -1,17 +1,17 @@
|
|
1
1
|
@import 'tao/form/mobile/globals';
|
2
2
|
|
3
|
-
tao-datetime-picker {
|
3
|
+
.tao-datetime-picker {
|
4
4
|
display: inline-block;
|
5
5
|
|
6
6
|
& > input[type='datetime-local'] {
|
7
7
|
display: none;
|
8
8
|
}
|
9
9
|
|
10
|
-
tao-date-picker.moment-picker {
|
10
|
+
.tao-date-picker.tao-moment-picker {
|
11
11
|
display: block;
|
12
12
|
}
|
13
13
|
|
14
|
-
tao-time-picker.moment-picker {
|
14
|
+
.tao-time-picker.tao-moment-picker {
|
15
15
|
display: block;
|
16
16
|
}
|
17
17
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
@import 'tao/form/mobile/globals';
|
2
2
|
@import 'tao/form/shared/fields/moment_picker/segment_list';
|
3
3
|
|
4
|
-
tao-moment-picker-segment-list {
|
4
|
+
.tao-moment-picker-segment-list {
|
5
5
|
display: block;
|
6
6
|
|
7
7
|
.link-clear {
|
@@ -35,7 +35,7 @@ tao-moment-picker-segment-list {
|
|
35
35
|
}
|
36
36
|
|
37
37
|
.segments {
|
38
|
-
.segment {
|
38
|
+
.tao-moment-picker-segment {
|
39
39
|
overflow: auto;
|
40
40
|
-webkit-overflow-scrolling: touch;
|
41
41
|
border-color: $light-line-color;
|