fmui-base 2.3.16 → 2.3.17

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.17：流程提交保存时增加表单的乐观锁校验功能，用来校验该表单数据在办理时有无被其他人修改过
 - 2.3.16：选人组件：常用类型增加用户全选功能
 - 2.3.15：时分字段保存丢失值，子表删除时页面空白
 - 2.3.14：表单切换组织增加开关

package/lib/form/form.js

@@ -690,8 +690,8 @@ var PageHome = function (_React$Component) {
         itemParam.decimalPlace = form.decimalPlace; //小数位数
         itemParam.dataAttr = form['dataAttr'];
         itemParam.maxlength = form['length'];
-        /*if(itemParam.dataAttr){
-          alert("265====="+itemParam.dataAttr.textLineFeed);
+        /*if(itemParam.dataAttr){
+          alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
         //宏值签名图片
         // if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
@@ -945,11 +945,11 @@ var PageHome = function (_React$Component) {
                   if (value == item.value) {
                     value = { value: value, text: item.name };
                   }
-                  /*}else{
-                    var defaultValue=form.defaultValue;
-                    if(defaultValue == item.value){
-                      value = {value:value,text:item.name};
-                    }
+                  /*}else{
+                    var defaultValue=form.defaultValue;
+                    if(defaultValue == item.value){
+                      value = {value:value,text:item.name};
+                    }
                   }*/
                   selectOptions.push(option);
                 }
@@ -2383,21 +2383,21 @@ var PageHome = function (_React$Component) {
       var length = item.maxlength;
       var patrn = /^-?\d+(\.\d+)?$/;
       if (newValue !== '' && newValue != '-') {
-        /* var validAttr=item['validAttr'];
-          if(validAttr!=null && validAttr.length>0){
-            for(var va=0;va<validAttr.length;va++){
-              var regular=validAttr[va]['regular'];
-              var tips=validAttr[va]['tips'];
-              var reg=new RegExp(regular.slice(1,-1),"g"); 
-              if(!reg.test(newValue)){
-                Toast.show({
-                        type: 'error',
-                        content:item.title+':'+tips
-                      });
-                      return false;
-              }
-              
-            }
+        /* var validAttr=item['validAttr'];
+          if(validAttr!=null && validAttr.length>0){
+            for(var va=0;va<validAttr.length;va++){
+              var regular=validAttr[va]['regular'];
+              var tips=validAttr[va]['tips'];
+              var reg=new RegExp(regular.slice(1,-1),"g"); 
+              if(!reg.test(newValue)){
+                Toast.show({
+                        type: 'error',
+                        content:item.title+':'+tips
+                      });
+                      return false;
+              }
+              
+            }
           }*/
         if (this.checkEmoji(newValue)) {
           _Toast2.default.show({
@@ -3422,12 +3422,12 @@ var PageHome = function (_React$Component) {
         });
         return false;
       }
-      /*  if(newValue=''){
-        Toast.show({
-                      type: 'error',
-                      content: '意见不能为空！',
-                  });
-                  return false;
+      /*  if(newValue=''){
+        Toast.show({
+                      type: 'error',
+                      content: '意见不能为空！',
+                  });
+                  return false;
       }*/
       if (newValue.length > 2000) {
         newValue = newValue.substring(0, 2000);

package/lib/form/subForm.js

@@ -335,28 +335,28 @@ var PageHome = function (_React$Component) {
       var data = this.props.data;
       var subTblList = data.subTbl; //子表
       var relatedTbl = data.relatedTbl; //关联表
-      /* var calculateExpList = data.calculateExpList;//计算公式列表 
-       var calculateExpList1 = value.calculateExpList;//计算公式列表
-       if(calculateExpList1){
-       	for(var key in calculateExpList1){
-       		  var calculateExpValue;
-                 if(calculateExpList){
-                   calculateExpValue = calculateExpList[key];
-                   if(!calculateExpValue){
-                     calculateExpValue = [];
-                   }
-                 }else{
-                   calculateExpList = {};
-                   calculateExpValue = [];
-                 }
-                 for(var j=0;j<calculateExpList1[key].length;j++){
-               	  calculateExpValue.push(calculateExpList1[key][j]);
-                 }
-                 calculateExpList[key] = calculateExpValue;
-       		  
-       	}
-       	
-       	data.calculateExpList = calculateExpList;
+      /* var calculateExpList = data.calculateExpList;//计算公式列表 
+       var calculateExpList1 = value.calculateExpList;//计算公式列表
+       if(calculateExpList1){
+       	for(var key in calculateExpList1){
+       		  var calculateExpValue;
+                 if(calculateExpList){
+                   calculateExpValue = calculateExpList[key];
+                   if(!calculateExpValue){
+                     calculateExpValue = [];
+                   }
+                 }else{
+                   calculateExpList = {};
+                   calculateExpValue = [];
+                 }
+                 for(var j=0;j<calculateExpList1[key].length;j++){
+               	  calculateExpValue.push(calculateExpList1[key][j]);
+                 }
+                 calculateExpList[key] = calculateExpValue;
+       		  
+       	}
+       	
+       	data.calculateExpList = calculateExpList;
        }*/
 
       this.dealwithSubData(subTblList, subTblNo, value, relatedTbl);

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

@@ -1474,7 +1474,7 @@ var PageHome = function (_React$Component) {
                     // }
                     t.setState({
                         editFormData: formData,
-                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : '',
+                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '',
                         //formDataNew:content.formDataNew,
                         // formData: formData,
                         // fileContent: fileContent,
@@ -4683,9 +4683,6 @@ 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;
@@ -4699,13 +4696,6 @@ 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;
                     //操作回调
                     if (typeof FlowCommon.operateCallBack === "function") {

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