Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js

.eslintrc

@@ -149,7 +149,6 @@
     "$": true,
     "WebUI": true,
     "BI": true,
-    "BICst": true,
     "Data": true,
     "Fix": true,
     "module": true

demo/js/widget/downlist/demo.downlist.js

@@ -1,31 +1,3 @@
-BICst.CONF = {};
-BICst.CONF.GROUP = {};
-BICst.CONF.GROUP.NUMBER = {};
-BICst.CONF.GROUP.NUMBER = {};
-BICst.CONF.GROUP.NUMBER.GROUP_BY_VALUE = 1;
-BICst.CONF.GROUP.NUMBER.CUSTOM_NUMBER_GROUP = 2;
-BICst.CONF.GROUP.NUMBER.SUM = 3;
-BICst.CONF.GROUP.NUMBER.AVG = 4;
-BICst.CONF.GROUP.NUMBER.MEDIAN = 5;
-BICst.CONF.GROUP.NUMBER.MAX = 6;
-BICst.CONF.GROUP.NUMBER.MIN = 7;
-BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION = 8;
-BICst.CONF.GROUP.NUMBER.VARIANCE = 9;
-BICst.CONF.GROUP.NUMBER.COUNT = 10;
-BICst.CONF.GROUP.NUMBER.RECORD_COUNT = 11;
-BICst.CONF.GROUP.NUMBER.NONE = 12;
-BICst.CONF.GROUP.NUMBER.PERIOD = 13;
-BICst.CONF.GROUP.NUMBER.RING = 14;
-BICst.CONF.GROUP.NUMBER.PERIOD_RATE = 15;
-BICst.CONF.GROUP.NUMBER.RING_RATE = 16;
-BICst.CONF.GROUP.NUMBER.YEAR = 17;
-BICst.CONF.GROUP.NUMBER.QUARTER = 18;
-BICst.CONF.GROUP.NUMBER.MONTH = 19;
-BICst.CONF.GROUP.NUMBER.WEEK = 20;
-BICst.CONF.GROUP.NUMBER.WEEKDAY = 21;
-BICst.CONF.GROUP.NUMBER.RENAME = 22;
-BICst.CONF.GROUP.NUMBER.DELETE = 23;
-
 Demo.Downlist = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-downlist"

dist/bundle.js

@@ -33841,17 +33841,6 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.vertical_center", BI.VerticalCenterLayout);/**
- * 保存数据，将js里面用到的常量数据都分离
- *
- */
-BI.Data = Data = {};
-
-/**
- * 存放bi里面通用的一些常量
- * @type {{}}
- */
-Data.Constant = BICst = {};
-/**
  * 缓冲池
  * @type {{Buffer: {}}}
  */
@@ -33860,7 +33849,7 @@ Data.Constant = BICst = {};
     var Buffer = {};
     var MODE = false;// 设置缓存模式为关闭
 
-    Data.BufferPool = {
+    BI.BufferPool = {
         put: function (name, cache) {
             if (BI.isNotNull(Buffer[name])) {
                 throw new Error("Buffer Pool has the key already!");
@@ -33879,7 +33868,7 @@ Data.Constant = BICst = {};
 
 (function () {
     var _Shared = {};
-    Data.SharingPool = {
+    BI.SharingPool = {
         _Shared: _Shared,
         put: function (name, shared) {
             _Shared[name] = shared;
@@ -33902,12 +33891,10 @@ Data.Constant = BICst = {};
             delete _Shared[key];
         }
     };
-})();Data.Req = {
+})();BI.Req = {
 
 };
-Data.Source = BISource = {
-
-};function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : factory(global.Fix = global.Fix || {});

dist/core.js

@@ -33841,17 +33841,6 @@ BI.VerticalCenterLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.vertical_center", BI.VerticalCenterLayout);/**
- * 保存数据，将js里面用到的常量数据都分离
- *
- */
-BI.Data = Data = {};
-
-/**
- * 存放bi里面通用的一些常量
- * @type {{}}
- */
-Data.Constant = BICst = {};
-/**
  * 缓冲池
  * @type {{Buffer: {}}}
  */
@@ -33860,7 +33849,7 @@ Data.Constant = BICst = {};
     var Buffer = {};
     var MODE = false;// 设置缓存模式为关闭
 
-    Data.BufferPool = {
+    BI.BufferPool = {
         put: function (name, cache) {
             if (BI.isNotNull(Buffer[name])) {
                 throw new Error("Buffer Pool has the key already!");
@@ -33879,7 +33868,7 @@ Data.Constant = BICst = {};
 
 (function () {
     var _Shared = {};
-    Data.SharingPool = {
+    BI.SharingPool = {
         _Shared: _Shared,
         put: function (name, shared) {
             _Shared[name] = shared;
@@ -33902,9 +33891,6 @@ Data.Constant = BICst = {};
             delete _Shared[key];
         }
     };
-})();Data.Req = {
+})();BI.Req = {
 
 };
-Data.Source = BISource = {
-
-};

dist/demo.js

@@ -12281,35 +12281,7 @@ Demo.CustomDateTime = BI.inherit(BI.Widget, {
         };
     }
 });
-BI.shortcut("demo.date_time", Demo.CustomDateTime);BICst.CONF = {};
-BICst.CONF.GROUP = {};
-BICst.CONF.GROUP.NUMBER = {};
-BICst.CONF.GROUP.NUMBER = {};
-BICst.CONF.GROUP.NUMBER.GROUP_BY_VALUE = 1;
-BICst.CONF.GROUP.NUMBER.CUSTOM_NUMBER_GROUP = 2;
-BICst.CONF.GROUP.NUMBER.SUM = 3;
-BICst.CONF.GROUP.NUMBER.AVG = 4;
-BICst.CONF.GROUP.NUMBER.MEDIAN = 5;
-BICst.CONF.GROUP.NUMBER.MAX = 6;
-BICst.CONF.GROUP.NUMBER.MIN = 7;
-BICst.CONF.GROUP.NUMBER.STANDARD_DEVIATION = 8;
-BICst.CONF.GROUP.NUMBER.VARIANCE = 9;
-BICst.CONF.GROUP.NUMBER.COUNT = 10;
-BICst.CONF.GROUP.NUMBER.RECORD_COUNT = 11;
-BICst.CONF.GROUP.NUMBER.NONE = 12;
-BICst.CONF.GROUP.NUMBER.PERIOD = 13;
-BICst.CONF.GROUP.NUMBER.RING = 14;
-BICst.CONF.GROUP.NUMBER.PERIOD_RATE = 15;
-BICst.CONF.GROUP.NUMBER.RING_RATE = 16;
-BICst.CONF.GROUP.NUMBER.YEAR = 17;
-BICst.CONF.GROUP.NUMBER.QUARTER = 18;
-BICst.CONF.GROUP.NUMBER.MONTH = 19;
-BICst.CONF.GROUP.NUMBER.WEEK = 20;
-BICst.CONF.GROUP.NUMBER.WEEKDAY = 21;
-BICst.CONF.GROUP.NUMBER.RENAME = 22;
-BICst.CONF.GROUP.NUMBER.DELETE = 23;
-
-Demo.Downlist = BI.inherit(BI.Widget, {
+BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-downlist"
     },

src/data/data.js

@@ -1,11 +0,0 @@
-/**
- * 保存数据，将js里面用到的常量数据都分离
- *
- */
-BI.Data = Data = {};
-
-/**
- * 存放bi里面通用的一些常量
- * @type {{}}
- */
-Data.Constant = BICst = {};

src/data/pool/pool.buffer.js

@@ -7,7 +7,7 @@
     var Buffer = {};
     var MODE = false;// 设置缓存模式为关闭
 
-    Data.BufferPool = {
+    BI.BufferPool = {
         put: function (name, cache) {
             if (BI.isNotNull(Buffer[name])) {
                 throw new Error("Buffer Pool has the key already!");

src/data/pool/pool.sharing.js

@@ -5,7 +5,7 @@
 
 (function () {
     var _Shared = {};
-    Data.SharingPool = {
+    BI.SharingPool = {
         _Shared: _Shared,
         put: function (name, shared) {
             _Shared[name] = shared;

src/data/req/req.js

@@ -1,3 +1,3 @@
-Data.Req = {
+BI.Req = {
 
 };

src/data/source/source.js

@@ -1,3 +0,0 @@
-Data.Source = BISource = {
-
-};

utils/utils.js

@@ -16278,17 +16278,6 @@ BI.Region.prototype = {
         return pos;
     }
 };/**
- * 保存数据，将js里面用到的常量数据都分离
- *
- */
-BI.Data = Data = {};
-
-/**
- * 存放bi里面通用的一些常量
- * @type {{}}
- */
-Data.Constant = BICst = {};
-/**
  * 缓冲池
  * @type {{Buffer: {}}}
  */
@@ -16297,7 +16286,7 @@ Data.Constant = BICst = {};
     var Buffer = {};
     var MODE = false;// 设置缓存模式为关闭
 
-    Data.BufferPool = {
+    BI.BufferPool = {
         put: function (name, cache) {
             if (BI.isNotNull(Buffer[name])) {
                 throw new Error("Buffer Pool has the key already!");
@@ -16316,7 +16305,7 @@ Data.Constant = BICst = {};
 
 (function () {
     var _Shared = {};
-    Data.SharingPool = {
+    BI.SharingPool = {
         _Shared: _Shared,
         put: function (name, shared) {
             _Shared[name] = shared;
@@ -16339,9 +16328,6 @@ Data.Constant = BICst = {};
             delete _Shared[key];
         }
     };
-})();Data.Req = {
+})();BI.Req = {
 
 };
-Data.Source = BISource = {
-
-};