Browse Source

Merge branch 'next' of https://github.com/jdf2e/nutui into next

richard1015 3 years ago
parent
commit
e0fb583e92

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

@@ -269,6 +269,7 @@ export default createDemo({
     };
 
     const onChange = (cal: CalBack, tag: string) => {
+      console.log('地址选择', cal);
       const name = (address as any)[cal.next];
       if (name.length < 1) {
         (showPopup as any)[tag] = false;

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

@@ -201,6 +201,13 @@ export default create({
     };
 
     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', {
         selectedValue: defaultValues.value,
         selectedOptions: selectedOptions.value

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

@@ -217,6 +217,16 @@ export default create({
     };
 
     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', {
         selectedValue: defaultValues.value,
         selectedOptions: selectedOptions.value