@truenewx/tnxvue3 3.0.0-alpha.18 → 3.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.0.0-alpha.18",
+  "version": "3.0.0-alpha.20",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "publishConfig": {
@@ -20,11 +20,11 @@
   },
   "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.9",
+    "@truenewx/tnxcore": "3.0.0-alpha.10",
     "@element-plus/icons-vue": "2.3.1",
     "async-validator": "4.2.5",
     "mitt": "3.0.1"

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

@@ -258,7 +258,7 @@ export default {
 }
 
 .tnxel-dialog .tnxel-dialog-footer {
-    padding: 0 1rem 1rem 1rem;
+    padding: 1rem;
     display: flex;
     justify-content: flex-end;
 }

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

@@ -28,6 +28,8 @@
         <HomeFilled v-else-if="value === 'HomeFilled'"/>
         <InfoFilled v-else-if="value === 'InfoFilled'"/>
         <List v-else-if="value === 'List'"/>
+        <Memo v-else-if="value === 'Memo'"/>
+        <Minus v-else-if="value === 'Minus'"/>
         <MoreFilled v-else-if="value === 'MoreFilled'"/>
         <OfficeBuilding v-else-if="value === 'OfficeBuilding'"/>
         <Picture v-else-if="value === 'Picture'"/>
@@ -42,6 +44,7 @@
         <Right v-else-if="value === 'Right'"/>
         <Search v-else-if="value === 'Search'"/>
         <Select v-else-if="value === 'Select'"/>
+        <SemiSelect v-else-if="value === 'SemiSelect'"/>
         <Setting v-else-if="value === 'Setting'"/>
         <Sort v-else-if="value === 'Sort'"/>
         <SuccessFilled v-else-if="value === 'SuccessFilled'"/>
@@ -84,6 +87,8 @@ import {
     InfoFilled,
     List,
     Loading,
+    Memo,
+    Minus,
     MoreFilled,
     OfficeBuilding,
     Picture,
@@ -98,6 +103,7 @@ import {
     Right,
     Search,
     Select,
+    SemiSelect,
     Setting,
     Sort,
     SuccessFilled,
@@ -137,6 +143,8 @@ const components = {
     HomeFilled,
     InfoFilled,
     List,
+    Memo,
+    Minus,
     MoreFilled,
     Loading,
     OfficeBuilding,
@@ -152,6 +160,7 @@ const components = {
     Right,
     Search,
     Select,
+    SemiSelect,
     Setting,
     Sort,
     SuccessFilled,

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

@@ -2,7 +2,7 @@
     <el-checkbox-group class="tnxel-select tnxel-checkbox-group" v-model="model" :theme="theme" :size="size"
         :disabled="disabled" :key="groupKey" v-if="selector === 'checkbox'">
         <template v-if="items">
-            <el-checkbox v-for="item in items" :key="item[valueName]" :label="item[valueName]"
+            <el-checkbox v-for="item in items" :key="item[valueName]" :value="item[valueName]"
                 :data-value="item[valueName]"
                 :disabled="item.disabled === true || typeof item.disabled === 'string'"
                 :title="typeof item.disabled === 'string' ? item.disabled : item.title">
@@ -68,8 +68,8 @@
     </div>
     <el-radio-group class="tnxel-select tnxel-radio-group ignore-feedback" v-model="model" :theme="theme" :size="size"
         :disabled="disabled" :key="groupKey" v-else-if="selector === 'radio'">
-        <el-radio :label="emptyValue" :class="emptyClass" :border="border" v-if="empty">{{ emptyText }}</el-radio>
-        <el-radio v-for="item in items" :key="item[valueName]" :label="item[valueName]" :data-value="item[valueName]"
+        <el-radio :value="emptyValue" :class="emptyClass" :border="border" v-if="empty">{{ emptyText }}</el-radio>
+        <el-radio v-for="item in items" :key="item[valueName]" :value="item[valueName]" :data-value="item[valueName]"
             :disabled="item.disabled === true || typeof item.disabled === 'string'"
             :title="typeof item.disabled === 'string' ? item.disabled : item.title"
             :border="border">
@@ -82,8 +82,8 @@
     </el-radio-group>
     <el-radio-group class="tnxel-select tnxel-radio-group ignore-feedback" v-model="model" :theme="theme" :size="size"
         :disabled="disabled" :key="groupKey" v-else-if="selector === 'radio-button'">
-        <el-radio-button :class="emptyClass" :label="emptyValue" v-if="empty">{{ emptyText }}</el-radio-button>
-        <el-radio-button v-for="item in items" :key="item[valueName]" :label="item[valueName]"
+        <el-radio-button :class="emptyClass" :value="emptyValue" v-if="empty">{{ emptyText }}</el-radio-button>
+        <el-radio-button v-for="item in items" :key="item[valueName]" :value="item[valueName]"
             :data-value="item[valueName]"
             :disabled="item.disabled === true || typeof item.disabled === 'string'"
             :title="typeof item.disabled === 'string' ? item.disabled : item.title">
@@ -138,14 +138,16 @@
     <el-select class="tnxel-select ignore-feedback" v-model="model" :placeholder="placeholder" :theme="theme"
         :size="size" :disabled="disabled" :filterable="filterable" :filter-method="filter"
         :multiple="selector === 'multi-select'" :key="groupKey" v-else>
-        <el-option class="text-secondary" :value="emptyValue" :label="emptyText" :class="emptyClass" v-if="empty"/>
+        <el-option class="text-secondary" :value="emptyValue" :class="emptyClass" v-if="empty">
+            {{ emptyText }}
+        </el-option>
         <template v-for="item in items">
-            <el-option :key="item[valueName]" :value="item[valueName]" :label="item[textName]"
-                :data-value="item[valueName]"
+            <el-option :key="item[valueName]" :value="item[valueName]" :data-value="item[valueName]"
                 :disabled="item.disabled === true || typeof item.disabled === 'string'"
                 :title="typeof item.disabled === 'string' ? item.disabled : item.title"
                 v-if="!hiddenValues.contains(item[valueName])">
-                <slot name="option" :item="item"></slot>
+                <slot name="option" :item="item" v-if="$slots.option"></slot>
+                <span v-else>item[textName]</span>
             </el-option>
         </template>
     </el-select>
@@ -196,7 +198,7 @@ export default {
         },
         emptyValue: {
             type: [String, Number, Boolean, Array],
-            default: null,
+            default: '', // 设为null会告警，暂时先设为空字符，在非字符串类型的情况下是否有问题，有待检验
         },
         emptyClass: String,
         placeholder: String,

package/src/element-plus/tnxel.css

@@ -275,14 +275,6 @@
     width: calc(100vw); /* 尽可能撑开，以与高度保持一致 */
 }
 
-.el-alert {
-    margin-bottom: 1rem;
-}
-
-.el-alert.w-100 .el-alert__content {
-    width: 100%;
-}
-
 .el-form-item {
     margin-bottom: 1rem;
 }
@@ -300,12 +292,6 @@
     padding-right: 1rem;
 }
 
-.el-form--label-right .el-form-item__label:before {
-    content: '*';
-    color: transparent;
-    margin-right: 4px;
-}
-
 .el-form--label-top .el-form-item__label {
     padding-bottom: 0;
     margin-bottom: 0.25rem;
@@ -638,8 +624,11 @@ el-card {
 }
 
 .el-alert {
-    --el-alert-padding: 0.75rem 1rem;
-    --el-alert-title-font-size: 14px;
+    margin-bottom: 1rem;
+}
+
+.el-alert.w-100 .el-alert__content {
+    width: 100%;
 }
 
 .el-alert .el-alert__icon {