fmui-base 2.3.62 → 2.3.64

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.64：关联值增加用户出生日期
+- 2.3.63：单选多选可输入选项支持设置提示文字,文字过长时换行显示
 - 2.3.62：单选多选可输入选项支持设置提示文字
 - 2.3.61：移动端流程提交时过滤主键无效参数，如null字符串
 - 2.3.60：移动端支持减签

package/lib/form/form.js

@@ -3573,6 +3573,8 @@ var PageHome = function (_React$Component) {
                       mainTblDataItem.value = userInfo.stationName || '';
                     } else if (relatepopuservalue == 'relateusercardid') {
                       mainTblDataItem.value = userInfo.cardId;
+                    } else if (relatepopuservalue == 'relateuserbirthdate') {
+                      mainTblDataItem.value = userInfo.birthDate || '';
                     } else if (relatepopuservalue == 'relateusersex') {
                       mainTblDataItem.value = userInfo.sexName || '';
                     } else if (relatepopuservalue == 'relateuserpolitical') {
@@ -3603,6 +3605,8 @@ var PageHome = function (_React$Component) {
                           mainTblDataItem.value = userInfo.stationName || '';
                         } else if (relatepopuservalue == 'relateusercardid') {
                           mainTblDataItem.value = userInfo.cardId;
+                        } else if (relatepopuservalue == 'relateuserbirthdate') {
+                          mainTblDataItem.value = userInfo.birthDate || '';
                         } else if (relatepopuservalue == 'relateusersex') {
                           mainTblDataItem.value = userInfo.sexName || '';
                         } else if (relatepopuservalue == 'relateuserpolitical') {

package/lib/select_input/selectInput.js

@@ -411,6 +411,9 @@ var SelectInput = function (_React$Component) {
         var optionClassName = checked ? 'dd-select-input-option checked' : 'dd-select-input-option';
         var inputDisabled = readOnly || !showInput;
 
+        var tip = option.inputTip || '';
+        var fillClassName = tip ? 'dd-select-input-text dd-select-input-text-tip' : 'dd-select-input-text';
+
         return _react2.default.createElement(
           'label',
           { className: optionClassName, key: optionValue || index },
@@ -429,18 +432,26 @@ var SelectInput = function (_React$Component) {
             { className: 'dd-select-input-option-text' },
             option.text
           ),
-          showInput && !readOnly ? _react2.default.createElement('input', {
-            className: 'dd-select-input-text',
-            type: 'text',
-            placeholder: option.inputTip || '',
-            value: fillText
-            // 输入框只有在当前项已选中且 readOnly=false 时才允许输入。
-            , disabled: inputDisabled,
+          showInput && !readOnly ? _react2.default.createElement('textarea', {
+            className: fillClassName,
+            rows: 1,
+            placeholder: tip,
+            value: fillText,
+            disabled: inputDisabled,
             onChange: function onChange(e) {
-              _this5.handleInputChange(optionValue, e.target.value);
+              var el = e.target;
+              el.style.height = 'auto';
+              el.style.height = el.scrollHeight + 'px';
+              _this5.handleInputChange(optionValue, el.value);
             },
             onBlur: function onBlur() {
               _this5.handleInputBlur();
+            },
+            ref: function ref(el) {
+              if (el) {
+                el.style.height = 'auto';
+                el.style.height = el.scrollHeight + 'px';
+              }
             }
           }) : null,
           showInput && readOnly && fillText ? _react2.default.createElement(

package/lib/select_input/selectInput.less

@@ -1,12 +1,19 @@
 .dd-select-input-field {
      width: 100%;
+     min-width: 0;
+     box-sizing: border-box;
 }
 
+/* 与 PC 一致：图标 + 选项文案 + 填空同一行；长提示在填空框内换行 */
 .dd-select-input-option {
      display: flex;
-     align-items: center;
+     flex-direction: row;
+     flex-wrap: nowrap;
+     align-items: flex-start;
      margin: 8px 12px 8px 0;
      cursor: pointer;
+     min-width: 0;
+     box-sizing: border-box;
 }
 
 .dd-select-input-native {
@@ -21,6 +28,7 @@
      width: 18px;
      height: 18px;
      margin-right: 8px;
+     margin-top: 5px;
      border: 1px solid #c7ced9;
      background: #fff;
      transition: all .2s ease;
@@ -65,20 +73,39 @@
 }
 
 .dd-select-input-option-text {
+     flex: 0 0 auto;
      margin-right: 8px;
+     margin-top: 4px;
      min-width: 32px;
+     line-height: 1.47;
 }
 
+/* 紧挨选项文案，占满剩余宽度；长 placeholder 在框内换行 */
 .dd-select-input-text {
-     flex: 1;
-     min-width: 48px;
+     flex: 1 1 0;
+     min-width: 0;
+     width: auto;
+     max-width: 100%;
+     min-height: 28px;
+     margin: 0;
+     box-sizing: border-box;
      border: none;
      border-bottom: 2px solid #999;
      outline: none;
      padding: 4px 5px;
-     margin-left: 6px;
      font-size: 14px;
+     line-height: 1.47;
      background-color: transparent;
+     resize: none;
+     overflow: hidden;
+     word-break: break-all;
+     overflow-wrap: anywhere;
+     white-space: pre-wrap;
+     field-sizing: content;
+}
+
+.dd-select-input-text-tip {
+     min-height: 28px;
 }
 
 .dd-select-input-text:disabled {
@@ -88,11 +115,14 @@
 }
 
 .dd-select-input-text-ro {
+     flex: 1 1 0;
+     min-width: 0;
      display: inline-block;
-     margin-left: 8px;
-     padding: 0 5px;
-     min-width: 48px;
+     margin: 0;
+     padding: 4px 5px;
+     box-sizing: border-box;
      color: #333;
      line-height: 1.47;
      word-break: break-all;
-}
+     white-space: pre-wrap;
+}

package/lib/upload/upload.js

@@ -368,6 +368,14 @@ var PageHome = function (_React$Component) {
                         return false;
                     }
                 }
+                // 上传前自定义函数：传入文件大小，返回 false 则阻止上传
+                if (typeof t.props.onBeforeUpload === 'function') {
+                    var canUpload = t.props.onBeforeUpload(file.size, file);
+                    if (canUpload === false) {
+                        file.cancel();
+                        return false;
+                    }
+                }
                 // console.info('queuefileadded', file);
                 file.session().progress(function (e) {
                     // console.info('progress', e);

package/package.json

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