fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

es6
iapyang 7 years ago
parent
510ae7fac3 2a213d2dd3
commit
9f718b7523
13 changed files with 140 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Gruntfile.js
  2. 56
      dist/bundle.js
  3. 2
      dist/bundle.min.css
  4. 16
      dist/bundle.min.js
  5. 15
      uidoc/SUMMARY.md
  6. 27
      uidoc/detailed/date/custom_date_time.md
  7. 21
      uidoc/detailed/date/date_combo.md
  8. 24
      uidoc/detailed/date/date_pane_widget.md
  9. 22
      uidoc/detailed/date/year_month_combo.md
  10. 22
      uidoc/detailed/date/year_quarter_combo.md
  11. 2
      uidoc/detailed/month_combo.md
  12. 2
      uidoc/detailed/quarter_combo.md
  13. 2
      uidoc/detailed/year_combo.md

2
Gruntfile.js
Unescape View File

@ -99,7 +99,7 @@ module.exports = function (grunt) {
},
bundleJs: {
src: ['dist/core.js', 'dist/base.js', 'dist/case.js', 'dist/widget.js', 'public/js/**/*.js'],
src: ['public/js/index.js', 'dist/core.js', 'dist/base.js', 'dist/case.js', 'dist/widget.js', 'public/js/**/*.js'],
dest: 'dist/bundle.js'
},

56
dist/bundle.js vendored
Unescape View File

@ -1,4 +1,30 @@
/*!
BI.servletURL = "https://fanruan.coding.me/fineui/dist/";
BI.resourceURL = "https://fanruan.coding.me/fineui/dist/resource/";
BI.i18n = {
"BI-Basic_OK": "确定",
"BI-Basic_Sure": "确定",
"BI-Basic_Clears": "清空",
"BI-Basic_Cancel": "取消",
"BI-Basic_Time": "时间",
"BI-Basic_Simple_Sunday": "日",
"BI-Basic_Simple_Monday": "一",
"BI-Basic_Simple_Tuesday": "二",
"BI-Basic_Simple_Wednesday": "三",
"BI-Basic_Simple_Thursday": "四",
"BI-Basic_Simple_Friday": "五",
"BI-Basic_Simple_Saturday": "六",
"BI-Multi_Date_Year": "年",
"BI-Multi_Date_Month": "月",
"BI-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"BI-Quarter_1": "第1季度",
"BI-Quarter_2": "第2季度",
"BI-Quarter_3": "第3季度",
"BI-Quarter_4": "第4季度",
"BI-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选"
};/*!
* jQuery JavaScript Library v1.9.1
* http://jquery.com/
*
@ -93647,30 +93673,4 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, {
}
});
BI.ValueChooserPane.EVENT_CHANGE = "ValueChooserPane.EVENT_CHANGE";
BI.shortcut('bi.value_chooser_pane', BI.ValueChooserPane);BI.servletURL = "https://fanruan.coding.me/fineui/dist/";
BI.resourceURL = "https://fanruan.coding.me/fineui/dist/resource/";
BI.i18n = {
"BI-Basic_OK": "确定",
"BI-Basic_Sure": "确定",
"BI-Basic_Clears": "清空",
"BI-Basic_Cancel": "取消",
"BI-Basic_Time": "时间",
"BI-Basic_Simple_Sunday": "日",
"BI-Basic_Simple_Monday": "一",
"BI-Basic_Simple_Tuesday": "二",
"BI-Basic_Simple_Wednesday": "三",
"BI-Basic_Simple_Thursday": "四",
"BI-Basic_Simple_Friday": "五",
"BI-Basic_Simple_Saturday": "六",
"BI-Multi_Date_Year": "年",
"BI-Multi_Date_Month": "月",
"BI-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"BI-Quarter_1": "第1季度",
"BI-Quarter_2": "第2季度",
"BI-Quarter_3": "第3季度",
"BI-Quarter_4": "第4季度",
"BI-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选"
};
BI.shortcut('bi.value_chooser_pane', BI.ValueChooserPane);

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
uidoc/SUMMARY.md
Unescape View File

@ -5,21 +5,20 @@
## 核心控件
* 布局
* [vertical](core/layout/vertical.md)
* [horizontal](core/layout/horizontal.md)
* [htape](core/layout/htape.md)
* [vtape](core/layout/vtape.md)
* [center_adapt](core/layout/center_adapt.md)
* [vertical_adapt](core/layout/vertical_adapt.md)
* [left_right_vertical_adapt](core/layout/left_right_vertical_adapt.md)
* [flow](core/layout/flow.md)
* [center](core/layout/center.md)
* [horizontal_adapt](core/layout/horizontal_adapt.md)
* [horizontal_auto](core/layout/horizontal_auto.md)
* [horizontal_float](core/layout/horizontal_float.md)
* [left_right_vertical_adapt](core/layout/left_right_vertical_adapt.md)
* [center](core/layout/center.md)
* [float_center](core/layout/float_center.md)
* [vertical](core/layout/vertical.md)
* [horizontal](core/layout/horizontal.md)
* [border](core/layout/border.md)
* [flow](core/layout/flow.md)
* [inline](core/layout/inline.md)
* [htape](core/layout/htape.md)
* [vtape](core/layout/vtape.md)
* [grid](core/layout/grid.md)
* [table](core/layout/table.md)
* [td](core/layout/td.md)

27
uidoc/detailed/date/custom_date_time.md
Unescape View File

@ -1,30 +1,15 @@
# custom_date_time
## 带方向的路径选择
## 日期选择下拉框（可以选择时分秒）
{% method %}
[source](https://jsfiddle.net/fineui/04h6gsps/)
[source](https://jsfiddle.net/fineui/2d9dcxov/)
{% common %}
```javascript
BI.createWidget({
type: "bi.direction_path_chooser",
type: "bi.custom_date_time_combo",
element: "#wrapper",
items: [[{
"region": "合同信息",
"text": "客户ID",
"value": "defa1f7ba8b2684a客户ID"
}, {
"region": "客户信息",
"text": "主键",
"value": "1f4711c201ef1842",
"direction": -1
}, {
"region": "合同的回款信息",
"text": "合同ID",
"value": "e351e9f1d8147947合同ID",
"direction": -1
}]]
});
```
@ -34,10 +19,4 @@ BI.createWidget({
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| items |二维数组,每个元素代表一条路径,相较于[path_chooser](path_chooser.md)多一个属性direction来指定方向 | array| | |
--- ---
type: "bi.year_month_combo",
ref: function (_ref) {
self.widget = _ref;
},
width: 300

21
uidoc/detailed/date/date_combo.md
Unescape View File

@ -1,2 +1,23 @@
# date_combo
##日期选择下拉框（弹出的年月选择可以进一步选择日期）
{% method %}
[source](https://jsfiddle.net/fineui/ebps32uy/)
{% common %}
```javascript
BI.createWidget({
type: "bi.date_combo",
element: "#wrapper",
width: 300
});
```
{% endmethod %}
##参数
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
--- ---

24
uidoc/detailed/date/date_pane_widget.md
Unescape View File

@ -1,2 +1,26 @@
# date_pane_widget
##日期选择下拉框的弹出面板
{% method %}
[source](https://jsfiddle.net/fineui/rL9005u6/)
{% common %}
```javascript
BI.createWidget({
type: "bi.date_pane_widget",
element: "#wrapper",
width: 300
});
```
{% endmethod %}
##参数
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| min | 限定可选日期的下限 | string | | '1900-01-01' |
| max | 限定可选日期的上限 | string | | '2099-12-31' |
| selectedTime | 选中的初始年月 | obj({year: y, month: m}) | | |
--- ---

22
uidoc/detailed/date/year_month_combo.md
Unescape View File

@ -1,2 +1,24 @@
# year_month_combo
##年月选择下拉框
{% method %}
[source](https://jsfiddle.net/fineui/ehvjj3xt/)
{% common %}
```javascript
BI.createWidget({
type: "bi.year_month_combo",
width: 300
});
```
{% endmethod %}
##参数
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| yearBehaviors |自定义年份选择的行为(详见[button_group](../../core/abstract/button_group.md)) | object| | |
| monthBehaviors |自定义年份选择的行为(详见[button_group](../../core/abstract/button_group.md)) | object| | |
--- ---

22
uidoc/detailed/date/year_quarter_combo.md
Unescape View File

@ -1,2 +1,24 @@
# year_quarter_combo
##年季度选择下拉框
{% method %}
[source](https://jsfiddle.net/fineui/xe6Lt6mo/)
{% common %}
```javascript
BI.createWidget({
type: "bi.year_quarter_combo",
width: 300
});
```
{% endmethod %}
##参数
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| yearBehaviors |自定义年份选择的行为(详见[button_group](../../core/abstract/button_group.md)) | object| | |
| monthBehaviors |自定义年份选择的行为(详见[button_group](../../core/abstract/button_group.md)) | object| | |
--- ---

2
uidoc/detailed/month_combo.md
Unescape View File

@ -20,7 +20,7 @@ BI.createWidget({
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} |
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等(详见[button_group](../core/abstract/button_group.md)) | object | | {} |
--- ---

2
uidoc/detailed/quarter_combo.md
Unescape View File

@ -20,6 +20,6 @@ BI.createWidget({
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} |
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等(详见[button_group](../core/abstract/button_group.md)) | object | | {} |
--- ---

2
uidoc/detailed/year_combo.md
Unescape View File

@ -20,7 +20,7 @@ BI.createWidget({
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} |
| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等(详见[button_group](../core/abstract/button_group.md)) | object | | {} |
| min | 限定可选日期的下限 | string | | '1900-01-01' |
| max | 限定可选日期的上限 | string | | '2099-12-31' |

Write Preview
Loading…
Cancel
Save