easy3wui 1.5.8-12.beta → 1.5.8-13.beta

package/lib/Easy3wEditBigTable/index.js

@@ -1074,7 +1074,7 @@ var _initialiseProps = function _initialiseProps() {
           titlec = column.name,
           helpInfo = column.helpInfo;
       var e3wFieldCfg = _this3.props.e3wFieldCfg;
-      var dataIndex = column.dataIndex;
+      var dataIndex = column.key;
 
       var objCfg = e3wFieldCfg && e3wFieldCfg[dataIndex] && e3wFieldCfg[dataIndex] instanceof Object ? e3wFieldCfg[dataIndex] : null;
       if (objCfg) {
@@ -1098,15 +1098,18 @@ var _initialiseProps = function _initialiseProps() {
             var needHelpFlag = true;
             if (titlec && titlec instanceof Object) {
               var _titlec = titlec,
+                  titleType = _titlec.type,
                   props = _titlec.props;
 
-              var _ref3 = props || {},
-                  placement = _ref3.placement,
-                  titleT = _ref3.title,
-                  children = _ref3.children,
-                  restProps = (0, _objectWithoutProperties3['default'])(_ref3, ['placement', 'title', 'children']);
+              var _ref3 = titleType || {},
+                  name = _ref3.name;
 
-              if (placement && titleT && children) {
+              var _ref4 = props || {},
+                  titleT = _ref4.title,
+                  children = _ref4.children,
+                  restProps = (0, _objectWithoutProperties3['default'])(_ref4, ['title', 'children']);
+
+              if (name === 'Tooltip' && titleT) {
                 // 创建新的Tooltip组件，继承现有props，更新title
                 titlec = _react2['default'].createElement(
                   _tooltip2['default'],
@@ -1185,7 +1188,6 @@ var _initialiseProps = function _initialiseProps() {
         column.name = titlec;
       }
       columnsNew.push((0, _extends3['default'])({}, column));
-      // return column;
     }
     if (autoAddNumber && typeof autoAddNumber === 'boolean') {
       var objColumns = columns && columns.length > 0 ? columns[0] : {};
@@ -1215,8 +1217,8 @@ var _initialiseProps = function _initialiseProps() {
   this.saveEditBigTableZJ = function () {
     var objToolbarProps = _this3.props.objToolbarProps;
 
-    var _ref4 = objToolbarProps || {},
-        saveEditBigTable = _ref4.saveEditBigTable;
+    var _ref5 = objToolbarProps || {},
+        saveEditBigTable = _ref5.saveEditBigTable;
 
     if (saveEditBigTable && typeof saveEditBigTable === 'function') {
       // 数据变更-回调函数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.8-12.beta",
+  "version": "1.5.8-13.beta",
   "description": "easy3wui components for react",
   "keywords": [
     "react",