Skip to content

U
uni-app

yangkaifeng / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 3
Star 1
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 a4ba298b 编写于 作者: Q qiang
浏览文件
操作

fix: picker value sync

上级 ffe97aa2
显示空白变更内容
内联 并排
Showing with 181 addition and 133 deletion
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @ a4ba298b
......@@ -1704,11 +1704,11 @@ function useResizeSensorUpdate(rootRef, emit2, reset) {
vue.watch(() => shared.extend({}, size), (value) => emit2("resize", value));
return () => {
const {
offsetWidth,
offsetHeight
} = rootRef.value;
size.width = offsetWidth;
size.height = offsetHeight;
width,
height
} = rootRef.value.getBoundingClientRect();
size.width = width;
size.height = height;
reset();
};
}
......@@ -4601,6 +4601,7 @@ var PickerView = /* @__PURE__ */ defineBuiltInComponent({
const rootRef = vue.ref(null);
const trigger = useCustomEvent(rootRef, emit2);
const state = useState$1(props2);
const resizeSensorRef = vue.ref(null);
let columnVNodes = [];
function getItemIndex(vnode) {
return columnVNodes.indexOf(vnode);
......@@ -4635,11 +4636,11 @@ var PickerView = /* @__PURE__ */ defineBuiltInComponent({
return vue.createVNode("uni-picker-view", {
"ref": rootRef
}, [vue.createVNode(ResizeSensor, {
"initial": true,
"ref": resizeSensorRef,
"onResize": ({
height
}) => state.height = height
}, null, 8, ["initial", "onResize"]), vue.createVNode("div", {
}, null, 8, ["onResize"]), vue.createVNode("div", {
"class": "uni-picker-view-wrapper"
}, [defaultSlots])], 512);
};
......@@ -5350,6 +5351,7 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({
const pickerViewProps = vue.inject("pickerViewProps");
const pickerViewState = vue.inject("pickerViewState");
const indicatorHeight = vue.ref(34);
const resizeSensorRef = vue.ref(null);
const maskSize = vue.computed(() => (pickerViewState.height - indicatorHeight.value) / 2);
const {
state: scopedAttrsState
......@@ -5416,11 +5418,11 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({
"class": ["uni-picker-view-indicator", pickerViewProps.indicatorClass],
"style": pickerViewProps.indicatorStyle
}), [vue.createVNode(ResizeSensor, {
"initial": true,
"ref": resizeSensorRef,
"onResize": ({
height
}) => indicatorHeight.value = height
}, null, 8, ["initial", "onResize"])], 16), vue.createVNode("div", {
}, null, 8, ["onResize"])], 16), vue.createVNode("div", {
"ref": contentRef,
"class": ["uni-picker-view-content", className],
"style": {
......@@ -10174,19 +10176,30 @@ var _sfc_main$1 = {
}, 300);
}
},
value() {
value: {
deep: true,
handler() {
this._setValueSync();
}
},
mode() {
this._setValueSync();
},
range() {
range: {
deep: true,
handler() {
this._setValueSync();
}
},
valueSync() {
valueSync: {
deep: true,
handler() {
this._setValueArray();
}
},
valueArray(val) {
valueArray: {
deep: true,
handler(val) {
if (this.mode === mode.TIME || this.mode === mode.DATE) {
const getValue = this.mode === mode.TIME ? this._getTimeValue : this._getDateValue;
const valueArray = this.valueArray;
......@@ -10219,6 +10232,7 @@ var _sfc_main$1 = {
}
});
}
}
},
created() {
initI18nPickerMsgsOnce();
......
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @ a4ba298b
......@@ -5368,11 +5368,11 @@ function useResizeSensorUpdate(rootRef, emit2, reset) {
watch(() => extend({}, size), (value) => emit2("resize", value));
return () => {
const {
offsetWidth,
offsetHeight
} = rootRef.value;
size.width = offsetWidth;
size.height = offsetHeight;
width,
height
} = rootRef.value.getBoundingClientRect();
size.width = width;
size.height = height;
reset();
};
}
......@@ -9353,6 +9353,11 @@ var PickerView = /* @__PURE__ */ defineBuiltInComponent({
const rootRef = ref(null);
const trigger = useCustomEvent(rootRef, emit2);
const state2 = useState$2(props2);
const resizeSensorRef = ref(null);
onMounted(() => {
const resizeSensor = resizeSensorRef.value;
state2.height = resizeSensor.$el.getBoundingClientRect().height;
});
let columnVNodes = [];
function getItemIndex(vnode) {
return columnVNodes.indexOf(vnode);
......@@ -9387,11 +9392,11 @@ var PickerView = /* @__PURE__ */ defineBuiltInComponent({
return createVNode("uni-picker-view", {
"ref": rootRef
}, [createVNode(ResizeSensor, {
"initial": true,
"ref": resizeSensorRef,
"onResize": ({
height
}) => state2.height = height
}, null, 8, ["initial", "onResize"]), createVNode("div", {
}, null, 8, ["onResize"]), createVNode("div", {
"class": "uni-picker-view-wrapper"
}, [defaultSlots])], 512);
};
......@@ -10129,6 +10134,11 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({
const pickerViewProps = inject("pickerViewProps");
const pickerViewState = inject("pickerViewState");
const indicatorHeight = ref(34);
const resizeSensorRef = ref(null);
onMounted(() => {
const resizeSensor = resizeSensorRef.value;
indicatorHeight.value = resizeSensor.$el.getBoundingClientRect().height;
});
const maskSize = computed(() => (pickerViewState.height - indicatorHeight.value) / 2);
const {
state: scopedAttrsState
......@@ -10241,11 +10251,11 @@ var PickerViewColumn = /* @__PURE__ */ defineBuiltInComponent({
"class": ["uni-picker-view-indicator", pickerViewProps.indicatorClass],
"style": pickerViewProps.indicatorStyle
}), [createVNode(ResizeSensor, {
"initial": true,
"ref": resizeSensorRef,
"onResize": ({
height
}) => indicatorHeight.value = height
}, null, 8, ["initial", "onResize"])], 16), createVNode("div", {
}, null, 8, ["onResize"])], 16), createVNode("div", {
"ref": contentRef,
"class": ["uni-picker-view-content", className],
"style": {
......@@ -18530,19 +18540,30 @@ var _sfc_main$1 = {
}, 300);
}
},
value() {
value: {
deep: true,
handler() {
this._setValueSync();
}
},
mode() {
this._setValueSync();
},
range() {
range: {
deep: true,
handler() {
this._setValueSync();
}
},
valueSync() {
valueSync: {
deep: true,
handler() {
this._setValueArray();
}
},
valueArray(val) {
valueArray: {
deep: true,
handler(val) {
if (this.mode === mode.TIME || this.mode === mode.DATE) {
const getValue = this.mode === mode.TIME ? this._getTimeValue : this._getDateValue;
const valueArray = this.valueArray;
......@@ -18575,6 +18596,7 @@ var _sfc_main$1 = {
}
});
}
}
},
created() {
initI18nPickerMsgsOnce();
......
packages/uni-h5/src/view/components/picker/index.vue
浏览文件 @ a4ba298b
......@@ -301,19 +301,30 @@ export default {
}, 300);
}
},
value() {
value: {
deep: true,
handler() {
this._setValueSync();
}
},
mode() {
this._setValueSync();
},
range() {
range: {
deep: true,
handler() {
this._setValueSync();
}
},
valueSync() {
valueSync: {
deep: true,
handler() {
this._setValueArray();
}
},
valueArray(val) {
valueArray: {
deep: true,
handler(val) {
if (this.mode === mode.TIME || this.mode === mode.DATE) {
const getValue =
this.mode === mode.TIME ? this._getTimeValue : this._getDateValue;
......@@ -352,6 +363,7 @@ export default {
}
}
});
}
},
},
created() {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或