From 683e11ae6a2b62e20188c63fe400fc51002171b2 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 30 Aug 2017 19:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E7=BB=86=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/version.js | 5 +- public/js/index.js | 5 +- uidoc/SUMMARY.md | 4 -- uidoc/base/tree/async_tree.md | 2 - uidoc/base/tree/part_tree.md | 2 - uidoc/base/tree/tree_view.md | 2 - uidoc/detailed/dialog.md | 20 ++++++++ uidoc/detailed/down_list_combo.md | 68 ++++++++++++++++++++++++++++ uidoc/detailed/month_combo.md | 24 ++++++++++ uidoc/detailed/multi_select_combo.md | 30 ++++++++++++ uidoc/detailed/node.md | 2 - uidoc/detailed/numeric_interval.md | 34 ++++++++++++++ uidoc/detailed/quarter_combo.md | 23 ++++++++++ uidoc/detailed/year_combo.md | 26 +++++++++++ 14 files changed, 233 insertions(+), 14 deletions(-) delete mode 100644 uidoc/base/tree/async_tree.md delete mode 100644 uidoc/base/tree/part_tree.md delete mode 100644 uidoc/base/tree/tree_view.md delete mode 100644 uidoc/detailed/node.md diff --git a/demo/version.js b/demo/version.js index 36b1da1f42..14d5960de8 100644 --- a/demo/version.js +++ b/demo/version.js @@ -25,5 +25,8 @@ BI.i18n = { "BI-Quarter_1": "第1季度", "BI-Quarter_2": "第2季度", "BI-Quarter_3": "第3季度", - "BI-Quarter_4": "第4季度" + "BI-Quarter_4": "第4季度", + "BI-Basic_Value": "值", + "BI-Load_More": "加载更多", + "BI-Select_All": "全选" }; \ No newline at end of file diff --git a/public/js/index.js b/public/js/index.js index 9f45ca30ec..c3bf5adc76 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -20,5 +20,8 @@ BI.i18n = { "BI-Quarter_1": "第1季度", "BI-Quarter_2": "第2季度", "BI-Quarter_3": "第3季度", - "BI-Quarter_4": "第4季度" + "BI-Quarter_4": "第4季度", + "BI-Basic_Value": "值", + "BI-Load_More": "加载更多", + "BI-Select_All": "全选" }; \ No newline at end of file diff --git a/uidoc/SUMMARY.md b/uidoc/SUMMARY.md index 04bf47fb71..b61669ada5 100644 --- a/uidoc/SUMMARY.md +++ b/uidoc/SUMMARY.md @@ -66,10 +66,6 @@ * [multifile_editor](base/editor/multifile_editor.md) * [textarea_editor](base/editor/textarea_editor.md) * [formula_editor](base/editor/formula_editor.md) -* 树 - * [tree_view](base/tree/tree_view.md) - * [async_tree](base/tree/async_tree.md) - * [part_tree](base/tree/part_tree.md) * 表格 * [table_view](base/table/table_view.md) * [grid_table](base/table/grid_table.md) diff --git a/uidoc/base/tree/async_tree.md b/uidoc/base/tree/async_tree.md deleted file mode 100644 index b4cf47d8d8..0000000000 --- a/uidoc/base/tree/async_tree.md +++ /dev/null @@ -1,2 +0,0 @@ -# async_tree - diff --git a/uidoc/base/tree/part_tree.md b/uidoc/base/tree/part_tree.md deleted file mode 100644 index bb60902124..0000000000 --- a/uidoc/base/tree/part_tree.md +++ /dev/null @@ -1,2 +0,0 @@ -# part_tree - diff --git a/uidoc/base/tree/tree_view.md b/uidoc/base/tree/tree_view.md deleted file mode 100644 index 3c3f7fe2aa..0000000000 --- a/uidoc/base/tree/tree_view.md +++ /dev/null @@ -1,2 +0,0 @@ -# tree_view - diff --git a/uidoc/detailed/dialog.md b/uidoc/detailed/dialog.md index 8c41f6d9c1..a9da35a306 100644 --- a/uidoc/detailed/dialog.md +++ b/uidoc/detailed/dialog.md @@ -1,2 +1,22 @@ # dialog +## 对话框 + +{% method %} +[source](https://jsfiddle.net/fineui/9tj0jrpp/) + +{% common %} +```javascript +BI.Msg.alert(title, content) +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| title | 对话框标题 | string | | | +| content | 对话框内容 | string | | | + +--- --- \ No newline at end of file diff --git a/uidoc/detailed/down_list_combo.md b/uidoc/detailed/down_list_combo.md index 729a1e2e53..dd5e9cfa3c 100644 --- a/uidoc/detailed/down_list_combo.md +++ b/uidoc/detailed/down_list_combo.md @@ -1,2 +1,70 @@ # down_list_combo +## 多层下拉列表的下拉框 + +{% method %} +[source](https://jsfiddle.net/fineui/p0hykqo9/) + +{% common %} +```javascript +BI.createWidget({ + type: 'bi.down_list_combo', + element: '#wrapper', + width: 300, + items: [ + [{ + el: { + text: "column 1111", + iconCls1: "check-mark-e-font", + value: 11 + }, + children: [{ + text: "column 1.1", + value: 21, + cls: "dot-e-font", + selected: true + }, { + text: "column 1.222222222222222222222222222222222222", + cls: "dot-e-font", + value: 22, + }] + }], + [{ + el: { + type: "bi.icon_text_icon_item", + text: "column 2", + iconCls1: "chart-type-e-font", + cls: "dot-e-font", + value: 12 + }, + disabled: true, + children: [{ + type: "bi.icon_text_item", + cls: "dot-e-font", + height: 25, + text: "column 2.1", + value: 11 + }, { + text: "column 2.2", + value: 12, + cls: "dot-e-font" + }] + }] + ] +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| el | 自定义下拉框trigger | object | | | +| trigger | 下拉列表的弹出方式 | string | click, hover | click | +| direction | 弹出列表和trigger的位置关系 | string | top | bottom | left | right | top,left | top,right | bottom,left | bottom,right | bottom | +| adjustLength | 弹出列表和trigger的距离 | number | | 0 | + +--- --- + +##具体配置方法见[Combo](../core/combination/bi.combo.md) \ No newline at end of file diff --git a/uidoc/detailed/month_combo.md b/uidoc/detailed/month_combo.md index 9a5dbe9c87..1d8a4b8237 100644 --- a/uidoc/detailed/month_combo.md +++ b/uidoc/detailed/month_combo.md @@ -1,2 +1,26 @@ # month_combo +## 月份选择下拉框 + +{% method %} +[source](https://jsfiddle.net/fineui/u4u04ntn/) + +{% common %} +```javascript +BI.createWidget({ + type: 'bi.month_combo', + element: '#wrapper', + width: 300 +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} | + +--- --- + diff --git a/uidoc/detailed/multi_select_combo.md b/uidoc/detailed/multi_select_combo.md index dee3ccbbe4..154050a989 100644 --- a/uidoc/detailed/multi_select_combo.md +++ b/uidoc/detailed/multi_select_combo.md @@ -1,2 +1,32 @@ # multi_select_combo +## 带确定的复选下拉框 + +{% method %} +[source](https://jsfiddle.net/fineui/oskypvLe/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.multi_select_combo", + element: '#wrapper', + width: 500, + itemsCreator: function(){ + return { + items: [], + hasNext: false + } + } +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| + +## 方法 +| 方法 | 说明 | 用法 | +| ---------------------------- | ---------------- | ------------------------------------ | | \ No newline at end of file diff --git a/uidoc/detailed/node.md b/uidoc/detailed/node.md deleted file mode 100644 index fb1feee2ce..0000000000 --- a/uidoc/detailed/node.md +++ /dev/null @@ -1,2 +0,0 @@ -# node节点 - diff --git a/uidoc/detailed/numeric_interval.md b/uidoc/detailed/numeric_interval.md index 0a249e0655..52430647d1 100644 --- a/uidoc/detailed/numeric_interval.md +++ b/uidoc/detailed/numeric_interval.md @@ -1,2 +1,36 @@ # numeric_interval +## 数值区间控件 + +{% method %} +[source](https://jsfiddle.net/fineui/oskypvLe/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.numerical_interval", + element: '#wrapper', + width: 500 +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| min | 最小值初始值 | number | | 无 | +| max | 最大值初始值 | number | | 无 | +| closeMin | 左区间初始状态 | boolean | | true | +| closeMax | 右区间初始状态 | boolean | | true | + +## 方法 +| 方法 | 说明 | 用法 | +| ---------------------------- | ---------------- | ------------------------------------ | +| isStateValid() | 当前状态是否有效(输入是否合法, 区间是否成立) | | +| setMinEnable(boolean) | 设置左区间输入框disable状态 | | +| setCloseMinEnable(boolean) | 设置左区间开闭combo的disable状态 | | +| setMaxEnable(boolean) | 设置右区间输入框disable状态 | | +| setCloseMaxEnable(boolean) | 设置右区间开闭combo的disable状态 | | +| setNumTip(string) | 设置数值区间的tip提示 | | \ No newline at end of file diff --git a/uidoc/detailed/quarter_combo.md b/uidoc/detailed/quarter_combo.md index 80ed82dbe3..3210b1144e 100644 --- a/uidoc/detailed/quarter_combo.md +++ b/uidoc/detailed/quarter_combo.md @@ -1,2 +1,25 @@ # quarter_combo +## 季度选择下拉框 + +{% method %} +[source](https://jsfiddle.net/fineui/rw7ubwtj/) + +{% common %} +```javascript +BI.createWidget({ + type: 'bi.quarter_combo', + element: '#wrapper', + width: 300 +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} | + +--- --- \ No newline at end of file diff --git a/uidoc/detailed/year_combo.md b/uidoc/detailed/year_combo.md index 6c6056ef3e..eacefabede 100644 --- a/uidoc/detailed/year_combo.md +++ b/uidoc/detailed/year_combo.md @@ -1,2 +1,28 @@ # year_combo +## 年份选择下拉框 + +{% method %} +[source](https://jsfiddle.net/fineui/3na3125L/) + +{% common %} +```javascript +BI.createWidget({ + type: 'bi.year_combo', + element: '#wrapper', + width: 300 +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| behaviors | 自定义下拉列表中item项的行为，如高亮，标红等 | object | | {} | +| min | 限定可选日期的下限 | string | | '1900-01-01' | +| max | 限定可选日期的上限 | string | | '2099-12-31' | + +--- --- +