Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~treecat/fineui

es6
Treecat 2 years ago
parent
commit
8efb8ba0e8
  1. 2
      package.json
  2. 6
      src/base/grid/grid.js
  3. 3
      src/base/single/editor/editor.multifile.js
  4. 13
      src/base/single/input/file.js
  5. 1
      src/core/4.widget.js
  6. 2
      src/widget/multiselect/multiselect.combo.js
  7. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  8. 2
      src/widget/multiselect/multiselect.insert.combo.js
  9. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  10. 2
      src/widget/multiselectlist/multiselectlist.insert.js
  11. 4
      src/widget/multiselectlist/multiselectlist.insert.nobar.js
  12. 2
      src/widget/multiselectlist/multiselectlist.js

2
package.json

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

6
src/base/grid/grid.js

@ -96,6 +96,12 @@ BI.GridView = BI.inherit(BI.Widget, {
this.element.scrollLeft(o.scrollLeft); this.element.scrollLeft(o.scrollLeft);
} }
}, },
destroyed: function () {
BI.each(this.renderedCells, function(i, cell) {
cell.el._destroy();
})
},
_calculateSizeAndPositionData: function () { _calculateSizeAndPositionData: function () {
var o = this.options; var o = this.options;

3
src/base/single/editor/editor.multifile.js

@ -43,14 +43,12 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
}); });
this.file.on(BI.File.EVENT_ERROR, function () { this.file.on(BI.File.EVENT_ERROR, function () {
self.fireEvent(BI.MultifileEditor.EVENT_ERROR, arguments); self.fireEvent(BI.MultifileEditor.EVENT_ERROR, arguments);
self._reset();
}); });
this.file.on(BI.File.EVENT_PROGRESS, function () { this.file.on(BI.File.EVENT_PROGRESS, function () {
self.fireEvent(BI.MultifileEditor.EVENT_PROGRESS, arguments); self.fireEvent(BI.MultifileEditor.EVENT_PROGRESS, arguments);
}); });
this.file.on(BI.File.EVENT_UPLOADED, function () { this.file.on(BI.File.EVENT_UPLOADED, function () {
self.fireEvent(BI.MultifileEditor.EVENT_UPLOADED, arguments); self.fireEvent(BI.MultifileEditor.EVENT_UPLOADED, arguments);
self._reset();
}); });
BI.createWidget({ BI.createWidget({
@ -95,6 +93,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
}, },
upload: function () { upload: function () {
this._reset();
this.file.upload(); this.file.upload();
}, },

13
src/base/single/input/file.js

@ -56,7 +56,7 @@
del: document.removeEventListener ? del: document.removeEventListener ?
function (node, name, callback) { function (node, name, callback) {
node.removeEventListener(name, callback, false); node.removeEventListener(name, callback, false);
return this; return this;
} : } :
function (node, name, callback) { function (node, name, callback) {
@ -113,8 +113,8 @@
if (isFunction(handler.onerror)) { if (isFunction(handler.onerror)) {
handler.onerror(); handler.onerror();
} }
return; return;
} }
for (var xhr = new XMLHttpRequest, for (var xhr = new XMLHttpRequest,
upload = xhr.upload || { upload = xhr.upload || {
@ -245,7 +245,7 @@
form.append("FileData", handler.file); form.append("FileData", handler.file);
xhr.send(form); xhr.send(form);
} }
return handler; return handler;
}; };
} else { } else {
@ -298,7 +298,7 @@
handler.onload(rpe, { responseText: responseText }); handler.onload(rpe, { responseText: responseText });
} }
} }
try { // IE < 8 does not accept enctype attribute ... try { // IE < 8 does not accept enctype attribute ...
var form = document.createElement("<form enctype=\"multipart/form-data\"></form>"), var form = document.createElement("<form enctype=\"multipart/form-data\"></form>"),
iframe = handler.iframe || (handler.iframe = document.createElement("<iframe id=\"" + target + "\" name=\"" + target + "\" src=\"" + url + "\"></iframe>")); iframe = handler.iframe || (handler.iframe = document.createElement("<iframe id=\"" + target + "\" name=\"" + target + "\" src=\"" + url + "\"></iframe>"));
@ -353,7 +353,7 @@
}; };
} }
xhr = null; xhr = null;
return sendFile; return sendFile;
}(Object.prototype.toString)); }(Object.prototype.toString));
@ -705,7 +705,6 @@
reset: function () { reset: function () {
if (this.wrap) { if (this.wrap) {
this.wrap.files = [];
this.wrap.attach_array = []; this.wrap.attach_array = [];
this.wrap.attach_names = []; this.wrap.attach_names = [];
this.wrap.attachNum = 0; this.wrap.attachNum = 0;

1
src/core/4.widget.js

@ -360,6 +360,7 @@
var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode(); var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render); var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render);
var els = render && render.call(this); var els = render && render.call(this);
els = this.options.configRender ? this.options.configRender(els) : els;
els = BI.Plugin.getRender(this.options.type, els); els = BI.Plugin.getRender(this.options.type, els);
if (BI.isPlainObject(els)) { if (BI.isPlainObject(els)) {
els = [els]; els = [els];

2
src/widget/multiselect/multiselect.combo.js

@ -35,7 +35,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
self.numberCounter.setButtonChecked(self.storeValue); self.numberCounter.setButtonChecked(self.storeValue);
}; };
this.storeValue = o.value || {}; this.storeValue = BI.deepClone(o.value) || {};
this._assertValue(this.storeValue); this._assertValue(this.storeValue);

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -34,7 +34,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
}; };
this.storeValue = { this.storeValue = {
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: o.value || [] value: BI.deepClone(o.value) || []
}; };
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;

2
src/widget/multiselect/multiselect.insert.combo.js

@ -33,7 +33,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self.trigger.getSearcher().setState(self.storeValue); self.trigger.getSearcher().setState(self.storeValue);
self.numberCounter.setButtonChecked(self.storeValue); self.numberCounter.setButtonChecked(self.storeValue);
}; };
this.storeValue = o.value || {}; this.storeValue = BI.deepClone(o.value) || {};
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -34,7 +34,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
}; };
this.storeValue = { this.storeValue = {
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: o.value || [] value: BI.deepClone(o.value) || []
}; };
// 标记正在请求数据 // 标记正在请求数据
this.requesting = false; this.requesting = false;

2
src/widget/multiselectlist/multiselectlist.insert.js

@ -15,7 +15,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
BI.MultiSelectInsertList.superclass._init.apply(this, arguments); BI.MultiSelectInsertList.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.storeValue = this._assertValue(o.value || {}); this.storeValue = this._assertValue(BI.deepClone(o.value) || {});
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && (self.storeValue.type === BI.Selection.All ? BI.remove(self.storeValue.value, self._startValue) : BI.pushDistinct(self.storeValue.value, self._startValue)); BI.isKey(self._startValue) && (self.storeValue.type === BI.Selection.All ? BI.remove(self.storeValue.value, self._startValue) : BI.pushDistinct(self.storeValue.value, self._startValue));

4
src/widget/multiselectlist/multiselectlist.insert.nobar.js

@ -16,7 +16,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
this.storeValue = { this.storeValue = {
type: BI.Selection.Multi, type: BI.Selection.Multi,
value: o.value || [] value: BI.deepClone(o.value) || []
}; };
var assertShowValue = function () { var assertShowValue = function () {
@ -363,4 +363,4 @@ BI.extend(BI.MultiSelectInsertNoBarList, {
}); });
BI.MultiSelectInsertNoBarList.EVENT_CHANGE = "EVENT_CHANGE"; BI.MultiSelectInsertNoBarList.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList); BI.shortcut("bi.multi_select_insert_no_bar_list", BI.MultiSelectInsertNoBarList);

2
src/widget/multiselectlist/multiselectlist.js

@ -15,7 +15,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
BI.MultiSelectList.superclass._init.apply(this, arguments); BI.MultiSelectList.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.storeValue = this._assertValue(o.value || {}); this.storeValue = this._assertValue(BI.deepClone(o.value) || {});
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && (self.storeValue.type === BI.Selection.All ? BI.remove(self.storeValue.value, self._startValue) : BI.pushDistinct(self.storeValue.value, self._startValue)); BI.isKey(self._startValue) && (self.storeValue.type === BI.Selection.All ? BI.remove(self.storeValue.value, self._startValue) : BI.pushDistinct(self.storeValue.value, self._startValue));

Loading…
Cancel
Save