@truenewx/tnxvue3 3.4.4 → 3.4.6

package/src/tnxvue.ts

@@ -2,11 +2,12 @@
  * 基于Vue 3的扩展支持
  */
 import Tnx, {util} from '../../tnxcore/src/tnxcore.ts';
-import Text from './text/Text.vue';
-import Percent from './percent/Percent.vue';
+import Text from './components/Text.vue';
+import Percent from './components/Percent.vue';
+import ScrollView from './components/ScrollView.vue';
 import * as Vue from 'vue';
 import mitt, {Emitter, EventType} from 'mitt';
-import {Router} from 'vue-router';
+import {Router, useRoute} from 'vue-router';
 import {VueRouter} from './tnxvue-router.ts';
 
 export {util};
@@ -27,11 +28,14 @@ export type DialogOptions = {
     click?: boolean | ((yes: boolean, close: () => void) => boolean | undefined) | ((close: () => void) => boolean | undefined);
     buttonText?: string | string[];
     buttons?: ButtonOptions[];
+    width?: number | string;
 }
 
 export type OpenType = 'alert' | 'confirm' | 'close' | 'none';
 
-export type DrawerOptions = DialogOptions
+export type DrawerOptions = DialogOptions & {
+    placement?: 'bottom' | 'right' | 'top' | 'left';
+}
 
 export type OpenOptions = DialogOptions & {
     mode?: 'dialog' | 'drawer';
@@ -49,6 +53,7 @@ export default class TnxVue extends Tnx {
     components: Record<string, Vue.Component> = {
         Text,
         Percent,
+        ScrollView,
     };
 
     constructor(apiBaseUrl: string, id: string = 'tnxvue') {
@@ -56,6 +61,10 @@ export default class TnxVue extends Tnx {
         this.libs.Vue = Vue;
     }
 
+    route(): ReturnType<typeof useRoute> {
+        return useRoute();
+    }
+
     install(app: Vue.App): void {
         for (let key of Object.keys(this.components)) {
             const component = this.components[key];
@@ -174,7 +183,7 @@ export default class TnxVue extends Tnx {
 
     protected getDefaultDialogButtons(
         type: OpenType,
-        click: boolean | ((yes: boolean, close: () => void) => boolean | undefined) | ((close: () => void) => boolean | undefined),
+        click: boolean | string | ((yes: boolean, close: () => void) => boolean | undefined) | ((close: () => void) => boolean | undefined),
         theme?: string): ButtonOptions[] {
         if (click !== false) {
             if (type === 'none') {
@@ -184,6 +193,9 @@ export default class TnxVue extends Tnx {
                     text: '确定',
                     type: theme || 'primary',
                     click(close: () => void) {
+                        if (typeof click === 'string') {
+                            click = this[click];
+                        }
                         if (typeof click === 'function') {
                             return click.call(this, true, close);
                         }
@@ -191,6 +203,9 @@ export default class TnxVue extends Tnx {
                 }, {
                     text: '取消',
                     click(close: () => void) {
+                        if (typeof click === 'string') {
+                            click = this[click];
+                        }
                         if (typeof click === 'function') {
                             return click.call(this, false, close);
                         }
@@ -201,6 +216,9 @@ export default class TnxVue extends Tnx {
                     text: '关闭',
                     type: theme,
                     click(close: () => void) {
+                        if (typeof click === 'string') {
+                            click = this[click];
+                        }
                         if (typeof click === 'function') {
                             return click.call(this, close);
                         }
@@ -211,6 +229,9 @@ export default class TnxVue extends Tnx {
                     text: '确定',
                     type: theme || 'primary',
                     click(close: () => void) {
+                        if (typeof click === 'string') {
+                            click = this[click];
+                        }
                         if (typeof click === 'function') {
                             return click.call(this, close);
                         }
@@ -221,7 +242,7 @@ export default class TnxVue extends Tnx {
         return [];
     }
 
-    closeDialog(all?: boolean): Promise<void> {
+    closeDialog(all?: boolean): void {
         // 默认不实现，由UI框架扩展层实现
         throw new Error('Unsupported function');
     }
@@ -235,7 +256,7 @@ export default class TnxVue extends Tnx {
         throw new Error('Unsupported function');
     }
 
-    closeDrawer(all?: boolean): Promise<void> {
+    closeDrawer(all?: boolean): void {
         // 默认不实现，由UI框架扩展层实现
         throw new Error('Unsupported function');
     }
@@ -256,10 +277,10 @@ export default class TnxVue extends Tnx {
 
     open(component: Vue.Component, props?: Record<string, any>, options: OpenOptions = {}) {
         const c = component as any;
-        if (typeof c.open === 'function') {
-            options = Object.assign({}, c.open(props), options);
-        } else if (c.methods && typeof c.methods.open === 'function') {
-            options = Object.assign({}, c.methods.open(props), options);
+        if (typeof c.openOptions === 'function') {
+            options = Object.assign({}, c.openOptions(props), options);
+        } else if (c.openOptions) {
+            options = Object.assign({}, c.openOptions, options);
         }
 
         let mode = options.mode;

package/src/vue.d.ts

@@ -0,0 +1,6 @@
+declare module '*.vue' {
+    import type { DefineComponent } from 'vue';
+
+    const component: DefineComponent<Record<string, never>, Record<string, never>, any>;
+    export default component;
+}

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "rootDir": "..",
     "target": "ES2020",
     "module": "ESNext",
     "moduleResolution": "Bundler",
@@ -18,16 +19,12 @@
       "ES2020",
       "DOM"
     ],
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@/*": [
-        "src/*"
-      ]
-    }
+    "types": []
   },
   "include": [
+    "src/**/*.d.ts",
     "src/**/*.ts",
+    "src/**/*.vue",
     "sample/**/*.ts",
     "node_modules/tdesign-vue-next/global.d.ts"
   ]