fmui-base 2.3.35 → 2.3.36

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.36：单选多选可输入，输入内容过多时不换行
 - 2.3.35：upload：鸿蒙微信端上传异常点击无反应问题
 - 2.3.34：移动端支持新疆CA电子签章功能，去除截图base64png图片的操作
 - 2.3.33：移动端支持新疆CA电子签章功能，移动端选人组件增加一些再次加载的入口

package/lib/form/form.js

@@ -695,8 +695,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){
@@ -968,11 +968,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);
                 }
@@ -2498,21 +2498,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({
@@ -3671,12 +3671,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);
@@ -3907,10 +3907,10 @@ var PageHome = function (_React$Component) {
       return resolved.strategy === 'wpsWebOffice' || resolved.officeType === 'wpsWebOffice';
     }
 
-    /**
-     * 解析正文类型，决定是否显示「编辑正文」。
-     * 可编辑且未解析完成：不挂 Upload（占位），避免 initData 把 recordId 冲成附件 id。
-     * 解析后：wps → 编辑正文；非 wps → Upload 只读样式。
+    /**
+     * 解析正文类型，决定是否显示「编辑正文」。
+     * 可编辑且未解析完成：不挂 Upload（占位），避免 initData 把 recordId 冲成附件 id。
+     * 解析后：wps → 编辑正文；非 wps → Upload 只读样式。
      */
 
   }, {

package/lib/form/subForm.js

@@ -342,28 +342,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/select_input/selectInput.js

@@ -393,13 +393,21 @@ var SelectInput = function (_React$Component) {
             { className: 'dd-select-input-option-text' },
             option.text
           ),
-          showInput ? _react2.default.createElement('input', {
+          showInput ? _react2.default.createElement('textarea', {
             className: 'dd-select-input-text',
-            type: 'text',
+            rows: 1,
             value: _this3.state.inputValues[optionValue] || ''
             // 输入框只有在当前项已选中且 readOnly=false 时才允许输入。
             , disabled: inputDisabled,
+            ref: function ref(el) {
+              if (el) {
+                el.style.height = 'auto';
+                el.style.height = el.scrollHeight + 'px';
+              }
+            },
             onChange: function onChange(e) {
+              e.target.style.height = 'auto';
+              e.target.style.height = e.target.scrollHeight + 'px';
               _this3.handleInputChange(optionValue, e.target.value);
             },
             onBlur: function onBlur() {

package/lib/select_input/selectInput.less

@@ -4,7 +4,8 @@
 
 .dd-select-input-option {
      display: flex;
-     align-items: center;
+     align-items: flex-start;
+     width: 100%;
      margin: 8px 0;
      cursor: pointer;
 }
@@ -21,6 +22,7 @@
      width: 18px;
      height: 18px;
      margin-right: 8px;
+     margin-top: 2px;
      border: 1px solid #c7ced9;
      background: #fff;
      transition: all .2s ease;
@@ -67,21 +69,35 @@
 .dd-select-input-option-text {
      margin-right: 8px;
      min-width: 32px;
+     max-width: 40%;
+     flex: 0 1 auto;
+     white-space: normal;
+     word-break: break-word;
+     line-height: 1.4;
 }
 
 .dd-select-input-text {
-     flex: 1;
-     min-width: 120px;
+     flex: 1 1 0;
+     min-width: 0;
+     width: auto;
+     max-width: 100%;
      border: none;
      border-bottom: 1px solid #ddd;
      outline: none;
      padding: 4px 2px;
      font-size: 14px;
+     line-height: 1.4;
      background-color: transparent;
+     white-space: pre-wrap;
+     word-break: break-all;
+     overflow-wrap: anywhere;
+     resize: none;
+     overflow: hidden;
+     field-sizing: content;
 }
 
 .dd-select-input-text:disabled {
      color: #333;
      border-bottom-color: #eee;
      cursor: not-allowed;
-}
+}

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