@truenewx/tnxvue3 3.0.0-alpha.8 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {
@@ -20,14 +20,13 @@
   },
   "peerDependencies": {
     "element-plus": "~2.8.0",
-    "vue": "~3.4.0",
+    "vue": "~3.5.0",
     "vue-router": "~4.4.0"
   },
   "dependencies": {
-    "@truenewx/tnxcore": "3.0.0-alpha.4",
+    "@truenewx/tnxcore": "3.0.0",
     "@element-plus/icons-vue": "2.3.1",
     "async-validator": "4.2.5",
-    "crypto-js": "4.2.0",
     "mitt": "3.0.1"
   },
   "devDependencies": {
@@ -65,6 +64,9 @@
       ],
       "no-undef": "warn",
       "no-useless-escape": "warn",
+      "no-empty": "off",
+      "vue/no-side-effects-in-computed-properties": "warn",
+      "vue/no-mutating-props": "warn",
       "vue/no-v-model-argument": "off",
       "vue/multi-word-component-names": "off"
     }

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

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

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

@@ -1,8 +1,11 @@
 <template>
-    <el-tooltip :content="tooltipContent" :placement="tooltipPlacement" :disabled="disabled || !tooltipContent"
-                v-if="disabled === false || disabledTip !== false">
-        <el-dropdown split-button :type="type" :class="className" :disabled="disabled" :title="title" :size="size"
-                     :style="$attrs.style" @click="clickButton" @command="clickItem" v-if="dropdownItems.length">
+    <el-tooltip
+        :content="tooltipContent"
+        :placement="tooltipPlacement"
+        :show-after="tooltipShowAfter"
+        :disabled="finalDisabled || !tooltipContent">
+        <el-dropdown split-button :type="type" :class="className" :disabled="finalDisabled" :title="title" :size="size"
+            :style="$attrs.style" @click="clickButton" @command="clickItem" v-if="dropdownItems.length">
             <i :class="icon" style="margin-right: 0.5rem;" v-if="icon"></i>
             <template v-if="!hiddenCaption">
                 <slot v-if="$slots.default"></slot>
@@ -11,18 +14,30 @@
             <template #dropdown>
                 <el-dropdown-menu>
                     <el-dropdown-item v-for="dropdownItem of dropdownItems" :key="dropdownItem.path"
-                                      :icon="dropdownItem.icon" :disabled="dropdownItem.disabled"
-                                      :title="dropdownItem.title"
-                                      :command="dropdownItem">
+                        :icon="dropdownItem.icon" :disabled="dropdownItem.disabled"
+                        :title="dropdownItem.title"
+                        :command="dropdownItem">
                         {{ dropdownItem.caption || (dropdownItem.menuItem ? dropdownItem.menuItem.caption : '') }}
                     </el-dropdown-item>
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
-        <el-button :type="type" :class="className" :disabled="disabled" :title="title" @click="clickButton" :size="size"
-                   :loading="loading" :plain="plain" :link="link" :text="text" :bg="bg" :autofocus="autofocus"
-                   :round="round"
-                   :circle="circle" :style="$attrs.style" v-else>
+        <el-button :type="type"
+            :class="className"
+            :disabled="finalDisabled"
+            :title="title"
+            @click="clickButton"
+            :size="size"
+            :loading="loading"
+            :plain="plain"
+            :link="link"
+            :text="text"
+            :bg="bg"
+            :autofocus="autofocus"
+            :round="round"
+            :circle="circle"
+            :style="$attrs.style"
+            v-else>
             <tnxel-icon :value="icon" v-if="icon"/>
             <span v-if="!hiddenCaption && ($slots.default || menuItem)">
                 <slot>{{ menuItem ? menuItem.caption : '' }}</slot>
@@ -52,7 +67,13 @@ export default {
         },
         type: String,
         icon: String,
-        size: String,
+        size: {
+            type: String,
+            validator: value => {
+                return ['small', 'default', 'large'].includes(value);
+            },
+            default: 'default',
+        },
         loading: Boolean,
         plain: Boolean,
         link: Boolean,
@@ -69,6 +90,11 @@ export default {
             type: String,
             default: 'top',
         },
+        tooltipShowAfter: Number,
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
         disabledTip: {
             type: [String, Boolean],
             default: '没有操作权限',
@@ -84,7 +110,7 @@ export default {
         }
         return {
             menuItem: menuItem,
-            disabled: null,
+            finalDisabled: this.disabled,
             dropdownItems: [],
         }
     },
@@ -106,7 +132,13 @@ export default {
             return undefined;
         },
         title() {
-            return this.disabled ? this.disabledTip : this.$attrs.title;
+            if (this.finalDisabled) {
+                if (this.disabledTip === false) {
+                    return undefined;
+                }
+                return this.disabledTip;
+            }
+            return this.$attrs.title;
         }
     },
     created() {
@@ -116,6 +148,9 @@ export default {
         granted() {
             this.init();
         },
+        disabled() {
+            this.init();
+        },
         dropdown() {
             this.buildDropdownItems();
         },
@@ -123,11 +158,11 @@ export default {
     methods: {
         init() {
             if (this.granted !== null) {
-                this.disabled = !this.granted;
+                this.finalDisabled = this.disabled || !this.granted;
             } else if (this.menu && this.path) {
                 let vm = this;
                 this.menu.loadGrantedItems(function () {
-                    vm.disabled = !vm.menu.isGranted(vm.path);
+                    vm.finalDisabled = this.disabled || !vm.menu.isGranted(vm.path);
                     vm.buildDropdownItems();
                 });
             }

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

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import * as $ from 'jquery';
+import $ from 'cash-dom';
 
 const util = window.tnx.util;
 

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

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import $ from 'jquery';
+import $ from 'cash-dom';
 import DialogContent from './DialogContent.vue';
 
 const util = window.tnx.util;
@@ -42,7 +42,10 @@ export default {
         'tnxel-dialog-content': DialogContent,
     },
     props: {
-        id: window.tnx.util.string.uuid32(),
+        id: {
+            type: String,
+            default: () => window.tnx.util.string.uuid32(),
+        },
         modelValue: Boolean,
         container: String,
         title: String,
@@ -153,7 +156,7 @@ export default {
                 }
             }
             if (!$dialog || !$dialog.length) {
-                $dialog = $('.el-dialog__wrapper[data-v-id="' + this.id + '"] .el-dialog:last');
+                $dialog = $('.tnxel-dialog[data-v-id="' + this.id + '"]');
             }
             if ($dialog.length) {
                 let top = window.tnx.util.dom.getTopVerticallyCenteredOnPage($dialog[0]);

package/src/element-plus/dropdown-item/DropdownItem.vue

@@ -13,8 +13,11 @@
 </template>
 
 <script>
+import TnxelIcon from '../icon/Icon.vue'
+
 export default {
     name: 'TnxelDropdownItem',
+    components: {TnxelIcon},
     props: {
         icon: String,
         iconSize: Number,