caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' into bugfix

es6
iapyang 4 years ago
parent
30fb4ddd69 a77447ed7d
commit
f189b0b1e0
48 changed files with 289 additions and 147 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      changelog.md
  2. 4
      dist/2.0/fineui.css
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 56
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 4
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 4
      dist/2.0/fineui_without_normalize.css
  11. 4
      dist/2.0/fineui_without_normalize.min.css
  12. 4
      dist/core.css
  13. 56
      dist/core.js
  14. 2
      dist/core.js.map
  15. 4
      dist/demo.css
  16. 56
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 4
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 56
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 4
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 39
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. 2
      dist/lib/base/single/single.d.ts
  30. 5
      dist/lib/core/wrapper/layout/adapt/adapt.leftvertical.d.ts
  31. 5
      dist/lib/core/wrapper/layout/layout.default.d.ts
  32. 4
      dist/lib/index.d.ts
  33. 2
      dist/resource.css
  34. 2
      dist/utils.js
  35. 2
      dist/utils.min.js
  36. 2
      package.json
  37. 26
      src/base/pane.js
  38. 4
      src/base/tree/ztree/asynctree.js
  39. 9
      src/base/tree/ztree/treeview.js
  40. 6
      src/component/treevaluechooser/pane.treevaluechooser.js
  41. 9
      src/less/base/tree/ztree.less
  42. 3
      src/widget/multiselecttree/multiselecttree.js
  43. 1
      src/widget/multiselecttree/multiselecttree.popup.js
  44. 1
      src/widget/multitree/multi.tree.popup.js
  45. 2
      typescript/base/single/single.ts
  46. 7
      typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts
  47. 7
      typescript/core/wrapper/layout/layout.default.ts
  48. 4
      typescript/index.ts

2
changelog.md
Unescape View File

@ -1,5 +1,7 @@
# 更新日志
2.0(2020-12)
- Pane系列提供small和big两种大小的加载动画
- 同步树列表系列支持不显示节点连接线和展开收起图标
- 规范了下拉树trigger中显示值的显示顺序
- bi.editor支持传入autocomplete
- [视觉]editor水印间距统一与文本域水印不可选中

4
dist/2.0/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

56
dist/2.0/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -21909,6 +21909,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -21937,25 +21938,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -21984,6 +21985,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -21992,7 +21997,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{
@ -56114,7 +56120,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {
@ -56284,6 +56291,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});
@ -57621,6 +57629,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,
@ -70218,7 +70227,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -70226,8 +70236,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});
@ -83511,7 +83522,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
window.jQuery = window.$ = jQuery;
if (!window.$ && !window.jQuery) {
window.jQuery = window.$ = jQuery;
}
BI.jQuery = BI.$ = jQuery;
@ -84687,7 +84700,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
paras: {
selectedValues: {}
},
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
_init: function () {
@ -84745,6 +84759,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_configSetting: function () {
var paras = this.options.paras;
var self = this;
var o = this.options;
var setting = {
async: {
enable: true,
@ -84768,7 +84783,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true, // 节点可以用html标签代替
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine,
},
callback: {
beforeExpand: beforeExpand,
@ -85009,7 +85025,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = n.value || n.text;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
// 处理标红
if (BI.isKey(o.paras.keyword)) {
n.text = BI.$("<div>").__textKeywordMarked__(BI.Text.formatText(n.text + ""), o.paras.keyword, n.py).html();
@ -85242,6 +85258,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
// 配置属性
_configSetting: function () {
var o = this.options;
var paras = this.options.paras;
var self = this;
var setting = {
@ -85265,7 +85282,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true,
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine
},
callback: {
beforeCheck: beforeCheck,

2
dist/2.0/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

56
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -21909,6 +21909,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -21937,25 +21938,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -21984,6 +21985,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -21992,7 +21997,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{
@ -56114,7 +56120,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {
@ -56284,6 +56291,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});
@ -57621,6 +57629,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,
@ -70218,7 +70227,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -70226,8 +70236,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});
@ -83511,7 +83522,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
window.jQuery = window.$ = jQuery;
if (!window.$ && !window.jQuery) {
window.jQuery = window.$ = jQuery;
}
BI.jQuery = BI.$ = jQuery;
@ -84687,7 +84700,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
paras: {
selectedValues: {}
},
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
_init: function () {
@ -84745,6 +84759,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_configSetting: function () {
var paras = this.options.paras;
var self = this;
var o = this.options;
var setting = {
async: {
enable: true,
@ -84768,7 +84783,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true, // 节点可以用html标签代替
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine,
},
callback: {
beforeExpand: beforeExpand,
@ -85009,7 +85025,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = n.value || n.text;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
// 处理标红
if (BI.isKey(o.paras.keyword)) {
n.text = BI.$("<div>").__textKeywordMarked__(BI.Text.formatText(n.text + ""), o.paras.keyword, n.py).html();
@ -85242,6 +85258,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
// 配置属性
_configSetting: function () {
var o = this.options;
var paras = this.options.paras;
var self = this;
var setting = {
@ -85265,7 +85282,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true,
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine
},
callback: {
beforeCheck: beforeCheck,

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

56
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -21909,6 +21909,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -21937,25 +21938,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -21984,6 +21985,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -21992,7 +21997,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{
@ -56114,7 +56120,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {
@ -56284,6 +56291,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});
@ -57621,6 +57629,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,
@ -70218,7 +70227,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -70226,8 +70236,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});
@ -83511,7 +83522,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
window.jQuery = window.$ = jQuery;
if (!window.$ && !window.jQuery) {
window.jQuery = window.$ = jQuery;
}
BI.jQuery = BI.$ = jQuery;
@ -84687,7 +84700,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
paras: {
selectedValues: {}
},
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
_init: function () {
@ -84745,6 +84759,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_configSetting: function () {
var paras = this.options.paras;
var self = this;
var o = this.options;
var setting = {
async: {
enable: true,
@ -84768,7 +84783,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true, // 节点可以用html标签代替
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine,
},
callback: {
beforeExpand: beforeExpand,
@ -85009,7 +85025,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = n.value || n.text;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
// 处理标红
if (BI.isKey(o.paras.keyword)) {
n.text = BI.$("<div>").__textKeywordMarked__(BI.Text.formatText(n.text + ""), o.paras.keyword, n.py).html();
@ -85242,6 +85258,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
// 配置属性
_configSetting: function () {
var o = this.options;
var paras = this.options.paras;
var self = this;
var setting = {
@ -85265,7 +85282,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true,
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine
},
callback: {
beforeCheck: beforeCheck,

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

56
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -21909,6 +21909,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -21937,25 +21938,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -21984,6 +21985,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -21992,7 +21997,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{
@ -56114,7 +56120,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {
@ -56284,6 +56291,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});
@ -57621,6 +57629,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,
@ -70218,7 +70227,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -70226,8 +70236,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});
@ -83511,7 +83522,9 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
window.jQuery = window.$ = jQuery;
if (!window.$ && !window.jQuery) {
window.jQuery = window.$ = jQuery;
}
BI.jQuery = BI.$ = jQuery;
@ -84687,7 +84700,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
paras: {
selectedValues: {}
},
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
_init: function () {
@ -84745,6 +84759,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_configSetting: function () {
var paras = this.options.paras;
var self = this;
var o = this.options;
var setting = {
async: {
enable: true,
@ -84768,7 +84783,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true, // 节点可以用html标签代替
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine,
},
callback: {
beforeExpand: beforeExpand,
@ -85009,7 +85025,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = n.value || n.text;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
// 处理标红
if (BI.isKey(o.paras.keyword)) {
n.text = BI.$("<div>").__textKeywordMarked__(BI.Text.formatText(n.text + ""), o.paras.keyword, n.py).html();
@ -85242,6 +85258,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
// 配置属性
_configSetting: function () {
var o = this.options;
var paras = this.options.paras;
var self = this;
var setting = {
@ -85265,7 +85282,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true,
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine
},
callback: {
beforeCheck: beforeCheck,

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

39
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -17936,6 +17936,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -17964,25 +17965,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -18011,6 +18012,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -18019,7 +18024,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{
@ -52141,7 +52147,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {
@ -52311,6 +52318,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});
@ -53648,6 +53656,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,
@ -66245,7 +66254,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -66253,8 +66263,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});

2
dist/fineui_without_jquery_polyfill.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/font.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/lib/base/single/single.d.ts vendored
Unescape View File

@ -5,7 +5,7 @@ export interface _Single extends _Widget {
_clearTimeOut(): void;
enableHover(opt?: SingleOpt): void;
disabledHover(): void;
setTitle(title: string, opt?: SingleOpt): void;
setTitle(title: string | Function, opt?: SingleOpt): void;
setWarningTitle(title: string, opt?: SingleOpt): void;
setTipType(v: string): void;
getTipType(): string;

5
dist/lib/core/wrapper/layout/adapt/adapt.leftvertical.d.ts vendored
Unescape View File

@ -0,0 +1,5 @@
import { _Layout } from "../../layout";
export interface _LeftVerticalAdapt extends _Layout {
resize(): void;
populate<T>(items?: T[]): void;
}

5
dist/lib/core/wrapper/layout/layout.default.d.ts vendored
Unescape View File

@ -0,0 +1,5 @@
import { _Layout } from "../layout";
export interface _DefaultLayout extends _Layout {
resize(): void;
populate<T>(items?: T[]): void;
}

4
dist/lib/index.d.ts vendored
Unescape View File

@ -43,7 +43,9 @@ import { _Layout } from "./core/wrapper/layout";
import { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
import { _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
import { _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
declare type ClassConstructor<T extends {}> = T & {
new (config: any): T;
(config: any): T;
@ -94,8 +96,10 @@ export interface BI extends _func, _i18n, _base, _inject {
Iframe: ClassConstructor<_Iframe>;
AbsoluteLayout: ClassConstructor<_AbsoluteLayout>;
VerticalLayout: ClassConstructor<_VerticalLayout>;
DefaultLayout: ClassConstructor<_DefaultLayout>;
Input: ClassConstructor<_Input> & _InputStatic;
SearchTextValueCombo: ClassConstructor<_SearchTextValueCombo> & _SearchTextValueComboStatic;
LeftVerticalAdaptLayout: ClassConstructor<_LeftVerticalAdapt>;
}
declare const _default: {
Decorators: typeof decorator;

2
dist/resource.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-9 16:00:25 */
/*! time: 2020-12-11 15:00:22 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20201209160235",
"version": "2.0.20201211150158",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

26
src/base/pane.js
Unescape View File

@ -13,6 +13,7 @@ BI.Pane = BI.inherit(BI.Widget, {
_baseCls: "bi-pane",
tipText: BI.i18nText("BI-No_Selected_Item"),
loadingText: "",
loadingSize: "small",
overlap: true,
onLoaded: BI.emptyFn
});
@ -41,25 +42,25 @@ BI.Pane = BI.inherit(BI.Widget, {
var loadingAnimation = BI.createWidget({
type: "bi.horizontal",
cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30,
width: 30,
hgap: 5,
height: this._getSize(60),
width: this._getSize(60),
hgap: this._getSize(10),
vgap: 2.5,
items: isIE ? [] : [{
type: "bi.layout",
cls: "animate-rect rect1",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect2",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}, {
type: "bi.layout",
cls: "animate-rect rect3",
height: 25,
width: 3
height: this._getSize(50),
width: this._getSize(5),
}]
});
// pane在同步方式下由items决定tipText的显示与否
@ -88,6 +89,10 @@ BI.Pane = BI.inherit(BI.Widget, {
this.element.addClass("loading-status");
},
_getSize: function(v) {
return Math.ceil(v / (this.options.loadingSize === 'small' ? 2 : 1));
},
_getLoadingTipItems: function (loadingTip) {
var o = this.options;
var loadingTipItems = [{
@ -96,7 +101,8 @@ BI.Pane = BI.inherit(BI.Widget, {
}];
BI.isNotEmptyString(o.loadingText) && loadingTipItems.push({
type: "bi.text",
text: o.loadingText
text: o.loadingText,
tgap: this._getSize(10),
});
return [{

4
src/base/tree/ztree/asynctree.js
Unescape View File

@ -21,6 +21,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
// 配置属性
_configSetting: function () {
var o = this.options;
var paras = this.options.paras;
var self = this;
var setting = {
@ -44,7 +45,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true,
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine
},
callback: {
beforeCheck: beforeCheck,

9
src/base/tree/ztree/treeview.js
Unescape View File

@ -11,7 +11,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
paras: {
selectedValues: {}
},
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
_init: function () {
@ -69,6 +70,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
_configSetting: function () {
var paras = this.options.paras;
var self = this;
var o = this.options;
var setting = {
async: {
enable: true,
@ -92,7 +94,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
showIcon: false,
expandSpeed: "",
nameIsHTML: true, // 节点可以用html标签代替
dblClickExpand: false
dblClickExpand: false,
showLine: o.showLine,
},
callback: {
beforeExpand: beforeExpand,
@ -333,7 +336,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
BI.each(ns, function (i, n) {
n.title = n.title || n.text || n.value;
n.isParent = n.isParent || n.parent;
n.value = n.value || n.text;
n.value = BI.isUndefined(n.value) ? n.text : n.value;
// 处理标红
if (BI.isKey(o.paras.keyword)) {
n.text = BI.$("<div>").__textKeywordMarked__(BI.Text.formatText(n.text + ""), o.paras.keyword, n.py).html();

6
src/component/treevaluechooser/pane.treevaluechooser.js
Unescape View File

@ -11,7 +11,8 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
return BI.extend(BI.TreeValueChooserPane.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-tree-value-chooser-pane",
items: null,
itemsCreator: BI.emptyFn
itemsCreator: BI.emptyFn,
showLine: true
});
},
@ -19,8 +20,9 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
BI.TreeValueChooserPane.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.pane = BI.createWidget({
type: "bi.multi_select_tree",
type: o.hideSearch ? "bi.multi_select_tree_popup" : "bi.multi_select_tree",
element: this,
showLine: o.showLine,
itemsCreator: BI.bind(this._itemsCreator, this)
});

9
src/less/base/tree/ztree.less
Unescape View File

@ -189,6 +189,14 @@
height: 24px
}
.ztree li span.button.switch.noline_open {
width: 0;
}
.ztree li span.button.switch.noline_close {
width: 0;
}
.ztree li span.button.noline_open {
background-position: -92px -72px
}
@ -203,6 +211,7 @@
.ztree li span.button.noline_docu {
background: none;
width: 0;
}
.ztree li span.button.ico_open {

3
src/widget/multiselecttree/multiselecttree.js
Unescape View File

@ -20,7 +20,8 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
this.adapter = BI.createWidget({
type: "bi.multi_select_tree_popup",
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
showLine: o.showLine
});
this.adapter.on(BI.MultiSelectTreePopup.EVENT_CHANGE, function () {
if (self.searcher.isSearching()) {

1
src/widget/multiselecttree/multiselecttree.popup.js
Unescape View File

@ -13,6 +13,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.popup = BI.createWidget({
type: "bi.async_tree",
showLine: o.showLine,
element: this,
itemsCreator: o.itemsCreator
});

1
src/widget/multitree/multi.tree.popup.js
Unescape View File

@ -27,6 +27,7 @@ BI.MultiTreePopup = BI.inherit(BI.Pane, {
this.tree = BI.createWidget(opts.el, {
type: "bi.async_tree",
showLine: opts.showLine,
height: 400,
cls: "popup-view-tree",
itemsCreator: opts.itemsCreator,

2
typescript/base/single/single.ts
Unescape View File

@ -11,7 +11,7 @@ export interface _Single extends _Widget {
disabledHover(): void;
setTitle(title: string, opt?: SingleOpt): void;
setTitle(title: string | Function, opt?: SingleOpt): void;
setWarningTitle(title: string, opt?: SingleOpt): void;

7
typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts
Unescape View File

@ -0,0 +1,7 @@
import { _Layout } from "../../layout";
export interface _LeftVerticalAdapt extends _Layout {
resize(): void;
populate<T>(items?: T[]): void;
}

7
typescript/core/wrapper/layout/layout.default.ts
Unescape View File

@ -0,0 +1,7 @@
import { _Layout } from "../layout";
export interface _DefaultLayout extends _Layout {
resize(): void;
populate<T>(items?: T[]): void;
}

4
typescript/index.ts
Unescape View File

@ -43,7 +43,9 @@ import { _Layout } from "./core/wrapper/layout";
import { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
import { _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
import { _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
type ClassConstructor<T extends {}> = T & {
@ -97,8 +99,10 @@ export interface BI extends _func, _i18n, _base, _inject {
Iframe: ClassConstructor<_Iframe>;
AbsoluteLayout: ClassConstructor<_AbsoluteLayout>;
VerticalLayout: ClassConstructor<_VerticalLayout>;
DefaultLayout: ClassConstructor<_DefaultLayout>;
Input: ClassConstructor<_Input> & _InputStatic;
SearchTextValueCombo: ClassConstructor<_SearchTextValueCombo> & _SearchTextValueComboStatic;
LeftVerticalAdaptLayout: ClassConstructor<_LeftVerticalAdapt>;
}
export default {

Write Preview
Loading…
Cancel
Save