@truenewx/tnxvue3 3.4.3 → 3.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "type": "module",
@@ -22,24 +22,30 @@
     "@element-plus/icons-vue": "~2.3.0",
     "async-validator": "~4.2.0",
     "bootstrap-vue-next": "~0.40.0",
-    "element-plus": "~2.11.0",
+    "element-plus": "~2.13.0",
     "tdesign-icons-vue-next": "~0.4.0",
-    "tdesign-mobile-vue": "~1.11.0",
+    "tdesign-mobile-vue": "~1.12.0",
     "tdesign-vue-next": "~1.17.0",
     "validator": "~13.15.0",
     "vue": "~3.5.0",
     "vue-router": "~4.6.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.4.2",
+    "@truenewx/tnxcore": "3.4.4",
+    "bootstrap": "5.3.8",
+    "cash-dom": "8.1.5",
     "mitt": "3.0.1"
   },
   "devDependencies": {
-    "@eslint/js": "9.39.1",
+    "@eslint/js": "9.39.2",
+    "@typescript-eslint/parser": "8.50.0",
+    "@typescript-eslint/eslint-plugin": "8.50.0",
     "@vitejs/plugin-vue": "6.0.1",
     "eslint": "9.39.1",
     "eslint-plugin-vue": "10.5.1",
     "globals": "16.5.0",
+    "tsx": "4.21.0",
+    "typescript": "5.6.3",
     "vite": "7.2.2",
     "vue-eslint-parser": "10.2.0"
   },
@@ -49,4 +55,4 @@
     "not dead",
     "not ie 11"
   ]
-}
+}

package/src/bootstrap-vue/dialog/Dialog.vue

@@ -20,9 +20,9 @@
         <component ref="content" :is="content" v-bind="contentProps" v-else></component>
         <template #footer>
             <TnxbsvButton v-for="(button, index) in buttons" :key="index"
-                :type="button.type || 'light'"
-                :loading="buttonLoadings[index]"
-                @click="btnClick(index)"
+                          :type="button.type || 'light'"
+                          :loading="buttonLoadings[index]"
+                          @click="btnClick(index)"
             >
                 {{ button.caption || button.text }}
             </TnxbsvButton>
@@ -113,14 +113,26 @@ export default {
         },
         btnClick(index) {
             const button = this.buttons[index];
-            if (button && typeof button.click === 'function') {
-                let result = button.click.call(this.$refs.content, this.close);
-                if (result === 'loading') {
-                    this.buttonLoadings[index] = true;
-                    return;
+            if (button) {
+                let click = button.click;
+                if (typeof click === 'string') {
+                    if (typeof this.$refs.content[click] === 'function') {
+                        click = this.$refs.content[click];
+                    } else {
+                        console.error(`Method '${click}' not found in component:`, this.$refs.content);
+                        click = null;
+                    }
                 }
-                if (result === false) {
-                    return;
+
+                if (typeof click === 'function') {
+                    let result = click.call(this.$refs.content, this.close);
+                    if (result === 'loading') {
+                        this.buttonLoadings[index] = true;
+                        return;
+                    }
+                    if (result === false) {
+                        return;
+                    }
                 }
             }
             this.close();

package/src/element-plus/aj-captcha/api/index.js

@@ -1,11 +1,11 @@
 // 获取验证图片以及token
 export function reqGet(data) {
-    return window.tnx.app.rpc.post('/captcha/generate', data);
+    return window.tnx.api.post('/captcha/generate', data);
 }
 
 // 滑动或者点选验证
 export function reqCheck(data) {
-    return window.tnx.app.rpc.post('/captcha/check', data);
+    return window.tnx.api.post('/captcha/check', data);
 }
 
 

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

@@ -74,33 +74,10 @@ export default {
     methods: {
         load() {
             if (this.url && this.url.startsWith(window.tnx.fss.PROTOCOL)) {
-                let rpc = window.tnx.app.rpc;
-                let fssConfig = window.tnx.fss.getClientConfig();
-                if (this.preview) {
-                    rpc.get(fssConfig.contextUrl + '/meta', {
-                        locationUrl: this.url
-                    }, (meta) => {
-                        this.src = meta.thumbnailReadUrl;
-                        this.previewSrcList = [meta.readUrl];
-                    }, {
-                        app: fssConfig.appName,
-                        error(errors) {
-                            console.error(errors[0].message);
-                        }
-                    });
-                } else {
-                    rpc.get(fssConfig.contextUrl + '/read/url', {
-                        locationUrl: this.url,
-                        thumbnail: true,
-                    }, (readUrl) => {
-                        this.src = readUrl;
-                    }, {
-                        app: fssConfig.appName,
-                        error(errors) {
-                            console.error(errors[0].message);
-                        }
-                    });
-                }
+                window.tnx.fss.getReadUrl(this.url, true).then(readUrl => {
+                    this.src = readUrl.thumbnailUrl;
+                    this.previewSrcList = [readUrl.readUrl];
+                });
             } else {
                 this.src = this.url;
             }

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

@@ -1,23 +1,22 @@
 <template>
     <div class="tnxel-date-picker d-flex" v-if="permanentable">
         <el-date-picker :type="type" v-model="model.value" :value-format="format" :editable="editable"
-            :placeholder="placeholderText" :clearable="empty" :default-value="defaultDate"
-            :disabled-date="disabledDate" :disabled="disabled || model.permanent"
-            :class="{'flex-grow-1': !pickerWidth}" :style="{width: pickerWidth}"
-            @change="emitModelValue"/>
+                        :placeholder="placeholderText" :clearable="empty" :default-value="defaultDate"
+                        :disabled-date="disabledDate" :disabled="disabled || model.permanent"
+                        :class="{'flex-grow-1': !pickerWidth}" :style="{width: pickerWidth}"
+                        @change="emitModelValue"/>
         <el-checkbox style="margin-left: 1rem; margin-right: 0.75rem;" v-model="model.permanent"
-            @change="onPermanentChange">{{ permanentText }}
+                     @change="onPermanentChange">{{ permanentText }}
         </el-checkbox>
     </div>
     <el-date-picker class="tnxel-date-picker" :type="type" v-model="model.value" :value-format="format"
-        :editable="editable" :placeholder="placeholderText" :clearable="empty" :default-value="defaultDate"
-        :disabled-date="disabledDate" :disabled="disabled" :style="{width: pickerWidth}" v-else/>
+                    :editable="editable" :placeholder="placeholderText" :clearable="empty" :default-value="defaultDate"
+                    :disabled-date="disabledDate" :disabled="disabled" :style="{width: pickerWidth}" v-else/>
 </template>
 
 <script>
 import $ from 'cash-dom';
-
-const util = window.tnx.util;
+import {util} from '../tnxel.ts';
 
 export default {
     name: 'TnxelDatePicker',

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

@@ -1,19 +1,19 @@
 <template>
     <el-dialog class="tnxel-dialog"
-        :data-v-id="id"
-        v-model="visible"
-        destroy-on-close
-        append-to-body
-        :modal="options.modal"
-        :close-on-click-modal="options['close-on-click-modal']"
-        :close-on-press-escape="options['close-on-press-escape']"
-        :show-close="options['show-close']"
-        :center="options.center"
-        :before-close="beforeClose"
-        @closed="onClosed">
+               :data-v-id="id"
+               v-model="visible"
+               destroy-on-close
+               append-to-body
+               :modal="options.modal"
+               :close-on-click-modal="options['close-on-click-modal']"
+               :close-on-press-escape="options['close-on-press-escape']"
+               :show-close="options['show-close']"
+               :center="options.center"
+               :before-close="beforeClose"
+               @closed="onClosed">
         <template #header>
             <div class="tnxel-dialog-title" :class="mergeClass({'border-bottom': title})" v-html="title"
-                v-if="title || options['show-close']"></div>
+                 v-if="title || options['show-close']"></div>
         </template>
         <template v-if="$slots.default">
             <slot></slot>
@@ -23,7 +23,7 @@
         <template #footer v-if="buttons && buttons.length">
             <div class="tnxel-dialog-footer" :class="mergeClass()">
                 <el-button v-for="(button, index) in buttons" :type="button.type" :key="index"
-                    :loading="buttonLoadings[index]" @click="btnClick(index)">{{ button.caption || button.text }}
+                           :loading="buttonLoadings[index]" @click="btnClick(index)">{{ button.caption || button.text }}
                 </el-button>
             </div>
         </template>
@@ -111,7 +111,7 @@ export default {
         },
     },
     mounted() {
-        window.tnx.app.eventBus.once('tnx.error', options => {
+        window.tnx.eventBus.once('tnx.error', options => {
             this.buttonLoadings = [];
         });
         this.$nextTick(() => {
@@ -133,7 +133,7 @@ export default {
         });
     },
     beforeUnmount() {
-        window.tnx.app.eventBus.off('tnx.error');
+        window.tnx.eventBus.off('tnx.error');
     },
     methods: {
         mergeClass(classObject) {
@@ -170,14 +170,26 @@ export default {
         },
         btnClick(index) {
             const button = this.buttons[index];
-            if (button && typeof button.click === 'function') {
-                let result = button.click.call(this.$refs.content, this.close);
-                if (result === 'loading') {
-                    this.buttonLoadings[index] = true;
-                    return;
+            if (button) {
+                let click = button.click;
+                if (typeof click === 'string') {
+                    if (typeof this.$refs.content[click] === 'function') {
+                        click = this.$refs.content[click];
+                    } else {
+                        console.error(`Method '${click}' not found in component:`, this.$refs.content);
+                        click = null;
+                    }
                 }
-                if (result === false) {
-                    return;
+
+                if (typeof click === 'function') {
+                    let result = click.call(this.$refs.content, this.close);
+                    if (result === 'loading') {
+                        this.buttonLoadings[index] = true;
+                        return;
+                    }
+                    if (result === false) {
+                        return;
+                    }
                 }
             }
             this.close();

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>
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-const util = window.tnx.util;
+import {util} from '../tnxel.ts';
 
 export default {
     name: 'TnxelDrawer',
@@ -87,9 +87,26 @@ export default {
     methods: {
         btnClick(index) {
             const button = this.buttons[index];
-            if (button && typeof button.click === 'function') {
-                if (button.click.call(this.$refs.content, this.close) === false) {
-                    return;
+            if (button) {
+                let click = button.click;
+                if (typeof click === 'string') {
+                    if (typeof this.$refs.content[click] === 'function') {
+                        click = this.$refs.content[click];
+                    } else {
+                        console.error(`Method '${click}' not found in component:`, this.$refs.content);
+                        click = null;
+                    }
+                }
+
+                if (typeof click === 'function') {
+                    let result = click.call(this.$refs.content, this.close);
+                    if (result === 'loading') {
+                        this.buttonLoadings[index] = true;
+                        return;
+                    }
+                    if (result === false) {
+                        return;
+                    }
                 }
             }
             this.close();

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

@@ -1,14 +1,14 @@
 <template>
     <div class="tnxel-edit-table-container" :id="id">
         <el-table ref="table"
-            class="tnxel-edit-table"
-            :class="{'padding-none': !padding}"
-            :data="tableDataList"
-            :row-key="rowKey"
-            :row-class-name="tableRowClassName"
-            :highlight-current-row="selectable"
-            border
-            @current-change="onSelectRow"
+                  class="tnxel-edit-table"
+                  :class="{'padding-none': !padding}"
+                  :data="tableDataList"
+                  :row-key="rowKey"
+                  :row-class-name="tableRowClassName"
+                  :highlight-current-row="selectable"
+                  border
+                  @current-change="onSelectRow"
         >
             <template #empty v-if="!tableDataList">
                 <tnxel-icon class="text-placeholder" value="Loading"/>
@@ -172,7 +172,7 @@ export default {
         initRules() {
             if (this.rules) {
                 if (typeof this.rules === 'string') {
-                    window.tnx.app.rpc.getMeta(this.rules, this.rulesApp).then(meta => {
+                    window.tnx.meta.getMeta(this.rules, this.rulesApp).then(meta => {
                         if (this.rulesLoaded) {
                             this.rulesLoaded(meta.$rules);
                         } else {
@@ -269,7 +269,7 @@ export default {
             let model = {};
             model[fieldName] = element.value;
             let successful = true;
-            window.tnx.app.validator.validate(rules, model).catch(errors => {
+            window.tnx.validator.validate(rules, model).catch(errors => {
                 if (errors) {
                     successful = false;
                     let message = '';

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

@@ -1,37 +1,37 @@
 <template>
-    <tnxel-fetch-cascader v-model="model"
-        url="/api/meta/enums" value-name="key" text-name="caption" index-name="searchIndex"
-        :disabled="disabled"
-        :empty="empty"
-        :filterable="filterable"
-        :theme="theme"
-        :params="{
+<tnxel-fetch-cascader v-model="model"
+                      url="/api/meta/enums" value-name="key" text-name="caption" index-name="searchIndex"
+                      :disabled="disabled"
+                      :empty="empty"
+                      :filterable="filterable"
+                      :theme="theme"
+                      :params="{
             type: type,
             subtype:subtype,
             grouped: true,
         }"
-        v-if="grouped"/>
-    <tnxel-select ref="select"
-        v-model="model"
-        :id="id"
-        :selector="selector"
-        :items="items"
-        value-name="key" text-name="caption" index-name="searchIndex"
-        :default-value="defaultValue"
-        :empty="empty"
-        :empty-value="emptyValue"
-        :placeholder="placeholder"
-        :disabled="disabled"
-        :filterable="filterable"
-        :theme="theme"
-        :size="size"
-        :tag-click="tagClick"
-        :change="change"
-        v-else>
-        <template #option="{item}" v-if="$slots.option">
-            <slot name="option" :item="item"></slot>
-        </template>
-    </tnxel-select>
+                      v-if="grouped"/>
+<tnxel-select ref="select"
+              v-model="model"
+              :id="id"
+              :selector="selector"
+              :items="items"
+              value-name="key" text-name="caption" index-name="searchIndex"
+              :default-value="defaultValue"
+              :empty="empty"
+              :empty-value="emptyValue"
+              :placeholder="placeholder"
+              :disabled="disabled"
+              :filterable="filterable"
+              :theme="theme"
+              :size="size"
+              :tag-click="tagClick"
+              :change="change"
+              v-else>
+    <template #option="{item}" v-if="$slots.option">
+        <slot name="option" :item="item"></slot>
+    </template>
+</tnxel-select>
 </template>
 
 <script>
@@ -116,7 +116,7 @@ export default {
                     this.initModel();
                 } else {
                     let vm = this;
-                    window.tnx.app.rpc.resolveEnumItems(this.type, this.subtype, {
+                    window.tnx.meta.resolveEnumItems(this.type, this.subtype, {
                         app: this.app,
                     }).then((items) => {
                         vm.items = items;

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

@@ -26,9 +26,7 @@ export default {
         };
     },
     mounted() {
-        window.tnx.app.rpc.resolveEnumType(this.type, this.subtype, {
-            app: this.app,
-        }).then(enumType => {
+        window.tnx.meta.resolveEnumType(this.type, this.subtype).then(enumType => {
             this.item = enumType.items.find(item => item.key === this.itemKey);
         });
     },

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

@@ -1,7 +1,7 @@
 <template>
     <el-cascader v-model="model" class="ignore-feedback" :options="items" :props="options"
-        :placeholder="placeholder" :show-all-levels="showAllLevels" :clearable="empty" :disabled="disabled"
-        :filterable="filterable" :filter-method="filter" v-if="items"/>
+                 :placeholder="placeholder" :show-all-levels="showAllLevels" :clearable="empty" :disabled="disabled"
+                 :filterable="filterable" :filter-method="filter" v-if="items"/>
 </template>
 
 <script>
@@ -47,7 +47,7 @@ export default {
         change: Function, // 选中值变化后的事件处理函数，由于比element的change事件传递更多参数，所以以prop的形式指定，以尽量节省性能
         transferItems: {
             type: Function,
-            default: function(items) {
+            default: function (items) {
                 return items;
             }
         },
@@ -121,7 +121,7 @@ export default {
             return null;
         },
         load() {
-            window.tnx.app.rpc.get(this.url, this.params).then((result) => {
+            window.tnx.api.get(this.url, this.params).then((result) => {
                 this.items = this.transferItems(result);
                 this.model = this.getModel();
             });

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

@@ -1,6 +1,6 @@
 <template>
     <el-select v-model="model" :loading="loading" :filterable="filterable" remote :remote-method="load"
-        :placeholder="finalPlaceholder" :disabled="disabled" :title="title" default-first-option>
+               :placeholder="finalPlaceholder" :disabled="disabled" :title="title" default-first-option>
         <el-option class="text-secondary" :value="null" :label="emptyText" v-if="empty"/>
         <el-option v-for="item in items" :key="item[valueName]" :value="item[valueName]" :label="label(item)"/>
         <el-option label="还有更多结果..." disabled v-if="more"/>
@@ -15,7 +15,7 @@ export default {
         url: String,
         params: { // 构建远程检索请求参数集的函数
             type: Function,
-            default: function(keyword) {
+            default: function (keyword) {
                 return keyword ? {keyword} : undefined;
             }
         },
@@ -122,7 +122,7 @@ export default {
             if (this.url && this.params) { // 当url或参数函数被设置为null时，不进行取数操作，用于初始条件不满足的情况
                 this.loading = true;
                 let params = this.params(keyword);
-                window.tnx.app.rpc.get(this.url, params).then(result => {
+                window.tnx.api.get(this.url, params).then(result => {
                     this.loading = false;
                     if (Array.isArray(result)) {
                         this.items = result;

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

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