Cauchy.Ke
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

布局

master
guy 8 years ago
parent
81485880e4
commit
3cdc31ecf3
10 changed files with 49 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      bi/base.css
  2. 8
      bi/case.js
  3. 9
      bi/widget.js
  4. 3
      docs/base.css
  5. 8
      docs/case.js
  6. 9
      docs/widget.js
  7. 8
      src/case/colorchooser/colorchooser.trigger.js
  8. 3
      src/css/base/colorchooser/colorchooser.trigger.css
  9. 9
      src/less/base/colorchooser/colorchooser.trigger.less
  10. 9
      src/widget/arrangement/arrangement.js

3
bi/base.css
Unescape View File

@ -6,6 +6,9 @@
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset; -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset; -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
} }
.bi-color-chooser-trigger .color-chooser-trigger-content.none-color {
background-image: url('data:image/svg+xml;utf8,<svg xmlns= "http://www.w3.org/2000/svg" width= "100%" height= "100%" ><line x1= "100%" y1= "0" x2= "0" y2= "100%" stroke= "#f07d0a" stroke-width= "2" /></svg>');
}
.bi-color-picker-button .color-picker-button-mask { .bi-color-picker-button .color-picker-button-mask {
border: 1px solid #1a1a1a; border: 1px solid #1a1a1a;
} }

8
bi/case.js
Unescape View File

@ -3949,7 +3949,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card" cls: "bi-card color-chooser-trigger-content"
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -3982,7 +3982,11 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
setValue: function (color) { setValue: function (color) {
BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments); BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments);
this.colorContainer.element.css("background-color", color); if (color === "") {
this.colorContainer.element.css("background-color", "").addClass("none-color")
} else {
this.colorContainer.element.css({"background-color": color}).removeClass("none-color");
}
} }
}); });
BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE"; BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE";

9
bi/widget.js
Unescape View File

@ -983,9 +983,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE: case BI.Arrangement.LAYOUT_TYPE.FREE:
return true; return true;
case BI.Arrangement.LAYOUT_TYPE.GRID: case BI.Arrangement.LAYOUT_TYPE.GRID:
// if (this._isRegionOverlay()) { if (this._isRegionOverlay()) {
// return false; return false;
// } }
} }
return true; return true;
}, },
@ -1416,9 +1416,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
}, },
_start: function () { _start: function () {
this.arrangement.setVisible(true);
if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) { if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) {
this.block.setVisible(true); this.block.setVisible(true);
} else {
this.arrangement.setVisible(true);
} }
}, },

3
docs/base.css
Unescape View File

@ -6,6 +6,9 @@
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset; -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset; -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
} }
.bi-color-chooser-trigger .color-chooser-trigger-content.none-color {
background-image: url('data:image/svg+xml;utf8,<svg xmlns= "http://www.w3.org/2000/svg" width= "100%" height= "100%" ><line x1= "100%" y1= "0" x2= "0" y2= "100%" stroke= "#f07d0a" stroke-width= "2" /></svg>');
}
.bi-color-picker-button .color-picker-button-mask { .bi-color-picker-button .color-picker-button-mask {
border: 1px solid #1a1a1a; border: 1px solid #1a1a1a;
} }

8
docs/case.js
Unescape View File

@ -3949,7 +3949,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card" cls: "bi-card color-chooser-trigger-content"
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -3982,7 +3982,11 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
setValue: function (color) { setValue: function (color) {
BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments); BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments);
this.colorContainer.element.css("background-color", color); if (color === "") {
this.colorContainer.element.css("background-color", "").addClass("none-color")
} else {
this.colorContainer.element.css({"background-color": color}).removeClass("none-color");
}
} }
}); });
BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE"; BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE";

9
docs/widget.js
Unescape View File

@ -983,9 +983,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE: case BI.Arrangement.LAYOUT_TYPE.FREE:
return true; return true;
case BI.Arrangement.LAYOUT_TYPE.GRID: case BI.Arrangement.LAYOUT_TYPE.GRID:
// if (this._isRegionOverlay()) { if (this._isRegionOverlay()) {
// return false; return false;
// } }
} }
return true; return true;
}, },
@ -1416,9 +1416,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
}, },
_start: function () { _start: function () {
this.arrangement.setVisible(true);
if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) { if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) {
this.block.setVisible(true); this.block.setVisible(true);
} else {
this.arrangement.setVisible(true);
} }
}, },

8
src/case/colorchooser/colorchooser.trigger.js
Unescape View File

@ -19,7 +19,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card" cls: "bi-card color-chooser-trigger-content"
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -52,7 +52,11 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
setValue: function (color) { setValue: function (color) {
BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments); BI.ColorChooserTrigger.superclass.setValue.apply(this, arguments);
this.colorContainer.element.css("background-color", color); if (color === "") {
this.colorContainer.element.css("background-color", "").addClass("none-color")
} else {
this.colorContainer.element.css({"background-color": color}).removeClass("none-color");
}
} }
}); });
BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE"; BI.ColorChooserTrigger.EVENT_CHANGE = "ColorChooserTrigger.EVENT_CHANGE";

3
src/css/base/colorchooser/colorchooser.trigger.css
Unescape View File

@ -6,3 +6,6 @@
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset; -webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset; -moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
} }
.bi-color-chooser-trigger .color-chooser-trigger-content.none-color {
background-image: url('data:image/svg+xml;utf8,<svg xmlns= "http://www.w3.org/2000/svg" width= "100%" height= "100%" ><line x1= "100%" y1= "0" x2= "0" y2= "100%" stroke= "#f07d0a" stroke-width= "2" /></svg>');
}

9
src/less/base/colorchooser/colorchooser.trigger.less
Unescape View File

@ -1,6 +1,11 @@
@import "../../bibase"; @import "../../bibase";
.bi-color-chooser-trigger{ .bi-color-chooser-trigger {
& .color-chooser-trigger-content {
&.none-color {
background-image: url('data:image/svg+xml;utf8,<svg xmlns= "http://www.w3.org/2000/svg" width= "100%" height= "100%" ><line x1= "100%" y1= "0" x2= "0" y2= "100%" stroke= "#f07d0a" stroke-width= "2" /></svg>')
}
}
.border-radius(2px); .border-radius(2px);
.box-shadow(0px,0px,2px,1px, @color-bi-background-dark, inset); .box-shadow(0px, 0px, 2px, 1px, @color-bi-background-dark, inset);
} }

9
src/widget/arrangement/arrangement.js
Unescape View File

@ -189,9 +189,9 @@ BI.Arrangement = BI.inherit(BI.Widget, {
case BI.Arrangement.LAYOUT_TYPE.FREE: case BI.Arrangement.LAYOUT_TYPE.FREE:
return true; return true;
case BI.Arrangement.LAYOUT_TYPE.GRID: case BI.Arrangement.LAYOUT_TYPE.GRID:
// if (this._isRegionOverlay()) { if (this._isRegionOverlay()) {
// return false; return false;
// } }
} }
return true; return true;
}, },
@ -622,9 +622,10 @@ BI.Arrangement = BI.inherit(BI.Widget, {
}, },
_start: function () { _start: function () {
this.arrangement.setVisible(true);
if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) { if (this.options.layoutType === BI.Arrangement.LAYOUT_TYPE.GRID) {
this.block.setVisible(true); this.block.setVisible(true);
} else {
this.arrangement.setVisible(true);
} }
}, },

Write Preview
Loading…
Cancel
Save