fmui-base 2.3.34 → 2.3.36

package/README.md

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

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/upload/upload.js

@@ -139,6 +139,11 @@ var PageHome = function (_React$Component) {
         var canDel = props.canDel;
         //可下载
         var canDownload = props.canDownload;
+        // 普通微信端：UA 判断（thirdMenuType 可能为 null，且值为 WX 而非 WeChat）
+        var isWeChatClient = _this.isRegularWeChatClient();
+        // 鸿蒙端：不设 input accept，事件内校验文件类型
+        var isHarmonyClient = _this.isHarmonyClient();
+        var skipInputAccept = isWeChatClient && isHarmonyClient;
         // 公众号不展示下载按钮
         if (getLoginUserInfo().thirdMenuType == 'WeChat') {
             canDownload = false;
@@ -243,7 +248,10 @@ var PageHome = function (_React$Component) {
             returnOnce: returnOnce,
             percent1: 0,
             showProgress: true,
-            isDesktop: isDesktop
+            isDesktop: isDesktop,
+            isWeChatClient: isWeChatClient,
+            isHarmonyClient: isHarmonyClient,
+            skipInputAccept: skipInputAccept
         };
         return _this;
     }
@@ -253,6 +261,36 @@ var PageHome = function (_React$Component) {
         value: function GenNonDuplicateID(randomLength) {
             return Number(Math.random().toString().substr(3, randomLength) + Date.now()).toString(36);
         }
+
+        // 普通微信（非企业微信）：与 base.js 中 isRegularWeChat 逻辑一致
+
+    }, {
+        key: 'isRegularWeChatClient',
+        value: function isRegularWeChatClient() {
+            if (typeof isRegularWeChat !== 'undefined') {
+                return !!isRegularWeChat;
+            }
+            var ua = navigator.userAgent || '';
+            return (/MicroMessenger/i.test(ua) && !/wxwork/i.test(ua)
+            );
+        }
+
+        // 鸿蒙端：thirdMenuType=MH、emp JSBridge 或 UA 识别
+
+    }, {
+        key: 'isHarmonyClient',
+        value: function isHarmonyClient() {
+            var thirdMenuType = getLoginUserInfo().thirdMenuType;
+            if (thirdMenuType == 'MH') {
+                return true;
+            }
+            if (typeof emp !== 'undefined') {
+                return true;
+            }
+            var ua = navigator.userAgent || '';
+            return (/HarmonyOS|OpenHarmony/i.test(ua)
+            );
+        }
     }, {
         key: 'del',
         value: function del(delIndex) {
@@ -269,7 +307,8 @@ var PageHome = function (_React$Component) {
                     name: 'file',
                     url: this.state.uploadUrl,
                     autoPending: true,
-                    accept: t.state.accept,
+                    // 普通微信/鸿蒙端不设 input accept，避免选择文件异常
+                    accept: t.state.skipInputAccept ? null : t.state.accept,
                     multiple: true,
                     fileSizeLimit: t.state.fileSizeLimit
                 };
@@ -300,7 +339,15 @@ var PageHome = function (_React$Component) {
                 request.setParam('businessExt', t.state.businessExt);
                 console.info(request.getParam('token'));
             }).on(_uploadcore.Events.QUEUE_FILE_ADDED, function (file) {
-                // return false;
+                // 普通微信/鸿蒙端：事件内校验文件类型（input 未设 accept）
+                if (t.state.skipInputAccept && t.state.accept && !t.isFileExtensionAllowed(file)) {
+                    file.cancel();
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: '文件类型错误！'
+                    });
+                    return false;
+                }
                 //判断总文件大小不超过
                 var fileAllSizeLimit = t.state.fileAllSizeLimit;
                 if (fileAllSizeLimit > 0) {
@@ -508,6 +555,28 @@ var PageHome = function (_React$Component) {
             });
             return up;
         }
+        // 校验文件扩展名（普通微信端 input 不设 accept 时使用）
+
+    }, {
+        key: 'isFileExtensionAllowed',
+        value: function isFileExtensionAllowed(file) {
+            var accept = this.state.accept;
+            if (!accept || !accept.extensions) {
+                return true;
+            }
+            var allowedExts = accept.extensions.toLowerCase().split(',').map(function (ext) {
+                return ext.trim().replace(/^\./, '');
+            });
+            var fileExt = (file.ext || '').toLowerCase().replace(/^\./, '');
+            if (!fileExt && file.name) {
+                var parts = file.name.split('.');
+                if (parts.length > 1) {
+                    fileExt = parts[parts.length - 1].toLowerCase();
+                }
+            }
+            return allowedExts.indexOf(fileExt) >= 0;
+        }
+
         //计算大小
 
     }, {

package/package.json

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