Browse Source

Merge pull request #528 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'b780fe897fb41867587a3c660046b9b4447bf699':
  BI-27617
  BI-27386 layer层创建invisible
  update
  BI-27628 点击添加项视觉修改
es6
Young 6 years ago
parent
commit
c20785ca46
  1. 30
      dist/_fineui.min.js
  2. 14
      dist/bundle.js
  3. 32
      dist/bundle.min.js
  4. 3
      dist/case.js
  5. 1
      dist/core.js
  6. 14
      dist/fineui.js
  7. 30
      dist/fineui.min.js
  8. 10
      dist/widget.js
  9. 3
      src/case/richeditor/bar/action.richeditor.js
  10. 1
      src/core/controller/controller.layer.js
  11. 10
      src/widget/multiselect/search/multiselect.search.insert.pane.js

30
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

14
dist/bundle.js vendored

@ -26938,6 +26938,7 @@ BI.LayerController = BI.inherit(BI.Controller, {
}, op), context); }, op), context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
invisible: true,
items: [{ items: [{
el: widget, el: widget,
left: 0, left: 0,
@ -83049,6 +83050,9 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
}, },
doCommand: function (args) { doCommand: function (args) {
// 执行命令前先恢复选区
this.options.editor.instance.restoreRng();
if (this.options.command) { if (this.options.command) {
this.options.editor.nicCommand(this.options.command, args); this.options.editor.nicCommand(this.options.command, args);
} }
@ -99060,14 +99064,12 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.addNotMatchTip = BI.createWidget({ this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
invisible: true, invisible: true,
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height, height: this.constants.height,
cls: "bi-high-light",
hgap: 5,
handler: function () { handler: function () {
self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter()); self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter());
} }
@ -99093,7 +99095,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.float_center_adapt", type: "bi.vertical",
items: [this.tooltipClick, this.addNotMatchTip], items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height height: this.constants.height
}, { }, {

32
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -10494,6 +10494,9 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
}, },
doCommand: function (args) { doCommand: function (args) {
// 执行命令前先恢复选区
this.options.editor.instance.restoreRng();
if (this.options.command) { if (this.options.command) {
this.options.editor.nicCommand(this.options.command, args); this.options.editor.nicCommand(this.options.command, args);
} }

1
dist/core.js vendored

@ -26938,6 +26938,7 @@ BI.LayerController = BI.inherit(BI.Controller, {
}, op), context); }, op), context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
invisible: true,
items: [{ items: [{
el: widget, el: widget,
left: 0, left: 0,

14
dist/fineui.js vendored

@ -27187,6 +27187,7 @@ BI.LayerController = BI.inherit(BI.Controller, {
}, op), context); }, op), context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
invisible: true,
items: [{ items: [{
el: widget, el: widget,
left: 0, left: 0,
@ -83298,6 +83299,9 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
}, },
doCommand: function (args) { doCommand: function (args) {
// 执行命令前先恢复选区
this.options.editor.instance.restoreRng();
if (this.options.command) { if (this.options.command) {
this.options.editor.nicCommand(this.options.command, args); this.options.editor.nicCommand(this.options.command, args);
} }
@ -99309,14 +99313,12 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.addNotMatchTip = BI.createWidget({ this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
invisible: true, invisible: true,
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height, height: this.constants.height,
cls: "bi-high-light",
hgap: 5,
handler: function () { handler: function () {
self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter()); self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter());
} }
@ -99342,7 +99344,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.float_center_adapt", type: "bi.vertical",
items: [this.tooltipClick, this.addNotMatchTip], items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height height: this.constants.height
}, { }, {

30
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/widget.js vendored

@ -11232,14 +11232,12 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.addNotMatchTip = BI.createWidget({ this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
invisible: true, invisible: true,
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height, height: this.constants.height,
cls: "bi-high-light",
hgap: 5,
handler: function () { handler: function () {
self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter()); self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter());
} }
@ -11265,7 +11263,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.float_center_adapt", type: "bi.vertical",
items: [this.tooltipClick, this.addNotMatchTip], items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height height: this.constants.height
}, { }, {

3
src/case/richeditor/bar/action.richeditor.js

@ -86,6 +86,9 @@ BI.RichEditorAction = BI.inherit(BI.Widget, {
}, },
doCommand: function (args) { doCommand: function (args) {
// 执行命令前先恢复选区
this.options.editor.instance.restoreRng();
if (this.options.command) { if (this.options.command) {
this.options.editor.nicCommand(this.options.command, args); this.options.editor.nicCommand(this.options.command, args);
} }

1
src/core/controller/controller.layer.js

@ -59,6 +59,7 @@ BI.LayerController = BI.inherit(BI.Controller, {
}, op), context); }, op), context);
var layout = BI.createWidget({ var layout = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
invisible: true,
items: [{ items: [{
el: widget, el: widget,
left: 0, left: 0,

10
src/widget/multiselect/search/multiselect.search.insert.pane.js

@ -35,14 +35,12 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
}); });
this.addNotMatchTip = BI.createWidget({ this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item", type: "bi.label",
invisible: true, invisible: true,
logic: {
dynamic: true
},
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height, height: this.constants.height,
cls: "bi-high-light",
hgap: 5,
handler: function () { handler: function () {
self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter()); self.fireEvent(BI.MultiSelectSearchInsertPane.EVENT_ADD_ITEM, o.keywordGetter());
} }
@ -68,7 +66,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
type: "bi.vtape", type: "bi.vtape",
element: this, element: this,
items: [{ items: [{
type: "bi.float_center_adapt", type: "bi.vertical",
items: [this.tooltipClick, this.addNotMatchTip], items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height height: this.constants.height
}, { }, {

Loading…
Cancel
Save