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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 this.wrap.attach_names = [];
                 this.wrap.attachNum = 0;
+            }
         },
 
         _setEnable: function (enable) {

dist/bundle.ie.js

@@ -22,7 +22,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8915,6 +8915,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9773,6 +9808,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10675,6 +10711,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -10787,12 +10824,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 
@@ -44536,7 +44567,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 文件大小限制
@@ -44708,21 +44739,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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 this.wrap.attach_names = [];
                 this.wrap.attachNum = 0;
+            }
         },
 
         _setEnable: function (enable) {

dist/bundle.js

@@ -22,7 +22,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8915,6 +8915,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9773,6 +9808,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10675,6 +10711,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -10787,12 +10824,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 
@@ -44940,7 +44971,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 文件大小限制
@@ -45112,21 +45143,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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 this.wrap.attach_names = [];
                 this.wrap.attachNum = 0;
+            }
         },
 
         _setEnable: function (enable) {

dist/core.js

@@ -22,7 +22,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8915,6 +8915,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9773,6 +9808,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10675,6 +10711,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -10787,12 +10824,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 

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, {

dist/fineui.ie.js

@@ -264,7 +264,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -9157,6 +9157,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -10015,6 +10050,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10917,6 +10953,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -11029,12 +11066,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 
@@ -44778,7 +44809,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 文件大小限制
@@ -44950,21 +44981,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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 this.wrap.attach_names = [];
                 this.wrap.attachNum = 0;
+            }
         },
 
         _setEnable: function (enable) {

dist/fineui.js

@@ -264,7 +264,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -9157,6 +9157,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -10015,6 +10050,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10917,6 +10953,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -11029,12 +11066,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 
@@ -45182,7 +45213,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 文件大小限制
@@ -45354,21 +45385,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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 this.wrap.attach_names = [];
                 this.wrap.attachNum = 0;
+            }
         },
 
         _setEnable: function (enable) {

dist/fineui_without_jquery_polyfill.js

@@ -22,7 +22,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8915,6 +8915,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9773,6 +9808,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -10675,6 +10711,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -10787,12 +10824,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 

dist/utils.js

@@ -22,7 +22,7 @@ if(_global.BI.prepares == null) {
 }/**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8915,6 +8915,41 @@ if(_global.BI.prepares == null) {
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9773,6 +9808,7 @@ if(_global.BI.prepares == null) {
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;
@@ -11452,6 +11488,7 @@ if (!_global.BI) {
     // deep方法
     _.extend(BI, {
         deepClone: _.cloneDeep,
+        deepExtend: _.merge,
 
         isDeepMatch: function (object, attrs) {
             var keys = BI.keys(attrs), length = keys.length;
@@ -11564,12 +11601,6 @@ if (!_global.BI) {
                 }
             }
             return result;
-        },
-
-        deepExtend: function () {
-            var args = [].slice.call(arguments);
-            args.unshift(true);
-            return $.extend.apply($, args);
         }
     });
 

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 () {
+            if (this.wrap) {
                 this.wrap.attach_array = [];
                 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);
         }
     });
 

src/core/lodash.js

@@ -1,7 +1,7 @@
 /**
  * @license
  * Lodash (Custom Build) <https://lodash.com/>
- * Build: `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"`
+ * Build: `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"`
  * Copyright JS Foundation and other contributors <https://js.foundation/>
  * Released under MIT license <https://lodash.com/license>
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
@@ -8894,6 +8894,41 @@
     return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
   }
 
+  /**
+   * This method is like `_.assign` except that it recursively merges own and
+   * inherited enumerable string keyed properties of source objects into the
+   * destination object. Source properties that resolve to `undefined` are
+   * skipped if a destination value exists. Array and plain object properties
+   * are merged recursively. Other objects and value types are overridden by
+   * assignment. Source objects are applied from left to right. Subsequent
+   * sources overwrite property assignments of previous sources.
+   *
+   * **Note:** This method mutates `object`.
+   *
+   * @static
+   * @memberOf _
+   * @since 0.5.0
+   * @category Object
+   * @param {Object} object The destination object.
+   * @param {...Object} [sources] The source objects.
+   * @returns {Object} Returns `object`.
+   * @example
+   *
+   * var object = {
+   *   'a': [{ 'b': 2 }, { 'd': 4 }]
+   * };
+   *
+   * var other = {
+   *   'a': [{ 'c': 3 }, { 'e': 5 }]
+   * };
+   *
+   * _.merge(object, other);
+   * // => { 'a': [{ 'b': 2, 'c': 3 }, { 'd': 4, 'e': 5 }] }
+   */
+  var merge = createAssigner(function(object, source, srcIndex) {
+    baseMerge(object, source, srcIndex);
+  });
+
   /**
    * This method is like `_.merge` except that it accepts `customizer` which
    * is invoked to produce the merged values of the destination and source
@@ -9752,6 +9787,7 @@
   lodash.keys = keys;
   lodash.map = map;
   lodash.matches = matches;
+  lodash.merge = merge;
   lodash.mixin = mixin;
   lodash.negate = negate;
   lodash.omit = omit;