fmui-base 2.3.10 → 2.3.12

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.11：门户首页grid常用应用部件增加扩展入口调整为页签（一网通办项目需求，临时版本）
+- 2.3.11：子表支持子表按钮自定义
 - 2.3.10：门户首页grid常用应用部件增加扩展入口（一网通办项目需求，临时版本）
 - 2.3.9：子表支持整个子表隐藏
 - 2.3.8：子表多列排版错乱处理

package/lib/form/subForm.js

@@ -1111,6 +1111,9 @@ var PageHome = function (_React$Component) {
       if (!extButtonList) {
         extButtonList = [];
       }
+      if (subForm && subForm[index] && subForm[index].extButtonList) {
+        extButtonList = subForm[index].extButtonList;
+      }
 
       return extButtonList.map(function (item, i) {
         return _react2.default.createElement(

package/lib/react_grid/react_grid.js

@@ -829,9 +829,17 @@ var MyGrid = function (_React$Component) {
                 null,
                 _react2.default.createElement('img', { className: 'nodata t-PL10 t-PR10', src: '../../../fmui/images/home/nodata.png' })
               )
+            ),
+            _react2.default.createElement(
+              _Tab2.default.Item,
+              { title: _react2.default.createElement(
+                  'div',
+                  { style: { color: styleSetting.titleSet.titleColor, fontWeight: styleSetting.titleSet.titleWeight == 1 ? 700 : '', fontSize: styleSetting.titleSet.titleSize } },
+                  t.props.cyyyPlusTitle ? t.props.cyyyPlusTitle : ''
+                ) },
+              t.props.cyyyPlusContent ? t.props.cyyyPlusContent : ''
             )
-          ),
-          t.props.extendedContent ? t.props.extendedContent : ''
+          )
         );
       }
       if (item.portletCode === 'bssx') {

package/lib/selectMember/select.js

@@ -5826,7 +5826,7 @@ var Page = function (_React$Component) {
       }
     }
 
-    // 根据 commonUsedData 实际选中状态同步全选
+    // 根据 commonUsedData 实际选中状态同步全选（仿照 roleCheckAll 逻辑）
 
   }, {
     key: 'syncCommonCheckState',
@@ -5944,10 +5944,10 @@ var Page = function (_React$Component) {
               commonTreeData.push(data);
             }
           }
-          selectCommonNum = t.commonDataChecked(commonUsedData);
-          if (selectCommonNum == commonUsedData.length) {
-            commonCheckAll = true;
-          }
+          t.commonDataChecked(commonUsedData);
+          var commonCheckState = t.syncCommonCheckState(commonUsedData);
+          selectCommonNum = commonCheckState.selectCommonNum;
+          commonCheckAll = commonCheckState.commonCheckAll;
         }
 
         if (commonUsedDataSearch != null && commonUsedDataSearch != undefined && commonUsedDataSearch.length > 0) {
@@ -6528,15 +6528,15 @@ var Page = function (_React$Component) {
       var t = this;
       var chooseType = this.getChooseType();
       if (obj.activeKey == "common") {
+        var isShowCheckAll = true;
+        if (checkType == "radio") {
+          isShowCheckAll = false;
+        }
         var commonUsedData = t.state.commonUsedData;
         if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
           t.commonDataChecked(commonUsedData);
         }
         var commonCheckState = t.syncCommonCheckState(commonUsedData);
-        var isShowCheckAll = true;
-        if (checkType == "radio") {
-          isShowCheckAll = false;
-        }
         t.setState({
           selectCommonNum: commonCheckState.selectCommonNum,
           isShowCheckAll: isShowCheckAll,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.3.10",
+  "version": "2.3.12",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",