@truenewx/tnxvue3 3.4.5 → 3.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "type": "module",
@@ -21,33 +21,34 @@
   "peerDependencies": {
     "@element-plus/icons-vue": "~2.3.0",
     "async-validator": "~4.2.0",
-    "bootstrap-vue-next": "~0.40.0",
-    "element-plus": "~2.13.0",
+    "bootstrap-vue-next": "~0.45.0",
+    "element-plus": "~2.14.0",
     "tdesign-icons-vue-next": "~0.4.0",
-    "tdesign-mobile-vue": "~1.12.0",
-    "tdesign-vue-next": "~1.17.0",
+    "tdesign-mobile-vue": "~1.15.0",
+    "tdesign-vue-next": "~1.20.0",
     "validator": "~13.15.0",
     "vue": "~3.5.0",
     "vue-router": "~4.6.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.4.4",
+    "@truenewx/tnxcore": "3.4.5",
     "bootstrap": "5.3.8",
     "cash-dom": "8.1.5",
     "mitt": "3.0.1"
   },
   "devDependencies": {
-    "@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"
+    "@eslint/js": "10.0.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@vitejs/plugin-vue": "6.0.7",
+    "eslint": "10.5.0",
+    "eslint-plugin-vue": "10.9.2",
+    "globals": "17.6.0",
+    "less": "4.6.6",
+    "tsx": "4.22.4",
+    "typescript": "6.0.3",
+    "vite": "8.0.16",
+    "vue-eslint-parser": "10.4.1"
   },
   "browserslist": [
     "> 1%",

package/src/bootstrap-vue/select/Select.vue

@@ -181,18 +181,17 @@ export default {
         },
         triggerChange(value) {
             if (this.change) {
-                let item = undefined;
                 if (this.isMulti()) {
-                    item = [];
+                    let item = [];
                     if (Array.isArray(value)) {
                         for (let v of value) {
                             item.push(this.getItem(v));
                         }
                     }
+                    this.change(item, this.id);
                 } else {
-                    item = this.getItem(value);
+                    this.change(this.getItem(value), this.id);
                 }
-                this.change(item, this.id);
             } else {
                 this.$emit('change', value);
             }

package/src/components/ScrollView.vue

@@ -0,0 +1,69 @@
+<template>
+    <div class="scroll-view">
+        <div class="scroll-view-y" :class="{'hide-scrollbar-y': !scrollY}">
+            <div class="scroll-view-x" :class="{'hide-scrollbar-x': !scrollX}">
+                <slot></slot>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'ScrollView',
+    props: {
+        scrollX: {
+            type: Boolean,
+            default: false,
+        },
+        scrollY: {
+            type: Boolean,
+            default: true,
+        },
+    },
+    data() {
+        return {};
+    },
+    methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+.scroll-view {
+    height: 100%;
+    min-height: 0;
+}
+
+.scroll-view-y {
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+.scroll-view-x {
+    width: 100%;
+    min-height: 100%;
+    overflow-x: auto;
+    overflow-y: visible;
+    -webkit-overflow-scrolling: touch;
+}
+
+.hide-scrollbar-y {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+}
+
+.hide-scrollbar-y::-webkit-scrollbar {
+    width: 0;
+}
+
+.hide-scrollbar-x {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+}
+
+.hide-scrollbar-x::-webkit-scrollbar {
+    height: 0;
+}
+</style>

package/src/css.d.ts

@@ -0,0 +1,4 @@
+declare module '*.css' {
+    const content: string;
+    export default content;
+}

package/src/element-plus/aj-captcha/utils/ase.js

@@ -1,12 +1,12 @@
-import * as CryptoES from 'crypto-es';
+import {AES, ECB, Pkcs7, Utf8} from 'crypto-es';
 
 /**
  * @word 要加密的内容
  * @keyWord String  服务器随机返回的关键字
  *  */
 export function aesEncrypt(word, keyWord = "XwKsGlMcdPMEhR1B") {
-    let key = CryptoES.enc.Utf8.parse(keyWord);
-    let srcs = CryptoES.enc.Utf8.parse(word);
-    let encrypted = CryptoES.AES.encrypt(srcs, key, {mode: CryptoES.mode.ECB, padding: CryptoES.pad.Pkcs7});
+    let key = Utf8.parse(keyWord);
+    let srcs = Utf8.parse(word);
+    let encrypted = AES.encrypt(srcs, key, {mode: ECB, padding: Pkcs7});
     return encrypted.toString();
 }

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

@@ -291,18 +291,17 @@ export default {
         },
         triggerChange(value) {
             if (this.change) {
-                let item = undefined;
                 if (this.isMulti()) {
-                    item = [];
+                    let item = [];
                     if (Array.isArray(value)) {
                         for (let v of value) {
                             item.push(this.getItem(v));
                         }
                     }
+                    this.change(item, this.id);
                 } else {
-                    item = this.getItem(value);
+                    this.change(this.getItem(value), this.id);
                 }
-                this.change(item, this.id);
             } else {
                 this.$emit('change', value);
             }

package/src/tdesign/mobile/drawer/Drawer.vue

@@ -4,6 +4,7 @@
         v-model="visible"
         :placement="placement"
         :title="title"
+        :style="popupStyle"
         @closed="onClosed"
     >
         <template #default>
@@ -62,6 +63,20 @@ export default {
             buttonLoadings: [],
         };
     },
+    computed: {
+        popupStyle() {
+            const style = {};
+            if (this.options && this.options.width) {
+                style.width = this.options.width;
+            }
+            if (this.placement === 'left' || this.placement === 'right') {
+                style.height = '100vh';
+                style.maxHeight = '100vh';
+                style.borderRadius = '0';
+            }
+            return style;
+        },
+    },
     watch: {
         modelValue(val) {
             this.visible = val;
@@ -155,10 +170,16 @@ export default {
 
 <style>
 .tnxtdm-drawer {
+    width: 75%;
+
     .tnxtdm-drawer-body {
         flex: 1;
         overflow-y: auto;
-        padding: 16px;
+    }
+
+    .tnxtdm-popup-content {
+        display: flex;
+        flex-direction: column;
     }
 
     .tnxtdm-drawer-footer {

package/src/tdesign/mobile/enum-select/EnumSelect.vue

@@ -1,21 +1,25 @@
 <template>
-    <tnxtdm-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"
-                   :width="width"
-                   :disabled="isDisabled"
-                   :filterable="filterable"
-                   :theme="theme"
-                   :size="size"
-                   :tag-click="tagClick"
-                   :change="change">
+    <tnxtdm-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"
+        :width="width"
+        :disabled="isDisabled"
+        :filterable="filterable"
+        :theme="theme"
+        :size="size"
+        :tag-click="tagClick"
+        :change="change"
+        :data-type="type"
+        :data-subtype="subtype"
+    >
         <template #option="{item}" v-if="$slots.option">
             <slot name="option" :item="item"></slot>
         </template>

package/src/tdesign/mobile/select/Select.vue

@@ -3,7 +3,7 @@
                       :disabled="isDisabled" :key="`checkbox-${groupKey}`" v-if="selector === 'checkbox'">
         <t-checkbox v-for="item in items" :key="item[valueName]" :value="item[valueName]"
                     :disabled="item.disabled === true || typeof item.disabled === 'string'"
-                    :label="item[textName]">
+                    :label="item[textName]" :data-key="item.key">
         </t-checkbox>
     </t-checkbox-group>
 
@@ -12,8 +12,9 @@
         <template v-if="items">
             <t-tag v-for="item in items" :key="item[valueName]"
                    :theme="isSelected(item[valueName]) ? 'primary' : 'default'"
-                   :variant="isSelected(item[valueName]) ? 'dark' : 'light'"
+                   :variant="isSelected(item[valueName]) ? 'dark' : 'light-outline'"
                    :disabled="isDisabled || item.disabled === true || typeof item.disabled === 'string'"
+                   :data-key="item.key"
                    @click="!isDisabled && select(item[valueName])">
                 <t-icon :name="item[iconName]" v-if="item[iconName]"/>
                 <span>{{ item[textName] }}</span>
@@ -30,6 +31,7 @@
                       :theme="isSelected(item[valueName]) ? 'primary' : 'default'"
                       size="small"
                       :disabled="isDisabled || item.disabled === true || typeof item.disabled === 'string'"
+                      :data-key="item.key"
                       @click="!isDisabled && select(item[valueName], $event)">
                 <t-icon :name="item[iconName]" v-if="item[iconName]"/>
                 <span>{{ item[textName] }}</span>
@@ -43,7 +45,7 @@
                    v-else-if="selector === 'radio-group'">
         <t-radio v-for="item in items" :key="item[valueName]" :value="item[valueName]"
                  :disabled="item.disabled === true || typeof item.disabled === 'string'"
-                 :label="item[textName]">
+                 :label="item[textName]" :data-key="item.key">
         </t-radio>
     </t-radio-group>
 
@@ -85,7 +87,7 @@
                     <t-checkbox-group v-model="tempModel">
                         <t-cell v-for="item in items" :key="item[valueName]" :title="item[textName]">
                             <template #right-icon>
-                                <t-checkbox :value="item[valueName]"/>
+                                <t-checkbox :value="item[valueName]" :data-key="item.key"/>
                             </template>
                         </t-cell>
                     </t-checkbox-group>
@@ -262,18 +264,17 @@ export default {
         },
         triggerChange(value) {
             if (this.change) {
-                let item = undefined;
                 if (this.isMulti()) {
-                    item = [];
+                    let item = [];
                     if (Array.isArray(value)) {
                         for (let v of value) {
                             item.push(this.getItem(v));
                         }
                     }
+                    this.change(item, this.id);
                 } else {
-                    item = this.getItem(value);
+                    this.change(this.getItem(value), this.id);
                 }
-                this.change(item, this.id);
             } else {
                 this.$emit('change', value);
             }

package/src/tdesign/mobile/slide-radio-group/SlideRadioGroup.vue

@@ -5,6 +5,7 @@
              :key="item.value"
              class="tnxtdm-slide-radio-group__item"
              :class="{'is-active': modelValue === item.value}"
+             :data-key="item.key"
              @click="onItemClick(item.value)"
              :ref="el => { if (el) itemRefs[index] = el }">
             <t-icon class="tnxtdm-slide-radio-group__item-icon" :name="item.icon" size="1rem" v-if="item.icon"/>
@@ -278,6 +279,14 @@ export default {
     padding: 0;
 }
 
+.tnxtdm-slide-radio-group--small.tnxtdm-slide-radio-group--rectangle {
+    border-radius: 4px;
+}
+
+.tnxtdm-slide-radio-group--small.tnxtdm-slide-radio-group--rectangle .tnxtdm-slide-radio-group__glider {
+    border-radius: 4px;
+}
+
 .tnxtdm-slide-radio-group--small .tnxtdm-slide-radio-group__glider {
     top: 1px;
     bottom: 1px;
@@ -286,6 +295,22 @@ export default {
 .tnxtdm-slide-radio-group__item {
     padding: 0 12px;
     font-size: 12px;
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: normal;
+    color: var(--td-text-color-secondary);
+    cursor: pointer;
+    z-index: 1;
+    transition: color 0.2s;
+    text-align: center;
+    white-space: nowrap;
+}
+
+.tnxtdm-slide-radio-group__item.is-active {
+    color: var(--td-text-color-primary);
+    font-weight: normal;
 }
 
 .tnxtdm-slide-radio-group--small .tnxtdm-slide-radio-group__item {
@@ -353,26 +378,6 @@ export default {
     background-color: var(--td-error-color);
 }
 
-.tnxtdm-slide-radio-group__item {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: normal;
-    color: var(--td-text-color-secondary);
-    cursor: pointer;
-    z-index: 1;
-    padding: 0 1rem;
-    transition: color 0.2s;
-    text-align: center;
-    white-space: nowrap;
-}
-
-.tnxtdm-slide-radio-group__item.is-active {
-    color: var(--td-text-color-primary);
-    font-weight: normal;
-}
-
 .tnxtdm-slide-radio-group--theme-primary .tnxtdm-slide-radio-group__item.is-active,
 .tnxtdm-slide-radio-group--theme-success .tnxtdm-slide-radio-group__item.is-active,
 .tnxtdm-slide-radio-group--theme-warning .tnxtdm-slide-radio-group__item.is-active,

package/src/tdesign/mobile/tnxtdm.css

@@ -7,20 +7,9 @@
     --td-tag-large-padding: 2px 10px;
 }
 
-.border-top-0,
-.border-top-0::before,
-.border-top-0 .t-cell-group--bordered::before {
-    border-top: none !important;
-}
-
-.border-bottom-0,
-.border-bottom-0::after,
-.border-bottom-0 .t-cell-group--bordered::after {
-    border-bottom: none !important;
-}
-
-.shadow {
-    box-shadow: var(--td-shadow-1);
+.t-loading__gradient-conic {
+    transform: none !important;
+    transform-origin: 50% 50% !important;
 }
 
 .t-input.border {
@@ -130,3 +119,7 @@
 .t-dialog__body {
     text-align: unset;
 }
+
+.t-image__img {
+    width: auto;
+}

package/src/tdesign/mobile/tnxtdm.ts

@@ -5,6 +5,7 @@ import TDesign, {Dialog as TDialogPlugin, Toast} from 'tdesign-mobile-vue/esm';
 import 'tdesign-mobile-vue/esm/style/index.js'
 import './tnxtdm.css';
 import * as Vue from "vue";
+import {EnumType, EnumItem} from '../../../../tnxcore/src/api/meta.ts';
 import {type DialogOptions, type DrawerOptions, type OpenOptions} from '../../tnxvue.ts';
 import Calendar from './calendar/Calendar.vue';
 import DateTimePicker from './date-time-picker/DateTimePicker.vue';
@@ -16,6 +17,7 @@ import RegionPicker from './region-picker/RegionPicker.vue';
 import Select from './select/Select.vue';
 import SlideRadioGroup from './slide-radio-group/SlideRadioGroup.vue';
 
+export type {EnumType, EnumItem};
 export type {OpenOptions};
 
 const components = {
@@ -171,7 +173,7 @@ export default class TnxTdm extends TnxTd {
             contentProps: contentProps,
             buttons: buttons,
             theme: options.theme,
-            placement: (options as any).placement,
+            placement: options.placement,
         });
         const drawer = drawerVm.mount(containerSelector) as ModalComponentInstance;
         drawer.options = Object.assign(drawer.options || {}, options);

package/src/tdesign/tnxtd.css

@@ -13,6 +13,38 @@ body {
     border: var(--border);
 }
 
+.border-top {
+    border-top: var(--border);
+}
+
+.border-bottom {
+    border-bottom: var(--border);
+}
+
+.border-left {
+    border-left: var(--border);
+}
+
+.border-right {
+    border-right: var(--border);
+}
+
+.border-top-0,
+.border-top-0::before,
+.border-top-0 .t-cell-group--bordered::before {
+    border-top: none !important;
+}
+
+.border-bottom-0,
+.border-bottom-0::after,
+.border-bottom-0 .t-cell-group--bordered::after {
+    border-bottom: none !important;
+}
+
+.shadow {
+    box-shadow: var(--td-shadow-1);
+}
+
 .bg-page {
     background-color: var(--td-bg-color-page);
 }

package/src/tnxvue-router.ts

@@ -169,7 +169,8 @@ export default function (items: RouteItem[], useHashHistory = true, fnImportPage
                 beforeLeaveHandler = async (to: RouteLocationNormalized): Promise<boolean> => {
                     let logined = await window.tnx.auth.isLogined();
                     if (!logined) {
-                        window.tnx.api.toLogin(to.path);
+                        let url = window.tnx.util.net.appendParams(to.path, to.query);
+                        window.tnx.api.toLogin(url);
                     }
                     return logined;
                 };

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};
@@ -32,7 +33,9 @@ export type DialogOptions = {
 
 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';
@@ -50,6 +53,7 @@ export default class TnxVue extends Tnx {
     components: Record<string, Vue.Component> = {
         Text,
         Percent,
+        ScrollView,
     };
 
     constructor(apiBaseUrl: string, id: string = 'tnxvue') {
@@ -57,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];

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,15 +19,10 @@
       "ES2020",
       "DOM"
     ],
-    "types": [],
-    "baseUrl": ".",
-    "paths": {
-      "@/*": [
-        "src/*"
-      ]
-    }
+    "types": []
   },
   "include": [
+    "src/**/*.d.ts",
     "src/**/*.ts",
     "src/**/*.vue",
     "sample/**/*.ts",