@truenewx/tnxvue3 3.4.0 → 3.4.1

package/src/element-plus/upload/Upload.vue

@@ -293,7 +293,7 @@ export default {
             this.files = [].concat(this.fileList);
             let vm = this;
             // 需在vue渲染之后才可正常操作dom元素
-            this.$nextTick(function () {
+            this.$nextTick(() => {
                 // 初始化显示尺寸
                 let width = vm.uploadSize.width;
                 if (width) {
@@ -360,7 +360,7 @@ export default {
             }
             // 校验文件重复
             const vm = this;
-            if (this.files.contains(function (f) {
+            if (this.files.contains((f) => {
                 const raw = f.raw ? f.raw : f;
                 return file.uid !== raw.uid && vm.getFileId(file) === vm.getFileId(raw);
             })) {
@@ -430,7 +430,7 @@ export default {
 
             const vm = this;
             const rpc = this.tnx.app.rpc;
-            return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 if (vm.validate(file)) {
                     let $upload = $('#' + vm.id + ' .el-upload');
                     if (vm.showFileList && vm.fileNumExceed) {
@@ -438,29 +438,12 @@ export default {
                     }
 
                     // 上传前需确保用户在fss应用中已登录
-                    rpc.ensureLogined(function () {
-                        if (vm.beforeUpload) {
-                            let promise = vm.beforeUpload(file);
-                            if (promise instanceof Promise) {
-                                promise.then(function () {
-                                    resolve(file);
-                                }).catch(function () {
-                                    reject(file);
-                                });
-                            } else if (promise === false) {
-                                reject(file);
-                            } else {
-                                resolve(file);
-                            }
-                        } else {
-                            resolve(file);
-                        }
-                    }, {
+                    rpc.ensureLogined({
                         app: vm.app,
                         toLogin(loginFormUrl, originalUrl, originalMethod) {
                             $upload.css('visibility', 'unset');
                             // 从当前应用登录表单地址
-                            rpc.get('/authentication/login-url', function (loginUrl) {
+                            rpc.get('/authentication/login-url').then(loginUrl => {
                                 if (loginUrl) {
                                     // 默认登录后跳转回当前页面
                                     loginUrl += loginUrl.contains('?') ? '&' : '?';
@@ -473,6 +456,23 @@ export default {
                             });
                             return true;
                         }
+                    }).then(() => {
+                        if (vm.beforeUpload) {
+                            let promise = vm.beforeUpload(file);
+                            if (promise instanceof Promise) {
+                                promise.then(() => {
+                                    resolve(file);
+                                }).catch(() => {
+                                    reject(file);
+                                });
+                            } else if (promise === false) {
+                                reject(file);
+                            } else {
+                                resolve(file);
+                            }
+                        } else {
+                            resolve(file);
+                        }
                     });
                 } else {
                     reject(file);
@@ -557,14 +557,14 @@ export default {
             }
         },
         removeFile(file) {
-            this.files.remove(function (f) {
+            this.files.remove((f) => {
                 return file.uid === f.uid;
             });
             this.$refs.upload.handleRemove(file);
             if (!this.fileNumExceed) {
                 this.handleErrors([]); // 移除一个文件后，此时如果有错误提示则一定为数量超限，需清空错误提示
                 let container = $('#' + this.id);
-                this.$nextTick(function () {
+                this.$nextTick(() => {
                     // 去掉文件列表的样式，以免其占高度
                     $('.el-upload-list', container).removeAttr('style');
                     // 恢复添加框默认样式

package/src/tnxvue-router.js

@@ -69,7 +69,7 @@ export default function (VueRouter, menu, fnImportPage) {
     let items;
     if (Array.isArray(menu)) {
         items = [];
-        menu.forEach(function (m) {
+        menu.forEach((m) => {
             if (Array.isArray(m.items)) {
                 items = items.concat(m.items);
             } else { // menu实际上是items
@@ -94,7 +94,7 @@ export default function (VueRouter, menu, fnImportPage) {
     // if (window.history && window.history.pushState) {
     //     window.history.pushState(null, null, document.URL);
     // }
-    window.addEventListener('popstate', function () {
+    window.addEventListener('popstate', () => {
         let $route = getCurrentRoute(router);
         if ($route) {
             $route.meta.historyFrom = router.history.state.forward;
@@ -111,7 +111,7 @@ export default function (VueRouter, menu, fnImportPage) {
         }
     };
 
-    router.beforeEach(function (to, from, next) {
+    router.beforeEach((to, from, next) => {
         if (typeof window.tnx.router.beforeLeave === 'function') {
             window.tnx.router.beforeLeave(router, from);
         }
@@ -128,7 +128,7 @@ export default function (VueRouter, menu, fnImportPage) {
         }
     });
 
-    router.afterEach(function (to, from) {
+    router.afterEach((to, from) => {
         router.prev = from;
         // 前后路径相同，但全路径不同（意味着参数不同），则需要刷新页面，否则页面不会刷新
         if (to.path === from.path && to.fullPath !== from.fullPath) {

package/src/tnxvue-validator.js

@@ -359,7 +359,13 @@ export default {
     validateRegExp: validator.validateRegExp,
     getRule,
     getRules,
-    validate: function (rules, source, callback) {
-        return new AsyncValidator(rules).validate(source, callback);
+    /**
+     * 校验字段
+     * @param rules 包含所有字段校验规则的对象，格式：{字段名: [规则数组]}
+     * @param model 待校验的模型对象，包含待校验的字段
+     * @returns {Promise} then({errors,fields}=>{})
+     */
+    validate: function (rules, model) {
+        return new AsyncValidator(rules).validate(model);
     },
 }

package/src/tnxvue.js

@@ -159,8 +159,8 @@ export default build('tnxvue', () => {
             }
             return this.dialog(component, title, buttons, options, props);
         },
-        getDefaultDialogButtons(type, callback, theme) {
-            if (callback !== false) {
+        getDefaultDialogButtons(type, click, theme) {
+            if (click !== false) {
                 if (type === 'none') {
                     return [];
                 } else if (type === 'confirm') {
@@ -168,15 +168,15 @@ export default build('tnxvue', () => {
                         text: '确定',
                         type: theme || 'primary',
                         click(close) {
-                            if (typeof callback === 'function') {
-                                return callback.call(this, true, close);
+                            if (typeof click === 'function') {
+                                return click.call(this, true, close);
                             }
                         }
                     }, {
                         text: '取消',
                         click(close) {
-                            if (typeof callback === 'function') {
-                                return callback.call(this, false, close);
+                            if (typeof click === 'function') {
+                                return click.call(this, false, close);
                             }
                         }
                     }];
@@ -185,8 +185,8 @@ export default build('tnxvue', () => {
                         text: '关闭',
                         type: theme,
                         click(close) {
-                            if (typeof callback === 'function') {
-                                return callback.call(this, close);
+                            if (typeof click === 'function') {
+                                return click.call(this, close);
                             }
                         }
                     }];
@@ -195,8 +195,8 @@ export default build('tnxvue', () => {
                         text: '确定',
                         type: theme || 'primary',
                         click(close) {
-                            if (typeof callback === 'function') {
-                                return callback.call(this, close);
+                            if (typeof click === 'function') {
+                                return click.call(this, close);
                             }
                         }
                     }];
@@ -256,7 +256,7 @@ export default build('tnxvue', () => {
     tnxvue.app.validator = validator;
     tnxvue.app.rpc.getMeta =
         tnxvue.util.function.around(tnxvue.app.rpc.getMeta, function (getMeta, url, callback, app) {
-            getMeta.call(tnxvue.app.rpc, url, function (meta) {
+            return getMeta.call(tnxvue.app.rpc, url, function (meta) {
                 if (meta) { // meta已被缓存，所以直接修改其内容，以便同步缓存
                     meta.$rules = validator.getRules(meta);
                     if (typeof callback === 'function') {
@@ -266,19 +266,6 @@ export default build('tnxvue', () => {
             }, app);
         });
 
-    tnxvue.app.page.init = tnxvue.util.function.around(tnxvue.app.page.init, function (init, page, container) {
-        if (container.tagName === 'BODY') { // vue不推荐以body为挂载目标，故从body下获取第一个div作为容器
-            for (let i = 0; i < container.children.length; i++) {
-                const child = container.children[i];
-                if (child.tagName === 'DIV') {
-                    container = child;
-                    break;
-                }
-            }
-        }
-        init.call(this, page, container);
-    });
-
     Object.assign(tnxvue.app.page, {
         // TODO 路由缓存迁移至tnxvue-router.js中
         startCache: function (router, model, intervalMillis, ignoredFields) {
@@ -289,7 +276,7 @@ export default build('tnxvue', () => {
 
                 if (path) {
                     let _this = this;
-                    let intervalId = setInterval(function () {
+                    let intervalId = setInterval(() => {
                         _this._storeCache(router, path, intervalId, model, ignoredFields);
                     }, intervalMillis);
                 }
@@ -350,8 +337,8 @@ export default build('tnxvue', () => {
         },
         /**
          * 前端页面模型转换为后端命令模型，检查文件上传是否完成，去掉后端不需要的多余字段，转换多层嵌入字段数据使其符合服务端命令模型的基本要求
+         * @param vm vue实例
          * @param model 前端页面模型
-         * @param refs 页面中的组件引用集
          * @param validFieldNames 有效的字段名称集，如有指定则清除模型中的无效字段
          */
         toCommandModel: function (vm, model, validFieldNames) {