@varlet/ui 3.3.9 → 3.3.11

package/highlight/web-types.en-US.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -5112,13 +5112,22 @@
             },
             {
               "name": "option-count",
-              "description": "Number of visible options",
+              "description": "Number of visible columns",
               "default": "6",
               "value": {
                 "type": "string | number",
                 "kind": "expression"
               }
             },
+            {
+              "name": "columns-count",
+              "description": "Number of visible columns",
+              "default": "-",
+              "value": {
+                "type": "string | number",
+                "kind": "expression"
+              }
+            },
             {
               "name": "confirm-button-text",
               "description": "Confirm button text",
@@ -5317,6 +5326,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "z-index",
+              "description": "The zIndex of element",
+              "default": "-",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
             }
           ],
           "events": [

package/highlight/web-types.zh-CN.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -5278,6 +5278,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "columns-count",
+              "description": "最大显示列数",
+              "default": "-",
+              "value": {
+                "type": "string | number",
+                "kind": "expression"
+              }
+            },
             {
               "name": "confirm-button-text",
               "description": "确认按钮文字",
@@ -5476,6 +5485,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "z-index",
+              "description": "元素 z-index",
+              "default": "-",
+              "value": {
+                "type": "number",
+                "kind": "expression"
+              }
             }
           ],
           "events": [

package/lib/varlet.cjs.js

@@ -1013,6 +1013,7 @@ const props$1h = {
     type: Boolean,
     default: true
   },
+  zIndex: Number,
   safeArea: Boolean,
   safeAreaTop: Boolean,
   teleport: {
@@ -1200,9 +1201,13 @@ var stdin_default$5V = vue.defineComponent({
     const {
       zIndex
     } = useZIndex(() => props2.show, 3);
+    const normalizedZIndex = vue.computed(() => {
+      var _a;
+      return (_a = props2.zIndex) != null ? _a : zIndex.value;
+    });
     const {
       onStackTop
-    } = useStack(() => props2.show, zIndex);
+    } = useStack(() => props2.show, normalizedZIndex);
     const {
       disabled
     } = useTeleport();
@@ -1237,7 +1242,7 @@ var stdin_default$5V = vue.defineComponent({
       return vue.createVNode("div", {
         "class": classes$1a(n$1p("overlay"), overlayClass),
         "style": __spreadValues$u({
-          zIndex: zIndex.value - 1
+          zIndex: normalizedZIndex.value - 1
         }, overlayStyle),
         "onClick": hidePopup
       }, null);
@@ -1246,7 +1251,7 @@ var stdin_default$5V = vue.defineComponent({
       return vue.withDirectives(vue.createVNode("div", vue.mergeProps({
         "class": classes$1a(n$1p("content"), n$1p(`--${props2.position}`), [props2.defaultStyle, n$1p("--content-background-color")], [props2.defaultStyle, n$1p("$-elevation--3")], [props2.safeArea, n$1p("--safe-area")], [props2.safeAreaTop, n$1p("--safe-area-top")]),
         "style": {
-          zIndex: zIndex.value
+          zIndex: normalizedZIndex.value
         },
         "role": "dialog",
         "aria-modal": "true"
@@ -1261,7 +1266,7 @@ var stdin_default$5V = vue.defineComponent({
         default: () => [vue.withDirectives(vue.createVNode("div", {
           "class": classes$1a(n$1p("$--box"), n$1p(), [!props2.overlay, n$1p("--pointer-events-none")]),
           "style": {
-            zIndex: zIndex.value - 2
+            zIndex: normalizedZIndex.value - 2
           }
         }, [props2.overlay && renderOverlay(), vue.createVNode(vue.Transition, {
           "name": props2.transition || n$1p(`$-pop-${props2.position}`)
@@ -19087,6 +19092,7 @@ const props$o = __spreadValues$7({
     type: [Number, String],
     default: 6
   },
+  columnsCount: [String, Number],
   confirmButtonText: String,
   cancelButtonText: String,
   confirmButtonTextColor: String,
@@ -19331,6 +19337,7 @@ const __sfc__$v = vue.defineComponent({
   setup(props2) {
     const modelValue = useVModel(props2, "modelValue");
     const scrollColumns = vue.ref([]);
+    const visibleColumnsCount = vue.computed(() => toNumber(props2.columnsCount));
     const optionHeight = vue.computed(() => toPxNum(props2.optionHeight));
     const optionCount = vue.computed(() => toPxNum(props2.optionCount));
     const center = vue.computed(() => optionCount.value * optionHeight.value / 2 - optionHeight.value / 2);
@@ -19357,7 +19364,8 @@ const __sfc__$v = vue.defineComponent({
       prevIndexes = [...indexes];
     }
     function normalizeNormalMode(columns) {
-      return columns.map((column, idx) => {
+      const visibleColumns = props2.columnsCount != null ? columns.slice(0, visibleColumnsCount.value) : columns;
+      return visibleColumns.map((column, idx) => {
         const scrollColumn = {
           id: sid$1++,
           prevY: 0,
@@ -19383,9 +19391,9 @@ const __sfc__$v = vue.defineComponent({
       createChildren(scrollColumns2, column);
       return scrollColumns2;
     }
-    function createChildren(scrollColumns2, children, syncModelValue = true) {
+    function createChildren(scrollColumns2, children, syncModelValue = true, depth = 1) {
       var _a;
-      if (children.length) {
+      if (children.length && (props2.columnsCount == null || depth <= visibleColumnsCount.value)) {
         const scrollColumn = {
           id: sid$1++,
           prevY: 0,
@@ -19409,7 +19417,8 @@ const __sfc__$v = vue.defineComponent({
         createChildren(
           scrollColumns2,
           (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : [],
-          syncModelValue
+          syncModelValue,
+          depth + 1
         );
       }
     }
@@ -19419,7 +19428,8 @@ const __sfc__$v = vue.defineComponent({
       createChildren(
         scrollColumns.value,
         (_a = scrollColumn.column[scrollColumn.index][getOptionKey("children")]) != null ? _a : [],
-        false
+        false,
+        scrollColumns.value.length + 1
       );
     }
     function initScrollColumns() {
@@ -29109,7 +29119,7 @@ withInstall(stdin_default$1);
 withPropsDefaultsSetter(stdin_default$1, props);
 const _WatermarkComponent = stdin_default$1;
 var stdin_default = stdin_default$1;
-const version = "3.3.9";
+const version = "3.3.11";
 function install(app) {
   stdin_default$5G.install && app.use(stdin_default$5G);
   stdin_default$5E.install && app.use(stdin_default$5E);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "description": "A material like components library",
   "main": "lib/varlet.cjs.js",
   "module": "es/index.mjs",
@@ -48,9 +48,9 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/icons": "3.3.9",
-    "@varlet/use": "3.3.9",
-    "@varlet/shared": "3.3.9"
+    "@varlet/icons": "3.3.11",
+    "@varlet/shared": "3.3.11",
+    "@varlet/use": "3.3.11"
   },
   "devDependencies": {
     "@vue/runtime-core": "3.4.21",
@@ -64,9 +64,9 @@
     "typescript": "^5.1.5",
     "vue": "3.4.21",
     "vue-router": "4.2.0",
-    "@varlet/cli": "3.3.9",
-    "@varlet/ui": "3.3.9",
-    "@varlet/touch-emulator": "3.3.9"
+    "@varlet/ui": "3.3.11",
+    "@varlet/cli": "3.3.11",
+    "@varlet/touch-emulator": "3.3.11"
   },
   "scripts": {
     "dev": "varlet-cli dev",

package/types/picker.d.ts

@@ -24,6 +24,7 @@ export interface PickerProps {
   cascade?: boolean
   optionHeight?: string | number
   optionCount?: string | number
+  columnsCount?: string | number
   confirmButtonText?: string
   cancelButtonText?: string
   confirmButtonTextColor?: string
@@ -70,6 +71,7 @@ export interface PickerOptions {
   cascade?: boolean
   optionHeight?: number | string
   optionCount?: number | string
+  columnsCount?: number | string
   confirmButtonText?: string
   cancelButtonText?: string
   confirmButtonTextColor?: string

package/types/popup.d.ts

@@ -17,6 +17,7 @@ export interface PopupProps extends BasicAttributes {
   defaultStyle?: boolean
   safeArea?: boolean
   safeAreaTop?: boolean
+  zIndex?: number
   teleport?: TeleportProps['to'] | false
   onOpen?: ListenerProp<() => void>
   onOpened?: ListenerProp<() => void>