build: compile 1.10.9

dist/cascader/index.d.ts

@@ -0,0 +1 @@
+export {};

dist/cascader/index.js

@@ -0,0 +1,205 @@
+import { VantComponent } from '../common/component';
+var FieldName;
+(function (FieldName) {
+ FieldName["TEXT"] = "text";
+ FieldName["VALUE"] = "value";
+ FieldName["CHILDREN"] = "children";
+})(FieldName || (FieldName = {}));
+const defaultFieldNames = {
+ text: FieldName.TEXT,
+ value: FieldName.VALUE,
+ children: FieldName.CHILDREN,
+};
+VantComponent({
+ props: {
+ title: String,
+ value: {
+ type: String,
+ observer: 'updateValue',
+ },
+ placeholder: {
+ type: String,
+ value: '请选择',
+ },
+ activeColor: {
+ type: String,
+ value: '#1989fa',
+ },
+ options: {
+ type: Array,
+ value: [],
+ observer: 'updateOptions',
+ },
+ swipeable: {
+ type: Boolean,
+ value: false,
+ },
+ closeable: {
+ type: Boolean,
+ value: true,
+ },
+ showHeader: {
+ type: Boolean,
+ value: true,
+ },
+ closeIcon: {
+ type: String,
+ value: 'cross',
+ },
+ fieldNames: {
+ type: Object,
+ value: defaultFieldNames,
+ observer: 'updateFieldNames',
+ },
+ },
+ data: {
+ tabs: [],
+ activeTab: 0,
+ textKey: FieldName.TEXT,
+ valueKey: FieldName.VALUE,
+ childrenKey: FieldName.CHILDREN,
+ },
+ created() {
+ this.updateTabs();
+ },
+ methods: {
+ updateOptions(val, oldVal) {
+ const isAsync = !!(val.length && oldVal.length);
+ this.updateTabs(isAsync);
+ },
+ updateValue(val) {
+ if (val !== undefined) {
+ const values = this.data.tabs.map((tab) => tab.selected && tab.selected[this.data.valueKey]);
+ if (values.indexOf(val) > -1) {
+ return;
+ }
+ }
+ this.updateTabs();
+ },
+ updateFieldNames() {
+ const { text = 'text', value = 'value', children = 'children', } = this.data.fieldNames || defaultFieldNames;
+ this.setData({
+ textKey: text,
+ valueKey: value,
+ childrenKey: children,
+ });
+ },
+ getSelectedOptionsByValue(options, value) {
+ for (let i = 0; i < options.length; i++) {
+ const option = options[i];
+ if (option[this.data.valueKey] === value) {
+ return [option];
+ }
+ if (option[this.data.childrenKey]) {
+ const selectedOptions = this.getSelectedOptionsByValue(option[this.data.childrenKey], value);
+ if (selectedOptions) {
+ return [option, ...selectedOptions];
+ }
+ }
+ }
+ },
+ updateTabs(isAsync = false) {
+ const { options, value } = this.data;
+ if (value !== undefined) {
+ const selectedOptions = this.getSelectedOptionsByValue(options, value);
+ if (selectedOptions) {
+ let optionsCursor = options;
+ const tabs = selectedOptions.map((option) => {
+ const tab = {
+ options: optionsCursor,
+ selected: option,
+ };
+ const next = optionsCursor.find((item) => item[this.data.valueKey] === option[this.data.valueKey]);
+ if (next) {
+ optionsCursor = next[this.data.childrenKey];
+ }
+ return tab;
+ });
+ if (optionsCursor) {
+ tabs.push({
+ options: optionsCursor,
+ selected: null,
+ });
+ }
+ this.setData({
+ tabs,
+ });
+ wx.nextTick(() => {
+ this.setData({
+ activeTab: tabs.length - 1,
+ });
+ });
+ return;
+ }
+ }
+ // 异步更新
+ if (isAsync) {
+ const { tabs } = this.data;
+ tabs[tabs.length - 1].options =
+ options[options.length - 1][this.data.childrenKey];
+ this.setData({
+ tabs,
+ });
+ return;
+ }
+ this.setData({
+ tabs: [
+ {
+ options,
+ selected: null,
+ },
+ ],
+ });
+ },
+ onClose() {
+ this.$emit('close');
+ },
+ onClickTab(e) {
+ const { index: tabIndex, title } = e.detail;
+ this.$emit('click-tab', { title, tabIndex });
+ },
+ // 选中
+ onSelect(e) {
+ const { option, tabIndex } = e.currentTarget.dataset;
+ if (option && option.disabled) {
+ return;
+ }
+ const { valueKey, childrenKey } = this.data;
+ let { tabs } = this.data;
+ tabs[tabIndex].selected = option;
+ if (tabs.length > tabIndex + 1) {
+ tabs = tabs.slice(0, tabIndex + 1);
+ }
+ if (option[childrenKey]) {
+ const nextTab = {
+ options: option[childrenKey],
+ selected: null,
+ };
+ if (tabs[tabIndex + 1]) {
+ tabs[tabIndex + 1] = nextTab;
+ }
+ else {
+ tabs.push(nextTab);
+ }
+ wx.nextTick(() => {
+ this.setData({
+ activeTab: tabIndex + 1,
+ });
+ });
+ }
+ this.setData({
+ tabs,
+ });
+ const selectedOptions = tabs.map((tab) => tab.selected).filter(Boolean);
+ const params = {
+ value: option[valueKey],
+ tabIndex,
+ selectedOptions,
+ };
+ this.$emit('change', params);
+ if (!option[childrenKey]) {
+ this.$emit('finish', params);
+ }
+ },
+ },
+});

dist/cascader/index.json

@@ -0,0 +1,8 @@
+{
+ "component": true,
+ "usingComponents": {
+ "van-icon": "../icon/index",
+ "van-tab": "../tab/index",
+ "van-tabs": "../tabs/index"
+ }
+}

dist/cascader/index.wxml

@@ -0,0 +1,53 @@
+<wxs src="./index.wxs" module="utils" />
+
+<view wx:if="{{ showHeader }}" class="van-cascader__header">
+ <text class="van-cascader__title"><slot name="title"></slot>{{ title }}</text>
+ <van-icon
+ wx:if="{{ closeable }}"
+ name="{{ closeIcon }}"
+ class="van-cascader__close-icon"
+ bind:tap="onClose"
+ />
+</view>
+
+<van-tabs
+ active="{{ activeTab }}"
+ custom-class="van-cascader__tabs"
+ wrap-class="van-cascader__tabs-wrap"
+ tab-class="van-cascader__tab"
+ color="{{ activeColor }}"
+ border="{{ false }}"
+ swipeable="{{ swipeable }}"
+ bind:click="onClickTab"
+>
+ <van-tab
+ wx:for="{{ tabs }}"
+ wx:for-item="tab"
+ wx:for-index="tabIndex"
+ wx:key="tabIndex"
+ title="{{ tab.selected ? tab.selected[textKey] : placeholder }}"
+ style="width: 100%;"
+ title-style="{{ !tab.selected ? 'color: #969799;font-weight:normal;' : '' }}"
+ >
+ <!-- 暂不支持 -->
+ <!-- <slot name="options-top"></slot> -->
+
+ <view class="van-cascader__options">
+ <view
+ wx:for="{{ tab.options }}"
+ wx:for-item="option"
+ wx:key="index"
+ class="{{ option.className }} {{ utils.optionClass(tab, textKey, option) }}"
+ style="{{ utils.optionStyle({ tab, textKey, option, activeColor }) }}"
+ data-option="{{ option }}"
+ data-tab-index="{{ tabIndex }}"
+ bind:tap="onSelect"
+ >
+ <text>{{ option[textKey] }}</text>
+ <van-icon wx:if="{{ utils.isSelected(tab, textKey, option) }}" name="success" size="18" />
+ </view>
+ </view>
+ <!-- 暂不支持 -->
+ <!-- <slot name="options-bottom"></slot> -->
+ </van-tab>
+</van-tabs>

dist/cascader/index.wxs

@@ -0,0 +1,24 @@
+var utils = require('../wxs/utils.wxs');
+var style = require('../wxs/style.wxs');
+
+function isSelected(tab, textKey, option) {
+ return tab.selected && tab.selected[textKey] === option[textKey]
+}
+
+function optionClass(tab, textKey, option) {
+ return utils.bem('cascader__option', { selected: isSelected({ tab, textKey, option }), disabled: option.disabled })
+}
+
+function optionStyle(data) {
+ var color = data.option.color || (isSelected(data.tab, data.textKey, data.option) ? data.activeColor : undefined);
+ return style({
+ color
+ });
+}
+
+
+module.exports = {
+ isSelected: isSelected,
+ optionClass: optionClass,
+ optionStyle: optionStyle,
+};

dist/cascader/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-cascader__header{align-items:center;display:flex;height:48px;justify-content:space-between;padding:0 16px}.van-cascader__title{font-size:16px;font-weight:600;line-height:20px}.van-cascader__close-icon{color:#c8c9cc;font-size:22px;height:22px}.van-cascader__tabs-wrap{height:48px!important;padding:0 8px}.van-cascader__tab{color:#323233!important;flex:none!important;font-weight:600!important;padding:0 8px!important}.van-cascader__tab--unselected{color:#969799!important;font-weight:400!important}.van-cascader__option{align-items:center;cursor:pointer;display:flex;font-size:14px;justify-content:space-between;line-height:20px;padding:10px 16px}.van-cascader__option:active{background-color:#f2f3f5}.van-cascader__option--selected{color:#1989fa;font-weight:600}.van-cascader__option--disabled{color:#c8c9cc;cursor:not-allowed}.van-cascader__option--disabled:active{background-color:initial}.van-cascader__options{-webkit-overflow-scrolling:touch;box-sizing:border-box;height:384px;overflow-y:auto;padding-top:6px}

dist/common/utils.d.ts

@@ -8,7 +8,7 @@ export { getSystemInfoSync } from './version';
 export declare function range(num: number, min: number, max: number): number;
 export declare function nextTick(cb: (...args: any[]) => void): void;
 export declare function addUnit(value?: string | number): string | undefined;
-export declare function requestAnimationFrame(cb: () => void): NodeJS.Timeout | WechatMiniprogram.NodesRef;
+export declare function requestAnimationFrame(cb: () => void): NodeJS.Timeout;
 export declare function pickExclude(obj: unknown, keys: string[]): {};
 export declare function getRect(context: WechatMiniprogram.Component.TrivialInstance, selector: string): Promise<WechatMiniprogram.BoundingClientRectCallbackResult>;
 export declare function getAllRect(context: WechatMiniprogram.Component.TrivialInstance, selector: string): Promise<WechatMiniprogram.BoundingClientRectCallbackResult[]>;

dist/common/utils.js

@@ -1,5 +1,5 @@
 import { isDef, isNumber, isPlainObject, isPromise } from './validator';
-import { canIUseGroupSetData, canIUseNextTick, getSystemInfoSync } from './version';
+import { canIUseGroupSetData, canIUseNextTick } from './version';
 export { isDef } from './validator';
 export { getSystemInfoSync } from './version';
 export function range(num, min, max) {
@@ -23,19 +23,9 @@ export function addUnit(value) {
  return isNumber(value) ? `${value}px` : value;
 }
 export function requestAnimationFrame(cb) {
- const systemInfo = getSystemInfoSync();
- if (systemInfo.platform === 'devtools') {
- return setTimeout(() => {
- cb();
- }, 1000 / 30);
- }
- return wx
- .createSelectorQuery()
- .selectViewport()
- .boundingClientRect()
- .exec(() => {
+ return setTimeout(() => {
  cb();
- });
+ }, 1000 / 30);
 }
 export function pickExclude(obj, keys) {
  if (!isPlainObject(obj)) {

dist/mixins/page-scroll.js

@@ -18,7 +18,7 @@ export function pageScrollMixin(scroller) {
  }
  const _scroller = scroller.bind(this);
  const { vanPageScroller = [] } = page;
- if (!vanPageScroller.length && isFunction(page.onPageScroll)) {
+ if (isFunction(page.onPageScroll) && page.onPageScroll !== onPageScroll) {
  vanPageScroller.push(page.onPageScroll.bind(page));
  }
  vanPageScroller.push(_scroller);
@@ -32,7 +32,7 @@ export function pageScrollMixin(scroller) {
  return;
  }
  const { vanPageScroller } = page;
- const index = vanPageScroller.findIndex(v => v === this._scroller);
+ const index = vanPageScroller.findIndex((v) => v === this._scroller);
  if (index > -1) {
  page.vanPageScroller.splice(index, 1);
  }

dist/tabs/index.js

@@ -5,7 +5,13 @@ import { isDef } from '../common/validator';
 import { useChildren } from '../common/relation';
 VantComponent({
  mixins: [touch],
- classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'],
+ classes: [
+ 'nav-class',
+ 'tab-class',
+ 'tab-active-class',
+ 'line-class',
+ 'wrap-class',
+ ],
  relation: useChildren('tab', function () {
  this.updateTabs();
  }),

dist/tabs/index.wxml

@@ -9,7 +9,7 @@
  container="{{ container }}"
  bind:scroll="onTouchScroll"
  >
- <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
+ <view class="{{ utils.bem('tabs__wrap', { scrollable }) }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }} wrap-class">
  <slot name="nav-left" />
 
  <scroll-view

lib/cascader/index.d.ts

@@ -0,0 +1 @@
+export {};