fmui-base 2.1.9 → 2.1.11

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.11：弹出选择组件双击选项后返回到列表页面
+- 2.1.10：表单关联字段bug处理
 - 2.1.9：弹出选择组件双击后返回报错
 - 2.1.8：流程表单支持自动保存设置
 - 2.1.7：移动选人bug

package/lib/form/subForm.js

@@ -51,6 +51,8 @@ var PageHome = function (_React$Component) {
 
     var module = props.module && props.module != "undefined" ? props.module : "approve";
     FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+    //需要隐藏表头的子表表名
+    var isHideSubTblHeadTblList = ['dj_org_mb_duty_now'];
 
     // var itemParam = 
     _this.state = {
@@ -69,7 +71,8 @@ var PageHome = function (_React$Component) {
         key: ''
       },
       commentList: [],
-      subModel: []
+      subModel: [],
+      isHideSubTblHeadTblList: isHideSubTblHeadTblList
     };
 
     return _this;
@@ -687,9 +690,11 @@ var PageHome = function (_React$Component) {
       var t = this;
       console.log("getDetai===");
       var subForm = this.state.itemParam.subForm;
+      var subTblName = this.state.itemParam.key;
       if (!subForm) {
         subForm = [];
       }
+
       return subForm.map(function (item, i) {
         return _react2.default.createElement(
           'div',
@@ -699,12 +704,12 @@ var PageHome = function (_React$Component) {
             { className: 't-BCf dd-bottom-border', onClick: _this2.detailShow.bind(_this2, i, item.show) },
             _react2.default.createElement(
               Box,
-              { className: 't-LH44 t-PL16 t-PR2' },
+              { className: _this2.state.isHideSubTblHeadTblList.indexOf(subTblName) == -1 ? "t-LH44 t-PL16 t-PR2" : "t-DN" },
               _react2.default.createElement('i', { className: item.show ? "iconfont icon-arrow-down t-FS18 t-FCc" : "iconfont icon-arrow-up t-rotate-90 t-FS18 t-FCc" })
             ),
             _react2.default.createElement(
               Box,
-              { flex: 1, className: 't-LH46 t-FC9' },
+              { flex: 1, className: _this2.state.isHideSubTblHeadTblList.indexOf(subTblName) == -1 ? "t-LH46 t-FC9" : "t-DN" },
               i + 1
             ),
             _react2.default.createElement(
@@ -796,10 +801,10 @@ var PageHome = function (_React$Component) {
       return _react2.default.createElement(
         'div',
         { className: t.state.itemParam.isHidden ? 't-DN' : '' },
-        _react2.default.createElement('div', { className: 't-BCf7 t-H10' }),
+        _react2.default.createElement('div', { className: t.state.isHideSubTblHeadTblList.indexOf(t.state.itemParam.key) == -1 ? "t-BCf7 t-H10" : "t-DN" }),
         _react2.default.createElement(
           HBox,
-          { className: 't-P16 t-FS16 t-BCf dd-bottom-border', onClick: this.detailShowAll.bind(this) },
+          { className: t.state.isHideSubTblHeadTblList.indexOf(t.state.itemParam.key) == -1 ? "t-P16 t-FS16 t-BCf dd-bottom-border" : "t-DN", onClick: this.detailShowAll.bind(this) },
           _react2.default.createElement(
             Box,
             { flex: 1 },

package/lib/form/table.js

@@ -843,18 +843,19 @@ var PageHome = function (_React$Component) {
 			var t = this;
 			var isSubField = false;
 			var subTblName = '';
+			console.log("dealwithRelaField===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
 				var hideFlag = false;
 				var mustFlag = false;
 				var editFlag = false;
 				formRelaFieldMapsObj.map(function (formRelaFieldMapsObjItem) {
+					mustFlag = false;
 					var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
 					var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
 					var editType = formRelaFieldMapsObjItem.editType;
 					if (relaFieldTblName) {
 						if (relaFieldTblName) var relaFieldTblNameArray = relaFieldTblName.split(",");
-
 						relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
 							var nowValue = "";
 							var mainTblData = data.mainTblData;

package/lib/poppage/check.js

@@ -172,7 +172,12 @@ var PageHome = function (_React$Component) {
                 }
                 this.props.onChange(returnValue);
             }
-            history.back();
+            //防止双击选项时back两次
+            if (!location.hash.includes('POPPAGE')) {
+                return;
+            } else {
+                history.back();
+            }
         }
 
         // 触发弹出选择
@@ -359,7 +364,7 @@ var PageHome = function (_React$Component) {
                         } else {
                             t.refs.table.initState();
                         }
-
+                        // 防止双击字段时间戳加了两次 back一次回不去
                         if (!location.hash.includes('POPPAGE')) {
                             window.history.pushState({
                                 Poppage: t.state.historyStamp
@@ -388,7 +393,7 @@ var PageHome = function (_React$Component) {
                     historyStamp: 'SearchPanel.index_' + Date.now()
                 }, function () {
                     t.refs.table.initState();
-
+                    // 防止双击字段时间戳加了两次 back一次回不去  
                     if (!location.hash.includes('POPPAGE')) {
                         window.history.pushState({
                             Poppage: t.state.historyStamp

package/package.json

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