fmui-base 2.1.71 → 2.1.73

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.73：宏值增加赋值属性
+- 2.1.72：弹出选择框搜索高度
 - 2.1.71：传阅支持选择到组织、职务、群组
 - 2.1.70：移动端流程发起推送标题实时更新
 - 2.1.69：移动端流程办理推送标题

package/lib/form/form.js

@@ -97,8 +97,6 @@ var _db2 = _interopRequireDefault(_db);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return 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; }
@@ -334,6 +332,11 @@ var PageHome = function (_React$Component) {
         //判断字段属性
         var fieldControllJson = this.props.fieldControll;
         var fieldControll = this.fieldControllFormat(tableName + "_" + key, fieldControllJson);
+        var _fuzhiFields = '';
+        if (fieldControllJson && fieldControllJson.fuzhiFields) {
+          _fuzhiFields = fieldControllJson.fuzhiFields;
+        }
+        console.log("fuzhiFields====" + _fuzhiFields);
         if (fieldControll) {
           if (fieldControll == 'hidden') {
             //隐藏
@@ -646,8 +649,14 @@ var PageHome = function (_React$Component) {
           alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
         //宏值签名图片
-        if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && !readOnly && !itemParam.bizCodeRuleId) {
-          value = form.defaultValue;
+        // if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
+        //     value = form.defaultValue;
+        // }
+        // 宏值新需求，赋值字段取defaultValue
+        if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && fuzhiFields != '') {
+          if (fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1) {
+            value = form.defaultValue;
+          }
         }
         if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro.value == 'currentUserSignPic') {
 
@@ -2940,8 +2949,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this3 = this,
-          _React$createElement;
+      var _this3 = this;
 
       var t = this;
       var radioFieldProps = {
@@ -3482,18 +3490,21 @@ var PageHome = function (_React$Component) {
                     _react2.default.createElement(
                       'div',
                       { className: this.state.commentUpload == '1' ? "" : "t-DN" },
-                      _react2.default.createElement(_upload2.default, (_React$createElement = {
+                      _react2.default.createElement(_upload2.default, {
                         ref: "upload_" + this.state.itemParam.uniqueName,
                         canAdd: true,
                         dir: this.state.module,
                         fileSizeLimit: 0,
                         canDel: true,
-                        limitNo: 5
-                      }, _defineProperty(_React$createElement, 'fileSizeLimit', 0), _defineProperty(_React$createElement, 'initList', this.state.commentInitList), _defineProperty(_React$createElement, 'onChange', function onChange(value, isInit) {
-                        _this3.changeSpyj4(_this3, value);
-                      }), _defineProperty(_React$createElement, 'onDel', function onDel(value) {
-                        t.changeSpyj4(_this3, value);
-                      }), _React$createElement))
+                        limitNo: 5,
+                        initList: this.state.commentInitList,
+                        onChange: function onChange(value, isInit) {
+                          _this3.changeSpyj4(_this3, value);
+                        },
+                        onDel: function onDel(value) {
+                          t.changeSpyj4(_this3, value);
+                        }
+                      })
                     )
                   )
                 ),

package/lib/poppage/table/table.js

@@ -618,11 +618,12 @@ var PageHome = function (_React$Component) {
                         ),
                         _react2.default.createElement(
                             'div',
-                            { className: 'dd-checkbox-wrap', style: { overflow: "auto", height: '' + winHeight } },
+                            { className: 'dd-checkbox-wrap', style: { overflow: "auto" } },
                             _react2.default.createElement(_RadioField2.default, {
                                 data: data,
                                 mode: 'list',
                                 iconPosition: 'left',
+                                className: 'poppage-list-search',
                                 onChange: this.changeSelectBox2.bind(this)
                             })
                         )

package/lib/poppage/table/table.less

@@ -32,4 +32,12 @@
 
 .t-radio-field-content{
 	white-space:pre !important;
+}
+// .poppage-list-search{ 
+// 	// height: 600px;
+// 	background-color: red;
+// }
+.dd-checkbox-wrap {
+	height: 100%;
+    padding-bottom: 50px;
 }

package/package.json

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