Browse Source

Merge pull request #120 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '55dd2dda55c445c728bbc430c6be88b4a0a6328e':
  css编译
es6
windy 7 years ago
parent
commit
13a1861af6
  1. 24
      bi/widget.css
  2. 24
      dist/bundle.css
  3. 24
      dist/widget.css
  4. 2
      public/less/app.less
  5. 12
      src/css/widget/pagetable/pagetable.cell.css
  6. 12
      src/css/widget/previewtable/previewtable.css
  7. 2
      src/less/base/foundation/bi.message.less
  8. 2
      src/less/resource/app.less
  9. 22
      src/less/typographic.less
  10. 2
      src/less/widget/pagetable/pagetable.cell.less
  11. 2
      src/less/widget/previewtable/previewtable.less
  12. 70
      uidoc/core/layout/border.md
  13. 12
      uidoc/core/layout/left_right_vertical_adapt.md
  14. 41
      uidoc/detailed/date/custom_date_time.md
  15. 43
      uidoc/detailed/file_manager.md
  16. 36
      uidoc/detailed/path/direction_path_chooser.md
  17. 37
      uidoc/detailed/path/path_chooser.md
  18. 31
      uidoc/detailed/relation_view.md

24
bi/widget.css

@ -257,12 +257,12 @@
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-page-table-cell { .bi-page-table-cell {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -278,12 +278,12 @@
max-width: 220px; max-width: 220px;
} }
.bi-preview-table { .bi-preview-table {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {

24
dist/bundle.css vendored

@ -3026,12 +3026,12 @@ li.CodeMirror-hint-active {
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-page-table-cell { .bi-page-table-cell {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -3047,12 +3047,12 @@ li.CodeMirror-hint-active {
max-width: 220px; max-width: 220px;
} }
.bi-preview-table { .bi-preview-table {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {

24
dist/widget.css vendored

@ -257,12 +257,12 @@
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-page-table-cell { .bi-page-table-cell {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
@ -278,12 +278,12 @@
max-width: 220px; max-width: 220px;
} }
.bi-preview-table { .bi-preview-table {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {

2
public/less/app.less

@ -22,7 +22,7 @@ body {
top: 0; top: 0;
left: 0; left: 0;
background-repeat: repeat; background-repeat: repeat;
.user-select(none); .user-select-disable();
color: @color-bi-text-normal; color: @color-bi-text-normal;
font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;

12
src/css/widget/pagetable/pagetable.cell.css

@ -1,8 +1,8 @@
.bi-page-table-cell { .bi-page-table-cell {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }

12
src/css/widget/previewtable/previewtable.css

@ -1,10 +1,10 @@
.bi-preview-table { .bi-preview-table {
-webkit-user-select: initial; -webkit-user-select: text;
-khtml-user-select: initial; -khtml-user-select: text;
-moz-user-select: initial; -moz-user-select: text;
-ms-user-select: initial; -ms-user-select: text;
-o-user-select: initial; -o-user-select: text;
user-select: initial; user-select: text;
} }
.bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > table > thead > tr.odd,
.bi-preview-table > div > div > div > table > thead > tr.odd { .bi-preview-table > div > div > div > table > thead > tr.odd {

2
src/less/base/foundation/bi.message.less

@ -7,7 +7,7 @@
.bi-message-text { .bi-message-text {
font-size: 16px; font-size: 16px;
.user-select(text); .user-select-enable();
} }
.bi-message-content { .bi-message-content {

2
src/less/resource/app.less

@ -22,7 +22,7 @@ body {
top: 0; top: 0;
left: 0; left: 0;
background-repeat: repeat; background-repeat: repeat;
.user-select(none); .user-select-disable();
color: @color-bi-text-normal; color: @color-bi-text-normal;
font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;

22
src/less/typographic.less

@ -25,11 +25,19 @@
overflow-y: hidden; overflow-y: hidden;
white-space:nowrap; white-space:nowrap;
} }
.user-select(@select){ .user-select-disable(){
-webkit-user-select: @select; -webkit-user-select: none;
-khtml-user-select: @select; -khtml-user-select: none;
-moz-user-select: @select; -moz-user-select: none;
-ms-user-select: @select; -ms-user-select: none;
-o-user-select: @select; -o-user-select: none;
user-select: @select; 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;
} }

2
src/less/widget/pagetable/pagetable.cell.less

@ -1,5 +1,5 @@
@import "../../bibase"; @import "../../bibase";
.bi-page-table-cell { .bi-page-table-cell {
.user-select(initial); .user-select-enable();
} }

2
src/less/widget/previewtable/previewtable.less

@ -1,7 +1,7 @@
@import "../../bibase"; @import "../../bibase";
.bi-preview-table { .bi-preview-table {
.user-select(initial); .user-select-enable();
& > div > table, & > div > div > div > table { & > div > table, & > div > div > div > table {
& > thead > tr.odd { & > thead > tr.odd {
background-color: @color-bi-background-normal; background-color: @color-bi-background-normal;

70
uidoc/core/layout/border.md

@ -7,97 +7,38 @@
{% common %} {% common %}
```javascript ```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({ BI.createWidget({
type: 'bi.border', type: 'bi.border',
element: "#wrapper", element: "#wrapper",
cls: "",
items: { items: {
north: { north: {
el: Demo._createNorth(), el: {type: "bi.label"},
height: 30, height: 30,
top: 20, top: 20,
left: 20, left: 20,
right: 20 right: 20
}, },
south: { south: {
el: Demo._createSouth(), el: {type: "bi.label"},
height: 50, height: 50,
bottom: 20, bottom: 20,
left: 20, left: 20,
right: 20 right: 20
}, },
west: { west: {
el: Demo._createWest(), el: {type: "bi.label"},
width: 200, width: 200,
left: 20 left: 20
}, },
east: { east: {
el: Demo._createEast(), el: {type: "bi.label"},
width: 300, width: 300,
right: 20 right: 20
}, },
center: Demo._createCenter() center: {el: {type: "bi.label"}}
} }
}); });
``` ```
{% endmethod %} {% endmethod %}
@ -110,5 +51,4 @@ BI.createWidget({
| :------ |:------------- | :----- | :----|:---- | :------ |:------------- | :----- | :----|:----
| items | 子控件对象 | object | north,east,west,south,center | | | | items | 子控件对象 | object | north,east,west,south,center | | |
--- ---

12
uidoc/core/layout/left_right_vertical_adapt.md

@ -21,12 +21,6 @@ BI.createWidget({
cls: "layout-bg1", cls: "layout-bg1",
width: 100, width: 100,
height: 30 height: 30
}, {
type: "bi.label",
text: "左边的垂直居中",
cls: "layout-bg2",
width: 100,
height: 30
}], }],
right: [{ right: [{
type: "bi.label", type: "bi.label",
@ -34,12 +28,6 @@ BI.createWidget({
cls: "layout-bg1", cls: "layout-bg1",
width: 100, width: 100,
height: 30 height: 30
}, {
type: "bi.label",
text: "右边的垂直居中",
cls: "layout-bg2",
width: 100,
height: 30
}] }]
} }
}); });

41
uidoc/detailed/date/custom_date_time.md

@ -1,2 +1,43 @@
# custom_date_time # 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

43
uidoc/detailed/file_manager.md

@ -1,2 +1,45 @@
# file_manager # 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属性 |
--- ---

36
uidoc/detailed/path/direction_path_chooser.md

@ -1,2 +1,38 @@
# direction_path_chooser # 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| | |
--- ---

37
uidoc/detailed/path/path_chooser.md

@ -1,2 +1,39 @@
# path_chooser # 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| | |
--- ---

31
uidoc/detailed/relation_view.md

@ -1,2 +1,33 @@
# relation_view # 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 %}
##参数
| 参数 | 说明 | 类型 | 可选值 | 默认值
| :------ |:------------- | :-----| :----|:----|
--- ---
Loading…
Cancel
Save