easy3wui 1.5.64-beta.7 → 1.5.64-beta.8

package/assets/editBigTable.css

@@ -72,3 +72,6 @@
   color: #999;
   opacity: 1;
 }
+.Easy3wEditBigTable .custom-edit-cell {
+  background-color: #f6ffed;
+}

package/assets/index.css

@@ -1556,3 +1556,6 @@ input.ant-input-number-input {
   color: #999;
   opacity: 1;
 }
+.Easy3wEditBigTable .custom-edit-cell {
+  background-color: #f6ffed;
+}

package/lib/Easy3wEditBigTable/index.js

@@ -189,26 +189,37 @@ var Easy3wEditBigTable = function (_Component) {
       return arr;
     };
 
-    _this.touchcountTotal = function () {
-      var rowsView = [].concat(_this.arrRows);
-      var objTotal = {}; // 总计对象
+    _this.touchCountTotal = function (rowsView, columns) {
       rowsView.map(function (row, index) {
-        _this.props.columns.map(function (item, idx) {
+        columns.map(function (item, idx) {
           var key = item.key,
-              totalFlag = item.totalFlag;
+              totalFlag = item.totalFlag,
+              children = item.children;
 
-          if (totalFlag && typeof totalFlag === 'boolean') {
+          if (children) {
+            _this.touchCountTotal(rowsView, children);
+          } else if (totalFlag && typeof totalFlag === 'boolean') {
             if (index === 0) {
-              objTotal[key] = 0;
+              _this.objTotal[key] = 0;
             }
             var intData = Number(row[key]) || 0;
-            objTotal[key] += intData;
+            _this.objTotal[key] += intData;
           }
           return idx;
         });
         return index;
       });
-      return objTotal;
+      return _this.objTotal;
+    };
+
+    _this.touchSetState = function (objState, callback) {
+      // objState 要设置的state对象
+      // callback 回调函数 非必须
+      if (callback && typeof callback === 'function') {
+        _this.setState(objState, callback);
+      } else {
+        _this.setState(objState);
+      }
     };
 
     _this.touchFilters = function () {
@@ -218,6 +229,12 @@ var Easy3wEditBigTable = function (_Component) {
         objFilters: (0, _extends5['default'])({}, objFilters, {
           enabled: !objFilters.enabled
         })
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -228,6 +245,12 @@ var Easy3wEditBigTable = function (_Component) {
 
       _this.setState({
         objFilters: (0, _extends5['default'])({}, objFilters, (_extends2 = {}, _extends2[fieldId] = value, _extends2))
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -238,6 +261,12 @@ var Easy3wEditBigTable = function (_Component) {
         objFilters: {
           enabled: objFilters.enabled
         }
+      }, function () {
+        var touchFiltersChangeState = _this.props.touchFiltersChangeState;
+
+        if (touchFiltersChangeState && typeof touchFiltersChangeState === 'function') {
+          touchFiltersChangeState((0, _extends5['default'])({}, _this.state.objFilters));
+        }
       });
     };
 
@@ -674,6 +703,7 @@ var Easy3wEditBigTable = function (_Component) {
   // #region 表头列处理
 
   // #endregion 表头列处理
+
   // #region 数据处理
   // 数据处理
 
@@ -685,6 +715,11 @@ var Easy3wEditBigTable = function (_Component) {
 
   // #endregion 数据处理
 
+  // #region state变更
+  // 设置组件state
+
+  // #endregion state变更
+
   // #region 筛选
   // 切换筛选
 
@@ -763,13 +798,15 @@ var Easy3wEditBigTable = function (_Component) {
     this.arrRows = this.touchDP();
     var objPrps = {};
     // #region 总计行
-    if (topTotalFlag) {
-      var arrTotalRows = [this.touchcountTotal()];
-      objPrps.topSummaryRows = arrTotalRows;
-    }
-    if (bottomTotalFlag) {
-      var _arrTotalRows = [this.touchcountTotal()];
-      objPrps.bottomSummaryRows = _arrTotalRows;
+    if (topTotalFlag || bottomTotalFlag) {
+      this.objTotal = {}; // 总计对象
+      var arrTotalRows = [this.touchCountTotal(this.arrRows, columns)];
+      if (topTotalFlag) {
+        objPrps.topSummaryRows = arrTotalRows;
+      }
+      if (bottomTotalFlag) {
+        objPrps.bottomSummaryRows = arrTotalRows;
+      }
     }
     // #endregion 总计行
     return _react2['default'].createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.64-beta.7",
+  "version": "1.5.64-beta.8",
   "description": "easy3wui components for react",
   "keywords": [
     "react",