fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~imp/fineui_fui

es6
imp 7 years ago
parent
8b392fd97a 59096e9241
commit
2256130de7
7 changed files with 96 additions and 50 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. 22
      dist/_fineui.min.js
  2. 33
      dist/bundle.js
  3. 22
      dist/bundle.min.js
  4. 22
      dist/fineui.min.js
  5. 19
      dist/fix/fix.js
  6. 14
      dist/widget.js
  7. 14
      src/widget/multitree/trigger/searcher.multi.tree.js

22
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

33
dist/bundle.js vendored
Unescape View File

@ -35213,12 +35213,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var oldValue = this.value; var oldValue = this.value;
this.value = value; this.value = value;
if (this.user) { if (this.user) {
// try { try {
this.cb.call(this.vm, value, oldValue, options); this.cb.call(this.vm, value, oldValue, options);
// } catch (e) { } catch (e) {
// } console.log(e);
}
} else { } else {
this.cb.call(this.vm, value, oldValue, options); try {
this.cb.call(this.vm, value, oldValue, options);
} catch (e) {
console.log(e);
}
} }
} }
} }
@ -35384,7 +35389,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return NaN; return NaN;
}, function (newValue, oldValue, opt) { }, function (newValue, oldValue, opt) {
callback(i, newValue, oldValue, _.extend({ index: i }, opt)); callback(i, newValue, oldValue, _.extend({ index: i }, opt));
}); }, options);
watchers.push(function unwatchFn() { watchers.push(function unwatchFn() {
w.teardown(); w.teardown();
v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, dep); v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, dep);
@ -35425,7 +35430,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return NaN; return NaN;
}, function (newValue, oldValue, opt) { }, function (newValue, oldValue, opt) {
callback(i, newValue, oldValue, _.extend({ index: i }, opt)); callback(i, newValue, oldValue, _.extend({ index: i }, opt));
}); }, options);
watchers.push(function unwatchFn() { watchers.push(function unwatchFn() {
_w.teardown(); _w.teardown();
root._globalDeps && delete root._globalDeps[regStr]; root._globalDeps && delete root._globalDeps[regStr];
@ -100620,6 +100625,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var o = this.options; var o = this.options;
ob || (ob = {}); ob || (ob = {});
ob.value || (ob.value = {}); ob.value || (ob.value = {});
var count = 0;
if (BI.isNumber(ob)) { if (BI.isNumber(ob)) {
this.editor.setState(ob); this.editor.setState(ob);
} else if (BI.size(ob.value) === 0) { } else if (BI.size(ob.value) === 0) {
@ -100629,8 +100635,16 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob.value, function (name, children) { BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; "; text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
if (childNodes !== "") {
count++;
}
}); });
this.editor.setState(text);
if (count > 20) {
this.editor.setState(BI.Selection.Multi);
} else {
this.editor.setState(text);
}
} }
function getChildrenNode (ob) { function getChildrenNode (ob) {
@ -100640,6 +100654,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
index++; index++;
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ","); text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes !== "") {
count++;
}
}); });
return text; return text;
} }

22
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
dist/fix/fix.js vendored
Unescape View File

@ -818,12 +818,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var oldValue = this.value; var oldValue = this.value;
this.value = value; this.value = value;
if (this.user) { if (this.user) {
// try { try {
this.cb.call(this.vm, value, oldValue, options); this.cb.call(this.vm, value, oldValue, options);
// } catch (e) { } catch (e) {
// } console.log(e);
}
} else { } else {
this.cb.call(this.vm, value, oldValue, options); try {
this.cb.call(this.vm, value, oldValue, options);
} catch (e) {
console.log(e);
}
} }
} }
} }
@ -989,7 +994,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return NaN; return NaN;
}, function (newValue, oldValue, opt) { }, function (newValue, oldValue, opt) {
callback(i, newValue, oldValue, _.extend({ index: i }, opt)); callback(i, newValue, oldValue, _.extend({ index: i }, opt));
}); }, options);
watchers.push(function unwatchFn() { watchers.push(function unwatchFn() {
w.teardown(); w.teardown();
v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, dep); v.__ob__._scopeDeps && remove(v.__ob__._scopeDeps, dep);
@ -1030,7 +1035,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return NaN; return NaN;
}, function (newValue, oldValue, opt) { }, function (newValue, oldValue, opt) {
callback(i, newValue, oldValue, _.extend({ index: i }, opt)); callback(i, newValue, oldValue, _.extend({ index: i }, opt));
}); }, options);
watchers.push(function unwatchFn() { watchers.push(function unwatchFn() {
_w.teardown(); _w.teardown();
root._globalDeps && delete root._globalDeps[regStr]; root._globalDeps && delete root._globalDeps[regStr];

14
dist/widget.js vendored
Unescape View File

@ -13473,6 +13473,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var o = this.options; var o = this.options;
ob || (ob = {}); ob || (ob = {});
ob.value || (ob.value = {}); ob.value || (ob.value = {});
var count = 0;
if (BI.isNumber(ob)) { if (BI.isNumber(ob)) {
this.editor.setState(ob); this.editor.setState(ob);
} else if (BI.size(ob.value) === 0) { } else if (BI.size(ob.value) === 0) {
@ -13482,8 +13483,16 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob.value, function (name, children) { BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; "; text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
if (childNodes !== "") {
count++;
}
}); });
this.editor.setState(text);
if (count > 20) {
this.editor.setState(BI.Selection.Multi);
} else {
this.editor.setState(text);
}
} }
function getChildrenNode (ob) { function getChildrenNode (ob) {
@ -13493,6 +13502,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
index++; index++;
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ","); text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes !== "") {
count++;
}
}); });
return text; return text;
} }

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

@ -111,6 +111,7 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
var o = this.options; var o = this.options;
ob || (ob = {}); ob || (ob = {});
ob.value || (ob.value = {}); ob.value || (ob.value = {});
var count = 0;
if (BI.isNumber(ob)) { if (BI.isNumber(ob)) {
this.editor.setState(ob); this.editor.setState(ob);
} else if (BI.size(ob.value) === 0) { } else if (BI.size(ob.value) === 0) {
@ -120,8 +121,16 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
BI.each(ob.value, function (name, children) { BI.each(ob.value, function (name, children) {
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; "; text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + "; ";
if (childNodes !== "") {
count++;
}
}); });
this.editor.setState(text);
if (count > 20) {
this.editor.setState(BI.Selection.Multi);
} else {
this.editor.setState(text);
}
} }
function getChildrenNode (ob) { function getChildrenNode (ob) {
@ -131,6 +140,9 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
index++; index++;
var childNodes = getChildrenNode(children); var childNodes = getChildrenNode(children);
text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ","); text += (o.valueFormatter(name + "") || name) + (childNodes === "" ? "" : (":" + childNodes)) + (index === size ? "" : ",");
if (childNodes !== "") {
count++;
}
}); });
return text; return text;
} }

Write Preview
Loading…
Cancel
Save