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'

es6
guy 4 years ago
parent
d08b435bb2 b51b8d1618
commit
d2c8d62a41
35 changed files with 82 additions and 71 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. 1
      changelog.md
  2. 2
      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. 18
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 2
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 2
      dist/2.0/fineui_without_normalize.css
  11. 2
      dist/2.0/fineui_without_normalize.min.css
  12. 2
      dist/core.css
  13. 18
      dist/core.js
  14. 2
      dist/core.js.map
  15. 2
      dist/demo.css
  16. 18
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 2
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 18
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 2
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 11
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. 2
      dist/resource.css
  30. 2
      dist/utils.js
  31. 2
      dist/utils.min.js
  32. 2
      package.json
  33. 2
      src/case/trigger/trigger.text.js
  34. 2
      src/case/trigger/trigger.text.small.js
  35. 5
      src/widget/multitree/trigger/searcher.multi.tree.js

1
changelog.md
Unescape View File

@ -1,5 +1,6 @@
# 更新日志
2.0(2020-12)
- 规范了下拉树trigger中显示值的显示顺序
- bi.editor支持传入autocomplete
- [视觉]editor水印间距统一与文本域水印不可选中
- 修复bi.file的url参数拼接问题

2
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

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

@ -1,4 +1,4 @@
/*! time: 2020-12-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -40797,7 +40797,7 @@ BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -41022,7 +41022,7 @@ BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -58297,9 +58297,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;
@ -78345,7 +78346,7 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
rleadingWhitespace = /^\s+/,
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
rhtml = /<|&#?\w+;/,
@ -78560,7 +78561,7 @@ jQuery.fn.extend({
( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
value = value.replace( rxhtmlTag, "<$1></$2>" );
// value = value.replace( rxhtmlTag, "<$1></$2>" );
try {
for (; i < l; i++ ) {
@ -78974,7 +78975,8 @@ jQuery.extend({
tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
wrap = wrapMap[ tag ] || wrapMap._default;
tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
// tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
tmp.innerHTML = wrap[1] + elem + wrap[2];
// Descend through wrappers to the right content
j = wrap[0];

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

File diff suppressed because one or more lines are too long

2
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

2
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -40797,7 +40797,7 @@ BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -41022,7 +41022,7 @@ BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -58297,9 +58297,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;
@ -78345,7 +78346,7 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
rleadingWhitespace = /^\s+/,
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
rhtml = /<|&#?\w+;/,
@ -78560,7 +78561,7 @@ jQuery.fn.extend({
( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
value = value.replace( rxhtmlTag, "<$1></$2>" );
// value = value.replace( rxhtmlTag, "<$1></$2>" );
try {
for (; i < l; i++ ) {
@ -78974,7 +78975,8 @@ jQuery.extend({
tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
wrap = wrapMap[ tag ] || wrapMap._default;
tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
// tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
tmp.innerHTML = wrap[1] + elem + wrap[2];
// Descend through wrappers to the right content
j = wrap[0];

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -40797,7 +40797,7 @@ BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -41022,7 +41022,7 @@ BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -58297,9 +58297,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;
@ -78345,7 +78346,7 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
rleadingWhitespace = /^\s+/,
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
rhtml = /<|&#?\w+;/,
@ -78560,7 +78561,7 @@ jQuery.fn.extend({
( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
value = value.replace( rxhtmlTag, "<$1></$2>" );
// value = value.replace( rxhtmlTag, "<$1></$2>" );
try {
for (; i < l; i++ ) {
@ -78974,7 +78975,8 @@ jQuery.extend({
tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
wrap = wrapMap[ tag ] || wrapMap._default;
tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
// tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
tmp.innerHTML = wrap[1] + elem + wrap[2];
// Descend through wrappers to the right content
j = wrap[0];

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
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

18
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -40797,7 +40797,7 @@ BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -41022,7 +41022,7 @@ BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -58297,9 +58297,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;
@ -78345,7 +78346,7 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
rleadingWhitespace = /^\s+/,
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
rhtml = /<|&#?\w+;/,
@ -78560,7 +78561,7 @@ jQuery.fn.extend({
( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
value = value.replace( rxhtmlTag, "<$1></$2>" );
// value = value.replace( rxhtmlTag, "<$1></$2>" );
try {
for (; i < l; i++ ) {
@ -78974,7 +78975,8 @@ jQuery.extend({
tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
wrap = wrapMap[ tag ] || wrapMap._default;
tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
// tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
tmp.innerHTML = wrap[1] + elem + wrap[2];
// Descend through wrappers to the right content
j = wrap[0];

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
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

11
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -36824,7 +36824,7 @@ BI.shortcut("bi.select_icon_text_trigger", BI.SelectIconTextTrigger);
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -37049,7 +37049,7 @@ BI.shortcut("bi.small_select_text_trigger", BI.SmallSelectTextTrigger);
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {
@ -54324,9 +54324,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;

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/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-7 14:13:30 */
/*! time: 2020-12-9 09:36:04 */
/******/ (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.20201207141454",
"version": "2.0.20201209093714",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

2
src/case/trigger/trigger.text.js
Unescape View File

@ -7,7 +7,7 @@
*/
BI.TextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {

2
src/case/trigger/trigger.text.small.js
Unescape View File

@ -6,7 +6,7 @@
*/
BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4
hgap: 6
},
_defaultConfig: function () {

5
src/widget/multitree/trigger/searcher.multi.tree.js
Unescape View File

@ -150,9 +150,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
function getChildrenNode (ob) {
var text = "";
var index = 0, size = BI.size(ob);
BI.each(ob, function (name, children) {
var names = BI.Func.getSortedResult(BI.keys(ob));
BI.each(names, function (idx, name) {
index++;
var childNodes = getChildrenNode(children);
var childNodes = getChildrenNode(ob[name]);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes === "") {
count++;

Write Preview
Loading…
Cancel
Save