guy 7 years ago
parent
commit
cae5d42b04
  1. 8
      demo/js/config/widget.js
  2. 95
      demo/js/widget/multiselect/demo.multi_select_tree.js
  3. 69
      demo/js/widget/multitree/demo.multi_tree_list.js
  4. 56
      dist/bundle.css
  5. 2
      dist/bundle.min.css
  6. 172
      dist/demo.js
  7. 56
      dist/fineui.css
  8. 2
      dist/fineui.min.css
  9. 56
      dist/resource.css
  10. 56
      public/css/icon.css
  11. 56
      src/css/resource/icon.css
  12. 10
      src/less/image.less
  13. 4
      src/less/resource/icon.less
  14. 56
      ui/css/icon.css

8
demo/js/config/widget.js

@ -110,6 +110,10 @@ Demo.WIDGET_CONFIG = [{
pId: 406,
text: "bi.multi_select_combo",
value: "demo.multi_select_combo"
}, {
pId: 406,
text: "bi.multi_select_list",
value: "demo.multi_select_list"
}, {
pId: 4,
id: 407,
@ -150,6 +154,10 @@ Demo.WIDGET_CONFIG = [{
pId: 411,
text: "bi.multi_tree_combo",
value: "demo.multi_tree_combo"
}, {
pId: 411,
text: "bi.multi_select_tree",
value: "demo.multi_select_tree"
}, {
pId: 4,
id: 412,

95
demo/js/widget/multiselect/demo.multi_select_tree.js

@ -0,0 +1,95 @@
/**
* Created by User on 2017/3/22.
*/
Demo.MultiSelectList = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-multi-select-combo"
},
mounted: function () {
this.list.populate();
},
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_list",
ref: function (ref) {
self.list = ref;
},
itemsCreator: BI.bind(this._itemsCreator, this),
value: {
type: 1,
value: ["柳州市城贸金属材料有限责任公司", "柳州市建福房屋租赁有限公司", "柳州市迅昌数码办公设备有限责任公司"]
}
});
widget.on(BI.MultiSelectCombo.EVENT_CONFIRM, function () {
BI.Msg.toast(JSON.stringify(this.getValue()));
});
return widget;
},
_getItemsByTimes: function (items, times) {
var res = [];
for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) {
res.push(items[i]);
}
return res;
},
_hasNextByTimes: function (items, times) {
return times * 10 < items.length;
},
_itemsCreator: function (options, callback) {
var self = this;
var items = Demo.CONSTANTS.ITEMS;
var keywords = (options.keywords || []).slice();
if (options.keyword) {
keywords.push(options.keyword);
}
BI.each(keywords, function (i, kw) {
var search = BI.Func.getSearchResult(items, kw);
items = search.match.concat(search.find);
});
if (options.selectedValues) {// 过滤
var filter = BI.makeObject(options.selectedValues, true);
items = BI.filter(items, function (i, ob) {
return !filter[ob.value];
});
}
if (options.type == BI.MultiSelectCombo.REQ_GET_ALL_DATA) {
callback({
items: items
});
return;
}
if (options.type == BI.MultiSelectCombo.REQ_GET_DATA_LENGTH) {
callback({count: items.length});
return;
}
BI.delay(function () {
callback({
items: self._getItemsByTimes(items, options.times),
hasNext: self._hasNextByTimes(items, options.times)
});
}, 1000);
},
render: function () {
return {
type: "bi.absolute",
scrolly: false,
items: [{
el: this._createMultiSelectCombo(),
top: 50,
left: 50,
right: 50,
bottom: 50
}]
};
}
});
BI.shortcut("demo.multi_select_list", Demo.MultiSelectList);

69
demo/js/widget/multitree/demo.multi_tree_list.js

@ -0,0 +1,69 @@
/**
* Created by Dailer on 2017/7/13.
*/
Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
props: {
baseCls: ""
},
mounted: function () {
this.tree.populate();
},
render: function () {
var self = this;
var items = BI.deepClone(Demo.CONSTANTS.TREE);
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.multi_select_tree",
ref: function (_ref) {
self.tree = _ref;
},
itemsCreator: function (options, callback) {
console.log(options);
// 根据不同的类型处理相应的结果
switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA:
break;
case BI.TreeView.REQ_TYPE_ADJUST_DATA:
break;
case BI.TreeView.REQ_TYPE_SELECT_DATA:
break;
case BI.TreeView.REQ_TYPE_GET_SELECTED_DATA:
break;
default :
break;
}
callback({
items: items
});
},
width: 300,
value: {
"根目录": {}
}
},
top: 50,
bottom: 50,
left: 50,
right: 50
}, {
el: {
type: "bi.button",
height: 30,
text: "getValue",
handler: function () {
BI.Msg.toast(JSON.stringify(self.tree.getValue()));
}
},
left: 50,
right: 50,
bottom: 20
}]
};
}
});
BI.shortcut("demo.multi_select_tree", Demo.MultiTreeCombo);

56
dist/bundle.css vendored

@ -6559,21 +6559,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -6581,7 +6566,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
@ -6599,18 +6583,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -6623,21 +6595,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png') no-repeat 0 0;
@ -6645,7 +6602,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png');
@ -6663,18 +6619,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat 0px 0px;

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

172
dist/demo.js vendored

@ -5757,6 +5757,10 @@ Demo.FIX_CONFIG = [{
pId: 406,
text: "bi.multi_select_combo",
value: "demo.multi_select_combo"
}, {
pId: 406,
text: "bi.multi_select_list",
value: "demo.multi_select_list"
}, {
pId: 4,
id: 407,
@ -5797,6 +5801,10 @@ Demo.FIX_CONFIG = [{
pId: 411,
text: "bi.multi_tree_combo",
value: "demo.multi_tree_combo"
}, {
pId: 411,
text: "bi.multi_select_tree",
value: "demo.multi_select_tree"
}, {
pId: 4,
id: 412,
@ -12432,6 +12440,100 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
}
});
BI.shortcut("demo.multi_select_combo", Demo.MultiSelectCombo);/**
* Created by User on 2017/3/22.
*/
Demo.MultiSelectList = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-multi-select-combo"
},
mounted: function () {
this.list.populate();
},
_createMultiSelectCombo: function () {
var self = this;
var widget = BI.createWidget({
type: "bi.multi_select_list",
ref: function (ref) {
self.list = ref;
},
itemsCreator: BI.bind(this._itemsCreator, this),
value: {
type: 1,
value: ["柳州市城贸金属材料有限责任公司", "柳州市建福房屋租赁有限公司", "柳州市迅昌数码办公设备有限责任公司"]
}
});
widget.on(BI.MultiSelectCombo.EVENT_CONFIRM, function () {
BI.Msg.toast(JSON.stringify(this.getValue()));
});
return widget;
},
_getItemsByTimes: function (items, times) {
var res = [];
for (var i = (times - 1) * 10; items[i] && i < times * 10; i++) {
res.push(items[i]);
}
return res;
},
_hasNextByTimes: function (items, times) {
return times * 10 < items.length;
},
_itemsCreator: function (options, callback) {
var self = this;
var items = Demo.CONSTANTS.ITEMS;
var keywords = (options.keywords || []).slice();
if (options.keyword) {
keywords.push(options.keyword);
}
BI.each(keywords, function (i, kw) {
var search = BI.Func.getSearchResult(items, kw);
items = search.match.concat(search.find);
});
if (options.selectedValues) {// 过滤
var filter = BI.makeObject(options.selectedValues, true);
items = BI.filter(items, function (i, ob) {
return !filter[ob.value];
});
}
if (options.type == BI.MultiSelectCombo.REQ_GET_ALL_DATA) {
callback({
items: items
});
return;
}
if (options.type == BI.MultiSelectCombo.REQ_GET_DATA_LENGTH) {
callback({count: items.length});
return;
}
BI.delay(function () {
callback({
items: self._getItemsByTimes(items, options.times),
hasNext: self._hasNextByTimes(items, options.times)
});
}, 1000);
},
render: function () {
return {
type: "bi.absolute",
scrolly: false,
items: [{
el: this._createMultiSelectCombo(),
top: 50,
left: 50,
right: 50,
bottom: 50
}]
};
}
});
BI.shortcut("demo.multi_select_list", Demo.MultiSelectList);/**
* Created by Dailer on 2017/7/13.
*/
Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
@ -12485,7 +12587,75 @@ Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
}
});
BI.shortcut("demo.multi_tree_combo", Demo.MultiTreeCombo);/*
BI.shortcut("demo.multi_tree_combo", Demo.MultiTreeCombo);/**
* Created by Dailer on 2017/7/13.
*/
Demo.MultiTreeCombo = BI.inherit(BI.Widget, {
props: {
baseCls: ""
},
mounted: function () {
this.tree.populate();
},
render: function () {
var self = this;
var items = BI.deepClone(Demo.CONSTANTS.TREE);
return {
type: "bi.absolute",
items: [{
el: {
type: "bi.multi_select_tree",
ref: function (_ref) {
self.tree = _ref;
},
itemsCreator: function (options, callback) {
console.log(options);
// 根据不同的类型处理相应的结果
switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA:
break;
case BI.TreeView.REQ_TYPE_ADJUST_DATA:
break;
case BI.TreeView.REQ_TYPE_SELECT_DATA:
break;
case BI.TreeView.REQ_TYPE_GET_SELECTED_DATA:
break;
default :
break;
}
callback({
items: items
});
},
width: 300,
value: {
"根目录": {}
}
},
top: 50,
bottom: 50,
left: 50,
right: 50
}, {
el: {
type: "bi.button",
height: 30,
text: "getValue",
handler: function () {
BI.Msg.toast(JSON.stringify(self.tree.getValue()));
}
},
left: 50,
right: 50,
bottom: 20
}]
};
}
});
BI.shortcut("demo.multi_select_tree", Demo.MultiTreeCombo);/*
Created by dailer on 2017 / 7 / 21.
*/
Demo.FileManager = BI.inherit(BI.Widget, {

56
dist/fineui.css vendored

@ -6559,21 +6559,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -6581,7 +6566,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
@ -6599,18 +6583,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -6623,21 +6595,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_active.png') no-repeat 0 0;
@ -6645,7 +6602,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_active.png');
@ -6663,18 +6619,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat 0px 0px;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

56
dist/resource.css vendored

@ -1415,21 +1415,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -1437,7 +1422,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
@ -1455,18 +1439,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -1479,21 +1451,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('images/2x/icon/radio_active.png') no-repeat 0 0;
@ -1501,7 +1458,6 @@ textarea::-webkit-scrollbar-thumb:hover {
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_active.png');
@ -1519,18 +1475,6 @@ textarea::-webkit-scrollbar-thumb:hover {
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('images/2x/icon/half_selected.png') no-repeat 0px 0px;

56
public/css/icon.css

@ -274,21 +274,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -296,7 +281,6 @@
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_active.png');
@ -314,18 +298,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -338,21 +310,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_active.png') no-repeat 0 0;
@ -360,7 +317,6 @@
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_active.png');
@ -378,18 +334,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/half_selected.png') no-repeat 0px 0px;

56
src/css/resource/icon.css

@ -274,21 +274,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -296,7 +281,6 @@
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_active.png');
@ -314,18 +298,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -338,21 +310,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('images/2x/icon/radio_active.png') no-repeat 0 0;
@ -360,7 +317,6 @@
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_active.png');
@ -378,18 +334,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('images/2x/icon/half_selected.png') no-repeat 0px 0px;

10
src/less/image.less

@ -340,7 +340,7 @@
}
}
.icon_custom_select(@class, @iconPath, @hoverPath:none, @activePath, @selectPath) {
.icon_custom_select(@class, @iconPath, @selectPath, @disablePath: @iconPath) {
.@{class} {
& .x-icon {
display: block;
@ -351,16 +351,16 @@
}
&.active .x-icon {
display: block;
.image2xPath(@activePath, 0, 0);
.image2xPath(@selectPath, 0, 0);
&.hack {
.imagePath(@activePath, 0, 0);
.imagePath(@selectPath, 0, 0);
}
}
&.disabled .x-icon {
display: block;
.image2xPath(@iconPath, 0, 0);
.image2xPath(@disablePath, 0, 0);
&.hack {
.imagePath(@iconPath, 0, 0);
.imagePath(@disablePath, 0, 0);
}
}
}

4
src/less/resource/icon.less

@ -59,9 +59,9 @@
}
//CheckBox
.icon_custom(check-box-icon, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-active, @icon-checkbox-disable, @icon-checkbox-active-disable);
.icon_custom_select(check-box-icon, @icon-checkbox-normal, @icon-checkbox-active, @icon-checkbox-disable);
//Radio
.icon_custom(radio-icon, @icon-radio-normal, @icon-radio-normal, @icon-radio-active, @icon-radio-disable, @icon-radio-active-disable);
.icon_custom_select(radio-icon, @icon-radio-normal, @icon-radio-active, @icon-radio-disable);
//Half Select
.icon(check-half-select-icon, @icon-half-select);

56
ui/css/icon.css

@ -274,21 +274,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:hover .x-icon,
.check-box-icon.hover .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png');
background-size: contain;
_background: none;
}
.check-box-icon:hover .x-icon.hack,
.check-box-icon.hover .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_normal.png');
_background: none;
}
.check-box-icon:active .x-icon,
.check-box-icon.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_active.png') no-repeat 0 0;
@ -296,7 +281,6 @@
background-size: contain;
_background: none;
}
.check-box-icon:active .x-icon.hack,
.check-box-icon.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_active.png');
@ -314,18 +298,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable.png');
_background: none;
}
.check-box-icon.disabled.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/check_box_disable2.png');
background-size: contain;
_background: none;
}
.check-box-icon.disabled.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/check_box_disable2.png');
_background: none;
}
.radio-icon .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
@ -338,21 +310,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:hover .x-icon,
.radio-icon.hover .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/radio_normal.png');
background-size: contain;
_background: none;
}
.radio-icon:hover .x-icon.hack,
.radio-icon.hover .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_normal.png');
_background: none;
}
.radio-icon:active .x-icon,
.radio-icon.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_active.png') no-repeat 0 0;
@ -360,7 +317,6 @@
background-size: contain;
_background: none;
}
.radio-icon:active .x-icon.hack,
.radio-icon.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_active.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_active.png');
@ -378,18 +334,6 @@
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable.png');
_background: none;
}
.radio-icon.disabled.active .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/2x/icon/radio_disable2.png');
background-size: contain;
_background: none;
}
.radio-icon.disabled.active .x-icon.hack {
background: url('decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png') no-repeat 0 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='decision/file?path=/com/fr/web/ui/images/1x/icon/radio_disable2.png');
_background: none;
}
.check-half-select-icon .x-icon {
display: block;
background: url('decision/file?path=/com/fr/web/ui/images/2x/icon/half_selected.png') no-repeat 0px 0px;

Loading…
Cancel
Save