From 093afd3be27ea5e9692839845b69bd56e2405518 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 13 八月 2024 23:49:45 +0800
Subject: [PATCH] 204.8.13

---
 miniprogram_npm/tdesign-miniprogram/picker/picker.js |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/miniprogram_npm/tdesign-miniprogram/picker/picker.js b/miniprogram_npm/tdesign-miniprogram/picker/picker.js
index 3b56691..3e210b7 100644
--- a/miniprogram_npm/tdesign-miniprogram/picker/picker.js
+++ b/miniprogram_npm/tdesign-miniprogram/picker/picker.js
@@ -5,13 +5,16 @@
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { SuperComponent, wxComponent } from '../common/src/index';
+import { rpx2px } from '../common/utils';
 import config from '../common/config';
 import props from './props';
+import useCustomNavbar from '../mixins/using-custom-navbar';
 const { prefix } = config;
 const name = `${prefix}-picker`;
 let Picker = class Picker extends SuperComponent {
     constructor() {
         super(...arguments);
+        this.behaviors = [useCustomNavbar];
         this.properties = props;
         this.externalClasses = [`${prefix}-class`, `${prefix}-class-confirm`, `${prefix}-class-cancel`, `${prefix}-class-title`];
         this.options = {
@@ -26,13 +29,20 @@
             },
         };
         this.observers = {
-            value() {
+            'value, visible'() {
                 this.updateChildren();
             },
             keys(obj) {
                 this.setData({
-                    labelAlias: obj.label || 'label',
-                    valueAlias: obj.value || 'value',
+                    labelAlias: (obj === null || obj === void 0 ? void 0 : obj.label) || 'label',
+                    valueAlias: (obj === null || obj === void 0 ? void 0 : obj.value) || 'value',
+                });
+            },
+        };
+        this.lifetimes = {
+            attached() {
+                this.setData({
+                    pickItemHeight: rpx2px(this.properties.itemHeight),
                 });
             },
         };
@@ -43,14 +53,18 @@
             valueAlias: 'value',
             defaultPopUpProps: {},
             defaultPopUpzIndex: 11500,
+            pickItemHeight: 0,
         };
         this.methods = {
             updateChildren() {
-                const { value } = this.properties;
+                const { pickItemHeight } = this.data;
+                const { value, defaultValue } = this.properties;
                 this.$children.forEach((child, index) => {
-                    var _a;
+                    var _a, _b;
                     child.setData({
-                        value: (_a = value === null || value === void 0 ? void 0 : value[index]) !== null && _a !== void 0 ? _a : '',
+                        value: (_b = (_a = value === null || value === void 0 ? void 0 : value[index]) !== null && _a !== void 0 ? _a : defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue[index]) !== null && _b !== void 0 ? _b : '',
+                        columnIndex: index,
+                        pickItemHeight,
                     });
                     child.update();
                 });

--
Gitblit v1.9.3