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

* commit '624455acdd1b6d7b42860262ca0630c45a80b52b':
  无JIRA任务 file.js修改一下
  无JIRA任务 换一下deepExtend

dist/base.js

@@ -9501,7 +9501,7 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
             this.element.attr("title", o.title || "");
         },
 
-        mounted: function () {
+        created: function () {
             var self = this, o = this.options;
             // create the noswfupload.wrap Object
             // wrap.maxSize 文件大小限制
@@ -9673,21 +9673,23 @@ BI.shortcut("bi.checkbox", BI.Checkbox);/**
         },
 
         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) {
-            this.wrap.upload(handler);
+            this.wrap && this.wrap.upload(handler);
         },
 
         getValue: function () {
-            return this.wrap.attach_array;
+            return this.wrap ? this.wrap.attach_array : [];
         },
 
         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) {

dist/demo.js

@@ -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.
  */
 Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

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"

src/base/single/input/file.js

@@ -413,7 +413,7 @@
             this.element.attr("title", o.title || "");
         },
 
-        mounted: function () {
+        created: function () {
             var self = this, o = this.options;
             // create the noswfupload.wrap Object
             // wrap.maxSize 文件大小限制
@@ -585,21 +585,23 @@
         },
 
         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) {
-            this.wrap.upload(handler);
+            this.wrap && this.wrap.upload(handler);
         },
 
         getValue: function () {
-            return this.wrap.attach_array;
+            return this.wrap ? this.wrap.attach_array : [];
         },
 
         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) {

src/core/base.js

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