@varlet/ui 1.27.5 → 1.27.6

package/es/context/lock.js

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

package/es/pagination/Pagination.js

@@ -108,10 +108,7 @@ export function render(_ctx, _cache) {
     /* KEYED_FRAGMENT */
     ))]),
     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);
       })

package/es/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/es/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/es/picker/Picker.js

@@ -296,26 +296,33 @@ export default 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 (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: {
@@ -326,7 +333,8 @@ export default 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/es/picker/props.js

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

package/es/popup/Popup.js

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

package/es/snackbar/core.js

@@ -75,7 +75,7 @@ export default defineComponent({
     var {
       zIndex
     } = useZIndex(() => props.show, 1);
-    useLock(props, 'show', 'lockScroll');
+    useLock(() => props.show, () => props.lockScroll);
     var isForbidClick = computed(() => props.type === 'loading' || props.forbidClick);
     var iconName = computed(() => {
       if (!props.type) return '';