fmui-base 2.2.56 → 2.2.58

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.58: 增加汇报周报组件，退回的批示意见增加标识
+- 2.2.57: 子表字段支持字段关联
 - 2.2.56: 手写签名按钮自定义，画笔上下抖动问题修复
 - 2.2.55: 流程列表分类搜索
 - 2.2.54: 手写签名样式调整

package/lib/comment_list/List.js

@@ -272,6 +272,8 @@ var PageHome = function (_React$Component) {
         //是否加签
         if (item.isAddlots && item.isAddlots == '1' && userName) {
           userName = userName + "（加签）";
+        } else if (item.isAddlots && item.isAddlots == '2' && userName) {
+          userName = userName + "（退回）";
         }
         var userNameHtml = _react2.default.createElement(
           'span',

package/lib/form/form.js

@@ -2704,7 +2704,7 @@ var PageHome = function (_React$Component) {
       } else {
         newValue = "";
       }
-      var formItem = data.formItem;
+      var formItem = this.props.allForm.item;
       var mainTblData = data.mainTblData;
       if (userId && formItem) {
         // t.refs[mainTblName+"_"+itemExt.key].reloadItemParam(itemExt.value);
@@ -2723,7 +2723,7 @@ var PageHome = function (_React$Component) {
                     } else if (relatepopuservalue == 'relateusercode') {
                       mainTblDataItem.value = userInfo.userCode;
                     } else if (relatepopuservalue == 'relateusertelphone') {
-                      mainTblDataItem.value = userInfo.telephone;
+                      mainTblDataItem.value = userInfo.userTelephone;
                     } else if (relatepopuservalue == 'relateuserdutyname') {
                       mainTblDataItem.value = userInfo.dutyName;
                     } else if (relatepopuservalue == 'relateusercardid') {
@@ -2732,6 +2732,45 @@ var PageHome = function (_React$Component) {
                     t.props.reloadItemParam(data.mainTblName + "_" + mainTblDataItem.key, mainTblDataItem.value);
                   }
                 }
+              } else if (item.children && item.children.length > 0) {
+                for (var k = 0; k < item.children.length; k++) {
+                  var childItem = item.children[k];
+                  if (childItem.dataAttr && childItem.dataAttr.relatepopuserField && childItem.dataAttr.relatepopuserField == code) {
+                    var relatepopuservalue = childItem.dataAttr.relatepopuserValue;
+                    for (var j = 0; j < mainTblData.length; j++) {
+                      var mainTblDataItem = mainTblData[j];
+                      if (mainTblDataItem.key == childItem.itemCode) {
+                        if (relatepopuservalue == 'relateuserorg') {
+                          mainTblDataItem.value = userInfo.orgName;
+                        } else if (relatepopuservalue == 'relateusercode') {
+                          mainTblDataItem.value = userInfo.userCode;
+                        } else if (relatepopuservalue == 'relateusertelphone') {
+                          mainTblDataItem.value = userInfo.userTelephone;
+                        } else if (relatepopuservalue == 'relateuserdutyname') {
+                          mainTblDataItem.value = userInfo.dutyName;
+                        } else if (relatepopuservalue == 'relateusercardid') {
+                          mainTblDataItem.value = userInfo.cardId;
+                        }
+                        // 如果当前Form是在子表中（dataType === 'sub'），需要通过SubForm来刷新
+                        // SubForm的reloadSubItemParam方法可以刷新子表所有行的字段
+                        if (t.props.dataType === 'sub' && t.props.subTblName === data.mainTblName) {
+                          // 尝试通过props获取reloadSubItemParam方法（如果SubForm传递了的话）
+                          if (t.props.reloadSubItemParam && typeof t.props.reloadSubItemParam === 'function') {
+                            var reloadParams = [];
+                            reloadParams.push({
+                              key: mainTblDataItem.uniqueName,
+                              value: mainTblDataItem.value,
+                              index: t.props.keyNo
+                            });
+                            if (reloadParams.length > 0) {
+                              t.props.reloadSubItemParam(reloadParams);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
               }
             }
           } else {}

package/lib/form/subForm.js

@@ -743,7 +743,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              return _react2.default.createElement(_form2.default, { className: "subform_" + item2.uniqueName, keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
+              return _react2.default.createElement(_form2.default, { className: "subform_" + item2.uniqueName, keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i), reloadSubItemParam: _this2.reloadSubItemParam.bind(_this2) });
             })
           )
         );

package/lib/work_item/index.js

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

package/lib/work_item/workItem.js

@@ -0,0 +1,195 @@
+'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 _class, _temp, _initialiseProps;
+
+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 _Toast = require('saltui/lib/Toast');
+
+var _Toast2 = _interopRequireDefault(_Toast);
+
+require('./workItem.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 workItem = (_temp = _class = function (_React$Component) {
+    _inherits(workItem, _React$Component);
+
+    function workItem(props) {
+        _classCallCheck(this, workItem);
+
+        // 传入的props参数
+        var _this = _possibleConstructorReturn(this, (workItem.__proto__ || Object.getPrototypeOf(workItem)).call(this, props));
+
+        _initialiseProps.call(_this);
+
+        var listValue = _this.props.value || [{ sortNo: 1, content: '' }];
+        var title = _this.props.label || '今日完成工作';
+        var readOnly = _this.props.readOnly || false;
+
+        // 组件级计数器，用于生成稳定的 React key（不暴露给外部）
+        _this._keyCounter = 1;
+        listValue = listValue.map(function (it) {
+            if (!it.__key) it.__key = _this._keyCounter++;
+            return it;
+        });
+
+        _this.state = {
+            listValue: listValue,
+            title: title,
+            readOnly: readOnly
+        };
+
+        return _this;
+    }
+
+    // 不在 componentDidMount 中保存渲染结果，直接在 render 中调用 initFn()
+
+
+    // 本地输入时更新 state，不立即通知父组件
+
+
+    // 输入完成（blur）时通知父组件或做后续处理
+
+
+    _createClass(workItem, [{
+        key: 'render',
+        value: function render() {
+            var _this2 = this;
+
+            return _react2.default.createElement(
+                _Group2.default.List,
+                { borderTopNone: true },
+                _react2.default.createElement(
+                    _Field2.default,
+                    { required: this.state.required, label: this.state.title, layout: 'v', multiLine: true },
+                    _react2.default.createElement(
+                        'div',
+                        null,
+                        this.initFn()
+                    ),
+                    _react2.default.createElement(
+                        'div',
+                        { className: 'iconfo', onClick: function onClick() {
+                                return _this2.addItem();
+                            } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-plus' })
+                    )
+                )
+            );
+        }
+    }]);
+
+    return workItem;
+}(_react2.default.Component), _initialiseProps = function _initialiseProps() {
+    var _this3 = this;
+
+    this.initFn = function () {
+        var list = _this3.state.listValue || [];
+        return _react2.default.createElement(
+            'div',
+            { className: 'list' },
+            list.map(function (item, index) {
+                return _react2.default.createElement(
+                    'div',
+                    { className: 'item', key: item.__key },
+                    _react2.default.createElement(
+                        'span',
+                        { className: 'number' },
+                        index + 1
+                    ),
+                    _react2.default.createElement('textarea', {
+                        disabled: _this3.state.readOnly,
+                        maxLength: 200,
+                        className: 'form-control',
+                        rows: 1,
+                        placeholder: '1-200\u4E2A\u5B57\u7B26',
+                        value: item.content,
+                        onChange: function onChange(e) {
+                            return _this3.handleLocalChange(index, e.target.value);
+                        },
+                        onBlur: function onBlur() {
+                            return _this3.handleContentChange(index);
+                        }
+                    }),
+                    _react2.default.createElement(
+                        'span',
+                        { className: 'remove-btn', onClick: function onClick() {
+                                return _this3.removeItem(index);
+                            } },
+                        _react2.default.createElement('i', { className: 'iconfont icon-close' })
+                    )
+                );
+            })
+        );
+    };
+
+    this.addItem = function () {
+        var listValue = JSON.parse(JSON.stringify(_this3.state.listValue));
+        var num = listValue.length + 1;
+        var newItem = { __key: _this3._keyCounter++, sortNo: num, content: '' };
+        if (num <= listValue.length) {
+            listValue.splice(num - 1, 0, newItem);
+        } else {
+            listValue.push(newItem);
+        }
+        listValue.forEach(function (it, i) {
+            return it.sortNo = i + 1;
+        });
+        _this3.setState({ listValue: listValue }, function () {
+            // 若需通知父组件，在这里回调（使用最新 state）
+            if (_this3.props.onChange) _this3.props.onChange(_this3.state.listValue);
+        });
+    };
+
+    this.removeItem = function (index) {
+        var listValue = JSON.parse(JSON.stringify(_this3.state.listValue));
+        if (index >= 0 && index < listValue.length && listValue.length > 1) {
+            listValue.splice(index, 1);
+            listValue.forEach(function (it, i) {
+                return it.sortNo = i + 1;
+            });
+            _this3.setState({ listValue: listValue }, function () {
+                if (_this3.props.onChange) _this3.props.onChange(_this3.state.listValue);
+            });
+        } else {
+            _Toast2.default.show({ type: 'error', content: '至少保留一个' });
+        }
+    };
+
+    this.handleLocalChange = function (index, value) {
+        var listValue = (_this3.state.listValue || []).slice();
+        if (index >= 0 && index < listValue.length) {
+            listValue[index] = Object.assign({}, listValue[index], { content: value });
+            _this3.setState({ listValue: listValue });
+        }
+    };
+
+    this.handleContentChange = function (index) {
+        if (_this3.props.onChange) _this3.props.onChange(_this3.state.listValue);
+    };
+}, _temp);
+exports.default = workItem;

package/lib/work_item/workItem.less

@@ -0,0 +1,67 @@
+.item {
+  position: relative;
+  border-radius: 4px;
+  margin: 5px 0;
+
+  .number {
+    width: 30px;
+    top: 1px;
+    left: 1px;
+    bottom: 1px;
+    position: absolute;
+    background: #f2f6fc;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9;
+  }
+
+  .form-control {
+    padding-left: 40px;
+    padding-right: 25px;
+  }
+
+  .form-control:focus {
+    border: 1px solid #3480fb;
+    border-radius: 4px;
+    box-shadow: none;
+    outline: 0;
+  }
+
+  .remove-btn {
+    width: 22px;
+    top: 1px;
+    right: 1px;
+    bottom: 1px;
+    position: absolute;
+    background: #f2f6fc;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9;
+
+    .iconfont {
+      font-size: 12px;
+      color: #909399;
+    }
+  }
+}
+
+.item:not(:last-child) {
+  margin: 5px 0 0 0;
+}
+
+.iconfo {
+  width: 30px;
+  height: 30px;
+  margin: 10px auto;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #3480fb;
+
+  .iconfont {
+    color: #fff;
+  }
+}

package/package.json

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