From 8cebb4436a766d6936dc42ea67e86e32611fc551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Fri, 14 Jul 2017 09:44:13 +0800 Subject: [PATCH] no message --- demo/css/main.css | 3 + demo/js/config/widget.js | 464 +++++++++-------- ...gement.js => demo.adaptive_arrangement.js} | 0 ...ent.js => demo.interactive_arrangement.js} | 0 demo/js/widget/editor/demo.clear_editor.js | 2 +- demo/js/widget/editor/demo.record_editor.js | 2 +- ...ectcombo.js => demo.multi_select_combo.js} | 0 demo/less/main.less | 4 + docs/demo.css | 3 + docs/demo.js | 469 ++++++++++-------- 10 files changed, 510 insertions(+), 437 deletions(-) rename demo/js/widget/arrangment/{demo.adaptivearrangement.js => demo.adaptive_arrangement.js} (100%) rename demo/js/widget/arrangment/{demo.interactivearrangement.js => demo.interactive_arrangement.js} (100%) rename demo/js/widget/multiselect/{demo.multiselectcombo.js => demo.multi_select_combo.js} (100%) diff --git a/demo/css/main.css b/demo/css/main.css index ab550ecc80..60476fa503 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -45,3 +45,6 @@ body { .bi-theme-dark body { background-color: #191B2B; } +.demo-editor { + border: 1px solid #cccccc; +} diff --git a/demo/js/config/widget.js b/demo/js/config/widget.js index e6007fb7a2..86ff37c726 100644 --- a/demo/js/config/widget.js +++ b/demo/js/config/widget.js @@ -1,217 +1,249 @@ Demo.WIDGET_CONFIG = [{ - id: 4, - text: "详细控件", - open: true -}, { - id: 401, - pId: 4, - text: "table" -}, { - pId: 401, - text: "bi.preview_table", - value: "demo.preview_table" -}, { - pId: 401, - text: "bi.responsive_table", - value: "demo.responsive_table" -},{ - pId: 401, - text: "bi.excel_table", - value: "demo.excel_table" -}, { - pId: 4, - text: "bi.path_chooser", - value: "demo.path_chooser" -}, { - pId: 4, - text: "bi.relation_view", - value: "demo.relation_view" -}, { - pId: 4, - text: "bi.date", - value: "demo.date" -},{ - pId: 4, - text: "bi.date_pane_widget", - value: "demo.date_pane" -}, { - pId: 4, - text: "bi.direction_path_chooser", - value: "demo.direction_path_chooser" -}, { - pId: 4, - text: "bi.adaptive_arrangement", - value: "demo.adaptive_arrangement" -}, { - pId: 4, - id: 402, - text: "年份控件", - open: false -}, { - pId: 402, - text: "bi.year_combo", - value: "demo.year" -}, { - pId: 4, - id: 403, - text: "月份控件", - open: false -}, { - pId: 403, - text: "bi.month_combo", - value: "demo.month" -}, { - pId: 4, - id: 404, - text: "季度控件", - open: false -}, { - pId: 404, - text: "bi.quarter_combo", - value: "demo.quarter" -}, { - pId: 4, - id: 405, - text: "下拉列表", - open: false -}, { - pId: 405, - text: "bi.down_list_combo", - value: "demo.down_list" -},{ - pId: 4, - id: 406, - text: "文本框控件", - open: false -}, { - pId: 406, - text: "bi.text_editor", - value: "demo.text_editor" -},{ - pId: 406, - text: "bi.search_editor", - value: "demo.search_editor" -},{ - pId: 406, - text: "bi.sign_initial_editor", - value: "demo.sign_initial_editor" -},{ - pId: 406, - text: "bi.sign_style_editor", - value: "demo.sign_style_editor" -},{ - pId: 406, - text: "bi.state_editor", - value: "demo.state_editor" -},{ - pId: 406, - text: "bi.clear_editor", - value: "demo.clear_editor" -},{ - pId: 406, - text: "bi.record_editor", - value: "demo.record_editor" -},{ - pId: 406, - text: "bi.shelter_editor", - value: "demo.shelter_editor" -}, -{ - pId: 4, - id: 407, - text: "下拉框控件", - open: false -}, { - pId: 407, - text: "bi.text_value_combo", - value: "demo.text_value_combo" -},{ - pId: 407, - text: "bi.text_value_check_combo", - value: "demo.text_value_check_combo" -},{ - pId: 407, - text: "bi.text_value_down_list_combo", - value: "demo.text_value_down_list_combo" -},{ - pId: 407, - text: "bi.static_combo", - value: "demo.static_combo" -},{ - pId: 407, - text: "bi.icon_combo", - value: "demo.icon_combo" -},{ - pId: 407, - text: "bi.formula_combo", - value: "demo.formula_combo" -},{ - pId:4, - id:408, - text:"选择字段列表", - open:false -},{ - pId: 408, - text: "bi.placeholder" -},{ - pId:4, - id:409, - text:"公式编辑器", - open: false -},{ - pId: 409, - text: "bi.placeholder" -},{ - pId:4, - id:410, - text:"数值区间控件" -},{ - pId: 410, - text: "bi.numerical_interval", - value:"demo.numberical_interval" -},{ - pId:4, - id:411, - text:"下拉复选框有确定按钮" -},{ - pId: 411, - text: "bi.multi_select_combo", - value:"demo.multi_select_combo" -},{ - pId:4, - id:412, - text:"简单日期控件" -},{ - pId: 412, - text: "bi.date_combo", - value:"demo.date" -},{ - pId: 412, - text: "bi.date_pane_widget", - value:"demo.date_pane_widget" -},{ - pId:4, - id:413, - text:"简单下拉树" -},{ - pId: 413, - text: "bi.single_tree_combo", - value:"demo.single_tree_combo" -},{ - pId: 413, - text: "bi.multilayer_single_tree_combo", - value:"demo.multilayer_single_tree_combo" -},{ - pId:4, - id:414, - text:"可选下拉树" -},{ - pId: 414, - text: "bi.select_tree_combo", - value:"demo.select_tree_combo" -},{ - pId: 414, - text: "bi.multilayer_select_tree_combo", - value:"demo.multilayer_select_tree_combo" -},]; - + id: 4, + text: "详细控件", + open: true + }, { + id: 400, + pId: 4, + text: "tree" + }, { + pId: 400, + text: "bi.multi_tree_combo", + value: "demo.multi_tree_combo" + }, { + id: 401, + pId: 4, + text: "table" + }, { + pId: 401, + text: "bi.preview_table", + value: "demo.preview_table" + }, { + pId: 401, + text: "bi.responsive_table", + value: "demo.responsive_table" + }, { + pId: 401, + text: "bi.excel_table", + value: "demo.excel_table" + }, { + pId: 4, + id: 402, + text: "年份控件", + open: false + }, { + pId: 402, + text: "bi.year_combo", + value: "demo.year" + }, { + pId: 4, + id: 403, + text: "月份控件", + open: false + }, { + pId: 403, + text: "bi.month_combo", + value: "demo.month" + }, { + pId: 4, + id: 404, + text: "季度控件", + open: false + }, { + pId: 404, + text: "bi.quarter_combo", + value: "demo.quarter" + }, { + pId: 4, + id: 405, + text: "下拉列表", + open: false + }, { + pId: 405, + text: "bi.down_list_combo", + value: "demo.down_list" + }, { + pId: 4, + id: 406, + text: "文本框控件", + open: false + }, { + pId: 406, + text: "bi.text_editor", + value: "demo.text_editor" + }, { + pId: 406, + text: "bi.search_editor", + value: "demo.search_editor" + }, { + pId: 406, + text: "bi.sign_initial_editor", + value: "demo.sign_initial_editor" + }, { + pId: 406, + text: "bi.sign_style_editor", + value: "demo.sign_style_editor" + }, { + pId: 406, + text: "bi.state_editor", + value: "demo.state_editor" + }, { + pId: 406, + text: "bi.clear_editor", + value: "demo.clear_editor" + }, { + pId: 406, + text: "bi.record_editor", + value: "demo.record_editor" + }, { + pId: 406, + text: "bi.shelter_editor", + value: "demo.shelter_editor" + }, + { + pId: 4, + id: 407, + text: "下拉框控件", + open: false + }, { + pId: 407, + text: "bi.text_value_combo", + value: "demo.text_value_combo" + }, { + pId: 407, + text: "bi.text_value_check_combo", + value: "demo.text_value_check_combo" + }, { + pId: 407, + text: "bi.text_value_down_list_combo", + value: "demo.text_value_down_list_combo" + }, { + pId: 407, + text: "bi.static_combo", + value: "demo.static_combo" + }, { + pId: 407, + text: "bi.icon_combo", + value: "demo.icon_combo" + }, { + pId: 407, + text: "bi.formula_combo", + value: "demo.formula_combo" + }, { + pId: 4, + id: 408, + text: "选择字段列表", + open: false + }, { + pId: 408, + text: "bi.placeholder" + }, { + pId: 4, + id: 409, + text: "公式编辑器", + open: false + }, { + pId: 409, + text: "bi.placeholder" + }, { + pId: 4, + id: 410, + text: "数值区间控件" + }, { + pId: 410, + text: "bi.numerical_interval", + value: "demo.numberical_interval" + }, { + pId: 4, + id: 411, + text: "下拉复选框有确定按钮" + }, { + pId: 411, + text: "bi.multi_select_combo", + value: "demo.multi_select_combo" + }, { + pId: 4, + id: 412, + text: "简单日期控件" + }, { + pId: 412, + text: "bi.date_combo", + value: "demo.date" + }, { + pId: 412, + text: "bi.date_pane_widget", + value: "demo.date_pane_widget" + }, { + pId: 412, + text: "bi.year_month_combo", + value: "demo.year_month_combo" + },{ + pId: 412, + text: "bi.year_quarter_combo", + value: "demo.year_quarter_combo" + },{ + pId: 4, + id: 413, + text: "简单下拉树" + }, { + pId: 413, + text: "bi.single_tree_combo", + value: "demo.single_tree_combo" + }, { + pId: 413, + text: "bi.multilayer_single_tree_combo", + value: "demo.multilayer_single_tree_combo" + }, { + pId: 4, + id: 414, + text: "可选下拉树" + }, { + pId: 414, + text: "bi.select_tree_combo", + value: "demo.select_tree_combo" + }, { + pId: 414, + text: "bi.multilayer_select_tree_combo", + value: "demo.multilayer_select_tree_combo" + }, { + pId: 4, + id: 415, + text: "路径选择" + }, { + pId: 415, + text: "bi.path_chooser", + value: "demo.path_chooser" + }, { + pId: 415, + text: "bi.direction_path_chooser", + value: "demo.direction_path_chooser" + }, { + pId: 4, + id: 416, + text: "关联视图" + }, { + pId: 416, + text: "bi.relation_view", + value: "demo.relation_view" + }, { + pId: 4, + id: 417, + text: "布局" + }, { + pId: 417, + text: "bi.adaptive_arrangement", + value: "demo.adaptive_arrangement" + }, { + pId: 417, + text: "bi.interactive_arrangement", + value: "demo.interactive_arrangement" + }, { + pId: 4, + id: 418, + text: "提示对话框" + }, { + pId: 418, + text: "bi.dialog", + value: "demo.dialog" + }, +]; \ No newline at end of file diff --git a/demo/js/widget/arrangment/demo.adaptivearrangement.js b/demo/js/widget/arrangment/demo.adaptive_arrangement.js similarity index 100% rename from demo/js/widget/arrangment/demo.adaptivearrangement.js rename to demo/js/widget/arrangment/demo.adaptive_arrangement.js diff --git a/demo/js/widget/arrangment/demo.interactivearrangement.js b/demo/js/widget/arrangment/demo.interactive_arrangement.js similarity index 100% rename from demo/js/widget/arrangment/demo.interactivearrangement.js rename to demo/js/widget/arrangment/demo.interactive_arrangement.js diff --git a/demo/js/widget/editor/demo.clear_editor.js b/demo/js/widget/editor/demo.clear_editor.js index 5ae29f49b7..c1e3baa655 100644 --- a/demo/js/widget/editor/demo.clear_editor.js +++ b/demo/js/widget/editor/demo.clear_editor.js @@ -10,7 +10,7 @@ Demo.ClearEditor = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.clear_editor", - cls: "editor", + cls: "demo-editor", width: 300, watermark: "这个是带清除按钮的" }], diff --git a/demo/js/widget/editor/demo.record_editor.js b/demo/js/widget/editor/demo.record_editor.js index 90a90d6ea8..0b74ac54c6 100644 --- a/demo/js/widget/editor/demo.record_editor.js +++ b/demo/js/widget/editor/demo.record_editor.js @@ -10,7 +10,7 @@ Demo.RecordEditor = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.record_editor", - cls: "editor", + cls: "demo-editor", width: 300, watermark: "这个是可以记录输入的" }], diff --git a/demo/js/widget/multiselect/demo.multiselectcombo.js b/demo/js/widget/multiselect/demo.multi_select_combo.js similarity index 100% rename from demo/js/widget/multiselect/demo.multiselectcombo.js rename to demo/js/widget/multiselect/demo.multi_select_combo.js diff --git a/demo/less/main.less b/demo/less/main.less index 662c65ed79..505fbe67b3 100644 --- a/demo/less/main.less +++ b/demo/less/main.less @@ -60,4 +60,8 @@ body { .bi-theme-dark body { background-color: @color-bi-background-normal-theme-dark; +} + +.demo-editor{ + border: 1px solid rgb(204, 204, 204); } \ No newline at end of file diff --git a/docs/demo.css b/docs/demo.css index 9b3f8c0bcc..71b16e78d6 100644 --- a/docs/demo.css +++ b/docs/demo.css @@ -48,6 +48,9 @@ body { .bi-theme-dark body { background-color: #191B2B; } +.demo-editor { + border: 1px solid #cccccc; +} .demo-north { background-color: #3c8dbc; } diff --git a/docs/demo.js b/docs/demo.js index 4925ee4bde..d9593e16b0 100644 --- a/docs/demo.js +++ b/docs/demo.js @@ -3338,223 +3338,254 @@ Demo.COMPONENT_CONFIG = [{ text: "pane", value: "demo.pane" }];Demo.WIDGET_CONFIG = [{ - id: 4, - text: "详细控件", - open: true -}, { - id: 401, - pId: 4, - text: "table" -}, { - pId: 401, - text: "bi.preview_table", - value: "demo.preview_table" -}, { - pId: 401, - text: "bi.responsive_table", - value: "demo.responsive_table" -},{ - pId: 401, - text: "bi.excel_table", - value: "demo.excel_table" -}, { - pId: 4, - text: "bi.path_chooser", - value: "demo.path_chooser" -}, { - pId: 4, - text: "bi.relation_view", - value: "demo.relation_view" -}, { - pId: 4, - text: "bi.date", - value: "demo.date" -},{ - pId: 4, - text: "bi.date_pane_widget", - value: "demo.date_pane" -}, { - pId: 4, - text: "bi.direction_path_chooser", - value: "demo.direction_path_chooser" -}, { - pId: 4, - text: "bi.adaptive_arrangement", - value: "demo.adaptive_arrangement" -}, { - pId: 4, - id: 402, - text: "年份控件", - open: false -}, { - pId: 402, - text: "bi.year_combo", - value: "demo.year" -}, { - pId: 4, - id: 403, - text: "月份控件", - open: false -}, { - pId: 403, - text: "bi.month_combo", - value: "demo.month" -}, { - pId: 4, - id: 404, - text: "季度控件", - open: false -}, { - pId: 404, - text: "bi.quarter_combo", - value: "demo.quarter" -}, { - pId: 4, - id: 405, - text: "下拉列表", - open: false -}, { - pId: 405, - text: "bi.down_list_combo", - value: "demo.down_list" -},{ - pId: 4, - id: 406, - text: "文本框控件", - open: false -}, { - pId: 406, - text: "bi.text_editor", - value: "demo.text_editor" -},{ - pId: 406, - text: "bi.search_editor", - value: "demo.search_editor" -},{ - pId: 406, - text: "bi.sign_initial_editor", - value: "demo.sign_initial_editor" -},{ - pId: 406, - text: "bi.sign_style_editor", - value: "demo.sign_style_editor" -},{ - pId: 406, - text: "bi.state_editor", - value: "demo.state_editor" -},{ - pId: 406, - text: "bi.clear_editor", - value: "demo.clear_editor" -},{ - pId: 406, - text: "bi.record_editor", - value: "demo.record_editor" -},{ - pId: 406, - text: "bi.shelter_editor", - value: "demo.shelter_editor" -}, -{ - pId: 4, - id: 407, - text: "下拉框控件", - open: false -}, { - pId: 407, - text: "bi.text_value_combo", - value: "demo.text_value_combo" -},{ - pId: 407, - text: "bi.text_value_check_combo", - value: "demo.text_value_check_combo" -},{ - pId: 407, - text: "bi.text_value_down_list_combo", - value: "demo.text_value_down_list_combo" -},{ - pId: 407, - text: "bi.static_combo", - value: "demo.static_combo" -},{ - pId: 407, - text: "bi.icon_combo", - value: "demo.icon_combo" -},{ - pId: 407, - text: "bi.formula_combo", - value: "demo.formula_combo" -},{ - pId:4, - id:408, - text:"选择字段列表", - open:false -},{ - pId: 408, - text: "bi.placeholder" -},{ - pId:4, - id:409, - text:"公式编辑器", - open: false -},{ - pId: 409, - text: "bi.placeholder" -},{ - pId:4, - id:410, - text:"数值区间控件" -},{ - pId: 410, - text: "bi.numerical_interval", - value:"demo.numberical_interval" -},{ - pId:4, - id:411, - text:"下拉复选框有确定按钮" -},{ - pId: 411, - text: "bi.multi_select_combo", - value:"demo.multi_select_combo" -},{ - pId:4, - id:412, - text:"简单日期控件" -},{ - pId: 412, - text: "bi.date_combo", - value:"demo.date" -},{ - pId: 412, - text: "bi.date_pane_widget", - value:"demo.date_pane_widget" -},{ - pId:4, - id:413, - text:"简单下拉树" -},{ - pId: 413, - text: "bi.single_tree_combo", - value:"demo.single_tree_combo" -},{ - pId: 413, - text: "bi.multilayer_single_tree_combo", - value:"demo.multilayer_single_tree_combo" -},{ - pId:4, - id:414, - text:"可选下拉树" -},{ - pId: 414, - text: "bi.select_tree_combo", - value:"demo.select_tree_combo" -},{ - pId: 414, - text: "bi.multilayer_select_tree_combo", - value:"demo.multilayer_select_tree_combo" -},]; - -Demo.Func = BI.inherit(BI.Widget, { + id: 4, + text: "详细控件", + open: true + }, { + id: 400, + pId: 4, + text: "tree" + }, { + pId: 400, + text: "bi.multi_tree_combo", + value: "demo.multi_tree_combo" + }, { + id: 401, + pId: 4, + text: "table" + }, { + pId: 401, + text: "bi.preview_table", + value: "demo.preview_table" + }, { + pId: 401, + text: "bi.responsive_table", + value: "demo.responsive_table" + }, { + pId: 401, + text: "bi.excel_table", + value: "demo.excel_table" + }, { + pId: 4, + id: 402, + text: "年份控件", + open: false + }, { + pId: 402, + text: "bi.year_combo", + value: "demo.year" + }, { + pId: 4, + id: 403, + text: "月份控件", + open: false + }, { + pId: 403, + text: "bi.month_combo", + value: "demo.month" + }, { + pId: 4, + id: 404, + text: "季度控件", + open: false + }, { + pId: 404, + text: "bi.quarter_combo", + value: "demo.quarter" + }, { + pId: 4, + id: 405, + text: "下拉列表", + open: false + }, { + pId: 405, + text: "bi.down_list_combo", + value: "demo.down_list" + }, { + pId: 4, + id: 406, + text: "文本框控件", + open: false + }, { + pId: 406, + text: "bi.text_editor", + value: "demo.text_editor" + }, { + pId: 406, + text: "bi.search_editor", + value: "demo.search_editor" + }, { + pId: 406, + text: "bi.sign_initial_editor", + value: "demo.sign_initial_editor" + }, { + pId: 406, + text: "bi.sign_style_editor", + value: "demo.sign_style_editor" + }, { + pId: 406, + text: "bi.state_editor", + value: "demo.state_editor" + }, { + pId: 406, + text: "bi.clear_editor", + value: "demo.clear_editor" + }, { + pId: 406, + text: "bi.record_editor", + value: "demo.record_editor" + }, { + pId: 406, + text: "bi.shelter_editor", + value: "demo.shelter_editor" + }, + { + pId: 4, + id: 407, + text: "下拉框控件", + open: false + }, { + pId: 407, + text: "bi.text_value_combo", + value: "demo.text_value_combo" + }, { + pId: 407, + text: "bi.text_value_check_combo", + value: "demo.text_value_check_combo" + }, { + pId: 407, + text: "bi.text_value_down_list_combo", + value: "demo.text_value_down_list_combo" + }, { + pId: 407, + text: "bi.static_combo", + value: "demo.static_combo" + }, { + pId: 407, + text: "bi.icon_combo", + value: "demo.icon_combo" + }, { + pId: 407, + text: "bi.formula_combo", + value: "demo.formula_combo" + }, { + pId: 4, + id: 408, + text: "选择字段列表", + open: false + }, { + pId: 408, + text: "bi.placeholder" + }, { + pId: 4, + id: 409, + text: "公式编辑器", + open: false + }, { + pId: 409, + text: "bi.placeholder" + }, { + pId: 4, + id: 410, + text: "数值区间控件" + }, { + pId: 410, + text: "bi.numerical_interval", + value: "demo.numberical_interval" + }, { + pId: 4, + id: 411, + text: "下拉复选框有确定按钮" + }, { + pId: 411, + text: "bi.multi_select_combo", + value: "demo.multi_select_combo" + }, { + pId: 4, + id: 412, + text: "简单日期控件" + }, { + pId: 412, + text: "bi.date_combo", + value: "demo.date" + }, { + pId: 412, + text: "bi.date_pane_widget", + value: "demo.date_pane_widget" + }, { + pId: 412, + text: "bi.year_month_combo", + value: "demo.year_month_combo" + },{ + pId: 412, + text: "bi.year_quarter_combo", + value: "demo.year_quarter_combo" + },{ + pId: 4, + id: 413, + text: "简单下拉树" + }, { + pId: 413, + text: "bi.single_tree_combo", + value: "demo.single_tree_combo" + }, { + pId: 413, + text: "bi.multilayer_single_tree_combo", + value: "demo.multilayer_single_tree_combo" + }, { + pId: 4, + id: 414, + text: "可选下拉树" + }, { + pId: 414, + text: "bi.select_tree_combo", + value: "demo.select_tree_combo" + }, { + pId: 414, + text: "bi.multilayer_select_tree_combo", + value: "demo.multilayer_select_tree_combo" + }, { + pId: 4, + id: 415, + text: "路径选择" + }, { + pId: 415, + text: "bi.path_chooser", + value: "demo.path_chooser" + }, { + pId: 415, + text: "bi.direction_path_chooser", + value: "demo.direction_path_chooser" + }, { + pId: 4, + id: 416, + text: "关联视图" + }, { + pId: 416, + text: "bi.relation_view", + value: "demo.relation_view" + }, { + pId: 4, + id: 417, + text: "布局" + }, { + pId: 417, + text: "bi.adaptive_arrangement", + value: "demo.adaptive_arrangement" + }, { + pId: 417, + text: "bi.interactive_arrangement", + value: "demo.interactive_arrangement" + }, { + pId: 4, + id: 418, + text: "提示对话框" + }, { + pId: 418, + text: "bi.dialog", + value: "demo.dialog" + }, +];Demo.Func = BI.inherit(BI.Widget, { props: { baseCls: "demo-func" }, @@ -6792,7 +6823,7 @@ Demo.ClearEditor = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.clear_editor", - cls: "editor", + cls: "demo-editor", width: 300, watermark: "这个是带清除按钮的" }], @@ -6813,7 +6844,7 @@ Demo.RecordEditor = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.record_editor", - cls: "editor", + cls: "demo-editor", width: 300, watermark: "这个是可以记录输入的" }],