fmui-base 2.3.12 → 2.3.13

package/README.md

@@ -3,7 +3,8 @@
 ---npm publish
 
 ## 更新日志 
-- 2.3.11：门户首页grid常用应用部件增加扩展入口调整为页签（一网通办项目需求，临时版本）
+- 2.3.13：子表字段带$时计算不生效，表单切换组织时，表单赋值的宏值实时更新
+- 2.3.12：门户首页grid常用应用部件增加扩展入口调整为页签（一网通办项目需求，临时版本）
 - 2.3.11：子表支持子表按钮自定义
 - 2.3.10：门户首页grid常用应用部件增加扩展入口（一网通办项目需求，临时版本）
 - 2.3.9：子表支持整个子表隐藏

package/lib/db/db.js

@@ -1140,6 +1140,16 @@ context.create('FlowModuleAPI', {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
     willFetch: function willFetch() {}
+  },
+  reloadFuzhiMacroFields: {
+    mockUrl: 'query/reloadFuzhiMacroFields.json',
+    url: _variables2.default.URLS.reloadFuzhiMacroFields,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
   }
 
 });

package/lib/db/variables.js

@@ -143,7 +143,8 @@ exports.default = {
         getSysSettingByMark: approveUrlPrefix + "getSysSettingByMark" + '?', //获取系统设置
         getUserSetInfo: urlBasicPrefix + 'setting/userinfo/getUserSetInfo' + '?', //获取用户组织信息
         orgSwitch: urlBasicPrefix + 'front/personal/orgSwitch' + '?', //切换组织
-        updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?' //更新发起人组织
+        updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?', //更新发起人组织
+        reloadFuzhiMacroFields: approveUrlPrefix + 'reloadFuzhiMacroFields' + '?' //组织切换后重载赋值宏值
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/form/form.js

@@ -2109,8 +2109,9 @@ var PageHome = function (_React$Component) {
             }
           }
         }
+        // 浅拷贝强制触发重渲染（只读 TextField 同引用时可能不刷新展示）
         this.setState({
-          itemParam: itemParam
+          itemParam: Object.assign({}, itemParam)
         }, function () {
           if (checkboxValueHas) {
             this.refs["checkbox_" + itemParam.tableName + "_" + itemParam.key].setState({

package/lib/form/table.js

@@ -1973,17 +1973,17 @@ var PageHome = function (_React$Component) {
 										filedItemValue = 0;
 										//return false;
 									}
-									var sumRegExp = new RegExp("sum\\(\\[" + fieldArrayItem + "\\]\\)", "g");
+									var sumRegExp = new RegExp("sum\\(\\[" + this.replaceDollar(fieldArrayItem) + "\\]\\)", "g");
 
 									if (exp.match(sumRegExp)) {
 										//当有sum函数
 										if (Array.isArray(fieldItem)) {
 											var sumValue = this.sum(fieldItem);
-											exp = exp.replace(new RegExp("sum\\(\\[" + fieldArrayItem + "\\]\\)", "g"), "(" + sumValue + ")");
+											exp = exp.replace(new RegExp("sum\\(\\[" + this.replaceDollar(fieldArrayItem) + "\\]\\)", "g"), "(" + sumValue + ")");
 										}
 									}
 
-									exp = exp.replace(new RegExp("\\[" + fieldArrayItem + "\\]", "g"), "(" + filedItemValue + ")");
+									exp = exp.replace(new RegExp("\\[" + this.replaceDollar(fieldArrayItem) + "\\]", "g"), "(" + filedItemValue + ")");
 								}
 							}
 

package/lib/nvoice/index.js

@@ -0,0 +1,16 @@
+'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

@@ -0,0 +1,177 @@
+'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;

package/lib/process_info/processInfo.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 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');
@@ -391,6 +393,7 @@ var PageHome = function (_React$Component) {
             dataId: dataId,
             formId: props.formId,
             editFormData: {},
+            formDataOptlock: '',
             formDataNew: {},
             data: {
                 dataId: "",
@@ -1471,6 +1474,7 @@ var PageHome = function (_React$Component) {
                     // }
                     t.setState({
                         editFormData: formData,
+                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : '',
                         //formDataNew:content.formDataNew,
                         // formData: formData,
                         // fileContent: fileContent,
@@ -2497,6 +2501,9 @@ var PageHome = function (_React$Component) {
                         processInstanceId: _this2.state.processInstanceId,
                         permissionCode: _this2.state.permissionCode
                     };
+                    if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
+                        param.optlock = t.state.formDataOptlock;
+                    }
                     var dealActionName = "";
                     if (_this2.state.isStart == true) {
                         dealActionName = "提交";
@@ -4676,6 +4683,9 @@ var PageHome = function (_React$Component) {
                 formType: "4",
                 editType: editType
             }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'commentAttitude', t.getSelectedCommentAttitude()), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'sealId', t.state.commentSealId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
+            if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
+                param.optlock = t.state.formDataOptlock;
+            }
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -4689,6 +4699,12 @@ var PageHome = function (_React$Component) {
                         type: 'success',
                         content: '保存成功'
                     });
+                    if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null) {
+                        var ol = parseInt(t.state.formDataOptlock, 10);
+                        if (!isNaN(ol)) {
+                            t.setState({ formDataOptlock: String(ol + 1) });
+                        }
+                    }
 
                     var dataId = content.dataId;
                     //操作回调
@@ -5082,6 +5098,9 @@ var PageHome = function (_React$Component) {
             //     param.commentbizSn=commentbizSn;
             // }
             param.commentbizSn = commentbizSn;
+            if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
+                param.optlock = t.state.formDataOptlock;
+            }
 
             var db = _db2.default;
             db.FlowModuleAPI.sendFlow(param).then(function (content) {
@@ -7728,6 +7747,9 @@ var PageHome = function (_React$Component) {
                     approveCurOrgId: newOrgId,
                     approveOrgSelectValue: value,
                     startUserOrgId: t.isApproveStartOrgUpdateScene() ? newOrgId : t.state.startUserOrgId
+                }, function () {
+                    // 用户手动切换组织后，重载赋值宏值字段
+                    t.reloadFuzhiMacroFieldsByOrg();
                 });
             }, function () {
                 t.setState({
@@ -7736,6 +7758,122 @@ var PageHome = function (_React$Component) {
                 });
             });
         }
+
+        /** 所属组织切换后，按当前组织重载赋值宏值字段并写回表单 */
+
+    }, {
+        key: 'reloadFuzhiMacroFieldsByOrg',
+        value: function reloadFuzhiMacroFieldsByOrg() {
+            var t = this;
+            var fuzhiFields = '';
+            if (t.state.fieldControll && t.state.fieldControll.fuzhiFields) {
+                fuzhiFields = t.state.fieldControll.fuzhiFields;
+            }
+            if (!fuzhiFields || fuzhiFields == 'null' || fuzhiFields == 'undefined' || !t.state.formId) {
+                return;
+            }
+            _db2.default.FlowModuleAPI.reloadFuzhiMacroFields({
+                formId: t.state.formId,
+                fuzhiFields: fuzhiFields
+            }).then(function (content) {
+                var fieldMap = content || {};
+                if (content && content.content && _typeof(content.content) === 'object' && !Array.isArray(content.content)) {
+                    fieldMap = content.content;
+                }
+                if (!fieldMap || Object.keys(fieldMap).length == 0) {
+                    return;
+                }
+                var editFormData = t.state.editFormData || {};
+                var mainTblData = editFormData.mainTblData || [];
+                var mainTblName = editFormData.mainTblName || t.state.form && t.state.form.formTblName || '';
+                var tableRef = t.refs.approveFormTable;
+                var resolveMacroVal = function resolveMacroVal(it) {
+                    if (!it) {
+                        return undefined;
+                    }
+                    if (it.uniqueName && typeof fieldMap[it.uniqueName] != 'undefined') {
+                        return fieldMap[it.uniqueName];
+                    }
+                    if (it.itemCode && typeof fieldMap[it.itemCode] != 'undefined') {
+                        return fieldMap[it.itemCode];
+                    }
+                    return undefined;
+                };
+                Object.keys(fieldMap).forEach(function (mapKey) {
+                    var newVal = fieldMap[mapKey];
+                    if (typeof newVal == 'undefined' || newVal == null) {
+                        return;
+                    }
+                    var itemCode = mapKey;
+                    if (mainTblName && mapKey.indexOf(mainTblName + '_') === 0) {
+                        itemCode = mapKey.substring(mainTblName.length + 1);
+                    } else if (mainTblName && mapKey.indexOf(mainTblName + '$') === 0) {
+                        itemCode = mapKey.substring(mainTblName.length + 1);
+                    }
+                    for (var i = 0; i < mainTblData.length; i++) {
+                        if (mainTblData[i].key == itemCode || mainTblData[i].key == mapKey) {
+                            mainTblData[i].value = newVal;
+                        }
+                    }
+                    // 可编辑 / 只读字段均通过 Form.reloadItemParam 刷新展示
+                    if (tableRef && tableRef.refs) {
+                        var tryKeys = [mapKey];
+                        if (mainTblName) {
+                            tryKeys.push(mainTblName + '_' + itemCode);
+                            tryKeys.push(mainTblName + '_' + mapKey);
+                        }
+                        if (mapKey.indexOf('$') >= 0) {
+                            tryKeys.push(mapKey.replace(/\$/g, '_'));
+                            if (mainTblName) {
+                                tryKeys.push(mainTblName + '_' + itemCode);
+                            }
+                        }
+                        for (var k = 0; k < tryKeys.length; k++) {
+                            var hitKey = tryKeys[k];
+                            var formRef = tableRef.refs[hitKey];
+                            if (!formRef || !formRef.reloadItemParam) {
+                                continue;
+                            }
+                            try {
+                                formRef.reloadItemParam([{ key: 'value', value: newVal }]);
+                                // 只读 TextField 偶发不跟 props，强制再刷一次
+                                if (typeof formRef.forceUpdate === 'function') {
+                                    formRef.forceUpdate();
+                                }
+                            } catch (e) {}
+                            break;
+                        }
+                    }
+                });
+                editFormData.mainTblData = mainTblData;
+                // 同步字段定义中的 value / defaultValue（只读赋值宏依赖）
+                var formItem = t.state.formItem || [];
+                var syncDefault = function syncDefault(items) {
+                    if (!items || !items.length) {
+                        return;
+                    }
+                    for (var i = 0; i < items.length; i++) {
+                        var it = items[i];
+                        if (!it) {
+                            continue;
+                        }
+                        var mv = resolveMacroVal(it);
+                        if (typeof mv != 'undefined') {
+                            it.defaultValue = mv;
+                            it.value = mv;
+                        }
+                        if (it.children && it.children.length) {
+                            syncDefault(it.children);
+                        }
+                    }
+                };
+                syncDefault(formItem);
+                t.setState({
+                    editFormData: editFormData,
+                    formItem: formItem
+                });
+            }).catch(function () {});
+        }
     }, {
         key: 'switchApproveOrg',
         value: function switchApproveOrg(orgId, callback, failCallback, options) {
@@ -8154,7 +8292,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { ref: 'approveFormTable', module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )