Browse Source

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

* commit '624455acdd1b6d7b42860262ca0630c45a80b52b':
  无JIRA任务 file.js修改一下
  无JIRA任务 换一下deepExtend
es6
windy 6 years ago
parent
commit
8d148af0b9
  1. 16
      dist/base.js
  2. 19995
      dist/bundle.ie.js
  3. 14
      dist/bundle.ie.min.js
  4. 19995
      dist/bundle.js
  5. 22
      dist/bundle.min.js
  6. 20109
      dist/core.js
  7. 25
      dist/demo.js
  8. 19995
      dist/fineui.ie.js
  9. 14
      dist/fineui.ie.min.js
  10. 19995
      dist/fineui.js
  11. 22
      dist/fineui.min.js
  12. 20107
      dist/fineui_without_jquery_polyfill.js
  13. 20109
      dist/utils.js
  14. 6
      dist/utils.min.js
  15. 2
      lodash.md
  16. 16
      src/base/single/input/file.js
  17. 7
      src/core/base.js
  18. 20044
      src/core/lodash.js

16
dist/base.js vendored

@ -9501,7 +9501,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
this.element.attr("title", o.title || ""); this.element.attr("title", o.title || "");
}, },
mounted: function () { created: function () {
var self = this, o = this.options; var self = this, o = this.options;
// create the noswfupload.wrap Object // create the noswfupload.wrap Object
// wrap.maxSize 文件大小限制 // wrap.maxSize 文件大小限制
@ -9673,21 +9673,23 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
}, },
select: function () { select: function () {
BI.Widget._renderEngine.createElement(this.wrap.dom.input).click(); this.wrap && BI.Widget._renderEngine.createElement(this.wrap.dom.input).click();
}, },
upload: function (handler) { upload: function (handler) {
this.wrap.upload(handler); this.wrap && this.wrap.upload(handler);
}, },
getValue: function () { getValue: function () {
return this.wrap.attach_array; return this.wrap ? this.wrap.attach_array : [];
}, },
reset: function () { reset: function () {
this.wrap.attach_array = []; if (this.wrap) {
this.wrap.attach_names = []; this.wrap.attach_array = [];
this.wrap.attachNum = 0; this.wrap.attach_names = [];
this.wrap.attachNum = 0;
}
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

19995
dist/bundle.ie.js vendored

File diff suppressed because it is too large Load Diff

14
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

19995
dist/bundle.js vendored

File diff suppressed because it is too large Load Diff

22
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

20109
dist/core.js vendored

File diff suppressed because it is too large Load Diff

25
dist/demo.js vendored

@ -6126,7 +6126,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

19995
dist/fineui.ie.js vendored

File diff suppressed because it is too large Load Diff

14
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

19995
dist/fineui.js vendored

File diff suppressed because it is too large Load Diff

22
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

20107
dist/fineui_without_jquery_polyfill.js vendored

File diff suppressed because it is too large Load Diff

20109
dist/utils.js vendored

File diff suppressed because it is too large Load Diff

6
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
lodash.md

@ -1 +1 @@
lodash core plus="debounce,throttle,get,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim" lodash core plus="debounce,throttle,get,findIndex,findLastIndex,findKey,findLastKey,isArrayLike,invert,invertBy,uniq,uniqBy,omit,omitBy,zip,unzip,rest,range,random,reject,intersection,drop,countBy,union,zipObject,initial,cloneDeep,clamp,isPlainObject,take,takeRight,without,difference,defaultsDeep,trim,merge"

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

@ -413,7 +413,7 @@
this.element.attr("title", o.title || ""); this.element.attr("title", o.title || "");
}, },
mounted: function () { created: function () {
var self = this, o = this.options; var self = this, o = this.options;
// create the noswfupload.wrap Object // create the noswfupload.wrap Object
// wrap.maxSize 文件大小限制 // wrap.maxSize 文件大小限制
@ -585,21 +585,23 @@
}, },
select: function () { select: function () {
BI.Widget._renderEngine.createElement(this.wrap.dom.input).click(); this.wrap && BI.Widget._renderEngine.createElement(this.wrap.dom.input).click();
}, },
upload: function (handler) { upload: function (handler) {
this.wrap.upload(handler); this.wrap && this.wrap.upload(handler);
}, },
getValue: function () { getValue: function () {
return this.wrap.attach_array; return this.wrap ? this.wrap.attach_array : [];
}, },
reset: function () { reset: function () {
this.wrap.attach_array = []; if (this.wrap) {
this.wrap.attach_names = []; this.wrap.attach_array = [];
this.wrap.attachNum = 0; this.wrap.attach_names = [];
this.wrap.attachNum = 0;
}
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

7
src/core/base.js

@ -564,6 +564,7 @@ if (!_global.BI) {
// deep方法 // deep方法
_.extend(BI, { _.extend(BI, {
deepClone: _.cloneDeep, deepClone: _.cloneDeep,
deepExtend: _.merge,
isDeepMatch: function (object, attrs) { isDeepMatch: function (object, attrs) {
var keys = BI.keys(attrs), length = keys.length; var keys = BI.keys(attrs), length = keys.length;
@ -676,12 +677,6 @@ if (!_global.BI) {
} }
} }
return result; return result;
},
deepExtend: function () {
var args = [].slice.call(arguments);
args.unshift(true);
return $.extend.apply($, args);
} }
}); });

20044
src/core/lodash.js

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save