@varlet/ui 2.20.5 → 2.20.7

package/lib/varlet.cjs.js

@@ -13890,13 +13890,14 @@ function __render__$M(_ctx, _cache) {
               class: vue.normalizeClass(_ctx.classes(_ctx.n("icon"), [!_ctx.hint, _ctx.n("--icon-non-hint")]))
             },
             [
-              _ctx.clearable && !_ctx.isEmpty(_ctx.value) ? (vue.openBlock(), vue.createBlock(_component_var_icon, {
-                key: 0,
-                class: vue.normalizeClass(_ctx.n("clear-icon")),
-                "var-field-decorator-cover": "",
-                name: "close-circle",
-                onClick: _ctx.handleClear
-              }, null, 8, ["class", "onClick"])) : vue.createCommentVNode("v-if", true),
+              _ctx.clearable && !_ctx.isEmpty(_ctx.value) ? vue.renderSlot(_ctx.$slots, "clear-icon", { key: 0 }, () => [
+                vue.createVNode(_component_var_icon, {
+                  class: vue.normalizeClass(_ctx.n("clear-icon")),
+                  "var-field-decorator-cover": "",
+                  name: "close-circle",
+                  onClick: _ctx.handleClear
+                }, null, 8, ["class", "onClick"])
+              ]) : vue.createCommentVNode("v-if", true),
               vue.renderSlot(_ctx.$slots, "append-icon")
             ],
             2
@@ -14883,10 +14884,6 @@ const __sfc__$J = vue.defineComponent({
     function stopAutoplay() {
       timer && clearTimeout(timer);
     }
-    function setTrackTranslate(value) {
-      trackTranslate.value = value;
-      dispatchSwipeItems();
-    }
     function handleTouchstart(event) {
       return __async$7(this, null, function* () {
         if (length.value <= 1 || !props2.touchable) {
@@ -14908,7 +14905,8 @@ const __sfc__$J = vue.defineComponent({
         return;
       }
       preventDefault(event);
-      setTrackTranslate(trackTranslate.value + (vertical2 ? moveY.value : moveX.value));
+      trackTranslate.value += vertical2 ? moveY.value : moveX.value;
+      dispatchSwipeItems();
     }
     function handleTouchend() {
       if (!touching.value) {
@@ -14924,7 +14922,7 @@ const __sfc__$J = vue.defineComponent({
       const quickSwiping = performance.now() - startTime.value <= SWIPE_DELAY && offset2 >= SWIPE_OFFSET;
       const swipeIndex = quickSwiping ? positive ? getSwipeIndex(index.value + 1) : getSwipeIndex(index.value - 1) : getSwipeIndex();
       lockDuration.value = false;
-      setTrackTranslate(swipeIndex * -size.value);
+      trackTranslate.value = swipeIndex * -size.value;
       const prevIndex = index.value;
       index.value = swipeIndexToIndex(swipeIndex);
       startAutoplay();
@@ -15996,6 +15994,9 @@ function __render__$D(_ctx, _cache) {
           onClear: _ctx.handleClear
         })),
         vue.createSlots({
+          "clear-icon": vue.withCtx(() => [
+            vue.renderSlot(_ctx.$slots, "clear-icon")
+          ]),
           "append-icon": vue.withCtx(() => [
             vue.renderSlot(_ctx.$slots, "append-icon")
           ]),
@@ -18343,7 +18344,16 @@ const __sfc__$v = vue.defineComponent({
     let prevIndexes = [];
     buildScrollColumns();
     vue.watch(() => props2.columns, buildScrollColumns, { deep: true });
-    vue.watch(() => modelValue.value, updateScrollColumnsIndex);
+    vue.watch(
+      () => modelValue.value,
+      () => {
+        if (props2.cascade && props2.modelValue.length) {
+          buildScrollColumns();
+        } else {
+          updateScrollColumnsIndex();
+        }
+      }
+    );
     function getOptionKey(key) {
       const keyMap = {
         text: props2.textKey,
@@ -18400,6 +18410,10 @@ const __sfc__$v = vue.defineComponent({
           scrolling: false
         };
         scrollColumns2.push(scrollColumn);
+        if (props2.modelValue.length) {
+          const index = children.findIndex((option) => modelValue.value[scrollColumns2.length - 1] === getValue(option));
+          scrollColumn.index = index === -1 ? 0 : index;
+        }
         scrollTo2(scrollColumn);
         createChildren(scrollColumns2, (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : []);
       }
@@ -18411,7 +18425,9 @@ const __sfc__$v = vue.defineComponent({
     }
     function buildScrollColumns() {
       scrollColumns.value = props2.cascade ? normalizeCascadeMode(props2.columns) : normalizeNormalMode(props2.columns);
-      updateScrollColumnsIndex();
+      if (!props2.cascade) {
+        updateScrollColumnsIndex();
+      }
     }
     function updateScrollColumnsIndex() {
       scrollColumns.value.forEach((scrollColumn, idx) => {
@@ -18523,7 +18539,7 @@ const __sfc__$v = vue.defineComponent({
       if (isSamePicked()) {
         return;
       }
-      if (cascade) {
+      if (cascade && !props2.modelValue.length) {
         rebuildChildren(scrollColumn);
       }
       const hasScrolling = scrollColumns.value.some((scrollColumn2) => scrollColumn2.scrolling);
@@ -20287,6 +20303,9 @@ function __render__$g(_ctx, _cache) {
               onClear: _ctx.handleClear
             })),
             vue.createSlots({
+              "clear-icon": vue.withCtx(() => [
+                vue.renderSlot(_ctx.$slots, "clear-icon")
+              ]),
               "append-icon": vue.withCtx(() => [
                 vue.renderSlot(_ctx.$slots, "append-icon")
               ]),
@@ -21486,9 +21505,10 @@ function __render__$d(_ctx, _cache) {
             2
             /* CLASS */
           ),
-          vue.createElementVNode(
+          _ctx.$slots.action ? (vue.openBlock(), vue.createElementBlock(
             "div",
             {
+              key: 0,
               class: vue.normalizeClass(_ctx.n("action"))
             },
             [
@@ -21496,7 +21516,7 @@ function __render__$d(_ctx, _cache) {
             ],
             2
             /* CLASS */
-          )
+          )) : vue.createCommentVNode("v-if", true)
         ],
         6
         /* CLASS, STYLE */
@@ -23201,7 +23221,8 @@ var stdin_default$l = {
   "--bottom-navigation-border-color": "#444"
 };
 var stdin_default$k = {
-  "--bottom-navigation-item-active-background-color": "#272727"
+  "--bottom-navigation-item-active-background-color": "#272727",
+  "--bottom-navigation-item-inactive-color": "#BFBFBF"
 };
 var stdin_default$j = {
   "--menu-background-color": "#272727"
@@ -24944,7 +24965,7 @@ withInstall(stdin_default$1);
 withPropsDefaultsSetter(stdin_default$1, props);
 const _WatermarkComponent = stdin_default$1;
 var stdin_default = stdin_default$1;
-const version = "2.20.5";
+const version = "2.20.7";
 function install(app) {
   stdin_default$3k.install && app.use(stdin_default$3k);
   stdin_default$3i.install && app.use(stdin_default$3i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "2.20.5",
+  "version": "2.20.7",
   "description": "A material like components library",
   "main": "lib/varlet.cjs.js",
   "module": "es/index.mjs",
@@ -48,12 +48,12 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/icons": "2.20.5",
-    "@varlet/use": "2.20.5",
-    "@varlet/shared": "2.20.5"
+    "@varlet/use": "2.20.7",
+    "@varlet/icons": "2.20.7",
+    "@varlet/shared": "2.20.7"
   },
   "devDependencies": {
-    "@vue/runtime-core": "3.4.0",
+    "@vue/runtime-core": "3.4.3",
     "@vue/test-utils": "2.4.1",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.7.18",
@@ -64,11 +64,11 @@
     "live-server": "^1.2.1",
     "lodash-es": "^4.17.21",
     "typescript": "^5.1.5",
-    "vue": "3.4.0",
+    "vue": "3.4.3",
     "vue-router": "4.2.0",
-    "@varlet/ui": "2.20.5",
-    "@varlet/cli": "2.20.5",
-    "@varlet/touch-emulator": "2.20.5"
+    "@varlet/ui": "2.20.7",
+    "@varlet/cli": "2.20.7",
+    "@varlet/touch-emulator": "2.20.7"
   },
   "scripts": {
     "dev": "varlet-cli dev",

package/types/input.d.ts

@@ -47,6 +47,7 @@ export class Input extends VarComponent {
   $slots: {
     'prepend-icon'(): VNode[]
     'append-icon'(): VNode[]
+    'clear-icon'(): VNode[]
     'extra-message'(): VNode[]
   }
 

package/types/select.d.ts

@@ -50,6 +50,7 @@ export class Select extends VarComponent {
   $slots: {
     'selected'(): VNode[]
     'prepend-icon'(): VNode[]
+    'clear-icon'(): VNode[]
     'append-icon'(): VNode[]
     'arrow-icon'(data: SelectArrowIconData): VNode[]
   }