@truenewx/tnxvue3 3.4.0 → 3.4.2

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,
                     });
                 }
             }

package/src/element-plus/enum-view/EnumView.vue

@@ -1,41 +1,41 @@
-<template>
-    <span v-if="item">{{ item.caption }}</span>
-</template>
-
-<script>
-export default {
-    name: 'TnxelEnumView',
-    props: {
-        type: {
-            type: String,
-            required: true,
-        },
-        subtype: String,
-        itemKey: {
-            type: String,
-            required: true,
-        },
-        app: {
-            type: String,
-            default: () => window.tnx.componentDefaultApp, // 设置为方法以延时加载，确保更改的值生效
-        },
-    },
-    data() {
-        return {
-            item: null,
-        };
-    },
-    mounted() {
-        window.tnx.app.rpc.resolveEnumType(this.type, this.subtype, enumType => {
-            this.item = enumType.items.find(item => item.key === this.itemKey);
-        }, {
-            app: this.app,
-        });
-    },
-    methods: {}
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <span v-if="item">{{ item.caption }}</span>
+</template>
+
+<script>
+export default {
+    name: 'TnxelEnumView',
+    props: {
+        type: {
+            type: String,
+            required: true,
+        },
+        subtype: String,
+        itemKey: {
+            type: String,
+            required: true,
+        },
+        app: {
+            type: String,
+            default: () => window.tnx.componentDefaultApp, // 设置为方法以延时加载，确保更改的值生效
+        },
+    },
+    data() {
+        return {
+            item: null,
+        };
+    },
+    mounted() {
+        window.tnx.app.rpc.resolveEnumType(this.type, this.subtype, {
+            app: this.app,
+        }).then(enumType => {
+            this.item = enumType.items.find(item => item.key === this.itemKey);
+        });
+    },
+    methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/element-plus/fetch-cascader/FetchCascader.vue

@@ -121,10 +121,9 @@ export default {
             return null;
         },
         load() {
-            let vm = this;
-            window.tnx.app.rpc.get(this.url, this.params, function(result) {
-                vm.items = vm.transferItems(result);
-                vm.model = vm.getModel();
+            window.tnx.app.rpc.get(this.url, this.params).then((result) => {
+                this.items = this.transferItems(result);
+                this.model = this.getModel();
             });
         },
         filter(node, keyword) {

package/src/element-plus/fetch-select/FetchSelect.vue

@@ -122,25 +122,24 @@ export default {
             if (this.url && this.params) { // 当url或参数函数被设置为null时，不进行取数操作，用于初始条件不满足的情况
                 this.loading = true;
                 let params = this.params(keyword);
-                let vm = this;
-                window.tnx.app.rpc.get(this.url, params, function(result) {
-                    vm.loading = false;
+                window.tnx.app.rpc.get(this.url, params).then(result => {
+                    this.loading = false;
                     if (Array.isArray(result)) {
-                        vm.items = result;
+                        this.items = result;
                     } else if (typeof result === 'object') {
-                        vm.items = result[vm.resultName];
+                        this.items = result[this.resultName];
                         if (result.paged) {
-                            vm.more = result.paged.morePage;
+                            this.more = result.paged.morePage;
                         }
                     }
                     // 确保选项的值均为字符串，以保证比较时的一致性
-                    if (Array.isArray(vm.items)) {
-                        vm.items.forEach(item => {
-                            item[vm.valueName] += '';
+                    if (Array.isArray(this.items)) {
+                        this.items.forEach(item => {
+                            item[this.valueName] += '';
                         });
                     }
-                    vm.$emit('items', params, vm.items, vm.more);
-                    vm.model = vm.getModel();
+                    this.$emit('items', params, this.items, this.more);
+                    this.model = this.getModel();
                 });
             }
         },

package/src/element-plus/fetch-tags/FetchTags.vue

@@ -94,13 +94,12 @@ export default {
             if (this.keyword) {
                 params[this.keywordName] = this.keyword;
             }
-            let vm = this;
-            window.tnx.app.rpc.get(this.url, params, result => {
+            window.tnx.app.rpc.get(this.url, params).then(result => {
                 if (result instanceof Array) {
-                    vm.items = vm.format(result);
+                    this.items = this.format(result);
                 } else if (result.records && result.paged) {
-                    vm.items = vm.format(result.records);
-                    vm.paged = result.paged;
+                    this.items = this.format(result.records);
+                    this.paged = result.paged;
                 }
             });
         },

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

@@ -144,7 +144,12 @@ export default {
         _initialize() {
             const vm = this;
             let fssConfig = vm.tnx.fss.getClientConfig(this.app);
-            vm.tnx.app.rpc.ensureLogined(function () {
+            vm.tnx.app.rpc.ensureLogined({
+                app: window.tnx.componentDefaultApp || fssConfig.appName,
+                toLogin(loginFormUrl, originalUrl, originalMethod) {
+                    return true;
+                }
+            }).then(() => {
                 let locationUrls;
                 if (vm.modelValue) {
                     locationUrls = Array.isArray(vm.modelValue) ? vm.modelValue : [vm.modelValue];
@@ -154,7 +159,9 @@ export default {
                 if (locationUrls.length) {
                     vm.tnx.app.rpc.get(fssConfig.contextUrl + '/metas', {
                         locationUrls: locationUrls
-                    }, function (metas) {
+                    }, {
+                        app: fssConfig.appName
+                    }).then(metas => {
                         let fileList = [];
                         metas.forEach(meta => {
                             if (meta) {
@@ -167,23 +174,16 @@ export default {
                             }
                         });
                         vm.fileList = fileList;
-                        vm.$nextTick(function () {
+                        vm.$nextTick(() => {
                             vm._loadUploadOptions();
                         });
-                    }, {
-                        app: fssConfig.appName
                     });
                 } else {
                     vm.fileList = [];
-                    vm.$nextTick(function () {
+                    vm.$nextTick(() => {
                         vm._loadUploadOptions();
                     });
                 }
-            }, {
-                app: window.tnx.componentDefaultApp || fssConfig.appName,
-                toLogin(loginFormUrl, originalUrl, originalMethod) {
-                    return true;
-                }
             });
         },
         _loadUploadOptions() {
@@ -191,7 +191,12 @@ export default {
             if (Object.keys(this.uploadOptions).length === 0) {
                 this.errors = null;
                 let vm = this;
-                vm.tnx.fss.loadUploadOptions(this.type, function (uploadOptions) {
+                vm.tnx.fss.loadUploadOptions(this.type, {
+                    app: vm.app,
+                    error: function (errors) {
+                        vm.errors = errors;
+                    }
+                }).then(uploadOptions => {
                     if (vm.extension) {
                         let extensions = Array.isArray(vm.extension) ? vm.extension : [vm.extension];
                         let acceptedExtensions = [];
@@ -220,11 +225,6 @@ export default {
                         }
                     }
                     vm.uploadOptions = uploadOptions;
-                }, {
-                    app: vm.app,
-                    error: function (errors) {
-                        vm.errors = errors;
-                    }
                 });
             }
         },
@@ -314,7 +314,7 @@ export default {
             if (typeof reject === 'function') {
                 reject(file);
             } else {
-                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候', function () {
+                this.tnx.alert('文件"' + file.name + '"还未上传完毕，请稍候').then(() => {
                     if (reject && typeof reject.disable === 'function') {
                         reject.disable(false);
                     }

package/src/element-plus/fss-view/FssView.vue

@@ -159,7 +159,7 @@ export default {
                 let vm = this;
                 rpc.get(fssConfig.contextUrl + '/meta', {
                     locationUrl: vm.url,
-                }, function (meta) {
+                }, (meta) => {
                     vm.meta = meta;
                 }, {
                     app: fssConfig.appName,

package/src/element-plus/icon/Icon.vue

@@ -16,6 +16,7 @@
         <CircleClose v-else-if="value === 'CircleClose'"/>
         <CircleCloseFilled v-else-if="value === 'CircleCloseFilled'"/>
         <CirclePlus v-else-if="value === 'CirclePlus'"/>
+        <CirclePlusFilled v-else-if="value === 'CirclePlusFilled'"/>
         <Close v-else-if="value === 'Close'"/>
         <CloseBold v-else-if="value === 'CloseBold'"/>
         <CopyDocument v-else-if="value === 'CopyDocument'"/>
@@ -66,6 +67,7 @@
         <Sort v-else-if="value === 'Sort'"/>
         <SuccessFilled v-else-if="value === 'SuccessFilled'"/>
         <Switch v-else-if="value === 'Switch'"/>
+        <Tools v-else-if="value === 'Tools'"/>
         <Top v-else-if="value === 'Top'"/>
         <User v-else-if="value === 'User'"/>
         <UserFilled v-else-if="value === 'UserFilled'"/>
@@ -92,6 +94,7 @@ import {
     CircleClose,
     CircleCloseFilled,
     CirclePlus,
+    CirclePlusFilled,
     Close,
     CloseBold,
     CopyDocument,
@@ -143,6 +146,7 @@ import {
     Sort,
     SuccessFilled,
     Switch,
+    Tools,
     Top,
     User,
     UserFilled,
@@ -167,6 +171,7 @@ const components = {
     CircleClose,
     CircleCloseFilled,
     CirclePlus,
+    CirclePlusFilled,
     Close,
     CloseBold,
     CopyDocument,
@@ -218,6 +223,7 @@ const components = {
     Sort,
     SuccessFilled,
     Switch,
+    Tools,
     Top,
     User,
     UserFilled,

package/src/element-plus/input-dropdown/InputDropdown.vue

@@ -1,74 +1,74 @@
-<template>
-    <el-input class="tnxel-input-dropdown"
-        v-model="model"
-        :disabled="disabled"
-    >
-        <template #append v-if="items?.length">
-            <el-dropdown :trigger="trigger" @command="selectItem">
-                <span class="el-dropdown-link">
-                    <Icon value="ArrowDown"/>
-                </span>
-                <template #dropdown>
-                    <el-dropdown-menu>
-                        <template v-for="(item, index) of items" :key="index">
-                            <el-dropdown-item
-                                :command="item[valueName]"
-                                :title="item[titleName]"
-                            >
-                                {{ item[textName] }}
-                            </el-dropdown-item>
-                        </template>
-                    </el-dropdown-menu>
-                </template>
-            </el-dropdown>
-        </template>
-    </el-input>
-</template>
-
-<script>
-import Icon from '../icon/Icon.vue';
-
-export default {
-    name: 'TnxelInputDropdown',
-    components: {Icon},
-    props: {
-        modelValue: String,
-        items: Array,
-        valueName: {
-            type: String,
-            default: 'value',
-        },
-        textName: {
-            type: String,
-            default: 'text',
-        },
-        titleName: {
-            type: String,
-            default: 'title',
-        },
-        trigger: String,
-        disabled: Boolean,
-    },
-    data() {
-        return {
-            model: this.modelValue,
-        };
-    },
-    watch: {
-        model() {
-            this.$emit('update:modelValue', this.model);
-        },
-        modelValue() {
-            this.model = this.modelValue;
-        },
-    },
-    methods: {
-        selectItem(value) {
-            this.model = value;
-        },
-    }
-}
-</script>
-
-<style>
-</style>
+<template>
+    <el-input class="tnxel-input-dropdown"
+        v-model="model"
+        :disabled="disabled"
+    >
+        <template #append v-if="items?.length">
+            <el-dropdown :trigger="trigger" @command="selectItem">
+                <span class="el-dropdown-link">
+                    <Icon value="ArrowDown"/>
+                </span>
+                <template #dropdown>
+                    <el-dropdown-menu>
+                        <template v-for="(item, index) of items" :key="index">
+                            <el-dropdown-item
+                                :command="item[valueName]"
+                                :title="item[titleName]"
+                            >
+                                {{ item[textName] }}
+                            </el-dropdown-item>
+                        </template>
+                    </el-dropdown-menu>
+                </template>
+            </el-dropdown>
+        </template>
+    </el-input>
+</template>
+
+<script>
+import Icon from '../icon/Icon.vue';
+
+export default {
+    name: 'TnxelInputDropdown',
+    components: {Icon},
+    props: {
+        modelValue: String,
+        items: Array,
+        valueName: {
+            type: String,
+            default: 'value',
+        },
+        textName: {
+            type: String,
+            default: 'text',
+        },
+        titleName: {
+            type: String,
+            default: 'title',
+        },
+        trigger: String,
+        disabled: Boolean,
+    },
+    data() {
+        return {
+            model: this.modelValue,
+        };
+    },
+    watch: {
+        model() {
+            this.$emit('update:modelValue', this.model);
+        },
+        modelValue() {
+            this.model = this.modelValue;
+        },
+    },
+    methods: {
+        selectItem(value) {
+            this.model = value;
+        },
+    }
+}
+</script>
+
+<style>
+</style>

package/src/element-plus/query-form/QueryForm.vue

@@ -75,7 +75,7 @@ export default {
     },
     mounted() {
         let vm = this;
-        setTimeout(function () {
+        setTimeout(() => {
             let queryable = vm.init;
             if (vm.$route.meta.isHistory()) {
                 queryable = true; // 历史性访问均需要执行查询

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

@@ -231,9 +231,9 @@ export default {
         if (this.init) {
             this.query();
         }
-        let vm = this;
         this.$nextTick(() => {
-            vm.containerHeight = $('.tnxel-query-table[id="' + vm.id + '"]').height();
+            this.containerHeight = this.getContainerHeight();
+            this.tableKey = this.id + '-table';
         });
     },
     methods: {
@@ -274,30 +274,29 @@ export default {
                     this.records = null;
                     this.paged = null;
                 }
-                let vm = this;
-                window.tnx.app.rpc.get(this.url, this.params, function (result) {
-                    vm.querying = false;
+                window.tnx.app.rpc.get(this.url, this.params).then(result => {
+                    this.querying = false;
                     if (Array.isArray(result)) {
-                        vm.records = vm.format(result);
+                        this.records = this.format(result);
                     } else {
-                        let records = vm.format(result.records);
-                        if (result.paged.pageNo > 1 && vm.appendMore) { // 追加记录
-                            vm.records = vm.records || [];
+                        let records = this.format(result.records);
+                        if (result.paged.pageNo > 1 && this.appendMore) { // 追加记录
+                            this.records = this.records || [];
                             // 结果页码大于当前页码才追加记录
-                            if (result.paged.pageNo > vm.paged.pageNo) {
-                                vm.records = vm.records.concat(records);
+                            if (result.paged.pageNo > this.paged.pageNo) {
+                                this.records = this.records.concat(records);
                             }
                         } else { // 替代记录
-                            vm.records = records;
+                            this.records = records;
                         }
-                        vm.paged = result.paged;
+                        this.paged = result.paged;
                     }
-                    vm.selectAllToPage();
-                    vm.tableKey = new Date().toString();
-                    if (vm.success) {
-                        vm.success(vm.records, vm.paged);
+                    this.selectAllToPage();
+                    this.tableKey = new Date().toString();
+                    if (this.success) {
+                        this.success(this.records, this.paged);
                     }
-                });
+                })
             }
         },
         format(records) {
@@ -323,9 +322,8 @@ 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) {
-                    return row[vm.selectName] === element[vm.selectName];
+                let index = window.tnx.util.array.indexOf(this.records, (element) => {
+                    return row[this.selectName] === element[this.selectName];
                 });
                 if (index >= 0) {
                     this.pageSelectedIndexes[index] = !this.pageSelectedIndexes[index];
@@ -342,12 +340,11 @@ export default {
             }
         },
         selectPageToAll() {
-            let vm = this;
             for (let index = 0; index < this.pageSelectedIndexes.length; index++) {
                 let selectedInPage = this.pageSelectedIndexes[index];
                 let record = this.records[index];
-                let fnEquals = function (element) {
-                    return record[vm.selectName] === element[vm.selectName];
+                let fnEquals = (element) => {
+                    return record[this.selectName] === element[this.selectName];
                 };
                 let selectedInAll = this.allSelectedRecords.contains(fnEquals);
                 if (selectedInPage && !selectedInAll) { // 当前页已选但全局未选，则加入全局已选清单
@@ -360,7 +357,6 @@ export default {
         },
         selectAllToPage() {
             if (this.selectable) {
-                let vm = this;
                 if (!Array.isArray(this.allSelectedRecords)) {
                     this.allSelectedRecords = [this.allSelectedRecords];
                 }
@@ -368,7 +364,7 @@ export default {
                 for (let selectedRecord of this.allSelectedRecords) {
                     for (let i = 0; i < this.records.length; i++) {
                         let record = this.records[i];
-                        if (record[vm.selectName] === selectedRecord[vm.selectName]) {
+                        if (record[this.selectName] === selectedRecord[this.selectName]) {
                             this.pageSelectedIndexes[i] = true;
                         }
                     }

package/src/element-plus/region-cascader/RegionCascader.vue

@@ -60,12 +60,11 @@ export default {
         }
     },
     created() {
-        let vm = this;
-        window.tnx.app.rpc.loadRegion(this.scope, parseInt(this.maxLevel), function (region) {
-            vm.region = region;
-            vm.model = vm.getModel();
-        }, {
+        window.tnx.app.rpc.loadRegion(this.scope, parseInt(this.maxLevel), {
             app: this.app,
+        }).then((region) => {
+            this.region = region;
+            this.model = this.getModel();
         });
     },
     methods: {