fmui-base 2.2.22 → 2.2.24

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.24：表单相关对象组件修改
+- 2.2.23：表单相关对象组件
 - 2.2.22：深圳CA密码验证
 - 2.2.21：表单组件支持批示意见开启态度
 - 2.2.20：流程列表组件支持流程分类category参数

package/lib/form/form.js

@@ -89,6 +89,10 @@ var _select = require('../selectMember/select');
 
 var _select2 = _interopRequireDefault(_select);
 
+var _relaObj = require('../rela_obj/relaObj');
+
+var _relaObj2 = _interopRequireDefault(_relaObj);
+
 require('./form.less');
 
 var _db = require('../db/db');
@@ -1389,7 +1393,15 @@ var PageHome = function (_React$Component) {
         //     // if(value && value!=''){
         //     //   value = this.getRelaObjByRelaId(value);
         //     // }
+        var dateFormat = form.dateFormat;
+        if (form.dataAttr && typeof form.dataAttr != "undefined") {
+          itemParam.relaobjType = form.dataAttr.relaobjType;
+        } else {
+          itemParam.relaobjType = "single";
+        }
+        console.log("relaobj===1276");
         if (value && value != '') {
+          itemParam.oldValue = value;
           this.ralaObjChange(itemParam.key, value, "");
         }
       }
@@ -3850,25 +3862,13 @@ var PageHome = function (_React$Component) {
         ) : this.state.itemParam.itemType == 'relaobj' ? _react2.default.createElement(
           'div',
           { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
-          _react2.default.createElement(
-            _Group2.default.List,
-            { borderTopNone: true },
-            _react2.default.createElement(
-              'div',
-              { className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
-              _react2.default.createElement(_TextareaField2.default, {
-                className: 't-W100',
-                required: t.state.itemParam.required,
-                label: t.state.itemParam.title,
-                readOnly: true,
-                minRows: 1,
-                placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder
-                // value={t.state.itemParam.value}
-                , onChange: this.ralaObjChange.bind(this, t.state.itemParam.key)
-              }),
-              t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
-            )
-          )
+          _react2.default.createElement(_relaObj2.default, {
+            id: t.state.itemParam.oldValue ? t.state.itemParam.oldValue : "",
+            label: t.state.itemParam.title,
+            required: t.state.itemParam.required,
+            relaobjType: t.state.itemParam.relaobjType
+          }),
+          t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
         ) : _react2.default.createElement('div', null)
       );
     }

package/lib/no_data/no_data.js

@@ -54,12 +54,7 @@ var NoData = function (_React$Component) {
                     _react2.default.createElement(
                         Box,
                         { className: this.props.className ? this.props.className : 't-MT20' },
-                        _react2.default.createElement('img', { src: this.props.nodataIcon ? this.props.nodataIcon : this.state.nodataIcon, style: { width: 60 + 'px' } })
-                    ),
-                    _react2.default.createElement(
-                        Box,
-                        { className: 't-FC6' },
-                        this.props.nullmsg ? this.props.nullmsg : '无搜索结果'
+                        _react2.default.createElement('img', { src: this.props.nodataIcon ? this.props.nodataIcon : this.state.nodataIcon, style: { width: 100 + 'px' } })
                     )
                 )
             );

package/lib/rela_obj/index.js

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

package/lib/rela_obj/relaObj.js

@@ -0,0 +1,226 @@
+'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 _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+require('./relaObj.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 relaObj = (_temp = _class = function (_React$Component) {
+    _inherits(relaObj, _React$Component);
+
+    function relaObj(props) {
+        _classCallCheck(this, relaObj);
+
+        // 传入的props参数
+        var _this = _possibleConstructorReturn(this, (relaObj.__proto__ || Object.getPrototypeOf(relaObj)).call(this, props));
+
+        _initialiseProps.call(_this);
+
+        var formId = _this.props.id;
+        var title = _this.props.label || '相关对象';
+        var relaobjType = _this.props.relaobjType || ''; //flow,info,file
+        var required = _this.props.required || false;
+        var flowType = false;
+        var infoType = false;
+        var fileType = false;
+        if (relaobjType.indexOf('flow') != -1) {
+            flowType = true;
+        }
+        if (relaobjType.indexOf('info') != -1) {
+            infoType = true;
+        }
+        if (relaobjType.indexOf('file') != -1) {
+            fileType = true;
+        }
+        _this.state = {
+            fileData: [],
+            flowData: [],
+            infoData: [],
+            formId: formId,
+            title: title,
+            relaobjType: relaobjType,
+            flowType: flowType,
+            infoType: infoType,
+            fileType: fileType,
+            required: required
+        };
+
+        return _this;
+    }
+
+    _createClass(relaObj, [{
+        key: 'componentDidMount',
+        value: function componentDidMount() {
+            this.initFn(this.state.formId);
+        }
+
+        // 跳转函数
+
+    }, {
+        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() {
+            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: 'h', multiLine: true },
+                    _react2.default.createElement(
+                        'div',
+                        null,
+                        _react2.default.createElement(
+                            'div',
+                            { className: this.state.flowType ? '' : 't-DN' },
+                            _react2.default.createElement(
+                                'div',
+                                { style: { fontWeight: '700' } },
+                                '\u76F8\u5173\u6D41\u7A0B ',
+                                _react2.default.createElement(
+                                    'span',
+                                    { style: { color: 'red' } },
+                                    '(' + (this.state.flowData && this.state.flowData.length || 0) + ')'
+                                ),
+                                ' '
+                            ),
+                            this.state.flowData && this.state.flowData.map(function (item, index) {
+                                return _react2.default.createElement(
+                                    'div',
+                                    { key: item.id, style: { padding: '2px 0' }, onClick: function onClick() {
+                                            _this2.jupFn(item);
+                                        } },
+                                    item.relaObjName
+                                );
+                            })
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: this.state.infoType ? '' : 't-DN' },
+                            _react2.default.createElement(
+                                'div',
+                                { style: { fontWeight: '700' } },
+                                '\u76F8\u5173\u4FE1\u606F ',
+                                _react2.default.createElement(
+                                    'span',
+                                    { style: { color: 'red' } },
+                                    '(' + (this.state.infoData && this.state.infoData.length || 0) + ')'
+                                ),
+                                ' '
+                            ),
+                            this.state.infoData && this.state.infoData.map(function (item, index) {
+                                return _react2.default.createElement(
+                                    'div',
+                                    { key: item.id, style: { padding: '2px 0' }, onClick: function onClick() {
+                                            _this2.jupFn(item);
+                                        } },
+                                    item.relaObjName
+                                );
+                            })
+                        ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: this.state.fileType ? '' : 't-DN' },
+                            _react2.default.createElement(
+                                'div',
+                                { style: { fontWeight: '700' } },
+                                '\u76F8\u5173\u9644\u4EF6 ',
+                                _react2.default.createElement(
+                                    'span',
+                                    { style: { color: 'red' } },
+                                    '(' + (this.state.fileData && this.state.fileData.length || 0) + ')'
+                                ),
+                                ' '
+                            ),
+                            this.state.fileData && this.state.fileData.map(function (item, index) {
+                                return _react2.default.createElement(
+                                    'div',
+                                    { key: item.id, style: { padding: '2px 0' }, onClick: _this2.downloadFile.bind(_this2, item) },
+                                    item.relaObjName
+                                );
+                            })
+                        )
+                    )
+                )
+            );
+        }
+    }]);
+
+    return relaObj;
+}(_react2.default.Component), _initialiseProps = function _initialiseProps() {
+    var _this3 = this;
+
+    this.initFn = function (formId) {
+        // 初始化表单详情数据  
+        _db2.default.FlowModuleAPI.getRelaObjByRelaId({
+            relaId: formId
+        }).then(function (content) {
+            _this3.setState({
+                fileData: content.file,
+                flowData: content.flow,
+                infoData: content.info
+            });
+        }).catch(function (error) {
+            console.error('获取表单详情数据失败', error);
+        });
+    };
+
+    this.jupFn = function (item) {
+        var url = '';
+        if (item.relaObjType === 'flow') {
+            url = getLoginUserInfo().contextPageUrl + '/mobile/modules/approve/dist/index.html?context=' + getLoginUserInfo().context + '#/process/processDetails/-99/-99/-99/5/0/' + item.relaObjId + '/approve';
+        } else if (item.relaObjType === 'info') {
+            url = getLoginUserInfo().contextPageUrl + '/mobile/modules/cms/dist/index.html?context=' + getLoginUserInfo().context + '#/info/details/' + item.relaObjId + '/1';
+        }
+        location.href = url;
+    };
+}, _temp);
+exports.default = relaObj;

package/package.json

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