update

Gruntfile.js

@@ -139,7 +139,26 @@ module.exports = function (grunt) {
             demoCss: {
                 src: ['demo/css/**/*.css'],
                 dest: 'dist/demo.css'
-            }
+            },
+            utilsJs: {
+                src: [
+                    'src/core/underscore.js',
+                    'src/core/foundation.js',
+                    'src/core/var.js',
+                    'src/core/proto/array.js',
+                    'src/core/proto/number.js',
+                    'src/core/proto/string.js',
+                    'src/core/base.js',
+                    'src/core/ob.js',
+                    'src/core/alias.js',
+                    'src/core/inject.js',
+                    'src/core/utils/*.js',
+
+                    'src/data/data.js',
+                    'src/data/**/*.js'
+                ],
+                dest: 'utils/utils.js'
+            },
         },
 
         less: {

bi/widget.css

@@ -1,374 +0,0 @@
-.bi-arrangement .arrangement-helper {
-  background: #3f8ce8;
-  z-index: 1000000000;
-}
-.bi-arrangement .arrangement-block {
-  z-index: 1000000000;
-}
-.bi-arrangement .arrangement-drop-container {
-  z-index: 1000000000;
-}
-.bi-arrangement .arrangement-drop-container .arrangement-drop-region {
-  overflow: hidden;
-}
-.bi-arrangement .arrangement-drop-container .drop-devider {
-  z-index: 1000000001;
-  background: #3f8ce8;
-}
-.bi-arrangement .arrangement-drop-container .top-left,
-.bi-arrangement .arrangement-drop-container .top-right,
-.bi-arrangement .arrangement-drop-container .bottom-left,
-.bi-arrangement .arrangement-drop-container .bottom-right,
-.bi-arrangement .arrangement-drop-container .top-left-second,
-.bi-arrangement .arrangement-drop-container .top-right-second,
-.bi-arrangement .arrangement-drop-container .bottom-left-second,
-.bi-arrangement .arrangement-drop-container .bottom-right-second,
-.bi-arrangement .arrangement-drop-container .top-center,
-.bi-arrangement .arrangement-drop-container .bottom-center,
-.bi-arrangement .arrangement-drop-container .left-center,
-.bi-arrangement .arrangement-drop-container .right-center,
-.bi-arrangement .arrangement-drop-container .top-center-second,
-.bi-arrangement .arrangement-drop-container .bottom-center-second,
-.bi-arrangement .arrangement-drop-container .left-center-second,
-.bi-arrangement .arrangement-drop-container .right-center-second {
-  z-index: 1000000001;
-  background: #3f8ce8;
-}
-.bi-arrangement-droppable {
-  z-index: 100000;
-}
-.bi-date-trigger {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-down-list-popup .list-group-item-text {
-  max-width: 203px;
-}
-.bi-down-list-popup .bi-down-list-item .list-item-text {
-  max-width: 203px;
-}
-.bi-excel-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #d4dadd;
-}
-.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
-  border-right: 1px solid #525466;
-}
-.bi-excel-table-header-cell {
-  font-weight: bold;
-}
-.bi-file-manager-nav-button .file-manager-nav-button-text {
-  max-width: 200px;
-}
-.bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #fafbfc;
-  color: #999999;
-}
-.bi-file-manager-nav-button .file-manager-nav-button-triangle {
-  z-index: 1;
-}
-.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #191b2b;
-  color: #999999;
-}
-.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
-  z-index: 1000000000;
-  background-color: #faaa39;
-}
-.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
-  z-index: 1000000000;
-}
-.bi-interval-slider {
-  min-height: 70px;
-}
-.bi-interval-slider-label {
-  min-height: 50px;
-}
-.bi-month-trigger {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-multidate-combo {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-multidate-popup .multidate-popup-label {
-  color: #3685f2;
-  font-size: 14px;
-}
-.bi-multidate-popup .multidate-popup-item:active,
-.bi-multidate-popup .multidate-popup-item.active {
-  background-color: #3685f2;
-  color: #ffffff;
-  -webkit-border-radius: 2px 2px 0 0;
-  -moz-border-radius: 2px 2px 0 0;
-  border-radius: 2px 2px 0 0;
-}
-.bi-multidate-popup .multidate-popup-button {
-  color: #3685f2;
-  font-size: 14px;
-}
-.bi-multidate-segment .bi-multidate-editor {
-  font-size: 14px;
-}
-.bi-multi-select-check-pane .multi-select-check-selected {
-  text-decoration: underline;
-}
-.bi-multi-select-combo .multi-select-trigger-icon-button {
-  font-size: 16px;
-}
-.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
-  font-size: 16px;
-}
-.bi-multi-select-trigger {
-  -webkit-border-radius: 2px 2px 2px 2px;
-  -moz-border-radius: 2px 2px 2px 2px;
-  border-radius: 2px 2px 2px 2px;
-}
-.bi-multi-select-search-pane .multi-select-toolbar {
-  color: #ff4949;
-}
-.bi-multi-select-check-selected-button {
-  z-index: 1;
-}
-.bi-multi-tree-check-pane .multi-tree-check-selected {
-  color: #3685f2;
-}
-.bi-multi-tree-combo .multi-select-trigger-icon-button {
-  font-size: 16px;
-}
-.bi-multi-tree-popup .popup-view-tree {
-  min-height: 170px;
-}
-.bi-multi-tree-check-selected-button .trigger-check-selected {
-  color: #3685f2;
-  z-index: 1;
-}
-.bi-number-editor {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-number-interval .number-interval-small-editor {
-  -moz-border-radius-topleft: 2px;
-  -webkit-border-top-left-radius: 2px;
-  -moz-border-radius-bottomleft: 2px;
-  -webkit-border-bottom-left-radius: 2px;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-}
-.bi-number-interval .number-interval-big-editor {
-  -moz-border-radius-topright: 2px;
-  -webkit-border-top-right-radius: 2px;
-  -moz-border-radius-bottomright: 2px;
-  -webkit-border-bottom-right-radius: 2px;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-.bi-number-interval .number-interval-big-combo {
-  -moz-border-radius-topleft: 2px;
-  -webkit-border-top-left-radius: 2px;
-  -moz-border-radius-bottomleft: 2px;
-  -webkit-border-bottom-left-radius: 2px;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-}
-.bi-number-interval .number-interval-big-combo .bi-icon-combo-trigger .icon-combo-trigger-icon {
-  font-size: 14px;
-}
-.bi-number-interval .number-interval-small-combo {
-  -moz-border-radius-topright: 2px;
-  -webkit-border-top-right-radius: 2px;
-  -moz-border-radius-bottomright: 2px;
-  -webkit-border-bottom-right-radius: 2px;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-.bi-number-interval .number-interval-small-combo .bi-icon-combo-trigger .icon-combo-trigger-icon {
-  font-size: 14px;
-}
-.bi-number-interval.number-error .bi-input {
-  color: #ff4949 !important;
-}
-.bi-page-table-cell {
-  -webkit-user-select: text;
-  -khtml-user-select: text;
-  -moz-user-select: text;
-  -ms-user-select: text;
-  -o-user-select: text;
-  user-select: text;
-}
-.bi-path-chooser .path-chooser-radio {
-  z-index: 1;
-}
-.bi-path-region .path-region-label {
-  z-index: 1;
-}
-.bi-preview-table-cell {
-  min-height: 25px;
-  min-width: 80px;
-  max-width: 220px;
-}
-.bi-preview-table {
-  -webkit-user-select: text;
-  -khtml-user-select: text;
-  -moz-user-select: text;
-  -ms-user-select: text;
-  -o-user-select: text;
-  user-select: text;
-}
-.bi-preview-table > div > table > thead > tr.odd,
-.bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #fafbfc;
-}
-.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
-.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #191b2b;
-}
-.bi-preview-table-header-cell {
-  font-weight: bold;
-  min-height: 25px;
-  min-width: 80px;
-  max-width: 220px;
-}
-.bi-quarter-trigger {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-relation-view-region .relation-view-region-container {
-  z-index: 1;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-.bi-relation-view-region .relation-view-region-container.other-package {
-  border-style: dashed;
-}
-.bi-sequence-table-dynamic-number .sequence-table-title-cell {
-  overflow: hidden;
-  overflow-x: hidden;
-  overflow-y: hidden;
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-sequence-table-dynamic-number .sequence-table-number-cell {
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-sequence-table-list-number .sequence-table-title-cell {
-  overflow: hidden;
-  overflow-x: hidden;
-  overflow-y: hidden;
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-sequence-table-list-number .sequence-table-number-cell {
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-sequence-table-tree-number .sequence-table-title-cell {
-  overflow: hidden;
-  overflow-x: hidden;
-  overflow-y: hidden;
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-sequence-table-tree-number .sequence-table-number-cell {
-  -webkit-box-sizing: border-box;
-  /*Safari3.2+*/
-  -moz-box-sizing: border-box;
-  /*Firefox3.5+*/
-  -ms-box-sizing: border-box;
-  /*IE8*/
-  box-sizing: border-box;
-  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
-}
-.bi-single-slider-label {
-  min-height: 50px;
-}
-.bi-single-slider-normal {
-  min-height: 30px;
-}
-.bi-single-slider {
-  min-height: 50px;
-}
-.bi-single-slider-button .slider-button {
-  cursor: ew-resize;
-  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
-}
-.bi-slider-track .gray-track {
-  background-color: rgba(153, 153, 153, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.bi-slider-track .blue-track {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.bi-param-time-interval.time-error .bi-input {
-  color: #ff4949;
-}
-.bi-param-time-interval.time-error .sign-editor-text {
-  color: #ff4949;
-}
-.bi-year-popup .year-popup-navigation {
-  line-height: 30px;
-}
-.bi-year-popup .year-popup-navigation > .center-element {
-  border-left: 1px solid #d4dadd;
-}
-.bi-year-popup .year-popup-navigation > .first-element {
-  border-left: none;
-}
-.bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
-  border-left: 1px solid #525466;
-}
-.bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
-  border-left: none;
-}
-.bi-year-trigger {
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}

dist/bundle.js

@@ -11158,7 +11158,7 @@ if (!window.BI) {
     window.BI = {};
 }
 
-!(function ($, undefined) {
+!(function (undefined) {
     var traverse = function (func, context) {
         return function (value, key, obj) {
             return func.call(context, key, value, obj);
@@ -12312,7 +12312,7 @@ if (!window.BI) {
             });
         }
     });
-})(jQuery);/**
+})();/**
  * 客户端观察者，主要处理事件的添加、删除、执行等
  * @class BI.OB
  * @abstract
@@ -12322,11 +12322,11 @@ BI.OB = function (config) {
     if (BI.isFunction(this.props)) {
         props = this.props(config);
     }
-    this.options = $.extend(this._defaultConfig(config), props, config);
+    this.options = ($ || _).extend(this._defaultConfig(config), props, config);
     this._init();
     this._initRef();
 };
-$.extend(BI.OB.prototype, {
+_.extend(BI.OB.prototype, {
     props: {},
     init: null,
     destroyed: null,
@@ -14695,7 +14695,7 @@ BI.IntegerBufferSet.prototype = {
     };
 })();window.BI = window.BI || {};
 
-$.extend(BI, {
+_.extend(BI, {
     $defaultImport: function (options, type) {
         var config;
         if (BI.isObject(options)) {
@@ -17494,7 +17494,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
     BI.cjkEncodeDO = function (o) {
         if (BI.isPlainObject(o)) {
             var result = {};
-            $.each(o, function (k, v) {
+            _.each(o, function (v, k) {
                 if (!(typeof v === "string")) {
                     v = BI.jsonEncode(v);
                 }
@@ -17610,7 +17610,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
         try {
             // 注意0啊
             // var jo = $.parseJSON(text) || {};
-            var jo = $.parseJSON(text);
+            var jo = $ ? $.parseJSON(text): window.JSON.parse(text);
             if (jo == null) {
                 jo = {};
             }
@@ -17647,7 +17647,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
                 return new Date(o.__time__);
             }
             for (var a in o) {
-                if (o[a] == o || typeof o[a] === "object" || $.isFunction(o[a])) {
+                if (o[a] == o || typeof o[a] === "object" || _.isFunction(o[a])) {
                     break;
                 }
                 o[a] = arguments.callee(o[a]);
@@ -20662,7 +20662,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
  * 对数组对象的扩展
  * @class Array
  */
-$.extend(Array.prototype, {
+_.extend(Array.prototype, {
     contains: function (o) {
         return this.indexOf(o) > -1;
     },
@@ -21567,7 +21567,7 @@ Number.prototype.div = function (arg) {
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String.prototype, {
+_.extend(String.prototype, {
 
     /**
      * 判断字符串是否已指定的字符串开始
@@ -21625,7 +21625,7 @@ $.extend(String.prototype, {
         } else {
             src += "&";
         }
-        $.each(paras, function (name, value) {
+        _.each(paras, function (value, name) {
             if (typeof(name) === "string") {
                 src += name + "=" + value + "&";
             }
@@ -21684,7 +21684,7 @@ $.extend(String.prototype, {
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String, {
+_.extend(String, {
 
     /**
      * 对字符串中的'和\做编码处理
@@ -99047,5 +99047,6 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Union_Relation": "联合关联"
 };

dist/core.js

@@ -11158,7 +11158,7 @@ if (!window.BI) {
     window.BI = {};
 }
 
-!(function ($, undefined) {
+!(function (undefined) {
     var traverse = function (func, context) {
         return function (value, key, obj) {
             return func.call(context, key, value, obj);
@@ -12312,7 +12312,7 @@ if (!window.BI) {
             });
         }
     });
-})(jQuery);/**
+})();/**
  * 客户端观察者，主要处理事件的添加、删除、执行等
  * @class BI.OB
  * @abstract
@@ -12322,11 +12322,11 @@ BI.OB = function (config) {
     if (BI.isFunction(this.props)) {
         props = this.props(config);
     }
-    this.options = $.extend(this._defaultConfig(config), props, config);
+    this.options = ($ || _).extend(this._defaultConfig(config), props, config);
     this._init();
     this._initRef();
 };
-$.extend(BI.OB.prototype, {
+_.extend(BI.OB.prototype, {
     props: {},
     init: null,
     destroyed: null,
@@ -14695,7 +14695,7 @@ BI.IntegerBufferSet.prototype = {
     };
 })();window.BI = window.BI || {};
 
-$.extend(BI, {
+_.extend(BI, {
     $defaultImport: function (options, type) {
         var config;
         if (BI.isObject(options)) {
@@ -17494,7 +17494,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
     BI.cjkEncodeDO = function (o) {
         if (BI.isPlainObject(o)) {
             var result = {};
-            $.each(o, function (k, v) {
+            _.each(o, function (v, k) {
                 if (!(typeof v === "string")) {
                     v = BI.jsonEncode(v);
                 }
@@ -17610,7 +17610,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
         try {
             // 注意0啊
             // var jo = $.parseJSON(text) || {};
-            var jo = $.parseJSON(text);
+            var jo = $ ? $.parseJSON(text): window.JSON.parse(text);
             if (jo == null) {
                 jo = {};
             }
@@ -17647,7 +17647,7 @@ BI.PopoverSection.EVENT_CLOSE = "EVENT_CLOSE";(function () {
                 return new Date(o.__time__);
             }
             for (var a in o) {
-                if (o[a] == o || typeof o[a] === "object" || $.isFunction(o[a])) {
+                if (o[a] == o || typeof o[a] === "object" || _.isFunction(o[a])) {
                     break;
                 }
                 o[a] = arguments.callee(o[a]);
@@ -20662,7 +20662,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
  * 对数组对象的扩展
  * @class Array
  */
-$.extend(Array.prototype, {
+_.extend(Array.prototype, {
     contains: function (o) {
         return this.indexOf(o) > -1;
     },
@@ -21567,7 +21567,7 @@ Number.prototype.div = function (arg) {
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String.prototype, {
+_.extend(String.prototype, {
 
     /**
      * 判断字符串是否已指定的字符串开始
@@ -21625,7 +21625,7 @@ $.extend(String.prototype, {
         } else {
             src += "&";
         }
-        $.each(paras, function (name, value) {
+        _.each(paras, function (value, name) {
             if (typeof(name) === "string") {
                 src += name + "=" + value + "&";
             }
@@ -21684,7 +21684,7 @@ $.extend(String.prototype, {
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String, {
+_.extend(String, {
 
     /**
      * 对字符串中的'和\做编码处理

public/bundle.js

@@ -119,5 +119,6 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Union_Relation": "联合关联"
 };

public/js/index.js

@@ -119,5 +119,6 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Union_Relation": "联合关联"
 };

src/core/alias.js

@@ -301,7 +301,7 @@
     BI.cjkEncodeDO = function (o) {
         if (BI.isPlainObject(o)) {
             var result = {};
-            $.each(o, function (k, v) {
+            _.each(o, function (v, k) {
                 if (!(typeof v === "string")) {
                     v = BI.jsonEncode(v);
                 }
@@ -417,7 +417,7 @@
         try {
             // 注意0啊
             // var jo = $.parseJSON(text) || {};
-            var jo = $.parseJSON(text);
+            var jo = $ ? $.parseJSON(text): window.JSON.parse(text);
             if (jo == null) {
                 jo = {};
             }
@@ -454,7 +454,7 @@
                 return new Date(o.__time__);
             }
             for (var a in o) {
-                if (o[a] == o || typeof o[a] === "object" || $.isFunction(o[a])) {
+                if (o[a] == o || typeof o[a] === "object" || _.isFunction(o[a])) {
                     break;
                 }
                 o[a] = arguments.callee(o[a]);

src/core/base.js

@@ -8,7 +8,7 @@ if (!window.BI) {
     window.BI = {};
 }
 
-!(function ($, undefined) {
+!(function (undefined) {
     var traverse = function (func, context) {
         return function (value, key, obj) {
             return func.call(context, key, value, obj);
@@ -1162,4 +1162,4 @@ if (!window.BI) {
             });
         }
     });
-})(jQuery);
+})();

src/core/ob.js

@@ -8,11 +8,11 @@ BI.OB = function (config) {
     if (BI.isFunction(this.props)) {
         props = this.props(config);
     }
-    this.options = $.extend(this._defaultConfig(config), props, config);
+    this.options = ($ || _).extend(this._defaultConfig(config), props, config);
     this._init();
     this._initRef();
 };
-$.extend(BI.OB.prototype, {
+_.extend(BI.OB.prototype, {
     props: {},
     init: null,
     destroyed: null,

src/core/proto/array.js

@@ -2,7 +2,7 @@
  * 对数组对象的扩展
  * @class Array
  */
-$.extend(Array.prototype, {
+_.extend(Array.prototype, {
     contains: function (o) {
         return this.indexOf(o) > -1;
     },

src/core/proto/string.js

@@ -2,7 +2,7 @@
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String.prototype, {
+_.extend(String.prototype, {
 
     /**
      * 判断字符串是否已指定的字符串开始
@@ -60,7 +60,7 @@ $.extend(String.prototype, {
         } else {
             src += "&";
         }
-        $.each(paras, function (name, value) {
+        _.each(paras, function (value, name) {
             if (typeof(name) === "string") {
                 src += name + "=" + value + "&";
             }
@@ -119,7 +119,7 @@ $.extend(String.prototype, {
  * 对字符串对象的扩展
  * @class String
  */
-$.extend(String, {
+_.extend(String, {
 
     /**
      * 对字符串中的'和\做编码处理

src/core/utils/load.js

@@ -1,6 +1,6 @@
 window.BI = window.BI || {};
 
-$.extend(BI, {
+_.extend(BI, {
     $defaultImport: function (options, type) {
         var config;
         if (BI.isObject(options)) {