@truenewx/tnxvue3 2.6.1 → 2.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {
@@ -30,8 +30,9 @@
     "vue-router": "4.1.6"
   },
   "devDependencies": {
-    "@babel/core": "7.21.8",
-    "@babel/eslint-parser": "7.21.8",
+    "@babel/core": "7.22.5",
+    "@babel/eslint-parser": "7.22.5",
+    "@babel/preset-env": "7.22.5",
     "@vue/cli-plugin-babel": "5.0.8",
     "@vue/cli-plugin-eslint": "5.0.8",
     "@vue/cli-service": "5.0.8",

package/src/element-plus/dialog/Dialog.vue

@@ -98,7 +98,7 @@ export default {
             this.visible = this.modelValue;
             if (newValue && !oldValue) { // 从隐藏到显示
                 let vm = this;
-                this.$nextTick(function () {
+                this.$nextTick(function() {
                     vm.locate(true);
                 });
             }
@@ -109,13 +109,13 @@ export default {
     },
     mounted() {
         let vm = this;
-        this.$nextTick(function () {
+        this.$nextTick(function() {
             if (this.visible) {
                 vm.locate(true);
             }
 
             if (vm.$refs.content && !vm.$refs.content.close) {
-                vm.$refs.content.close = function () {
+                vm.$refs.content.close = function() {
                     vm.close();
                 }
             }
@@ -143,7 +143,7 @@ export default {
                     $dialog = $container.next('.el-overlay').find('.el-dialog');
                 }
             }
-            if (!$dialog?.length) {
+            if (!$dialog || !$dialog.length) {
                 $dialog = $('.el-dialog:last');
             }
             if ($dialog.length) {
@@ -179,9 +179,9 @@ export default {
         },
         close(callback) {
             const vm = this;
-            this.beforeClose(function () {
+            this.beforeClose(function() {
                 if (typeof callback === 'function') {
-                    vm.options.onClosed = util.function.around(vm.options.onClosed, function (onClosed) {
+                    vm.options.onClosed = util.function.around(vm.options.onClosed, function(onClosed) {
                         if (onClosed) {
                             onClosed();
                         }

package/src/element-plus/fss-upload/FssUpload.vue

@@ -87,7 +87,11 @@ export default {
     },
     computed: {
         uploadingFiles() {
-            return this.$refs.upload?.files || [];
+            let files = null;
+            if (this.$refs.upload) {
+                files = this.$refs.upload.files;
+            }
+            return files || [];
         },
     },
     watch: {
@@ -130,7 +134,7 @@ export default {
         _initialize() {
             const vm = this;
             let fssConfig = vm.tnx.fss.getClientConfig();
-            vm.tnx.app.rpc.ensureLogined(function () {
+            vm.tnx.app.rpc.ensureLogined(function() {
                 let locationUrls;
                 if (vm.modelValue) {
                     locationUrls = Array.isArray(vm.modelValue) ? vm.modelValue : [vm.modelValue];
@@ -140,7 +144,7 @@ export default {
                 if (locationUrls.length) {
                     vm.tnx.app.rpc.get(fssConfig.contextUrl + '/metas', {
                         locationUrls: locationUrls
-                    }, function (metas) {
+                    }, function(metas) {
                         let fileList = [];
                         metas.forEach(meta => {
                             if (meta) {
@@ -153,7 +157,7 @@ export default {
                             }
                         });
                         vm.fileList = fileList;
-                        vm.$nextTick(function () {
+                        vm.$nextTick(function() {
                             vm._loadUploadOptions();
                         });
                     }, {
@@ -161,7 +165,7 @@ export default {
                     });
                 } else {
                     vm.fileList = [];
-                    vm.$nextTick(function () {
+                    vm.$nextTick(function() {
                         vm._loadUploadOptions();
                     });
                 }
@@ -176,7 +180,7 @@ export default {
             // 上传限制为空才执行加载，避免多次重复加载
             if (Object.keys(this.uploadOptions).length === 0) {
                 let vm = this;
-                vm.tnx.fss.loadUploadOptions(this.type, function (uploadOptions) {
+                vm.tnx.fss.loadUploadOptions(this.type, function(uploadOptions) {
                     if (vm.extension) {
                         let extensions = Array.isArray(vm.extension) ? vm.extension : [vm.extension];
                         let acceptedExtensions = [];
@@ -294,7 +298,7 @@ export default {
             if (typeof reject === 'function') {
                 reject(file);
             } else {
-                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候', function () {
+                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候', function() {
                     if (reject && typeof reject.disable === 'function') {
                         reject.disable(false);
                     }

package/src/element-plus/input-number/InputNumber.vue

@@ -1,150 +1,150 @@
-<template>
-    <div class="tnxel-input-number" :class="containerClassObject">
-        <el-input-number ref="input" class="flex-grow-1" :class="{'rounded-end-0': suffix, 'text-start': !controls}"
-                         v-model="model"
-                         :min="min" :max="max"
-                         :controls="controls" controls-position="right"
-                         :placeholder="placeholderText" :disabled="disabled"
-                         :step="step || Math.pow(10, -this.scale)" step-strictly
-                         :precision="scale"
-                         :value-on-clear="null"
-                         :size="size"
-                         @change="onChange"
-                         @blur="$emit('blur', $event)"/>
-        <div class="el-input-group__append" v-if="suffix">{{ suffix }}</div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'TnxelInputNumber',
-    props: {
-        modelValue: [Number, String],
-        span: Number,
-        min: Number,
-        max: Number,
-        placeholder: {
-            type: String,
-            default: () => '请设置',
-        },
-        disabled: Boolean,
-        append: String,
-        controls: {
-            type: Boolean,
-            default: true,
-        },
-        step: Number,
-        scale: {
-            type: Number,
-            default: 0,
-        },
-        required: Boolean,
-        size: String,
-    },
-    emits: ['update:modelValue', 'blur'],
-    data() {
-        return {
-            model: typeof this.modelValue === 'string' ? Number(this.modelValue) : this.modelValue,
-            showRequiredError: false,
-        }
-    },
-    computed: {
-        placeholderText() {
-            if (this.placeholder) {
-                return this.placeholder;
-            }
-            let text = this.disabled ? '未' : '请';
-            text += this.controls ? '设置' : '输入';
-            return text;
-        },
-        containerClassObject() {
-            let classObject = {
-                'is-error': this.showRequiredError,
-            };
-            if (this.span) {
-                classObject['el-col'] = true;
-                classObject['el-col-' + this.span] = true;
-            }
-            return classObject;
-        },
-        suffix() {
-            if (this.append) {
-                return this.append;
-            }
-            if (this.$slots?.append) {
-                let append = this.$slots.append();
-                if (append?.length) {
-                    return append[0].text;
-                }
-            }
-            return null;
-        }
-    },
-    watch: {
-        model(value) {
-            this.$emit('update:modelValue', value);
-        },
-        modelValue(value) {
-            this.model = typeof value === 'string' ? Number(value) : value;
-        }
-    },
-    methods: {
-        validateRequired(focusError) {
-            if (this.required) {
-                this.showRequiredError = this.model === undefined || this.model === null || this.model === '';
-                if (this.showRequiredError && focusError) {
-                    this.focus();
-                }
-                return !this.showRequiredError;
-            }
-            return true;
-        },
-        focus() {
-            this.$refs.input.focus();
-        },
-        onChange() {
-            this.validateRequired(false);
-        },
-    }
-}
-</script>
-
-<style>
-.tnxel-input-number {
-    display: flex;
-}
-
-.tnxel-input-number .el-input-number {
-    width: auto;
-    line-height: 1;
-}
-
-.tnxel-input-number .el-input__inner {
-    min-width: 50px;
-}
-
-.tnxel-input-number .el-input-number.text-start .el-input__inner {
-    text-align: left;
-}
-
-.tnxel-input-number .el-input-number.is-controls-right .el-input__wrapper {
-    padding-left: 8px;
-}
-
-.tnxel-input-number .el-input-number .el-input__wrapper .el-input__suffix {
-    display: none;
-}
-
-.tnxel-input-number .el-input-number.rounded-end-0 .el-input__wrapper {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.tnxel-input-number .el-input-group__append {
-    border: 1px solid var(--el-border-color);
-    border-left: none;
-    line-height: 1;
-    border-top-right-radius: var(--el-input-border-radius, var(--el-border-radius-base));
-    border-bottom-right-radius: var(--el-input-border-radius, var(--el-border-radius-base));
-}
-</style>
+<template>
+    <div class="tnxel-input-number" :class="containerClassObject">
+        <el-input-number ref="input" class="flex-grow-1" :class="{'rounded-end-0': suffix, 'text-start': !controls}"
+                         v-model="model"
+                         :min="min" :max="max"
+                         :controls="controls" controls-position="right"
+                         :placeholder="placeholderText" :disabled="disabled"
+                         :step="step || Math.pow(10, -this.scale)" step-strictly
+                         :precision="scale"
+                         :value-on-clear="null"
+                         :size="size"
+                         @change="onChange"
+                         @blur="$emit('blur', $event)"/>
+        <div class="el-input-group__append" v-if="suffix">{{ suffix }}</div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'TnxelInputNumber',
+    props: {
+        modelValue: [Number, String],
+        span: Number,
+        min: Number,
+        max: Number,
+        placeholder: {
+            type: String,
+            default: () => '请设置',
+        },
+        disabled: Boolean,
+        append: String,
+        controls: {
+            type: Boolean,
+            default: true,
+        },
+        step: Number,
+        scale: {
+            type: Number,
+            default: 0,
+        },
+        required: Boolean,
+        size: String,
+    },
+    emits: ['update:modelValue', 'blur'],
+    data() {
+        return {
+            model: typeof this.modelValue === 'string' ? Number(this.modelValue) : this.modelValue,
+            showRequiredError: false,
+        }
+    },
+    computed: {
+        placeholderText() {
+            if (this.placeholder) {
+                return this.placeholder;
+            }
+            let text = this.disabled ? '未' : '请';
+            text += this.controls ? '设置' : '输入';
+            return text;
+        },
+        containerClassObject() {
+            let classObject = {
+                'is-error': this.showRequiredError,
+            };
+            if (this.span) {
+                classObject['el-col'] = true;
+                classObject['el-col-' + this.span] = true;
+            }
+            return classObject;
+        },
+        suffix() {
+            if (this.append) {
+                return this.append;
+            }
+            if (this.$slots && this.$slots.append) {
+                let append = this.$slots.append();
+                if (append && append.length) {
+                    return append[0].text;
+                }
+            }
+            return null;
+        }
+    },
+    watch: {
+        model(value) {
+            this.$emit('update:modelValue', value);
+        },
+        modelValue(value) {
+            this.model = typeof value === 'string' ? Number(value) : value;
+        }
+    },
+    methods: {
+        validateRequired(focusError) {
+            if (this.required) {
+                this.showRequiredError = this.model === undefined || this.model === null || this.model === '';
+                if (this.showRequiredError && focusError) {
+                    this.focus();
+                }
+                return !this.showRequiredError;
+            }
+            return true;
+        },
+        focus() {
+            this.$refs.input.focus();
+        },
+        onChange() {
+            this.validateRequired(false);
+        },
+    }
+}
+</script>
+
+<style>
+.tnxel-input-number {
+    display: flex;
+}
+
+.tnxel-input-number .el-input-number {
+    width: auto;
+    line-height: 1;
+}
+
+.tnxel-input-number .el-input__inner {
+    min-width: 50px;
+}
+
+.tnxel-input-number .el-input-number.text-start .el-input__inner {
+    text-align: left;
+}
+
+.tnxel-input-number .el-input-number.is-controls-right .el-input__wrapper {
+    padding-left: 8px;
+}
+
+.tnxel-input-number .el-input-number .el-input__wrapper .el-input__suffix {
+    display: none;
+}
+
+.tnxel-input-number .el-input-number.rounded-end-0 .el-input__wrapper {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.tnxel-input-number .el-input-group__append {
+    border: 1px solid var(--el-border-color);
+    border-left: none;
+    line-height: 1;
+    border-top-right-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+    border-bottom-right-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+}
+</style>

package/src/element-plus/query-table/QueryTable.vue

@@ -27,7 +27,7 @@
                 </template>
                 <span v-else>&lt;空&gt;</span>
             </template>
-            <template #append v-if="records?.length && paged && typeof paged.total !== 'number'">
+            <template #append v-if="records && records.length && paged && typeof paged.total !== 'number'">
                 <tnxel-button class="py-0 px-1 mx-2 border-0" icon="Top" tooltip="回到顶部" plain
                               @click="scrollToTop"/>
                 <tnxel-icon class="text-secondary" value="Loading" :size="18" v-if="querying"/>
@@ -40,7 +40,7 @@
             </template>
         </el-table>
         <slot name="paged" :paged="paged" :show="showPaged" :query="query"
-              v-if="params.pageSize > 0 && typeof paged?.total === 'number'">
+              v-if="params.pageSize > 0 && paged && typeof paged.total === 'number'">
             <tnxel-paged :value="paged" :change="onPagedChange" :align="pagedAlign" v-if="showPaged"/>
         </slot>
     </div>
@@ -135,7 +135,7 @@ export default {
         },
         tableMaxHeight() {
             if (this.fixedHeight && this.containerHeight) {
-                return typeof this.paged?.total === 'number' ? (this.containerHeight - 40) : this.containerHeight;
+                return (this.paged && typeof this.paged.total === 'number') ? (this.containerHeight - 40) : this.containerHeight;
             }
             return undefined;
         },
@@ -180,7 +180,7 @@ export default {
             return undefined;
         },
         pageAllSelected() {
-            if (this.records?.length) {
+            if (this.records && this.records.length) {
                 let selected = null;
                 for (let i = 0; i < this.records.length; i++) {
                     if (selected === null) {
@@ -194,7 +194,7 @@ export default {
             return false;
         },
         allSelectedIndeterminate() {
-            if (this.records?.length) {
+            if (this.records && this.records.length) {
                 let firstSelected = this.pageSelectedIndexes[0] || false;
                 if (this.records.length === 1) {
                     return firstSelected;
@@ -261,7 +261,7 @@ export default {
                     this.paged = null;
                 }
                 let vm = this;
-                window.tnx.app.rpc.get(this.url, this.params, function (result) {
+                window.tnx.app.rpc.get(this.url, this.params, function(result) {
                     vm.querying = false;
                     if (Array.isArray(result)) {
                         vm.records = vm.format(result);
@@ -309,7 +309,7 @@ export default {
         selectRow(row, column, cell) {
             if (this.selectable && this.records && column.getColumnIndex() > 0 && !cell.innerHTML.contains('</a>')) {
                 let vm = this;
-                let index = window.tnx.util.array.indexOf(this.records, function (element) {
+                let index = window.tnx.util.array.indexOf(this.records, function(element) {
                     return row[vm.selectName] === element[vm.selectName];
                 });
                 if (index >= 0) {
@@ -319,7 +319,7 @@ export default {
             }
         },
         selectAll(selected) {
-            if (this.records?.length) {
+            if (this.records && this.records.length) {
                 for (let i = 0; i < this.records.length; i++) {
                     this.pageSelectedIndexes[i] = selected;
                 }
@@ -331,7 +331,7 @@ export default {
             for (let index = 0; index < this.pageSelectedIndexes.length; index++) {
                 let selectedInPage = this.pageSelectedIndexes[index];
                 let record = this.records[index];
-                let fnEquals = function (element) {
+                let fnEquals = function(element) {
                     return record[vm.selectName] === element[vm.selectName];
                 };
                 let selectedInAll = this.allSelectedRecords.contains(fnEquals);

package/src/element-plus/select/Select.vue

@@ -136,7 +136,7 @@
 <script>
 import Icon from '../icon/Icon.vue';
 
-export const isMultiSelector = function (selector) {
+export const isMultiSelector = function(selector) {
     return selector === 'checkbox' || selector === 'tags' || selector === 'texts';
 }
 export default {
@@ -218,7 +218,7 @@ export default {
             if (util.object.isNotEmpty(newValue) || util.object.isNotEmpty(oldValue)) {
                 let vm = this;
                 // 确保变更事件在值变更应用后再触发
-                this.$nextTick(function () {
+                this.$nextTick(function() {
                     vm.triggerChange(newValue);
                 });
             }
@@ -288,7 +288,7 @@ export default {
             if (util.object.isNull(model)) {
                 return null;
             }
-            if (items?.length) {
+            if (items && items.length) {
                 let item = this.getItem(model);
                 if (item) {
                     return item[this.valueName];
@@ -345,7 +345,7 @@ export default {
             if (this.isMulti()) {
                 let index = this.model.indexOf(value);
                 if (index >= 0) {
-                    this.model = this.model.filter(function (e, i) {
+                    this.model = this.model.filter(function(e, i) {
                         return i !== index;
                     });
                 } else {

package/src/element-plus/tnxel.js

@@ -2,7 +2,7 @@
 /**
  * 基于ElementPlus的扩展支持
  */
-import ElementPlus, {ElLoading, ElMessage, ElMessageBox} from 'element-plus';
+import ElementPlus, { ElLoading, ElMessage, ElMessageBox } from 'element-plus';
 import ElementPlus_zh_CN from 'element-plus/es/locale/lang/zh-cn';
 import tnxbs from '@truenewx/tnxcore/src/tnxbs'; // 二次封装组件中使用了Bootstrap的基础样式
 import tnxvue from '../tnxvue.js';
@@ -87,7 +87,6 @@ const dialogContainerClass = 'tnxel-dialog-container';
 const drawerContainerClass = 'tnxel-drawer-container';
 
 const tnxel = Object.assign({}, tnxbs, tnxvue, {
-    libs: Object.assign({}, tnxbs.libs, tnxvue.libs, {ElementPlus}),
     components,
     _dialogs: [], // 对话框堆栈
     dialog(content, title, buttons, options, contentProps) {
@@ -119,7 +118,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
             theme: options.theme,
         }).mount(containerSelector);
         dialogVm.options = Object.assign(dialogVm.options || {}, options);
-        dialogVm.options.onClosed = this.util.function.around(dialogVm.options.onClosed, function (onClosed) {
+        dialogVm.options.onClosed = this.util.function.around(dialogVm.options.onClosed, function(onClosed) {
             let $container = $(containerSelector);
             $container.next('.el-overlay').remove();
             $container.remove();
@@ -176,7 +175,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
         }).mount(containerSelector);
         drawerVm.id = drawerId;
         drawerVm.options = Object.assign(drawerVm.options || {}, options);
-        drawerVm.options.onClosed = this.util.function.around(drawerVm.options.onClosed, function (onClosed) {
+        drawerVm.options.onClosed = this.util.function.around(drawerVm.options.onClosed, function(onClosed) {
             let $container = $(containerSelector);
             $container.next('.el-overlay').remove();
             $container.remove();
@@ -210,7 +209,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
     },
     _handleZIndex(selector) {
         const util = this.util;
-        setTimeout(function () {
+        setTimeout(function() {
             const topZIndex = util.dom.minTopZIndex(2);
             const element = $(selector);
             const zIndex = Number(element.css('zIndex'));
@@ -282,7 +281,7 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
             options.cancelButtonText = buttonText;
         }
         if (typeof callback === 'function') {
-            options.callback = function (action) {
+            options.callback = function(action) {
                 let yes = undefined;
                 if (action === 'confirm') {
                     yes = options.reverse ? false : true;
@@ -374,14 +373,15 @@ const tnxel = Object.assign({}, tnxbs, tnxvue, {
     }
 });
 
-tnxel.install = tnxel.util.function.around(tnxel.install, function (install, vm) {
+tnxel.install = tnxel.util.function.around(tnxel.install, function(install, vm) {
+    install.call(window.tnx, vm);
     vm.use(ElementPlus, {
         locale: ElementPlus_zh_CN,
     });
-    install.call(window.tnx, vm);
+    this.libs.ElementPlus = ElementPlus;
 });
 
-tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave, function (beforeLeave, router, from) {
+tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave, function(beforeLeave, router, from) {
     // 页面跳转前关闭当前页面中可能存在的所有消息框和对话框
     window.tnx._closeMessage();
     window.tnx.closeDialog(true);
@@ -389,19 +389,19 @@ tnxel.router.beforeLeave = tnxel.util.function.around(tnxel.router.beforeLeave,
 });
 
 tnxel.date = {
-    formatDateTime: function (row, column, cellValue) {
+    formatDateTime: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateTime();
         }
         return undefined;
     },
-    formatDate: function (row, column, cellValue) {
+    formatDate: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDate();
         }
         return undefined;
     },
-    formatTime: function (row, column, cellValue) {
+    formatTime: function(row, column, cellValue) {
         if (typeof cellValue === 'number') {
             cellValue = new Date(cellValue);
         }
@@ -413,7 +413,7 @@ tnxel.date = {
         }
         return undefined;
     },
-    formatTimeMinute: function (row, column, cellValue) {
+    formatTimeMinute: function(row, column, cellValue) {
         if (typeof cellValue === 'number') {
             cellValue = new Date(cellValue);
         }
@@ -428,19 +428,19 @@ tnxel.date = {
         }
         return undefined;
     },
-    formatDateMinute: function (row, column, cellValue) {
+    formatDateMinute: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateMinute();
         }
         return undefined;
     },
-    formatDateMonth: function (row, column, cellValue) {
+    formatDateMonth: function(row, column, cellValue) {
         if (cellValue) {
             return new Date(cellValue).formatDateMonth();
         }
         return undefined;
     },
-    formatPermanentableDate: function (row, column, cellValue) {
+    formatPermanentableDate: function(row, column, cellValue) {
         if (Array.isArray(cellValue)) {
             cellValue = cellValue[column];
         }
@@ -457,7 +457,7 @@ tnxel.date = {
 };
 
 tnxel.number = {
-    formatPercent: function (row, column, cellValue) {
+    formatPercent: function(row, column, cellValue) {
         if (typeof cellValue !== 'number') {
             cellValue = parseFloat(cellValue);
         }
@@ -489,13 +489,13 @@ tnxel.boolean = {
             text: '无',
         }]
     },
-    format: function (row, column, cellValue) {
+    format: function(row, column, cellValue) {
         if (typeof cellValue === 'boolean') {
             cellValue = cellValue.toText();
         }
         return cellValue;
     },
-    formatHas: function (row, column, cellValue) {
+    formatHas: function(row, column, cellValue) {
         if (typeof cellValue === 'boolean') {
             cellValue = tnxel.boolean.items.getText('has', cellValue);
         }
@@ -506,7 +506,7 @@ tnxel.boolean = {
 tnxel.table = {}
 
 const rpc = tnxel.app.rpc;
-rpc.handleErrors = tnxel.util.function.around(rpc.handleErrors, function (handleErrors, errors, options) {
+rpc.handleErrors = tnxel.util.function.around(rpc.handleErrors, function(handleErrors, errors, options) {
     if (options && options.form) {
         let forms;
         if (Array.isArray(options.form)) {

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

@@ -12,7 +12,7 @@
                :file-list="fileList"
                :show-file-list="true"
                :headers="uploadHeaders"
-               :multiple="uploadOptions?.number !== 1"
+               :multiple="uploadOptions && uploadOptions.number !== 1"
                :accept="uploadAccept" :disabled="disabled" v-if="uploadOptions">
         <template #file="{file}">
             <div class="el-upload-list__panel" :data-file-id="getFileId(file)" :style="itemPanelStyle"
@@ -140,7 +140,7 @@ export default {
         fileIcon: {
             type: [String, Function],
             default() {
-                return function (file) {
+                return function(file) {
                     if (isImage(file)) {
                         return 'Picture';
                     }
@@ -170,11 +170,11 @@ export default {
     },
     computed: {
         fileNumExceed() {
-            return this.uploadOptions?.number && this.files.length >= this.uploadOptions.number;
+            return this.uploadOptions && this.uploadOptions.number && this.files.length >= this.uploadOptions.number;
         },
         imageable() {
             let imageable = false;
-            if (this.uploadOptions?.extensions) {
+            if (this.uploadOptions && this.uploadOptions.extensions) {
                 for (let extension of this.uploadOptions.extensions) {
                     if (this.tnx.util.file.isImage(extension)) {
                         imageable = true;
@@ -223,7 +223,8 @@ export default {
             return content;
         },
         uploadAccept() {
-            if (this.uploadOptions && !this.uploadOptions.extensionsRejected && this.uploadOptions.extensions?.length) {
+            if (this.uploadOptions && !this.uploadOptions.extensionsRejected && this.uploadOptions.extensions
+                && this.uploadOptions.extensions.length) {
                 let accept = '';
                 for (let extension of this.uploadOptions.extensions) {
                     accept += ',.' + extension;
@@ -243,7 +244,10 @@ export default {
                 width = width || uploadSize.width;
                 height = height || uploadSize.height;
             }
-            return {width, height};
+            return {
+                width,
+                height
+            };
         },
         itemPanelStyle() {
             let style = {
@@ -270,7 +274,7 @@ export default {
             this.init();
         },
         fileList() {
-            if (this.uploadOptions?.number) {
+            if (this.uploadOptions && this.uploadOptions.number) {
                 this.init();
             }
         }
@@ -280,7 +284,7 @@ export default {
             this.files = [].concat(this.fileList);
             let vm = this;
             // 需在vue渲染之后才可正常操作dom元素
-            this.$nextTick(function () {
+            this.$nextTick(function() {
                 // 初始化显示尺寸
                 let width = vm.uploadSize.width;
                 if (width) {
@@ -347,7 +351,7 @@ export default {
             }
             // 校验文件重复
             const vm = this;
-            if (this.files.contains(function (f) {
+            if (this.files.contains(function(f) {
                 const raw = f.raw ? f.raw : f;
                 return file.uid !== raw.uid && vm.getFileId(file) === vm.getFileId(raw);
             })) {
@@ -417,7 +421,7 @@ export default {
 
             const vm = this;
             const rpc = this.tnx.app.rpc;
-            return new Promise(function (resolve, reject) {
+            return new Promise(function(resolve, reject) {
                 if (vm.validate(file)) {
                     let $upload = $('#' + vm.id + ' .el-upload');
                     if (vm.showFileList && vm.fileNumExceed) {
@@ -425,13 +429,13 @@ export default {
                     }
 
                     // 上传前需确保用户在fss应用中已登录
-                    rpc.ensureLogined(function () {
+                    rpc.ensureLogined(function() {
                         if (vm.beforeUpload) {
                             let promise = vm.beforeUpload(file);
                             if (promise instanceof Promise) {
-                                promise.then(function () {
+                                promise.then(function() {
                                     resolve(file);
-                                }).catch(function () {
+                                }).catch(function() {
                                     reject(file);
                                 });
                             } else if (promise === false) {
@@ -447,7 +451,7 @@ export default {
                         toLogin(loginFormUrl, originalUrl, originalMethod) {
                             $upload.css('visibility', 'unset');
                             // 从当前应用登录表单地址
-                            rpc.get('/authentication/login-url', function (loginUrl) {
+                            rpc.get('/authentication/login-url', function(loginUrl) {
                                 if (loginUrl) {
                                     // 默认登录后跳转回当前页面
                                     loginUrl += loginUrl.contains('?') ? '&' : '?';
@@ -543,14 +547,14 @@ export default {
             }
         },
         removeFile(file) {
-            this.files.remove(function (f) {
+            this.files.remove(function(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(function() {
                     // 去掉文件列表的样式，以免其占高度
                     $('.el-upload-list', container).removeAttr('style');
                     // 恢复添加框默认样式
@@ -575,7 +579,7 @@ export default {
                         const image = new Image();
                         image.src = url;
                         const _this = this;
-                        image.onload = function () {
+                        image.onload = function() {
                             file.width = image.width;
                             file.height = image.height;
                             _this._doPreviewImage(file);

package/src/tnxvue-cli.js

@@ -56,7 +56,7 @@ module.exports = {
                 });
             }
         }
-        if (patterns?.length) {
+        if (patterns && patterns.length) {
             pluginPatterns = pluginPatterns.concat(patterns);
         }
         config.plugins.push(new CopyWebpackPlugin({patterns: pluginPatterns}));

package/src/tnxvue-router.js

@@ -1,7 +1,7 @@
 /**
  * 基于Vue的路由器构建函数
  */
-import {FunctionUtil, NetUtil} from '@truenewx/tnxcore/src/tnxcore-util';
+import { FunctionUtil, NetUtil } from '@truenewx/tnxcore/src/tnxcore-util';
 
 function addRoute(routes, superiorPath, item, fnImportPage) {
     if (item && item.path) {
@@ -59,11 +59,11 @@ function getCurrentRoute(router) {
     return router.currentRoute._value;
 }
 
-export default function (VueRouter, menu, fnImportPage) {
+export default function(VueRouter, menu, fnImportPage) {
     let items;
     if (Array.isArray(menu)) {
         items = [];
-        menu.forEach(function (m) {
+        menu.forEach(function(m) {
             items = items.concat(m.items);
         });
     } else {
@@ -84,7 +84,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', function() {
         let $route = getCurrentRoute(router);
         if ($route) {
             $route.meta.historyFrom = router.history.state.forward;
@@ -93,7 +93,7 @@ export default function (VueRouter, menu, fnImportPage) {
 
     // 注册离开页面前事件处理支持
     router.$beforeLeaveHandlers = {};
-    router.beforeLeave = function (handler) {
+    router.beforeLeave = function(handler) {
         if (typeof handler === 'function') {
             let $route = getCurrentRoute(router);
             let path = $route.path;
@@ -101,7 +101,7 @@ export default function (VueRouter, menu, fnImportPage) {
         }
     };
 
-    router.beforeEach(function (to, from, next) {
+    router.beforeEach(function(to, from, next) {
         if (typeof window.tnx.router.beforeLeave === 'function') {
             window.tnx.router.beforeLeave(router, from);
         }
@@ -118,7 +118,7 @@ export default function (VueRouter, menu, fnImportPage) {
         }
     });
 
-    router.afterEach(function (to, from) {
+    router.afterEach(function(to, from) {
         router.prev = from;
         // 前后hash相同，但全路径不同（意味着参数不同），则需要刷新页面，否则页面不会刷新
         if (to.href === from.href && to.fullPath !== from.fullPath) {
@@ -126,8 +126,8 @@ export default function (VueRouter, menu, fnImportPage) {
         }
     });
 
-    router.back = FunctionUtil.around(router.back, function (back, path) {
-        if (!router.prev?.href) { // 没有href，说明当前页面为刷新后进入的第一个页面，无法简单返回
+    router.back = FunctionUtil.around(router.back, function(back, path) {
+        if (!router.prev || !router.prev.href) { // 没有href，说明当前页面为刷新后进入的第一个页面，无法简单返回
             let $route = getCurrentRoute(router);
             if (!path) { // 未指定默认返回路径，则返回上一级页面
                 path = $route.meta.superiorPath;
@@ -141,7 +141,7 @@ export default function (VueRouter, menu, fnImportPage) {
         back.call(router);
     });
 
-    router.pushState = function (path) {
+    router.pushState = function(path) {
         let success = NetUtil.pushState('#' + path);
         if (!success) {
             this.push(path);
@@ -149,7 +149,7 @@ export default function (VueRouter, menu, fnImportPage) {
         return success;
     }
 
-    router.replaceState = function (path) {
+    router.replaceState = function(path) {
         let success = NetUtil.replaceState('#' + path);
         if (!success) {
             this.replace(path);

package/src/tnxvue-validator.js

@@ -317,7 +317,7 @@ function getRule(validationName, validationValue, fieldMeta) {
     if (rule) {
         rule.name = validationName;
         let metaType = 'text';
-        if (fieldMeta?.type) {
+        if (fieldMeta && fieldMeta.type) {
             metaType = fieldMeta.type.toLowerCase();
         }
         rule.type = rule.type || getRuleType(metaType);
@@ -359,7 +359,7 @@ export default {
     validateRegExp: validator.validateRegExp,
     getRule,
     getRules,
-    validate: function (rules, source, callback) {
+    validate: function(rules, source, callback) {
         return new AsyncValidator(rules).validate(source, callback);
     },
 }

package/src/tnxvue.js

@@ -27,9 +27,6 @@ const components = {
 };
 
 const tnxvue = Object.assign({}, tnxcore, {
-    libs: Object.assign({}, tnxcore.libs, {
-        Vue: Vue
-    }),
     components,
     router: {
         instance: null,
@@ -52,7 +49,7 @@ const tnxvue = Object.assign({}, tnxcore, {
         }
         vm.config.unwrapInjectedRef = true;
         window.tnx.app.eventBus = mitt();
-        window.tnx.app.eventBus.once = function (name, handler) {
+        window.tnx.app.eventBus.once = function(name, handler) {
             this.all.set(name, [handler]);
         }
         return vm;
@@ -62,6 +59,7 @@ const tnxvue = Object.assign({}, tnxcore, {
             const component = this.components[key];
             vm.component(component.name, component);
         }
+        this.libs.Vue = Vue;
     },
     dialog(content, title, buttons, options, contentProps) {
         // 默认不实现，由UI框架扩展层实现
@@ -75,11 +73,13 @@ const tnxvue = Object.assign({}, tnxcore, {
         options = options || {};
 
         let mode = options.mode;
-        if (component.methods?.dialog) {
-            options = Object.assign({}, component.methods.dialog(props), options);
-        } else if (component.methods?.drawer) {
-            options = Object.assign({}, component.methods.drawer(props), options);
-            mode = 'drawer';
+        if (component.methods) {
+            if (component.methods.dialog) {
+                options = Object.assign({}, component.methods.dialog(props), options);
+            } else if (component.methods.drawer) {
+                options = Object.assign({}, component.methods.drawer(props), options);
+                mode = 'drawer';
+            }
         }
 
         const title = component.title || options.title;
@@ -147,19 +147,19 @@ Object.assign(tnxvue.util, {
      * @param obj 对象
      * @returns {boolean} 是否组件实例
      */
-    isComponent: function (obj) {
+    isComponent: function(obj) {
         return (typeof obj === 'object') && (typeof obj.render === 'function');
     }
 });
 
-tnxvue.app.isProduction = function () {
+tnxvue.app.isProduction = function() {
     if (process && process.env && process.env.NODE_ENV !== 'production') {
         return false;
     }
     return true;
 };
 
-tnxvue.app.toDevUrl = function (url, portIndex, replacement) {
+tnxvue.app.toDevUrl = function(url, portIndex, replacement) {
     if (!this.isProduction()) {
         let index = url.indexOf(':', url.indexOf('//'));
         if (index > 0) { // 必须带有端口号才可替换
@@ -185,8 +185,8 @@ tnxvue.app.toDevUrl = function (url, portIndex, replacement) {
 
 // 元数据到async-validator组件规则的转换处理
 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) {
+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) {
         if (meta) { // meta已被缓存，所以直接修改其内容，以便同步缓存
             meta.$rules = validator.getRules(meta);
             if (typeof callback === 'function') {
@@ -196,7 +196,7 @@ tnxvue.app.rpc.getMeta = tnxvue.util.function.around(tnxvue.app.rpc.getMeta, fun
     }, app);
 });
 
-tnxvue.app.page.init = tnxvue.util.function.around(tnxvue.app.page.init, function (init, page, container) {
+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];
@@ -210,22 +210,22 @@ tnxvue.app.page.init = tnxvue.util.function.around(tnxvue.app.page.init, functio
 });
 
 Object.assign(tnxvue.app.page, {
-    startCache: function (router, model, intervalMillis, ignoredFields) {
+    startCache: function(router, model, intervalMillis, ignoredFields) {
         if (localStorage && intervalMillis && intervalMillis > 1000) { // 缓存间隔必须超过1秒
-            let path = this._readCache(router, undefined, function (cache) {
+            let path = this._readCache(router, undefined, function(cache) {
                 Object.assign(model, cache.model);
             });
 
             if (path) {
                 let _this = this;
-                let intervalId = setInterval(function () {
+                let intervalId = setInterval(function() {
                     _this._storeCache(router, path, intervalId, model, ignoredFields);
                 }, intervalMillis);
             }
         }
         return model;
     },
-    _readCache: function (router, path, callback) {
+    _readCache: function(router, path, callback) {
         if (localStorage) {
             path = path || router.app.$route.path || '/';
             let cache = localStorage[path];
@@ -238,7 +238,7 @@ Object.assign(tnxvue.app.page, {
             return path;
         }
     },
-    _storeCache: function (router, path, intervalId, model, ignoredFields) {
+    _storeCache: function(router, path, intervalId, model, ignoredFields) {
         if (path && intervalId) {
             let data = {};
             if (Array.isArray(ignoredFields) && ignoredFields.length) {
@@ -257,21 +257,21 @@ Object.assign(tnxvue.app.page, {
             });
         }
     },
-    saveCache: function (router, model) {
+    saveCache: function(router, model) {
         let intervalId;
         let ignoredFields;
-        let path = this._readCache(router, undefined, function (cache) {
+        let path = this._readCache(router, undefined, function(cache) {
             intervalId = cache.intervalId;
             ignoredFields = cache.ignored;
         });
         this._storeCache(router, path, intervalId, model, ignoredFields);
     },
-    stopCache: function (router, path) {
-        return this._readCache(router, path, function (cache) {
+    stopCache: function(router, path) {
+        return this._readCache(router, path, function(cache) {
             clearInterval(cache.intervalId);
         });
     },
-    clearCache: function (router) {
+    clearCache: function(router) {
         let path = this.stopCache(router);
         if (path) {
             delete localStorage[path];
@@ -283,7 +283,7 @@ Object.assign(tnxvue.app.page, {
      * @param refs 页面中的组件引用集
      * @param validFieldNames 有效的字段名称集，如有指定则清除模型中的无效字段
      */
-    toCommandModel: function (vm, model, validFieldNames) {
+    toCommandModel: function(vm, model, validFieldNames) {
         let result = {};
         if (model) {
             if (vm.$refs) {
@@ -315,14 +315,14 @@ Object.assign(tnxvue.app.page, {
      * 转换多层嵌入字段数据使其符合前端页面模型的基本要求
      * @param model 服务端视图模型
      */
-    toPageModel: function (model) {
+    toPageModel: function(model) {
         let expanded = this._expandRefFields(model);
         while (expanded) {
             expanded = this._expandRefFields(model);
         }
         return model;
     },
-    _expandRefFields: function (model) {
+    _expandRefFields: function(model) {
         let expanded = false;
         Object.keys(model).forEach(key => {
             let value = model[key];