@truenewx/tnxvue3 3.4.0 → 3.4.1

package/src/bootstrap-vue/upload/Upload.vue

@@ -1,173 +1,173 @@
-<template>
-    <div class="tnxbsv-upload">
-        <BOverlay :show="uploading" spinner-variant="primary" spinner-small>
-            <BInputGroup>
-                <BFormInput :value="file?.name" :placeholder="placeholder" tabindex="-1" readonly/>
-                <template #append>
-                    <div class="input-group-append">
-                        <i class="bi bi-x-circle icon-clear" @click="clear" v-if="empty"/>
-                        <BButton :variant="buttonType" @click="toSelect">{{ buttonText }}</BButton>
-                    </div>
-                </template>
-            </BInputGroup>
-            <BFormFile class="d-none" v-model="file" :accept="uploadOptions.extensions || accept"/>
-        </BOverlay>
-        <div class="tnxbsv-upload-error" v-if="errorMessage">{{ errorMessage }}</div>
-    </div>
-</template>
-
-<script>
-import {BOverlay, BInputGroup, BFormInput, BButton, BFormFile} from 'bootstrap-vue-next';
-
-export default {
-    name: 'TnxbsvUpload',
-    components: {BOverlay, BInputGroup, BFormInput, BButton, BFormFile,},
-    props: {
-        app: String, // 上传目标应用名称
-        action: {
-            type: String,
-            required: true,
-        },
-        accept: [String, Array],
-        uploadOptions: {
-            type: Object,
-            default: () => ({}),
-        },
-        placeholder: String,
-        buttonType: {
-            type: String,
-            default: 'light',
-        },
-        buttonText: {
-            type: String,
-            default: '选择文件',
-        },
-        empty: Boolean,
-        beforeUpload: Function,
-        onSuccess: Function,
-        onError: Function,
-    },
-    data() {
-        return {
-            file: null,
-            uploading: false,
-            errorMessage: null,
-        };
-    },
-    computed: {
-        actionUrl() {
-            let baseUrl;
-            if (this.app) {
-                baseUrl = window.tnx.app.rpc.getBaseUrl(this.app);
-            }
-            baseUrl = baseUrl || window.tnx.app.rpc.getDefaultBaseUrl();
-            return baseUrl + this.action;
-        },
-    },
-    watch: {
-        file(newFile, oldFile) {
-            if (newFile) {
-                if (!newFile.handled) {
-                    this.uploadFile();
-                }
-            } else if (!oldFile.handled) {
-                oldFile.handled = true;
-                this.file = oldFile;
-            }
-        }
-    },
-    mounted() {
-        this.file = null;
-        this.uploading = false;
-        this.errorMessage = null;
-    },
-    methods: {
-        toSelect() {
-            const $ = window.tnx.libs.$;
-            $('.tnxbsv-upload input[type="file"]').trigger('click')
-        },
-        clear() {
-            this.file.handled = true;
-            this.$nextTick(() => {
-                this.file = null;
-            });
-        },
-        uploadFile() {
-            if (this.file) {
-                if (this.beforeUpload && this.beforeUpload(this.file) === false) {
-                    return;
-                }
-                const formData = new FormData();
-                formData.append('file', this.file);
-                this.uploading = true;
-                this.errorMessage = null;
-
-                window.tnx.app.rpc.request(this.actionUrl, {
-                    method: 'POST',
-                    body: formData,
-                    timeout: 0,  // 文件上传不设置超时
-                    app: this.app,  // 指定目标应用
-                    success: result => {
-                        if (this.onSuccess) {
-                            this.onSuccess(result);
-                        } else {
-                            console.log('文件上传成功:', result);
-                        }
-                        this.uploading = false;
-                    },
-                    error: error => {
-                        this.uploading = false;
-                        if (this.onError && this.onError(error) === false) {
-                            return;
-                        }
-                        this.errorMessage = error.message;
-                    }
-                });
-            }
-        }
-    }
-}
-</script>
-
-<style>
-.tnxbsv-upload input:focus {
-    outline: none;
-    box-shadow: none;
-    border-color: var(--bs-border-color);
-}
-
-.tnxbsv-upload .input-group-append {
-    position: relative;
-}
-
-.tnxbsv-upload .input-group-append .icon-clear {
-    position: absolute;
-    right: calc(100% + 0.75rem);
-    top: 50%;
-    transform: translateY(-50%);
-    cursor: pointer;
-    z-index: 10;
-    color: var(--bs-tertiary-color);
-}
-
-.tnxbsv-upload .input-group-append .icon-clear:hover {
-    color: var(--bs-secondary-color);
-}
-
-.tnxbsv-upload .input-group-append .btn {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-.tnxbsv-upload-error {
-    margin-top: 0.25rem;
-    color: var(--bs-danger);
-    font-size: 87.5%;
-}
-
-.tnxbsv-upload-placeholder {
-    margin-top: 0.25rem;
-    color: var(--bs-tertiary-color);
-    font-size: 87.5%;
-}
-</style>
+<template>
+    <div class="tnxbsv-upload">
+        <BOverlay :show="uploading" spinner-variant="primary" spinner-small>
+            <BInputGroup>
+                <BFormInput :value="file?.name" :placeholder="placeholder" tabindex="-1" readonly/>
+                <template #append>
+                    <div class="input-group-append">
+                        <i class="bi bi-x-circle icon-clear" @click="clear" v-if="empty"/>
+                        <BButton :variant="buttonType" @click="toSelect">{{ buttonText }}</BButton>
+                    </div>
+                </template>
+            </BInputGroup>
+            <BFormFile class="d-none" v-model="file" :accept="uploadOptions.extensions || accept"/>
+        </BOverlay>
+        <div class="tnxbsv-upload-error" v-if="errorMessage">{{ errorMessage }}</div>
+    </div>
+</template>
+
+<script>
+import {BOverlay, BInputGroup, BFormInput, BButton, BFormFile} from 'bootstrap-vue-next';
+
+export default {
+    name: 'TnxbsvUpload',
+    components: {BOverlay, BInputGroup, BFormInput, BButton, BFormFile,},
+    props: {
+        app: String, // 上传目标应用名称
+        action: {
+            type: String,
+            required: true,
+        },
+        accept: [String, Array],
+        uploadOptions: {
+            type: Object,
+            default: () => ({}),
+        },
+        placeholder: String,
+        buttonType: {
+            type: String,
+            default: 'light',
+        },
+        buttonText: {
+            type: String,
+            default: '选择文件',
+        },
+        empty: Boolean,
+        beforeUpload: Function,
+        onSuccess: Function,
+        onError: Function,
+    },
+    data() {
+        return {
+            file: null,
+            uploading: false,
+            errorMessage: null,
+        };
+    },
+    computed: {
+        actionUrl() {
+            let baseUrl;
+            if (this.app) {
+                baseUrl = window.tnx.app.rpc.getBaseUrl(this.app);
+            }
+            baseUrl = baseUrl || window.tnx.app.rpc.getDefaultBaseUrl();
+            return baseUrl + this.action;
+        },
+    },
+    watch: {
+        file(newFile, oldFile) {
+            if (newFile) {
+                if (!newFile.handled) {
+                    this.uploadFile();
+                }
+            } else if (!oldFile.handled) {
+                oldFile.handled = true;
+                this.file = oldFile;
+            }
+        }
+    },
+    mounted() {
+        this.file = null;
+        this.uploading = false;
+        this.errorMessage = null;
+    },
+    methods: {
+        toSelect() {
+            const $ = window.tnx.libs.$;
+            $('.tnxbsv-upload input[type="file"]').trigger('click')
+        },
+        clear() {
+            this.file.handled = true;
+            this.$nextTick(() => {
+                this.file = null;
+            });
+        },
+        uploadFile() {
+            if (this.file) {
+                if (this.beforeUpload && this.beforeUpload(this.file) === false) {
+                    return;
+                }
+                const formData = new FormData();
+                formData.append('file', this.file);
+                this.uploading = true;
+                this.errorMessage = null;
+
+                window.tnx.app.rpc.request(this.actionUrl, {
+                    method: 'POST',
+                    body: formData,
+                    timeout: 0,  // 文件上传不设置超时
+                    app: this.app,  // 指定目标应用
+                    success: result => {
+                        if (this.onSuccess) {
+                            this.onSuccess(result);
+                        } else {
+                            console.log('文件上传成功:', result);
+                        }
+                        this.uploading = false;
+                    },
+                    error: error => {
+                        this.uploading = false;
+                        if (this.onError && this.onError(error) === false) {
+                            return;
+                        }
+                        this.errorMessage = error.message;
+                    }
+                });
+            }
+        }
+    }
+}
+</script>
+
+<style>
+.tnxbsv-upload input:focus {
+    outline: none;
+    box-shadow: none;
+    border-color: var(--bs-border-color);
+}
+
+.tnxbsv-upload .input-group-append {
+    position: relative;
+}
+
+.tnxbsv-upload .input-group-append .icon-clear {
+    position: absolute;
+    right: calc(100% + 0.75rem);
+    top: 50%;
+    transform: translateY(-50%);
+    cursor: pointer;
+    z-index: 10;
+    color: var(--bs-tertiary-color);
+}
+
+.tnxbsv-upload .input-group-append .icon-clear:hover {
+    color: var(--bs-secondary-color);
+}
+
+.tnxbsv-upload .input-group-append .btn {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.tnxbsv-upload-error {
+    margin-top: 0.25rem;
+    color: var(--bs-danger);
+    font-size: 87.5%;
+}
+
+.tnxbsv-upload-placeholder {
+    margin-top: 0.25rem;
+    color: var(--bs-tertiary-color);
+    font-size: 87.5%;
+}
+</style>

package/src/element-plus/avatar/Avatar.vue

@@ -76,13 +76,12 @@ export default {
             if (this.url && this.url.startsWith(window.tnx.fss.PROTOCOL)) {
                 let rpc = window.tnx.app.rpc;
                 let fssConfig = window.tnx.fss.getClientConfig();
-                let vm = this;
-                if (vm.preview) {
+                if (this.preview) {
                     rpc.get(fssConfig.contextUrl + '/meta', {
-                        locationUrl: vm.url
-                    }, function (meta) {
-                        vm.src = meta.thumbnailReadUrl;
-                        vm.previewSrcList = [meta.readUrl];
+                        locationUrl: this.url
+                    }, (meta) => {
+                        this.src = meta.thumbnailReadUrl;
+                        this.previewSrcList = [meta.readUrl];
                     }, {
                         app: fssConfig.appName,
                         error(errors) {
@@ -91,10 +90,10 @@ export default {
                     });
                 } else {
                     rpc.get(fssConfig.contextUrl + '/read/url', {
-                        locationUrl: vm.url,
+                        locationUrl: this.url,
                         thumbnail: true,
-                    }, function (readUrl) {
-                        vm.src = readUrl;
+                    }, (readUrl) => {
+                        this.src = readUrl;
                     }, {
                         app: fssConfig.appName,
                         error(errors) {

package/src/element-plus/button/Button.vue

@@ -161,7 +161,7 @@ export default {
                 this.finalDisabled = this.disabled || !this.granted;
             } else if (this.menu && this.path) {
                 let vm = this;
-                this.menu.loadGrantedItems(function () {
+                this.menu.loadGrantedItems(() => {
                     vm.finalDisabled = this.disabled || !vm.menu.isGranted(vm.path);
                     vm.buildDropdownItems();
                 });
@@ -201,7 +201,7 @@ export default {
                 } else if (this.$router && this.click !== true && item.menuItem && item.menuItem.path) {
                     // click属性为true时执行点击动作而不是跳转
                     let vm = this;
-                    this.$router.push(item.path).catch(function () {
+                    this.$router.push(item.path).catch(() => {
                         // 指定路径无法跳转，则触发点击事件
                         vm.$emit('click', item.path);
                     });

package/src/element-plus/curd/Curd.vue

@@ -109,19 +109,18 @@ export default {
             }
         },
         toAdd() {
-            let vm = this;
             window.tnx.open(this.page, this.pageProps, {
-                title: vm.addText + (vm.modelName || ''),
-                click: function(yes, close) {
+                title: this.addText + (this.modelName || ''),
+                click: (yes, close) => {
                     if (yes) {
                         if (typeof this.validateForm === 'function') {
-                            this.validateForm(function(model) {
-                                if (vm.add) {
-                                    vm.add(model, function() {
-                                        vm._onAdded(model, close);
+                            this.validateForm((model) => {
+                                if (this.add) {
+                                    this.add(model, () => {
+                                        this._onAdded(model, close);
                                     });
                                 } else {
-                                    vm._onAdded(model, close);
+                                    this._onAdded(model, close);
                                 }
                             });
                             return false;
@@ -164,26 +163,25 @@ export default {
         toUpdate(index) {
             let model = Object.assign({}, this.list[index]);
             if (model) {
-                let vm = this;
                 window.tnx.open(this.page, {
                     modelValue: model
                 }, {
-                    title: vm.updateText + (vm.modelName || ''),
-                    click: function(yes, close) {
+                    title: this.updateText + (this.modelName || ''),
+                    click: (yes, close) => {
                         if (yes) {
                             if (typeof this.validateForm === 'function') {
-                                this.validateForm(function(model) {
-                                    if (vm.update) {
-                                        vm.update(index, model, function() {
-                                            vm._onUpdated(index, model, close);
+                                this.validateForm((model) => {
+                                    if (this.update) {
+                                        this.update(index, model, () => {
+                                            this._onUpdated(index, model, close);
                                         });
                                     } else {
-                                        vm._onUpdated(index, model, close);
+                                        this._onUpdated(index, model, close);
                                     }
                                 });
                                 return false;
                             } else {
-                                vm._onUpdated(index, model, close);
+                                this._onUpdated(index, model, close);
                             }
                         }
                     }
@@ -199,16 +197,15 @@ export default {
             close();
         },
         toRemove(index) {
-            let vm = this;
             let modelName = this.modelName ? ('该' + this.modelName) : '';
-            window.tnx.confirm('确定要' + this.removeText + modelName + '吗？', function(yes) {
+            window.tnx.confirm('确定要' + this.removeText + modelName + '吗？').then((yes) => {
                 if (yes) {
-                    if (vm.remove) {
-                        vm.remove(index, function() {
-                            vm._onRemoved(index);
+                    if (this.remove) {
+                        this.remove(index, () => {
+                            this._onRemoved(index);
                         });
                     } else {
-                        vm._onRemoved(index);
+                        this._onRemoved(index);
                     }
                 }
             });

package/src/element-plus/date-picker/DatePicker.vue

@@ -124,7 +124,7 @@ export default {
     },
     mounted() {
         let vm = this;
-        this.$watch('model', function () {
+        this.$watch('model', () => {
             vm.emitModelValue();
         }, {
             deep: true

package/src/element-plus/detail-form/DetailForm.vue

@@ -4,7 +4,7 @@
         <slot></slot>
         <el-form-item class="w-100 mb-0" :label="vertical ? undefined : '&nbsp;'" v-if="update || back !== false">
             <el-button :type="theme || 'primary'" @click="toUpdate" v-if="update">{{ updateText }}</el-button>
-            <el-button type="default" @click="toBack" v-if="back !== false">{{ backText }}</el-button>
+            <el-button @click="toBack" v-if="back !== false">{{ backText }}</el-button>
         </el-form-item>
     </el-form>
 </template>

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

@@ -101,9 +101,8 @@ export default {
         modelValue(newValue, oldValue) {
             this.visible = this.modelValue;
             if (newValue && !oldValue) { // 从隐藏到显示
-                let vm = this;
-                this.$nextTick(function () {
-                    vm.locate(true);
+                this.$nextTick(() => {
+                    this.locate(true);
                 });
             }
         },
@@ -115,22 +114,21 @@ export default {
         window.tnx.app.eventBus.once('tnx.error', options => {
             this.buttonLoadings = [];
         });
-        let vm = this;
-        this.$nextTick(function () {
+        this.$nextTick(() => {
             if (this.visible) {
-                vm.locate(true);
+                this.locate(true);
             }
 
-            if (vm.$refs.content && !vm.$refs.content.close) {
-                vm.$refs.content.close = function () {
-                    vm.close();
+            if (this.$refs.content && !this.$refs.content.close) {
+                this.$refs.content.close = () => {
+                    this.close();
                 }
             }
 
-            if (typeof vm.options.onShown === 'function') {
-                vm.options.onShown.call(this);
+            if (typeof this.options.onShown === 'function') {
+                this.options.onShown.call(this);
             } else {
-                vm.$emit('shown');
+                this.$emit('shown');
             }
         });
     },
@@ -184,18 +182,18 @@ export default {
             }
             this.close();
         },
-        close(callback) {
-            const vm = this;
-            this.beforeClose(function () {
-                if (typeof callback === 'function') {
-                    vm.options.onClosed = window.tnx.util.function.around(vm.options.onClosed, function (onClosed) {
+        close() {
+            return new Promise((resolve) => {
+                this.beforeClose(() => {
+                    const originalOnClosed = this.options.onClosed;
+                    this.options.onClosed = window.tnx.util.function.around(originalOnClosed, function (onClosed) {
                         if (onClosed) {
                             onClosed();
                         }
-                        callback();
+                        resolve();
                     });
-                }
-                vm.visible = false;
+                    this.visible = false;
+                });
             });
         },
         beforeClose(done) {

package/src/element-plus/drawer/Drawer.vue

@@ -23,7 +23,7 @@
             </div>
             <div class="tnxel-drawer-footer" v-if="buttons && buttons.length">
                 <el-button v-for="(button, index) in buttons" :type="button.type" :key="index"
-                           @click="btnClick(index)">{{ button.caption || button.text }}
+                    @click="btnClick(index)">{{ button.caption || button.text }}
                 </el-button>
             </div>
         </div>
@@ -64,7 +64,7 @@ export default {
     },
     mounted() {
         let vm = this;
-        this.$nextTick(function () {
+        this.$nextTick(() => {
             if (vm.$refs.content && !vm.$refs.content.close) {
                 vm.$refs.content.close = function () {
                     vm.close();
@@ -94,18 +94,19 @@ export default {
             }
             this.close();
         },
-        close(callback) {
+        close() {
             const vm = this;
-            this.beforeClose(function () {
-                if (typeof callback === 'function') {
-                    vm.options.onClosed = util.function.around(vm.options.onClosed, function (onClosed) {
+            return new Promise((resolve) => {
+                this.beforeClose(() => {
+                    const originalOnClosed = vm.options.onClosed;
+                    vm.options.onClosed = util.function.around(originalOnClosed, function (onClosed) {
                         if (onClosed) {
                             onClosed();
                         }
-                        callback();
+                        resolve();
                     });
-                }
-                vm.visible = false;
+                    vm.visible = false;
+                });
             });
         },
         beforeClose(done) {

package/src/element-plus/edit-table/EditTable.vue

@@ -172,7 +172,7 @@ export default {
         initRules() {
             if (this.rules) {
                 if (typeof this.rules === 'string') {
-                    window.tnx.app.rpc.getMeta(this.rules, meta => {
+                    window.tnx.app.rpc.getMeta(this.rules, this.rulesApp).then(meta => {
                         if (this.rulesLoaded) {
                             this.rulesLoaded(meta.$rules);
                         } else {
@@ -180,7 +180,7 @@ export default {
                         }
                         this.validationRules = meta.$rules;
                         this.bindRules();
-                    }, this.rulesApp);
+                    });
                 } else {
                     this.validationRules = this.rules;
                     this.bindRules();
@@ -269,7 +269,7 @@ export default {
             let model = {};
             model[fieldName] = element.value;
             let successful = true;
-            window.tnx.app.validator.validate(rules, model, errors => {
+            window.tnx.app.validator.validate(rules, model).catch(errors => {
                 if (errors) {
                     successful = false;
                     let message = '';

package/src/element-plus/enum-select/EnumSelect.vue

@@ -116,11 +116,11 @@ export default {
                     this.initModel();
                 } else {
                     let vm = this;
-                    window.tnx.app.rpc.resolveEnumItems(this.type, this.subtype, function (items) {
+                    window.tnx.app.rpc.resolveEnumItems(this.type, this.subtype, {
+                        app: this.app,
+                    }).then((items) => {
                         vm.items = items;
                         vm.initModel();
-                    }, {
-                        app: this.app,
                     });
                 }
             }