fmui-base 2.1.97 → 2.1.99

package/README.md

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

package/lib/comment_list/List.js

@@ -318,7 +318,7 @@ var PageHome = function (_React$Component) {
           return _react2.default.createElement(
             VBox,
             { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
-            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16 t-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
+            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
               Box,
               null,
               '\'\''

package/lib/form/form.js

@@ -3150,7 +3150,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' },
                 _react2.default.createElement(
                   'span',
                   { style: t.state.itemParam.formStyleObj.titleStyle == null ? {} : t.state.itemParam.formStyleObj.titleStyle },
@@ -3345,7 +3345,7 @@ var PageHome = function (_React$Component) {
                 { className: 't-field-box t-FBAC t-W100' },
                 _react2.default.createElement(
                   'div',
-                  { className: t.state.itemParam.required ? "t-field-layout-h-label t-FS16 required" : "t-field-layout-h-label t-FS16" },
+                  { className: t.state.itemParam.required ? "t-field-layout-h-label  required" : "t-field-layout-h-label" },
                   t.state.itemParam.title
                 ),
                 _react2.default.createElement(
@@ -3358,7 +3358,7 @@ var PageHome = function (_React$Component) {
                     { flex: '1' },
                     _react2.default.createElement(
                       'span',
-                      { className: 't-FL t-FS16' },
+                      { className: 't-FL ' },
                       t.state.itemParam.selectValue
                     )
                   ),
@@ -3522,7 +3522,7 @@ var PageHome = function (_React$Component) {
               { className: 'flex-comment t-field-box' },
               _react2.default.createElement(
                 'div',
-                { className: 't-field-layout-h-label t-FS16 t-FBJ' },
+                { className: 't-field-layout-h-label  t-FBJ' },
                 _react2.default.createElement(
                   'span',
                   null,
@@ -3538,7 +3538,7 @@ var PageHome = function (_React$Component) {
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },
                   _react2.default.createElement(
                     'div',
-                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 t-FS16 commonwords' : 't-DN' },
+                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 'theme-color t-P6 commonwords' : 't-DN' },
                     _react2.default.createElement(
                       'div',
                       { onClick: this.selectCommonwords.bind(this) },

package/lib/form/subForm.js

@@ -871,7 +871,7 @@ var PageHome = function (_React$Component) {
         _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.state.isHideSubTblHeadTblList.indexOf(t.state.itemParam.key) == -1 ? "t-P16 t-FS16 t-BCf dd-bottom-border" : "t-DN", onClick: this.detailShowAll.bind(this) },
+          { className: t.state.isHideSubTblHeadTblList.indexOf(t.state.itemParam.key) == -1 ? "t-P16 t-BCf dd-bottom-border" : "t-DN", onClick: this.detailShowAll.bind(this) },
           _react2.default.createElement(
             Box,
             { flex: 1 },
@@ -895,7 +895,7 @@ var PageHome = function (_React$Component) {
         ),
         _react2.default.createElement(
           'div',
-          { className: "hejidiv-" + t.state.itemParam.key + "  t-FS16 t-BCf ", style: { textAlign: 'right', paddingRight: 20 } },
+          { className: "hejidiv-" + t.state.itemParam.key + " t-BCf ", style: { textAlign: 'right', paddingRight: 20 } },
           this.getSubTotal()
         ),
         _react2.default.createElement(

package/lib/form/table.js

@@ -1813,7 +1813,7 @@ var PageHome = function (_React$Component) {
 						{ className: 't-field-box' },
 						_react2.default.createElement(
 							'div',
-							{ className: 't-field-layout-h-label t-FS16' },
+							{ className: 't-field-layout-h-label' },
 							'\u9000\u56DE\u610F\u89C1'
 						),
 						_react2.default.createElement(
@@ -1832,7 +1832,7 @@ var PageHome = function (_React$Component) {
 						{ className: 'flex-comment default-comment t-field-box' },
 						_react2.default.createElement(
 							'div',
-							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },
+							{ className: 't-field-layout-h-label t-FBJ' },
 							_react2.default.createElement(
 								'span',
 								null,
@@ -1848,7 +1848,7 @@ var PageHome = function (_React$Component) {
 								{ className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
 								_react2.default.createElement(
 									'div',
-									{ className: 'theme-color t-P6 t-FS16 commonwords' },
+									{ className: 'theme-color t-P6 commonwords' },
 									_react2.default.createElement(
 										'div',
 										{ onClick: this.selectCommonwords.bind(this) },

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(
@@ -11071,12 +11079,12 @@ var Page = function (_React$Component) {
             { className: 't-field-box t-FBH' },
             _react2.default.createElement(
               'div',
-              { className: required ? "t-field-layout-h-label t-FS16 required" : "t-field-layout-h-label t-FS16" },
+              { className: required ? "t-field-layout-h-label   required" : "t-field-layout-h-label" },
               t.state.label
             ),
             _react2.default.createElement(
               HBox,
-              { flex: 1, className: t.state.scopeList == null || t.state.scopeList.length <= 0 ? "t-fw t-FS12 t-FC9 t-PL14 t-PR14" : "t-fw t-FS12 t-FC9 t-P10", vAlign: 'center' },
+              { flex: 1, className: t.state.scopeList == null || t.state.scopeList.length <= 0 ? "t-fw t-FS12 t-FC9 t-PL14 t-PR14" : "t-fw t-FS12 t-FC9", style: { justifyContent: "flex-end" }, vAlign: 'center' },
               t.state.scopeList.map(function (item, i) {
                 var className = "";
                 if (item.scopeType == "user") {

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.97",
+  "version": "2.1.99",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",