@varlet/ui 1.27.5 → 1.27.6

package/es/varlet.esm.js

@@ -874,21 +874,21 @@ function releaseLock(uid) {
   delete Context.locks[uid];
   resolveLock();
 }
-function useLock(props2, state, use2) {
+function useLock(source, useSource) {
   var {
     uid
   } = getCurrentInstance();
-  if (use2) {
-    watch(() => props2[use2], (newValue) => {
+  if (useSource) {
+    watch(useSource, (newValue) => {
       if (newValue === false) {
         releaseLock(uid);
-      } else if (newValue === true && props2[state] === true) {
+      } else if (newValue === true && source() === true) {
         addLock(uid);
       }
     });
   }
-  watch(() => props2[state], (newValue) => {
-    if (use2 && props2[use2] === false) {
+  watch(source, (newValue) => {
+    if (useSource && useSource() === false) {
       return;
     }
     if (newValue === true) {
@@ -898,34 +898,34 @@ function useLock(props2, state, use2) {
     }
   });
   onBeforeMount(() => {
-    if (use2 && props2[use2] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
-    if (props2[state] === true) {
+    if (source() === true) {
       addLock(uid);
     }
   });
   onUnmounted(() => {
-    if (use2 && props2[use2] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
-    if (props2[state] === true) {
+    if (source() === true) {
       releaseLock(uid);
     }
   });
   onActivated(() => {
-    if (use2 && props2[use2] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
-    if (props2[state] === true) {
+    if (source() === true) {
       addLock(uid);
     }
   });
   onDeactivated(() => {
-    if (use2 && props2[use2] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
-    if (props2[state] === true) {
+    if (source() === true) {
       releaseLock(uid);
     }
   });
@@ -992,7 +992,7 @@ var Popup = defineComponent({
       }
       (_props$onUpdateShow = props2["onUpdate:show"]) == null ? void 0 : _props$onUpdateShow.call(props2, false);
     };
-    useLock(props2, "show", "lockScroll");
+    useLock(() => props2.show, () => props2.lockScroll);
     watch(() => props2.show, (newValue) => {
       var {
         onOpen,
@@ -11493,10 +11493,7 @@ function render$n(_ctx, _cache) {
       }, 1032, ["class", "onClick"])), [[_directive_ripple]]);
     }), 128))]),
     default: withCtx(() => [createElementVNode("div", {
-      class: normalizeClass(_ctx.n("size--open")),
-      style: {
-        "display": "flex"
-      },
+      class: normalizeClass(_ctx.classes(_ctx.n("size--open"), [_ctx.current <= 1 || _ctx.disabled, _ctx.n("size--open--disabled")])),
       onClick: _cache[5] || (_cache[5] = function() {
         return _ctx.showMenu && _ctx.showMenu(...arguments);
       })
@@ -11736,6 +11733,10 @@ var props$k = _extends$2({
     type: Boolean,
     default: false
   },
+  cascadeInitialIndexes: {
+    type: Array,
+    default: () => []
+  },
   optionHeight: {
     type: [Number, String],
     default: 44
@@ -11993,24 +11994,29 @@ var VarPicker = defineComponent({
           scrollEl: null,
           scrolling: false
         };
-        scrollTo2(scrollColumn, scrollColumn.index, 200);
+        scrollTo2(scrollColumn, scrollColumn.index, 0, true);
         return scrollColumn;
       });
     };
     var normalizeCascadeColumns = (cascadeColumns) => {
       var scrollColumns2 = [];
-      createChildren(scrollColumns2, cascadeColumns);
+      createChildren(scrollColumns2, cascadeColumns, true);
       return scrollColumns2;
     };
-    var createChildren = (scrollColumns2, children) => {
+    var createChildren = function(scrollColumns2, children, initial) {
+      if (initial === void 0) {
+        initial = false;
+      }
       if (isArray(children) && children.length) {
+        var _props$cascadeInitial;
+        var index = initial ? (_props$cascadeInitial = props2.cascadeInitialIndexes[scrollColumns2.length]) != null ? _props$cascadeInitial : 0 : 0;
         var scrollColumn = {
           id: sid$1++,
           prevY: void 0,
           momentumPrevY: void 0,
           touching: false,
           translate: center.value,
-          index: 0,
+          index,
           duration: 0,
           momentumTime: 0,
           column: {
@@ -12021,7 +12027,8 @@ var VarPicker = defineComponent({
           scrolling: false
         };
         scrollColumns2.push(scrollColumn);
-        createChildren(scrollColumns2, scrollColumn.columns[scrollColumn.index].children);
+        scrollTo2(scrollColumn, scrollColumn.index, 0, true);
+        createChildren(scrollColumns2, scrollColumn.columns[scrollColumn.index].children, initial);
       }
     };
     var rebuildChildren = (scrollColumn) => {
@@ -14350,7 +14357,7 @@ var VarSnackbarCore = defineComponent({
     var {
       zIndex
     } = useZIndex(() => props2.show, 1);
-    useLock(props2, "show", "lockScroll");
+    useLock(() => props2.show, () => props2.lockScroll);
     var isForbidClick = computed(() => props2.type === "loading" || props2.forbidClick);
     var iconName = computed(() => {
       if (!props2.type)

package/highlight/attributes.json

@@ -97,7 +97,7 @@
   },
   "var-badge/position": {
     "type": "string",
-    "description": "徽标标签中有其他标签时定义徽标在其他标签上的位置，可选值 `right-top` `top-bottom` `left-top` `left-bottom` 默认值：right-top"
+    "description": "徽标标签中有其他标签时定义徽标在其他标签上的位置，可选值 `right-top` `right-bottom` `left-top` `left-bottom` 默认值：right-top"
   },
   "var-badge/color": {
     "type": "string",
@@ -945,7 +945,7 @@
   },
   "var-loading/radius": {
     "type": "string | number",
-    "description": "loading 的类型为 `circle` 时，可设置其大小 默认值：-"
+    "description": "loading 的类型为 `circle` 时，可设置其半径大小 默认值：-"
   },
   "var-menu/v-model:show": {
     "type": "string",
@@ -1035,6 +1035,10 @@
     "type": "boolean",
     "description": "是否开启级联模式 默认值：true"
   },
+  "var-picker/cascade-initial-indexes": {
+    "type": "number[]",
+    "description": "级联模式的初始化索引列表 默认值：-"
+  },
   "var-picker/option-height": {
     "type": "string | number",
     "description": "选项的高度(px rem) 默认值：44"

package/highlight/tags.json

@@ -397,6 +397,7 @@
       "text-key",
       "toolbar",
       "cascade",
+      "cascade-initial-indexes",
       "option-height",
       "option-count",
       "confirm-button-text",

package/highlight/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "1.27.4",
+  "version": "1.27.6",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -305,7 +305,7 @@
             },
             {
               "name": "position",
-              "description": "徽标标签中有其他标签时定义徽标在其他标签上的位置，可选值 `right-top` `top-bottom` `left-top` `left-bottom`",
+              "description": "徽标标签中有其他标签时定义徽标在其他标签上的位置，可选值 `right-top` `right-bottom` `left-top` `left-bottom`",
               "default": "right-top",
               "value": {
                 "type": "string",
@@ -2821,7 +2821,7 @@
             },
             {
               "name": "radius",
-              "description": "loading 的类型为 `circle` 时，可设置其大小",
+              "description": "loading 的类型为 `circle` 时，可设置其半径大小",
               "default": "-",
               "value": {
                 "type": "string | number",
@@ -3114,6 +3114,15 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "cascade-initial-indexes",
+              "description": "级联模式的初始化索引列表",
+              "default": "-",
+              "value": {
+                "type": "number[]",
+                "kind": "expression"
+              }
+            },
             {
               "name": "option-height",
               "description": "选项的高度(px rem)",
@@ -4155,7 +4164,7 @@
           "slots": [
             {
               "name": "default",
-              "description": "加载成功后显示的内容"
+              "description": "非加载状态下的内容"
             }
           ]
         },

package/lib/context/lock.js

@@ -26,33 +26,26 @@ function releaseLock(uid) {
   delete _.default.locks[uid];
   resolveLock();
 }
-/**
- * 组件锁操作
- * @param props 组件props
- * @param state 组件props中控制组件加锁的开关对应的key值
- * @param use 组件props中控制组件加锁的开关是否可用对应的key值
- */
 
-
-function useLock(props, state, use) {
+function useLock(source, useSource) {
   var {
     uid
   } = (0, _vue.getCurrentInstance)();
 
-  if (use) {
-    (0, _vue.watch)(() => props[use], newValue => {
+  if (useSource) {
+    (0, _vue.watch)(useSource, newValue => {
       if (newValue === false) {
         // 改变为禁用状态 组件解锁
         releaseLock(uid);
-      } else if (newValue === true && props[state] === true) {
+      } else if (newValue === true && source() === true) {
         // 改变为启用状态 并且popup处于开启状态 组件加锁
         addLock(uid);
       }
     });
   }
 
-  (0, _vue.watch)(() => props[state], newValue => {
-    if (use && props[use] === false) {
+  (0, _vue.watch)(source, newValue => {
+    if (useSource && useSource() === false) {
       return;
     }
 
@@ -65,41 +58,41 @@ function useLock(props, state, use) {
     }
   });
   (0, _vue.onBeforeMount)(() => {
-    if (use && props[use] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
 
-    if (props[state] === true) {
+    if (source() === true) {
       // popup处于开启状态 组件挂载 组件加锁
       addLock(uid);
     }
   });
   (0, _vue.onUnmounted)(() => {
-    if (use && props[use] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
 
-    if (props[state] === true) {
+    if (source() === true) {
       // popup处于开启状态 组件卸载 组件解锁
       releaseLock(uid);
     }
   });
   (0, _vue.onActivated)(() => {
-    if (use && props[use] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
 
-    if (props[state] === true) {
+    if (source() === true) {
       // popup处于开启状态 组件处于keepalive前台 组件加锁
       addLock(uid);
     }
   });
   (0, _vue.onDeactivated)(() => {
-    if (use && props[use] === false) {
+    if (useSource && useSource() === false) {
       return;
     }
 
-    if (props[state] === true) {
+    if (source() === true) {
       // popup处于开启状态 组件处于keepalive后台 组件解锁
       releaseLock(uid);
     }

package/lib/pagination/Pagination.js

@@ -126,10 +126,7 @@ function render(_ctx, _cache) {
     /* KEYED_FRAGMENT */
     ))]),
     default: (0, _vue.withCtx)(() => [(0, _vue.createElementVNode)("div", {
-      class: (0, _vue.normalizeClass)(_ctx.n('size--open')),
-      style: {
-        "display": "flex"
-      },
+      class: (0, _vue.normalizeClass)(_ctx.classes(_ctx.n('size--open'), [_ctx.current <= 1 || _ctx.disabled, _ctx.n('size--open--disabled')])),
       onClick: _cache[5] || (_cache[5] = function () {
         return _ctx.showMenu && _ctx.showMenu(...arguments);
       })

package/lib/pagination/pagination.css

@@ -1 +1 @@
-:root { --pagination-font-size: var(--font-size-md); --pagination-active-color: #fff; --pagination-active-bg-color: var(--color-primary); --pagination-hover-bg-color: #edf5ff; --pagination-total-margin: 0 12px; --pagination-total-line-height: 24px; --pagination-item-width: 32px; --pagination-item-height: 32px; --pagination-item-margin: 0 6px; --pagination-item-background: #fff; --pagination-item-border-radius: 4px; --pagination-list-bg-color: #fff; --pagination-list-active-bg-color: #edf5ff; --pagination-list-active-color: var(--color-primary); --pagination-input-width: 32px; --pagination-simple-padding: 0 0 2px 0; --pagination-disabled-color: var(--color-text-disabled); --pagination-bg-disabled-color: var(--color-disabled); --pagination-size-line-height: 24px;}.pagination-flex-nowrap { display: flex; white-space: nowrap; align-items: center;}.var-pagination { display: flex; align-items: center; list-style: none; margin: 0; font-size: var(--pagination-font-size); padding: 0;}.var-pagination__item { display: inline-flex; min-width: var(--pagination-item-width); align-items: center; justify-content: center; margin: var(--pagination-item-margin); height: var(--pagination-item-height); cursor: pointer; border-radius: var(--pagination-item-border-radius); outline: none; transition: all 0.25s; user-select: none; background: var(--pagination-item-background);}.var-pagination__item:hover { background-color: var(--pagination-hover-bg-color);}.var-pagination__item--active { color: var(--pagination-active-color); background-color: var(--pagination-active-bg-color) !important;}.var-pagination__item--disabled--active { background: var(--pagination-bg-disabled-color);}.var-pagination__item--hide { display: none;}.var-pagination__item--disabled { cursor: default !important; color: var(--pagination-disabled-color);}.var-pagination__item--disabled:hover { background-color: unset;}.var-pagination__item--hover:hover { background: inherit;}.var-pagination__prev { margin-left: 0;}.var-pagination__total { display: flex; white-space: nowrap; align-items: center; line-height: var(--pagination-total-line-height); margin: var(--pagination-total-margin);}.var-pagination__size { display: flex; white-space: nowrap; align-items: center; line-height: var(--pagination-size-line-height); margin: var(--pagination-item-margin);}.var-pagination__size--open { display: flex; align-items: center; cursor: pointer;}.var-pagination__list { background-color: var(--pagination-list-bg-color); cursor: pointer; transition: all 0.25s;}.var-pagination__list:hover { color: var(--pagination-list-active-color); background-color: var(--pagination-hover-bg-color);}.var-pagination__list--active { background-color: var(--pagination-list-active-bg-color) !important; color: var(--pagination-list-active-color);}.var-pagination__quickly,.var-pagination__simple { display: flex; white-space: nowrap; align-items: center;}.var-pagination__quickly [var-pagination-cover],.var-pagination__simple [var-pagination-cover] { width: var(--pagination-input-width);}.var-pagination__quickly [var-pagination-cover] .var-input__wrap,.var-pagination__simple [var-pagination-cover] .var-input__wrap { padding: 0;}.var-pagination__quickly [var-pagination-cover] .var-input__input,.var-pagination__simple [var-pagination-cover] .var-input__input { height: auto; text-align: center;}.var-pagination__quickly { margin: var(--pagination-item-margin);}.var-pagination__quickly [var-pagination-cover] { margin-left: 6px;}.var-pagination__size--open-icon[var-pagination-cover] { font-size: inherit;}.var-pagination--simple-padding { padding: var(--pagination-simple-padding);}
+:root { --pagination-font-size: var(--font-size-md); --pagination-active-color: #fff; --pagination-active-bg-color: var(--color-primary); --pagination-hover-bg-color: #edf5ff; --pagination-total-margin: 0 12px; --pagination-total-line-height: 24px; --pagination-item-width: 32px; --pagination-item-height: 32px; --pagination-item-margin: 0 6px; --pagination-item-background: #fff; --pagination-item-border-radius: 4px; --pagination-list-bg-color: #fff; --pagination-list-active-bg-color: #edf5ff; --pagination-list-active-color: var(--color-primary); --pagination-input-width: 32px; --pagination-simple-padding: 0 0 2px 0; --pagination-disabled-color: var(--color-text-disabled); --pagination-bg-disabled-color: var(--color-disabled); --pagination-size-line-height: 24px;}.pagination-flex-nowrap { display: flex; white-space: nowrap; align-items: center;}.var-pagination { display: flex; align-items: center; list-style: none; margin: 0; font-size: var(--pagination-font-size); padding: 0;}.var-pagination__item { display: inline-flex; min-width: var(--pagination-item-width); align-items: center; justify-content: center; margin: var(--pagination-item-margin); height: var(--pagination-item-height); cursor: pointer; border-radius: var(--pagination-item-border-radius); outline: none; transition: all 0.25s; user-select: none; background-color: var(--pagination-item-background);}.var-pagination__item:hover { background-color: var(--pagination-hover-bg-color);}.var-pagination__item--active { color: var(--pagination-active-color); background-color: var(--pagination-active-bg-color) !important;}.var-pagination__item--hide { display: none;}.var-pagination__item--disabled { cursor: default; color: var(--pagination-disabled-color); background-color: unset;}.var-pagination__item--disabled:hover { background-color: unset;}.var-pagination__item--disabled--hover:hover { background-color: inherit;}.var-pagination__item--disabled--active { background-color: var(--pagination-bg-disabled-color);}.var-pagination__item--disabled--active:hover { background-color: var(--pagination-bg-disabled-color);}.var-pagination__prev { margin-left: 0;}.var-pagination__total { display: flex; white-space: nowrap; align-items: center; line-height: var(--pagination-total-line-height); margin: var(--pagination-total-margin);}.var-pagination__size { display: flex; white-space: nowrap; align-items: center; line-height: var(--pagination-size-line-height); margin: var(--pagination-item-margin);}.var-pagination__size--open { display: flex; align-items: center; cursor: pointer;}.var-pagination__size--open--disabled { cursor: default;}.var-pagination__list { background-color: var(--pagination-list-bg-color); cursor: pointer; transition: all 0.25s;}.var-pagination__list:hover { color: var(--pagination-list-active-color); background-color: var(--pagination-hover-bg-color);}.var-pagination__list--active { background-color: var(--pagination-list-active-bg-color) !important; color: var(--pagination-list-active-color);}.var-pagination__quickly,.var-pagination__simple { display: flex; white-space: nowrap; align-items: center;}.var-pagination__quickly [var-pagination-cover],.var-pagination__simple [var-pagination-cover] { width: var(--pagination-input-width);}.var-pagination__quickly [var-pagination-cover] .var-input__wrap,.var-pagination__simple [var-pagination-cover] .var-input__wrap { padding: 0;}.var-pagination__quickly [var-pagination-cover] .var-input__input,.var-pagination__simple [var-pagination-cover] .var-input__input { height: auto; text-align: center;}.var-pagination__quickly { margin: var(--pagination-item-margin);}.var-pagination__quickly [var-pagination-cover] { margin-left: 6px;}.var-pagination__size--open-icon[var-pagination-cover] { font-size: inherit;}.var-pagination--simple-padding { padding: var(--pagination-simple-padding);}

package/lib/pagination/pagination.less

@@ -67,7 +67,7 @@
     outline: none;
     transition: all 0.25s;
     user-select: none;
-    background: var(--pagination-item-background);
+    background-color: var(--pagination-item-background);
 
     &:hover {
       background-color: var(--pagination-hover-bg-color);
@@ -78,26 +78,31 @@
       background-color: var(--pagination-active-bg-color) !important;
     }
 
-    &--disabled--active {
-      background: var(--pagination-bg-disabled-color);
-    }
-
     &--hide {
       display: none;
     }
 
     &--disabled {
-      cursor: default !important;
+      cursor: default;
       color: var(--pagination-disabled-color);
+      background-color: unset;
 
       &:hover {
         background-color: unset;
       }
-    }
 
-    &--hover {
-      &:hover {
-        background: inherit;
+      &--hover {
+        &:hover {
+          background-color: inherit;
+        }
+      }
+
+      &--active {
+        background-color: var(--pagination-bg-disabled-color);
+
+        &:hover {
+          background-color: var(--pagination-bg-disabled-color);
+        }
       }
     }
   }
@@ -123,6 +128,10 @@
       display: flex;
       align-items: center;
       cursor: pointer;
+
+      &--disabled {
+        cursor: default;
+      }
     }
   }
 

package/lib/picker/Picker.js

@@ -313,26 +313,33 @@ var _default = (0, _vue.defineComponent)({
           scrollEl: null,
           scrolling: false
         };
-        scrollTo(scrollColumn, scrollColumn.index, 200);
+        scrollTo(scrollColumn, scrollColumn.index, 0, true);
         return scrollColumn;
       });
     };
 
     var normalizeCascadeColumns = cascadeColumns => {
       var scrollColumns = [];
-      createChildren(scrollColumns, cascadeColumns);
+      createChildren(scrollColumns, cascadeColumns, true);
       return scrollColumns;
     };
 
-    var createChildren = (scrollColumns, children) => {
+    var createChildren = function (scrollColumns, children, initial) {
+      if (initial === void 0) {
+        initial = false;
+      }
+
       if ((0, _shared.isArray)(children) && children.length) {
+        var _props$cascadeInitial;
+
+        var index = initial ? (_props$cascadeInitial = props.cascadeInitialIndexes[scrollColumns.length]) != null ? _props$cascadeInitial : 0 : 0;
         var scrollColumn = {
           id: sid++,
           prevY: undefined,
           momentumPrevY: undefined,
           touching: false,
           translate: center.value,
-          index: 0,
+          index,
           duration: 0,
           momentumTime: 0,
           column: {
@@ -343,7 +350,8 @@ var _default = (0, _vue.defineComponent)({
           scrolling: false
         };
         scrollColumns.push(scrollColumn);
-        createChildren(scrollColumns, scrollColumn.columns[scrollColumn.index].children);
+        scrollTo(scrollColumn, scrollColumn.index, 0, true);
+        createChildren(scrollColumns, scrollColumn.columns[scrollColumn.index].children, initial);
       }
     };
 

package/lib/picker/props.js

@@ -29,6 +29,10 @@ var props = _extends({
     type: Boolean,
     default: false
   },
+  cascadeInitialIndexes: {
+    type: Array,
+    default: () => []
+  },
   optionHeight: {
     type: [Number, String],
     default: 44

package/lib/popup/Popup.js

@@ -61,7 +61,7 @@ var _default = (0, _vue.defineComponent)({
       (_props$onUpdateShow = props['onUpdate:show']) == null ? void 0 : _props$onUpdateShow.call(props, false);
     };
 
-    (0, _lock.useLock)(props, 'show', 'lockScroll');
+    (0, _lock.useLock)(() => props.show, () => props.lockScroll);
     (0, _vue.watch)(() => props.show, newValue => {
       var {
         onOpen,

package/lib/snackbar/core.js

@@ -92,7 +92,7 @@ var _default = (0, _vue.defineComponent)({
     var {
       zIndex
     } = (0, _zIndex.useZIndex)(() => props.show, 1);
-    (0, _lock.useLock)(props, 'show', 'lockScroll');
+    (0, _lock.useLock)(() => props.show, () => props.lockScroll);
     var isForbidClick = (0, _vue.computed)(() => props.type === 'loading' || props.forbidClick);
     var iconName = (0, _vue.computed)(() => {
       if (!props.type) return '';

package/lib/snackbar/style/index.js

@@ -1,8 +1,8 @@
 require('../../styles/common.css')
+require('../SnackbarSfc.css')
 require('../../styles/elevation.css')
 require('../../loading/loading.css')
 require('../../button/button.css')
 require('../../icon/icon.css')
 require('../snackbar.css')
 require('../coreSfc.css')
-require('../SnackbarSfc.css')

package/lib/snackbar/style/less.js

@@ -1,8 +1,8 @@
 require('../../styles/common.less')
+require('../SnackbarSfc.less')
 require('../../styles/elevation.less')
 require('../../loading/loading.less')
 require('../../button/button.less')
 require('../../icon/icon.less')
 require('../snackbar.less')
 require('../coreSfc.less')
-require('../SnackbarSfc.less')