fmui-base 2.1.98 → 2.2.1

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.1：表单关联增加行隐藏参数
+- 2.1.99：移动端选人组件，默认展开当前登录人所在组织
 - 2.1.98：组件样式调整
 - 2.1.97：选人组件支持党员非党员检索
 - 2.1.96：新规范流程表单样式修改

package/lib/form/form.js

@@ -1678,7 +1678,7 @@ var PageHome = function (_React$Component) {
                 if (item.triggerFieldName == mainTblDataItem.key) {
                   // if(item.triggerFieldVal == mainTblDataItem.value){
                   var editType = item.editType;
-                  if (editType == 'hide') {
+                  if (editType == 'hide' || editType == 'rowhide') {
                     // relaFieldMap["key"]="isHidden";
                     if (item.triggerFieldVal == mainTblDataItem.value) {
                       itemParam.isHidden = true;
@@ -1728,7 +1728,7 @@ var PageHome = function (_React$Component) {
                     if (item.triggerFieldName == mainTblDataItem.itemCode) {
                       // if(item.triggerFieldVal == mainTblDataItem.value){
                       var editType = item.editType;
-                      if (editType == 'hide') {
+                      if (editType == 'hide' || editType == 'rowhide') {
                         // relaFieldMap["key"]="isHidden";
                         if (item.triggerFieldVal == mainTblDataItem.value) {
                           itemParam.isHidden = true;

package/lib/form/table.js

@@ -933,7 +933,7 @@ var PageHome = function (_React$Component) {
 								}
 							}
 							var relaFieldMap = {};
-							if (editType == 'hide') {
+							if (editType == 'hide' || editType == 'rowhide') {
 								relaFieldMap["key"] = "isHidden";
 								if (triggerFieldVal == nowValue) {
 									relaFieldMap["value"] = true;

package/lib/selectMember/select.js

@@ -310,8 +310,9 @@ var Page = function (_React$Component) {
       top: "",
       nodataText: "暂无数据",
       isShowSelectCpc: isShowSelectCpc, //是否显示党员选项
-      cunSelectCpc: "1", //1是党员，0是非党员
-      selectCpcOptions: [{ value: "1", checked: true, content: '党员', disable: false }, { value: "0", checked: false, content: '非党员', disable: false }]
+      curSelectCpc: "1", //1是党员，0是非党员
+      selectCpcOptions: [{ value: "1", checked: true, content: '党员', disable: false }, { value: "0", checked: false, content: '非党员', disable: false }],
+      selUserOurorg: "0" //是否默认打开本组织
     };
 
     _db2.default.FlowModuleAPI.getSysSettingByMark({ mark: 'selUserIsDJ' }).then(function (content) {
@@ -321,6 +322,14 @@ var Page = function (_React$Component) {
     }).catch(function (error) {
       console.error(error);
     });
+    _db2.default.FlowModuleAPI.getSysSettingByMark({ mark: 'selUserOurorg' }).then(function (content) {
+      console.log("selUserOurorg", content);
+      if (!(typeof _this.props.isShowInMyOrg != "undefined" && _this.props.isShowInMyOrg != null) && content && content == '1') {
+        _this.state.isShowInMyOrg = true;
+      }
+    }).catch(function (error) {
+      console.error(error);
+    });
     _this.listener = _this.handleHidePopup.bind(_this);
     return _this;
   }
@@ -810,7 +819,6 @@ var Page = function (_React$Component) {
             if (t.props.onChange != undefined) {
               t.props.onChange(scopeLists, fieldDataValue);
             }
-
             //选人验签
             if (bizSn && bizSn != "" && bizSn != undefined) {
 
@@ -1003,7 +1011,7 @@ var Page = function (_React$Component) {
             }
           }
           for (var i = 0; i < orgUserList.length; i++) {
-            if (t.state.isShowSelectCpc && t.state.cunSelectCpc.indexOf(orgUserList[i].isCpc) === -1) {
+            if (t.state.isShowSelectCpc && t.state.curSelectCpc.indexOf(orgUserList[i].isCpc) === -1) {
               continue;
             }
             if (!orgUserList[i].checked) {
@@ -1759,7 +1767,7 @@ var Page = function (_React$Component) {
         if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
       }
       t.setState({
-        cunSelectCpc: newremindStyle
+        curSelectCpc: newremindStyle
       }, function () {
         t.instance.update(t.getContent());
       });
@@ -8081,9 +8089,9 @@ var Page = function (_React$Component) {
         }
       }
       var isShowSelectCpc = this.state.isShowSelectCpc;
-      var cunSelectCpc = this.state.cunSelectCpc;
+      var curSelectCpc = this.state.curSelectCpc;
       console.log("isShowSelectCpc:" + isShowSelectCpc);
-      console.log("cunSelectCpc:" + cunSelectCpc);
+      console.log("curSelectCpc:" + curSelectCpc);
 
       var props = {
         placeholder: "请输入",
@@ -8994,7 +9002,7 @@ var Page = function (_React$Component) {
                   chooseType.indexOf("userAndOrg") >= 0 || chooseType.indexOf("userNotOrg") >= 0 ? t.state.orgUserList.map(function (user, index) {
                     return _react2.default.createElement(
                       HBox,
-                      { vAlign: 'center', className: isShowSelectCpc && cunSelectCpc.indexOf(user.isCpc) == -1 ? "t-DN" : "t-BCf", onClick: function onClick() {
+                      { vAlign: 'center', className: isShowSelectCpc && curSelectCpc.indexOf(user.isCpc) == -1 ? "t-DN" : "t-BCf", onClick: function onClick() {
                           t.checkItemMember(index, "orgUser");
                         } },
                       _react2.default.createElement(

package/lib/upload/upload.js

@@ -627,7 +627,7 @@ var PageHome = function (_React$Component) {
                     { className: this.state.label == '' ? 't-DN' : 't-field-box t-FBH t-FBAC t-FBJ' },
                     _react2.default.createElement(
                         'div',
-                        { className: this.state.required ? 't-field-layout-h-label t-FS16 required' : 't-field-layout-h-label t-FS16' },
+                        { className: this.state.required ? 't-field-layout-h-label  required' : 't-field-layout-h-label ' },
                         this.props.label
                     )
                 ),

package/package.json

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