From 55dd2dda55c445c728bbc430c6be88b4a0a6328e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 31 Aug 2017 17:45:51 +0800 Subject: [PATCH] =?UTF-8?q?css=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/widget.css | 24 +++---- dist/bundle.css | 24 +++---- dist/widget.css | 24 +++---- public/less/app.less | 2 +- src/css/widget/pagetable/pagetable.cell.css | 12 ++-- src/css/widget/previewtable/previewtable.css | 12 ++-- src/less/base/foundation/bi.message.less | 2 +- src/less/resource/app.less | 2 +- src/less/typographic.less | 22 ++++-- src/less/widget/pagetable/pagetable.cell.less | 2 +- .../widget/previewtable/previewtable.less | 2 +- uidoc/core/layout/border.md | 70 ++----------------- .../core/layout/left_right_vertical_adapt.md | 12 ---- uidoc/detailed/date/custom_date_time.md | 41 +++++++++++ uidoc/detailed/file_manager.md | 43 ++++++++++++ uidoc/detailed/path/direction_path_chooser.md | 36 ++++++++++ uidoc/detailed/path/path_chooser.md | 37 ++++++++++ uidoc/detailed/relation_view.md | 31 ++++++++ 18 files changed, 261 insertions(+), 137 deletions(-) diff --git a/bi/widget.css b/bi/widget.css index d07adc5bfa..4c081f9d40 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -257,12 +257,12 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-page-table-cell { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -278,12 +278,12 @@ max-width: 220px; } .bi-preview-table { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/dist/bundle.css b/dist/bundle.css index 59cd85729a..2a7ac0026e 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3026,12 +3026,12 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-page-table-cell { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -3047,12 +3047,12 @@ li.CodeMirror-hint-active { max-width: 220px; } .bi-preview-table { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/dist/widget.css b/dist/widget.css index d07adc5bfa..4c081f9d40 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -257,12 +257,12 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-page-table-cell { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -278,12 +278,12 @@ max-width: 220px; } .bi-preview-table { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/public/less/app.less b/public/less/app.less index 6df89e13bd..458843c6ba 100644 --- a/public/less/app.less +++ b/public/less/app.less @@ -22,7 +22,7 @@ body { top: 0; left: 0; background-repeat: repeat; - .user-select(none); + .user-select-disable(); color: @color-bi-text-normal; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; -webkit-font-smoothing: antialiased; diff --git a/src/css/widget/pagetable/pagetable.cell.css b/src/css/widget/pagetable/pagetable.cell.css index 19a8914b6c..5cfe70bef8 100644 --- a/src/css/widget/pagetable/pagetable.cell.css +++ b/src/css/widget/pagetable/pagetable.cell.css @@ -1,8 +1,8 @@ .bi-page-table-cell { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css index a829e78c0f..2fc0f57bea 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -1,10 +1,10 @@ .bi-preview-table { - -webkit-user-select: initial; - -khtml-user-select: initial; - -moz-user-select: initial; - -ms-user-select: initial; - -o-user-select: initial; - user-select: initial; + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/src/less/base/foundation/bi.message.less b/src/less/base/foundation/bi.message.less index 58394874bb..1a475966be 100644 --- a/src/less/base/foundation/bi.message.less +++ b/src/less/base/foundation/bi.message.less @@ -7,7 +7,7 @@ .bi-message-text { font-size: 16px; - .user-select(text); + .user-select-enable(); } .bi-message-content { diff --git a/src/less/resource/app.less b/src/less/resource/app.less index f9e0456369..3fe14de0c2 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -22,7 +22,7 @@ body { top: 0; left: 0; background-repeat: repeat; - .user-select(none); + .user-select-disable(); color: @color-bi-text-normal; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; -webkit-font-smoothing: antialiased; diff --git a/src/less/typographic.less b/src/less/typographic.less index f2cb38f7e2..d40a717816 100644 --- a/src/less/typographic.less +++ b/src/less/typographic.less @@ -25,11 +25,19 @@ overflow-y: hidden; white-space:nowrap; } -.user-select(@select){ - -webkit-user-select: @select; - -khtml-user-select: @select; - -moz-user-select: @select; - -ms-user-select: @select; - -o-user-select: @select; - user-select: @select; +.user-select-disable(){ + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} +.user-select-enable(){ + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + -o-user-select: text; + user-select: text; } \ No newline at end of file diff --git a/src/less/widget/pagetable/pagetable.cell.less b/src/less/widget/pagetable/pagetable.cell.less index 1628cb8064..7768c93485 100644 --- a/src/less/widget/pagetable/pagetable.cell.less +++ b/src/less/widget/pagetable/pagetable.cell.less @@ -1,5 +1,5 @@ @import "../../bibase"; .bi-page-table-cell { - .user-select(initial); + .user-select-enable(); } \ No newline at end of file diff --git a/src/less/widget/previewtable/previewtable.less b/src/less/widget/previewtable/previewtable.less index b5a5fdee50..1aee1ac662 100644 --- a/src/less/widget/previewtable/previewtable.less +++ b/src/less/widget/previewtable/previewtable.less @@ -1,7 +1,7 @@ @import "../../bibase"; .bi-preview-table { - .user-select(initial); + .user-select-enable(); & > div > table, & > div > div > div > table { & > thead > tr.odd { background-color: @color-bi-background-normal; diff --git a/uidoc/core/layout/border.md b/uidoc/core/layout/border.md index 6714e701fb..2030b1cd1b 100644 --- a/uidoc/core/layout/border.md +++ b/uidoc/core/layout/border.md @@ -7,97 +7,38 @@ {% common %} ```javascript - -Demo = {}; -Demo._createNorth = function(){ - return BI.createWidget({ - type: "bi.label", - text: "North", - cls: "layout-bg1", - height: 30 - }) -}; -Demo._createWest = function(){ - return BI.createWidget({ - type: "bi.center", - cls: "layout-bg2", - items:[{ - type: "bi.label", - text: "West", - whiteSpace: "normal" - }] - }) -}; - -Demo._createCenter = function(){ - return BI.createWidget({ - type: "bi.center", - cls: "layout-bg3", - items: [{ - type: "bi.label", - text: "Center", - whiteSpace: "normal" - }] - }) -}; - -Demo._createEast = function(){ - return BI.createWidget({ - type: "bi.center", - cls: "layout-bg5", - items: [{ - type: "bi.label", - text: "East", - whiteSpace: "normal" - }] - }) -}; - -Demo._createSouth = function(){ - return BI.createWidget({ - type: "bi.label", - text: "South", - cls: "layout-bg6", - height: 50 - }) -}; - BI.createWidget({ type: 'bi.border', element: "#wrapper", - cls: "", items: { north: { - el: Demo._createNorth(), + el: {type: "bi.label"}, height: 30, top: 20, left: 20, right: 20 }, south: { - el: Demo._createSouth(), + el: {type: "bi.label"}, height: 50, bottom: 20, left: 20, right: 20 }, west: { - el: Demo._createWest(), + el: {type: "bi.label"}, width: 200, left: 20 }, east: { - el: Demo._createEast(), + el: {type: "bi.label"}, width: 300, right: 20 }, - center: Demo._createCenter() + center: {el: {type: "bi.label"}} } }); - - - ``` {% endmethod %} @@ -110,5 +51,4 @@ BI.createWidget({ | :------ |:------------- | :----- | :----|:---- | items | 子控件对象 | object | north,east,west,south,center | | | - --- \ No newline at end of file diff --git a/uidoc/core/layout/left_right_vertical_adapt.md b/uidoc/core/layout/left_right_vertical_adapt.md index 4b3e090b1a..55099b0671 100644 --- a/uidoc/core/layout/left_right_vertical_adapt.md +++ b/uidoc/core/layout/left_right_vertical_adapt.md @@ -21,12 +21,6 @@ BI.createWidget({ cls: "layout-bg1", width: 100, height: 30 - }, { - type: "bi.label", - text: "左边的垂直居中", - cls: "layout-bg2", - width: 100, - height: 30 }], right: [{ type: "bi.label", @@ -34,12 +28,6 @@ BI.createWidget({ cls: "layout-bg1", width: 100, height: 30 - }, { - type: "bi.label", - text: "右边的垂直居中", - cls: "layout-bg2", - width: 100, - height: 30 }] } }); diff --git a/uidoc/detailed/date/custom_date_time.md b/uidoc/detailed/date/custom_date_time.md index 6491740b63..679760ae91 100644 --- a/uidoc/detailed/date/custom_date_time.md +++ b/uidoc/detailed/date/custom_date_time.md @@ -1,2 +1,43 @@ # custom_date_time +## 带方向的路径选择 + +{% method %} +[source](https://jsfiddle.net/fineui/04h6gsps/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.direction_path_chooser", + element: "#wrapper", + items: [[{ + "region": "合同信息", + "text": "客户ID", + "value": "defa1f7ba8b2684a客户ID" + }, { + "region": "客户信息", + "text": "主键", + "value": "1f4711c201ef1842", + "direction": -1 + }, { + "region": "合同的回款信息", + "text": "合同ID", + "value": "e351e9f1d8147947合同ID", + "direction": -1 + }]] +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| items |二维数组,每个元素代表一条路径,相较于[path_chooser](path_chooser.md)多一个属性direction来指定方向 | array| | | +--- --- +type: "bi.year_month_combo", + ref: function (_ref) { + self.widget = _ref; + }, + width: 300 \ No newline at end of file diff --git a/uidoc/detailed/file_manager.md b/uidoc/detailed/file_manager.md index 0ba990ce28..e00fdfc28c 100644 --- a/uidoc/detailed/file_manager.md +++ b/uidoc/detailed/file_manager.md @@ -1,2 +1,45 @@ # file_manager +## 文件管理器 + +{% method %} +[source](https://jsfiddle.net/fineui/2g4k0kxh/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.file_manager", + items: [{ + id: "1", + value: "1", + text: "根目录" + }, { + id: "11", + pId: "1", + value: "11", + text: "第一级子目录1" + }, { + id: "12", + pId: "1", + value: "12", + text: "第一级子目录2" + }] +}) +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| + +--- --- + +##方法 + +| 方法 | 说明 | +| :------ |:------------- | +| getSelectedValue() | 获取当前选中项的value值 | +| getSelectedId | 获取当前选中项的id属性 | +--- --- \ No newline at end of file diff --git a/uidoc/detailed/path/direction_path_chooser.md b/uidoc/detailed/path/direction_path_chooser.md index 5aa629be36..f1336587e5 100644 --- a/uidoc/detailed/path/direction_path_chooser.md +++ b/uidoc/detailed/path/direction_path_chooser.md @@ -1,2 +1,38 @@ # direction_path_chooser +## 带方向的路径选择 + +{% method %} +[source](https://jsfiddle.net/fineui/04h6gsps/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.direction_path_chooser", + element: "#wrapper", + items: [[{ + "region": "合同信息", + "text": "客户ID", + "value": "defa1f7ba8b2684a客户ID" + }, { + "region": "客户信息", + "text": "主键", + "value": "1f4711c201ef1842", + "direction": -1 + }, { + "region": "合同的回款信息", + "text": "合同ID", + "value": "e351e9f1d8147947合同ID", + "direction": -1 + }]] +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| items |二维数组,每个元素代表一条路径,相较于[path_chooser](path_chooser.md)多一个属性direction来指定方向 | array| | | +--- --- \ No newline at end of file diff --git a/uidoc/detailed/path/path_chooser.md b/uidoc/detailed/path/path_chooser.md index d3a9e87089..21977202c7 100644 --- a/uidoc/detailed/path/path_chooser.md +++ b/uidoc/detailed/path/path_chooser.md @@ -1,2 +1,39 @@ # path_chooser +## 路径选择 + +{% method %} +[source](https://jsfiddle.net/fineui/5519b4xo/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.path_chooser", + element: "#wrapper", + items: [[{ + "region": "8c4460bc3605685e", + "regionText": "采购订单XXX", + "text": "ID", + "value": "1" + }, { + "region": "0fbd0dc648f41e97", + "regionText": "采购订单", + "text": "学号", + "value": "3" + }, { + "region": "c6d72d6c7e19a667", + "regionText": "供应商基本信息", + "text": "ID", + "value": "5" + }]] +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| +| items |二维数组,每个元素代表一条路径 | array| | | +--- --- \ No newline at end of file diff --git a/uidoc/detailed/relation_view.md b/uidoc/detailed/relation_view.md index 8a5149a4c6..e6073f9f09 100644 --- a/uidoc/detailed/relation_view.md +++ b/uidoc/detailed/relation_view.md @@ -1,2 +1,33 @@ # relation_view +## 关联视图 + +{% method %} +[source](https://jsfiddle.net/fineui/k19mvL7q/) + +{% common %} +```javascript +BI.createWidget({ + type: "bi.relation_view", + items: [{ + primary: { + region: "B", regionText: "比", + title: "b2...", + value: "b2", text: "b2字段" + }, + foreign: {region: "C", value: "c1", text: "c1字段"} + }, { + primary: {region: "A", value: "a1", text: "a1字段"}, + foreign: {region: "C", value: "c2", text: "c2字段"} + }] +}); +``` + +{% endmethod %} + +##参数 + +| 参数 | 说明 | 类型 | 可选值 | 默认值 +| :------ |:------------- | :-----| :----|:----| + +--- --- \ No newline at end of file