fmui-base 2.3.34 → 2.3.35

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

package/lib/nvoice/index.js

@@ -1,16 +0,0 @@
-'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

@@ -1,177 +0,0 @@
-'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;