Browse Source

fix: picker组件首次弹起点击确定没返回值问题解决 (#1542)

* fix: marge主分支 (#1)

* doc: calendar 文档修改 (#1410)

* feat: 添加range组件、calendar组件在线文档

* fix: 文档调整

* fix: 重构calendar组件

* feat: 日历组件重构,文档修改,功能完善

* fix: 格式化

* fix: 代码格式化调整。

* fix: 去除无用代码

* fix: 文档调整

* fix:  文档调整

* fix: taro  demo 样式修改

* feat: range组件功能完善,新增 竖向操作,刻度展示。

* fix: 冲突解决

* feat: taro功能新增,兼容处理,文档修改

* feat: 添加range组件,jdt主题色

* fix: 修改组件初始化逻辑

* feat: 新增h5 日期多选功能

* feat: taro版本添加 日期多选功能

* fix: 修复多选,无法选中开头结尾日期问题

* fix: 文档修改,添加en-US 文档

* fix: 文档完善

Co-authored-by: lkjh3214 <13121007159@163.com>
Co-authored-by: love_forever <1039168735@qq.com>

* feat: imagepreview 部分功能补齐 (#1412)

* feat: image新增单元测试

* feat: ellipsis添加单元测试

* feat: imagepreview 添加

* fix: popop单元测试修改

* docs: 添加版本号

* feat: support highlight for JetBrains web-types

* test(imagepreview): edit snap

* fix(image): dts edit import

* docs(input): demo和md国际化文案修改 (#1414)

* fix: 抽离 input  ConfirmTextType

* feat: input、switch国际化

* feat: category、address国际化

* feat: taro升级maxlength问题

* fix: 国际化增加默认字段

* fix: blank

* fix: input组件国际化文案修改

* style: add ellipsis add sass

* docs(elevator): 增加吸顶props

* feat: input组件新增input slot插槽 (#1418)

* fix: 抽离 input  ConfirmTextType

* feat: input、switch国际化

* feat: category、address国际化

* feat: taro升级maxlength问题

* fix: 国际化增加默认字段

* fix: blank

* fix: input组件国际化文案修改

* feat: input组件新增input slot插槽

* release: v3.1.22

* Update README.md

add alipay img

* Update README.md

* docs: changelog 3.1.22

Co-authored-by: lkjh3214 <305624531@qq.com>
Co-authored-by: lkjh3214 <13121007159@163.com>
Co-authored-by: love_forever <1039168735@qq.com>
Co-authored-by: richard1015 <51844712@qq.com>
Co-authored-by: ailululu <912429321@qq.com>
Co-authored-by: snandy <zhouyrt@gmail.com>

* feat: imagepreview重复问题修改

* fix: picker 组件重影问题修改

* fix: 科技样式同步

* feat: picker组件惯性滚动优化

* feat: picker组件惯性滚动优化

* fix: issue问题修噶

* fix: datepicker国际化修噶

* fix: datePicker在year-month下,maxDate不生效问题解决

* fix: picker异步处理

* fix: picker taro

* fix: picker问题修改

* feat: address 新增插槽

* feat: address 新增插槽

* feat: picker-Taro 添加 平铺展示

* feat: picker-Taro 添加 平铺展示

* feat: 解决Scrollview 打包后不生效问题

* feat: 地址 Demo 修改

* fix: 修复 picker 组件首次弹起点击确定没返回值

Co-authored-by: lkjh3214 <305624531@qq.com>
Co-authored-by: lkjh3214 <13121007159@163.com>
Co-authored-by: love_forever <1039168735@qq.com>
Co-authored-by: richard1015 <51844712@qq.com>
Co-authored-by: ailululu <912429321@qq.com>
Co-authored-by: snandy <zhouyrt@gmail.com>
yangxiaolu1993 3 years ago
parent
commit
9815df46b3

+ 2 - 1
src/packages/__VUE/address/demo.vue

@@ -181,7 +181,7 @@ export default createDemo({
         { id: 9, name: '昌平区', title: 'C' },
         { id: 9, name: '昌平区', title: 'C' },
         { id: 6, name: '石景山区', title: 'S' },
         { id: 6, name: '石景山区', title: 'S' },
         { id: 3, name: '八里庄街道', title: 'B' },
         { id: 3, name: '八里庄街道', title: 'B' },
-        { id: 9, name: '北苑', title: 'B' }
+        { id: 10, name: '北苑', title: 'B' }
       ],
       ],
       country: [
       country: [
         { id: 3, name: '八里庄街道', title: 'B' },
         { id: 3, name: '八里庄街道', title: 'B' },
@@ -269,6 +269,7 @@ export default createDemo({
     };
     };
 
 
     const onChange = (cal: CalBack, tag: string) => {
     const onChange = (cal: CalBack, tag: string) => {
+      console.log('地址选择', cal);
       const name = (address as any)[cal.next];
       const name = (address as any)[cal.next];
       if (name.length < 1) {
       if (name.length < 1) {
         (showPopup as any)[tag] = false;
         (showPopup as any)[tag] = false;

+ 7 - 0
src/packages/__VUE/picker/index.taro.vue

@@ -201,6 +201,13 @@ export default create({
     };
     };
 
 
     const confirmHandler = () => {
     const confirmHandler = () => {
+      if (defaultValues.value && !defaultValues.value.length) {
+        columnsList.value.forEach((columns) => {
+          defaultValues.value.push(columns[0].value);
+          selectedOptions.value.push(columns[0]);
+        });
+      }
+
       emit('confirm', {
       emit('confirm', {
         selectedValue: defaultValues.value,
         selectedValue: defaultValues.value,
         selectedOptions: selectedOptions.value
         selectedOptions: selectedOptions.value

+ 10 - 0
src/packages/__VUE/picker/index.vue

@@ -217,6 +217,16 @@ export default create({
     };
     };
 
 
     const confirmHandler = () => {
     const confirmHandler = () => {
+      console.log('确定选择项', columnsList.value);
+
+      if (defaultValues.value && !defaultValues.value.length) {
+        columnsList.value.forEach((columns) => {
+          console.log(columns);
+          defaultValues.value.push(columns[0].value);
+          selectedOptions.value.push(columns[0]);
+        });
+      }
+
       emit('confirm', {
       emit('confirm', {
         selectedValue: defaultValues.value,
         selectedValue: defaultValues.value,
         selectedOptions: selectedOptions.value
         selectedOptions: selectedOptions.value