fmui-base 2.3.15 → 2.3.16

package/lib/selectMember/select.js

@@ -951,7 +951,127 @@ var Page = function (_React$Component) {
       var t = this;
       var scopeList = this.state.scopeList;
       var chooseType = this.getChooseType();
-      if ("user" == type) {
+      if ("common" == type) {
+        var commonCheckAll = t.state.commonCheckAll;
+        commonCheckAll = !commonCheckAll;
+        var commonUsedData = t.state.commonUsedData;
+        var total = t.state.total;
+        var selectCommonNum = t.state.selectCommonNum;
+        var selectedList = t.state.selectedList;
+        var selectUsers = selectedList.selectUsers;
+        var selectOrgs = selectedList.selectOrgs;
+        var selectRoles = selectedList.selectRoles;
+        var selectStations = selectedList.selectStations;
+        var selectGroups = selectedList.selectGroups;
+        if (selectUsers == null || selectUsers == undefined) {
+          selectUsers = [];
+        }
+        if (selectOrgs == null || selectOrgs == undefined) {
+          selectOrgs = [];
+        }
+        if (selectRoles == null || selectRoles == undefined) {
+          selectRoles = [];
+        }
+        if (selectStations == null || selectStations == undefined) {
+          selectStations = [];
+        }
+        if (selectGroups == null || selectGroups == undefined) {
+          selectGroups = [];
+        }
+        if (commonCheckAll) {
+          for (var i = 0; i < commonUsedData.length; i++) {
+            var common = commonUsedData[i];
+            if (!common.checked) {
+              commonUsedData[i].checked = true;
+              total++;
+              selectCommonNum++;
+              var selectedData = { id: common.scopeValue };
+              var selectData = null;
+              if (common.scopeType == "user") {
+                selectedData.userName = common.scopeName;
+                selectedData.imageId = common.imageId;
+                selectData = selectUsers;
+              } else if (common.scopeType == "org") {
+                selectedData.orgName = common.scopeName;
+                selectData = selectOrgs;
+              } else if (common.scopeType == "role") {
+                selectedData.roleName = common.scopeName;
+                selectData = selectRoles;
+              } else if (common.scopeType == "station") {
+                selectedData.stationName = common.scopeName;
+                selectData = selectStations;
+              } else if (common.scopeType == "group") {
+                selectedData.groupName = common.scopeName;
+                selectData = selectGroups;
+              }
+              if (selectData != null) {
+                var flag = true;
+                for (var j = 0; j < selectData.length; j++) {
+                  if (selectData[j].id == common.scopeValue) {
+                    flag = false;
+                    break;
+                  }
+                }
+                if (flag) {
+                  selectData.push(selectedData);
+                  scopeList.push(commonUsedData[i]);
+                }
+              }
+            }
+          }
+        } else {
+          for (var i = 0; i < commonUsedData.length; i++) {
+            var common = commonUsedData[i];
+            if (common.checked) {
+              commonUsedData[i].checked = false;
+              total--;
+              selectCommonNum--;
+              var selectData = null;
+              if (common.scopeType == "user") {
+                selectData = selectUsers;
+              } else if (common.scopeType == "org") {
+                selectData = selectOrgs;
+              } else if (common.scopeType == "role") {
+                selectData = selectRoles;
+              } else if (common.scopeType == "station") {
+                selectData = selectStations;
+              } else if (common.scopeType == "group") {
+                selectData = selectGroups;
+              }
+              if (selectData != null) {
+                for (var j = 0; j < selectData.length; j++) {
+                  if (selectData[j].id == common.scopeValue) {
+                    selectData.splice(j, 1);
+                    break;
+                  }
+                }
+              }
+              for (var j = 0; j < scopeList.length; j++) {
+                if (scopeList[j].scopeValue == common.scopeValue) {
+                  scopeList.splice(j, 1);
+                  break;
+                }
+              }
+            }
+          }
+        }
+        selectedList.selectUsers = selectUsers;
+        selectedList.selectOrgs = selectOrgs;
+        selectedList.selectRoles = selectRoles;
+        selectedList.selectStations = selectStations;
+        selectedList.selectGroups = selectGroups;
+        var commonCheckState = t.syncCommonCheckState(commonUsedData);
+        t.setState({
+          commonUsedData: commonUsedData,
+          total: total,
+          selectCommonNum: commonCheckState.selectCommonNum,
+          commonCheckAll: commonCheckState.commonCheckAll,
+          selectedList: selectedList,
+          scopeList: scopeList
+        }, function () {
+          _this2.instance.update(_this2.getContent());
+        });
+      } else if ("user" == type) {
         var navList = t.state.navUserList;
         var index = navList.length - 1;
         navList[index].checkAll = !navList[index].checkAll;
@@ -2141,10 +2261,13 @@ var Page = function (_React$Component) {
               };
               commonUsedData.push(data);
             }
+            var commonCheckState = t.syncCommonCheckState(commonUsedData);
             t.setState({
               commonTreeData: commonTreeData,
               commonUsedData: commonUsedData,
               selectUserNum: selectUserNum,
+              selectCommonNum: commonCheckState.selectCommonNum,
+              commonCheckAll: commonCheckState.commonCheckAll,
               navCommonList: navList,
               isShowNav: isShowNav,
               isShowCheckAll: isShowCheckAll
@@ -3924,9 +4047,12 @@ var Page = function (_React$Component) {
             };
             commonUsedData.push(data);
           }
+          var commonCheckState = t.syncCommonCheckState(commonUsedData);
           stateParam = {
             commonTreeData: commonTreeData,
             commonUsedData: commonUsedData,
+            selectCommonNum: commonCheckState.selectCommonNum,
+            commonCheckAll: commonCheckState.commonCheckAll,
             navCommonList: navList,
             isShowNav: true,
             isShowCheckAll: isShowCheckAll
@@ -4148,7 +4274,7 @@ var Page = function (_React$Component) {
         }
         var result = t.checkOneCommonItem(commonUsedData[index].checked, selectData, commonUsedData, selectedData, checkType, total, selectCommonNum, index, scopeList);
         total = result.total;
-        selectUserNum = result.selectNum;
+        selectCommonNum = result.selectNum;
         if (common.scopeType == "user") {
           selectedList.selectUsers = selectData;
         } else if (common.scopeType == "org") {
@@ -4160,10 +4286,12 @@ var Page = function (_React$Component) {
         } else if (common.scopeType == "group") {
           selectedList.selectGroups = selectData;
         }
+        var commonCheckState = t.syncCommonCheckState(commonUsedData);
         t.setState({
           commonUsedData: commonUsedData,
           total: total,
-          selectCommonNum: selectUserNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
+          commonCheckAll: commonCheckState.commonCheckAll,
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
@@ -5698,6 +5826,23 @@ var Page = function (_React$Component) {
       }
     }
 
+    // 根据 commonUsedData 实际选中状态同步全选（仿照 roleCheckAll 逻辑）
+
+  }, {
+    key: 'syncCommonCheckState',
+    value: function syncCommonCheckState(commonUsedData) {
+      var selectCommonNum = 0;
+      if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
+        for (var i = 0; i < commonUsedData.length; i++) {
+          if (commonUsedData[i].checked) {
+            selectCommonNum++;
+          }
+        }
+      }
+      var commonCheckAll = commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0 && selectCommonNum == commonUsedData.length;
+      return { selectCommonNum: selectCommonNum, commonCheckAll: commonCheckAll };
+    }
+
     //修改获取的常用数据选中状态
 
   }, {
@@ -5799,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) {
@@ -6383,23 +6528,19 @@ var Page = function (_React$Component) {
       var t = this;
       var chooseType = this.getChooseType();
       if (obj.activeKey == "common") {
-        var commonUsedData = t.state.commonUsedData;
-        var selectCommonNum = 0;
-        var commonCheckAll = false;
-        if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
-          selectCommonNum = t.commonDataChecked(commonUsedData);
-          if (selectCommonNum == commonUsedData.length) {
-            commonCheckAll = true;
-          }
-        }
         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);
         t.setState({
-          selectCommonNum: selectCommonNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckAll,
+          commonCheckAll: commonCheckState.commonCheckAll,
           isShowNav: false,
           activeKey: obj.activeKey
         }, function () {
@@ -7413,20 +7554,16 @@ var Page = function (_React$Component) {
 
         }
 
-        var selectCommonNum = 0;
         if (commonSearchData.length > 0) {
-          selectCommonNum = t.commonDataChecked(commonSearchData);
-        }
-        var commonCheckAll = false;
-        if (commonSearchData != null && commonSearchData != undefined && selectCommonNum == commonSearchData.length) {
-          commonCheckAll = true;
+          t.commonDataChecked(commonSearchData);
         }
+        var commonCheckState = t.syncCommonCheckState(commonSearchData);
         t.setState({
           commonUsedData: commonSearchData,
           commonTreeData: commonTreeData,
-          selectCommonNum: selectCommonNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckAll,
+          commonCheckAll: commonCheckState.commonCheckAll,
           commonName: value,
           isShowNav: false,
           activeKey: type
@@ -8577,6 +8714,34 @@ var Page = function (_React$Component) {
                 tabContent = _react2.default.createElement(
                   'div',
                   { id: 'anchor', style: { overflow: "auto", height: '' + t.state.tabHeight }, className: 't-PB68 dd-top-border scrollHeight t-PR' },
+                  _react2.default.createElement(
+                    'div',
+                    { className: t.state.isShowCheckAll && t.state.commonUsedData.length > 0 ? "" : "t-DN" },
+                    _react2.default.createElement(
+                      'div',
+                      { className: 't-PL16 t-PR16 t-LH3 dd-bottom-border t-BCf', onClick: function onClick() {
+                          t.checkAllMember("common");
+                        } },
+                      _react2.default.createElement(
+                        HBox,
+                        { vAlign: 'center' },
+                        _react2.default.createElement(
+                          HBox,
+                          null,
+                          _react2.default.createElement(
+                            'div',
+                            { className: t.state.commonCheckAll ? '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(
                     'div',
                     { className: t.state.commonName == "" && t.state.isShowNav ? "t-BCf7 t-OFA t-WSN dd-bottom-border" : "t-DN" },

package/lib/tblform/FlowCommentPane.js

@@ -49,8 +49,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 

package/package.json

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

package/lib/nvoice/index.js

@@ -1,16 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _nvoice = require('./nvoice');
-
-Object.defineProperty(exports, 'default', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_nvoice).default;
-  }
-});
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/nvoice/nvoice.js

@@ -1,177 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports.default = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _Group = require('saltui/lib/Group');
-
-var _Group2 = _interopRequireDefault(_Group);
-
-var _Field = require('saltui/lib/Field');
-
-var _Field2 = _interopRequireDefault(_Field);
-
-var _upload = require('../upload/upload');
-
-var _upload2 = _interopRequireDefault(_upload);
-
-var _Boxs = require('saltui/lib/Boxs');
-
-var _Boxs2 = _interopRequireDefault(_Boxs);
-
-var _db = require('../db/db');
-
-var _db2 = _interopRequireDefault(_db);
-
-require('./nvoice.less');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var HBox = _Boxs2.default.HBox,
-    Box = _Boxs2.default.Box,
-    VBox = _Boxs2.default.VBox;
-
-var Nvoice = function (_React$Component) {
-    _inherits(Nvoice, _React$Component);
-
-    function Nvoice(props) {
-        _classCallCheck(this, Nvoice);
-
-        // 传入的props参数
-        var _this = _possibleConstructorReturn(this, (Nvoice.__proto__ || Object.getPrototypeOf(Nvoice)).call(this, props));
-
-        _this.initFn = function (id) {
-
-            // 初始发票详情数据  
-            _db2.default.form.getNoInvoiceList({
-                invoicedataid: id
-            }).then(function (content) {
-                _this.setState({
-                    invoicedata: content
-                });
-            }).catch(function (error) {
-                console.error('获取详情数据失败', error);
-            });
-        };
-
-        var invoicedataid = _this.props.id;
-        var title = _this.props.label || '发票详情';
-        var required = _this.props.required || false;
-
-        _this.state = {
-            invoicedataid: invoicedataid,
-            invoicedata: [],
-            title: title,
-            required: required
-        };
-
-        return _this;
-    }
-
-    _createClass(Nvoice, [{
-        key: 'componentDidMount',
-        value: function componentDidMount() {
-            this.initFn(this.state.invoicedataid);
-        }
-    }, {
-        key: 'downloadFile',
-
-
-        // 下载函数
-        value: function (_downloadFile) {
-            function downloadFile(_x) {
-                return _downloadFile.apply(this, arguments);
-            }
-
-            downloadFile.toString = function () {
-                return _downloadFile.toString();
-            };
-
-            return downloadFile;
-        }(function (file) {
-            downloadFile(file.relaObjId);
-        })
-    }, {
-        key: 'render',
-        value: function render() {
-            return _react2.default.createElement(
-                _Group2.default.List,
-                { borderTopNone: true },
-                _react2.default.createElement(
-                    _Field2.default,
-                    { required: this.state.required, label: this.state.title, layout: 'h', multiLine: true },
-                    _react2.default.createElement(
-                        'div',
-                        null,
-                        this.state.invoicedata.map(function (item, index) {
-                            var fileList = [];
-                            try {
-                                if (item.invoicefileInfo) {
-                                    fileList = JSON.parse(item.invoicefileInfo);
-                                }
-                            } catch (e) {
-                                console.error('发票附件解析失败', e);
-                            }
-
-                            return _react2.default.createElement(
-                                'div',
-                                { key: item.id, className: 't-MT2' },
-                                _react2.default.createElement(
-                                    VBox,
-                                    { className: 'nvoice-filetitle', hAlign: 'start' },
-                                    _react2.default.createElement(
-                                        Box,
-                                        null,
-                                        item.invoicename
-                                    ),
-                                    _react2.default.createElement(
-                                        HBox,
-                                        { vAlign: 'center' },
-                                        _react2.default.createElement(
-                                            Box,
-                                            { className: 'label label-primary' },
-                                            item.invoicetype
-                                        ),
-                                        _react2.default.createElement(
-                                            Box,
-                                            null,
-                                            '\uFFE5',
-                                            item.invoiceamount
-                                        )
-                                    )
-                                ),
-                                _react2.default.createElement(_upload2.default, {
-                                    required: false,
-                                    canDel: false,
-                                    canPreview: true,
-                                    canDownload: true,
-                                    initList: fileList,
-                                    dir: 'form_invoice',
-                                    ref: 'upload_invoice'
-                                })
-                            );
-                        })
-                    )
-                )
-            );
-        }
-    }]);
-
-    return Nvoice;
-}(_react2.default.Component);
-
-exports.default = Nvoice;