fmui-base 2.1.96 → 2.1.98

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.98：组件样式调整
+- 2.1.97：选人组件支持党员非党员检索
 - 2.1.96：新规范流程表单样式修改
 - 2.1.95：新规范样式修改
 - 2.1.94：统一待办跳转

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/db/db.js

@@ -1070,6 +1070,21 @@ context.create('FlowModuleAPI', {
       //   content: <Loading />
       // });
     }
+  },
+
+  getSysSettingByMark: {
+    mockUrl: 'query/queryCanBack.json',
+    url: _variables2.default.URLS.getSysSettingByMark,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    /*    header:{'content-Type':'application/x-www-form-urlencoded'},*/
+    willFetch: function willFetch() {
+      // Toast.show({
+      //   content: <Loading />
+      // });
+    }
   }
 
 });

package/lib/db/variables.js

@@ -135,7 +135,8 @@ exports.default = {
         getUserInfo: approveUrlPrefix + "getUserInfo" + '?', //获取用户信息
         getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?', //获取可发起的子流程
         getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?', //获取相关对象
-        getUrgencyEnum: approveUrlPrefix + "getUrgencyEnum" + '?' //获取相关对象
+        getUrgencyEnum: approveUrlPrefix + "getUrgencyEnum" + '?', //获取枚举
+        getSysSettingByMark: approveUrlPrefix + "getSysSettingByMark" + '?' //获取系统设置
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

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/process_list/processList.js

@@ -384,7 +384,7 @@ var ListItem = function (_React$Component) {
           { className: 'approve-item', onClick: this.clickDetail.bind(this) },
           _react2.default.createElement(
             Box,
-            { className: 'approve-check' },
+            { className: this.props.isBatch == false ? 't-DN' : 'approve-check' },
             _react2.default.createElement(
               Box,
               { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskId': this.props.id, 'data-module': this.props.module, 'data-processInstanceId': this.props.processInstanceId },
@@ -1255,26 +1255,22 @@ var PageHome = function (_React$Component2) {
       };
       var undoDiv = _react2.default.createElement(
         'div',
-        null,
+        { className: 't-badge' },
         ' \u5F85\u529E',
         this.state.titleCount.undo == 0 ? '' : _react2.default.createElement(
           'span',
-          { style: { color: 'red' } },
-          '(',
-          this.state.titleCount.undo,
-          ')'
+          { className: 'badge-inner' },
+          this.state.titleCount.undo
         )
       );
       var unreadDiv = _react2.default.createElement(
         'div',
-        null,
+        { className: 't-badge' },
         ' \u5F85\u9605',
         this.state.titleCount.unread == 0 ? '' : _react2.default.createElement(
           'span',
-          { style: { color: 'red' } },
-          '(',
-          this.state.titleCount.unread,
-          ')'
+          { className: 'badge-inner' },
+          this.state.titleCount.unread
         )
       );
       return _react2.default.createElement(

package/lib/selectMember/select.js

@@ -45,6 +45,10 @@ var _Toast = require('saltui/lib/Toast');
 
 var _Toast2 = _interopRequireDefault(_Toast);
 
+var _CheckboxField = require('saltui/lib/CheckboxField');
+
+var _CheckboxField2 = _interopRequireDefault(_CheckboxField);
+
 var _variables = require('../db/variables');
 
 var _variables2 = _interopRequireDefault(_variables);
@@ -204,6 +208,8 @@ var Page = function (_React$Component) {
         chooseObj = chooseObj.substring(0, chooseObj.length - 1);
       }
     }
+    var isShowSelectCpc = false;
+
     _this.state = {
       bottomHeight: bottomHeight,
       baseCorpId: baseCorpId,
@@ -302,9 +308,19 @@ var Page = function (_React$Component) {
       winHeight: winHeight + "px",
       tabHeight: "",
       top: "",
-      nodataText: "暂无数据"
+      nodataText: "暂无数据",
+      isShowSelectCpc: isShowSelectCpc, //是否显示党员选项
+      cunSelectCpc: "1", //1是党员，0是非党员
+      selectCpcOptions: [{ value: "1", checked: true, content: '党员', disable: false }, { value: "0", checked: false, content: '非党员', disable: false }]
     };
 
+    _db2.default.FlowModuleAPI.getSysSettingByMark({ mark: 'selUserIsDJ' }).then(function (content) {
+      if (content && content == '1') {
+        _this.state.isShowSelectCpc = true;
+      }
+    }).catch(function (error) {
+      console.error(error);
+    });
     _this.listener = _this.handleHidePopup.bind(_this);
     return _this;
   }
@@ -941,6 +957,7 @@ var Page = function (_React$Component) {
         if (navList[index].canUse == "0" && !navList[index].isCur) {
           return;
         }
+
         navList[index].checkAll = !navList[index].checkAll;
         var orgList = t.state.orgList;
         var orgUserList = t.state.orgUserList;
@@ -986,6 +1003,9 @@ 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) {
+              continue;
+            }
             if (!orgUserList[i].checked) {
               orgUserList[i].checked = true;
               total++;
@@ -1730,6 +1750,20 @@ var Page = function (_React$Component) {
         });
       }
     }
+  }, {
+    key: 'selectCpcChange',
+    value: function selectCpcChange(data) {
+      var t = this;
+      var newremindStyle = "";
+      for (var i = 0; i < data.length; i++) {
+        if (i == data.length - 1) newremindStyle += data[i].value;else newremindStyle += data[i].value + ',';
+      }
+      t.setState({
+        cunSelectCpc: newremindStyle
+      }, function () {
+        t.instance.update(t.getContent());
+      });
+    }
 
     //选择本组织
 
@@ -8046,6 +8080,10 @@ var Page = function (_React$Component) {
           checkAllCanUse = navList[navList.length - 1].canUse;
         }
       }
+      var isShowSelectCpc = this.state.isShowSelectCpc;
+      var cunSelectCpc = this.state.cunSelectCpc;
+      console.log("isShowSelectCpc:" + isShowSelectCpc);
+      console.log("cunSelectCpc:" + cunSelectCpc);
 
       var props = {
         placeholder: "请输入",
@@ -8760,30 +8798,46 @@ var Page = function (_React$Component) {
                   { id: 'anchor', style: { overflow: "auto", height: '' + t.state.tabHeight }, className: 't-PB68 dd-top-border scrollHeight t-PR' },
                   _react2.default.createElement(
                     'div',
-                    { className: isShowCheckAll ? "" : "t-DN" },
+                    { className: 'select-row' },
                     _react2.default.createElement(
                       'div',
-                      { className: 't-PL16 t-PR16 t-LH3 dd-bottom-border t-BCf', onClick: function onClick() {
-                          t.checkAllMember("org");
-                        } },
+                      { className: isShowCheckAll ? "select-all-btn" : "t-DN" },
                       _react2.default.createElement(
-                        HBox,
-                        { vAlign: 'center' },
+                        'div',
+                        { className: 't-PL16 t-PR16 t-LH3 dd-bottom-border t-BCf', onClick: function onClick() {
+                            t.checkAllMember("org");
+                          } },
                         _react2.default.createElement(
                           HBox,
-                          null,
+                          { vAlign: 'center' },
                           _react2.default.createElement(
-                            'div',
-                            { className: checkAllCanUse == '0' ? 't-checkbox-field-icon-list disabled' : currentCheckAll ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
-                            _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+                            HBox,
+                            null,
+                            _react2.default.createElement(
+                              'div',
+                              { className: checkAllCanUse == '0' ? 't-checkbox-field-icon-list disabled' : currentCheckAll ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                              _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+                            )
+                          ),
+                          _react2.default.createElement(
+                            Box,
+                            { flex: 1, className: 't-ML10' },
+                            '\u5168\u9009'
                           )
-                        ),
-                        _react2.default.createElement(
-                          Box,
-                          { flex: 1, className: 't-ML10' },
-                          '\u5168\u9009'
                         )
                       )
+                    ),
+                    _react2.default.createElement(
+                      'div',
+                      { className: isShowSelectCpc ? "checkbox-field-wrapper" : "t-DN" },
+                      _react2.default.createElement(_CheckboxField2.default, {
+                        data: t.state.selectCpcOptions,
+                        mode: 'list',
+                        required: false,
+                        inline: true,
+                        onChange: t.selectCpcChange.bind(t),
+                        className: 'checkbox-inline'
+                      })
                     )
                   ),
                   _react2.default.createElement(
@@ -8940,7 +8994,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: ' t-BCf', onClick: function onClick() {
+                      { vAlign: 'center', className: isShowSelectCpc && cunSelectCpc.indexOf(user.isCpc) == -1 ? "t-DN" : "t-BCf", onClick: function onClick() {
                           t.checkItemMember(index, "orgUser");
                         } },
                       _react2.default.createElement(
@@ -11017,12 +11071,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/selectMember/select.less

@@ -37,4 +37,29 @@
 //4.0规范修改样式
 .t-search-bar-input[type=search] {
   border-radius: 83px !important;
+}
+
+
+.checkbox-inline > div {
+  display: flex !important;
+  flex-direction: row !important;
+}
+
+.select-row {
+  display: flex;
+  align-items: center;
+}
+
+.select-all-btn {
+  flex-shrink: 0;   
+  width: 100px;  /* 不压缩全选按钮 */
+}
+.t-checkbox-field-icon-wrapper+.t-checkbox-field-content {
+    padding-right: 24px !important;
+    padding-left: 0px !important;
+}
+.checkbox-field-wrapper {
+  flex: 1;            /* 占满剩余空间 */
+  min-width: 0;       /* 防止溢出 */
+  overflow: hidden;   /* 超出隐藏 */
 }

package/package.json

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