Merge pull request #26 from liub1934/dev

制表符转空格
liub1934 · Mar 14, 2021 · b1d0381 · b1d0381
2 parents 907dccd + d190739
commit b1d0381
Show file tree

Hide file tree

Showing 10 changed files with 306 additions and 309 deletions.
diff --git a/App.vue b/App.vue
@@ -1,17 +1,17 @@
 <script>
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
+  export default {
+    onLaunch: function() {
+      console.log('App Launch')
+    },
+    onShow: function() {
+      console.log('App Show')
+    },
+    onHide: function() {
+      console.log('App Hide')
+    }
+  }
 </script>
 
 <style>
-	/*每个页面公共css */
+/*每个页面公共css */
 </style>
diff --git a/components/lb-picker/index.vue b/components/lb-picker/index.vue
@@ -236,25 +236,25 @@ export default {
       default: '取消'
     },
     cancelColor: {
-			type: String,
-			default: '#999'
-		},
+      type: String,
+      default: '#999'
+    },
     confirmText: {
       type: String,
       default: '确定'
     },
     confirmColor: {
-			type: String,
-			default: '#007aff'
-		},
+      type: String,
+      default: '#007aff'
+    },
     canHide: {
       type: Boolean,
       default: true
     },
     emptyColor: {
-			type: String,
-			default: '#999'
-		},
+      type: String,
+      default: '#999'
+    },
     emptyText: {
       type: String,
       default: '暂无数据'

diff --git a/components/lb-picker/pickers/date-selector-picker.vue b/components/lb-picker/pickers/date-selector-picker.vue
@@ -160,7 +160,6 @@ export default {
       return this.dayjs(selectItem)
     },
     setColumnData (n = 0) {
-      let list = [...this.pickerColumns]
       const formatArr = this.displayFormat.split('-')
       const formatObj = {
         YY: 'year',
@@ -187,9 +186,8 @@ export default {
           }
           let value = this.selectItem[name]
           if (index !== n) {
-            list[index] = obj
+            this.$set(this.pickerColumns, index, obj)
           }
-          // list.push(obj)
           let n = obj.list.findIndex(l => l.value === value)
           if (n < 0) {
             const l = obj.list.length - 1
@@ -213,7 +211,6 @@ export default {
           this.$set(this.selectItem, name, value)
         }
       })
-      this.pickerColumns = list
     },
     isSame (name, type = 'startInfo') {
       let same = true

diff --git a/components/lb-picker/pickers/multi-selector-picker.vue b/components/lb-picker/pickers/multi-selector-picker.vue
@@ -10,11 +10,11 @@
         <!-- #ifdef H5 -->
         <view v-for="(item, i) in column || []"
           :class="[
-				    'lb-picker-column',
-				    item[props.value] === selectValue[index]
-				      ? 'lb-picker-column-active'
-				      : ''
-				  ]"
+            'lb-picker-column',
+            item[props.value] === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
           :data-item="pressEnable ? JSON.stringify(item) : ''"
           @touchstart="touchstart"

diff --git a/components/lb-picker/pickers/selector-picker.vue b/components/lb-picker/pickers/selector-picker.vue
@@ -9,11 +9,11 @@
         <!-- #ifdef H5 -->
         <view v-for="(item, i) in list"
           :class="[
-				    'lb-picker-column',
-				    (item[props.value] || item) === selectValue
-				      ? 'lb-picker-column-active'
-				      : ''
-				  ]"
+            'lb-picker-column',
+            (item[props.value] || item) === selectValue
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
           :data-item="pressEnable ? JSON.stringify(item) : ''"
           @touchstart="touchstart"
@@ -104,5 +104,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../style/picker-item.scss';
+@import "../style/picker-item.scss";
 </style>
diff --git a/components/lb-picker/pickers/unlinked-selector-picker.vue b/components/lb-picker/pickers/unlinked-selector-picker.vue
@@ -10,11 +10,11 @@
         <!-- #ifdef H5 -->
         <view v-for="(item, i) in column || []"
           :class="[
-				    'lb-picker-column',
-				    (item[props.value] || item) === selectValue[index]
-				      ? 'lb-picker-column-active'
-				      : ''
-				  ]"
+            'lb-picker-column',
+            (item[props.value] || item) === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
           :key="i"
           :data-item="pressEnable ? JSON.stringify(item) : ''"
           @touchstart="touchstart"

diff --git a/pages.json b/pages.json
@@ -1,112 +1,112 @@
 {
-	"pages": [
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "lb-picker选择器"
-			}
-		},
-		{
-			"path": "pages/demos/demo1/demo1",
-			"style": {
-				"navigationBarTitleText": "单选"
-			}
-		},
-		{
-			"path": "pages/demos/demo2/demo2",
-			"style": {
-				"navigationBarTitleText": "多级联动"
-			}
-		},
-		{
-			"path": "pages/demos/demo12/demo12",
-			"style": {
-				"navigationBarTitleText": "多级非联动"
-			}
-		},
-		{
-			"path": "pages/demos/demo3/demo3",
-			"style": {
-				"navigationBarTitleText": "省市区选择"
-			}
-		},
-		{
-			"path": "pages/demos/demo16/demo16",
-			"style": {
-				"navigationBarTitleText": "日期选择"
-			}
-		},
-		{
-			"path": "pages/demos/demo13/demo13",
-			"style": {
-				"navigationBarTitleText": "inline默认显示"
-			}
-		},
-		{
-			"path": "pages/demos/demo14/demo14",
-			"style": {
-				"navigationBarTitleText": "formatter自定义显示"
-			}
-		},
-		{
-			"path": "pages/demos/demo15/demo15",
-			"style": {
-				"navigationBarTitleText": "长按Toast提示"
-			}
-		},
-		{
-			"path": "pages/demos/demo4/demo4",
-			"style": {
-				"navigationBarTitleText": "自定义确定取消文字及颜色"
-			}
-		},
-		{
-			"path": "pages/demos/demo5/demo5",
-			"style": {
-				"navigationBarTitleText": "插槽自定义选择器各部分"
-			}
-		},
-		{
-			"path": "pages/demos/demo6/demo6",
-			"style": {
-				"navigationBarTitleText": "可视区自定义滚动个数"
-			}
-		},
-		{
-			"path": "pages/demos/demo7/demo7",
-			"style": {
-				"navigationBarTitleText": "自定义数据结构"
-			}
-		},
-		{
-			"path": "pages/demos/demo9/demo9",
-			"style": {
-				"navigationBarTitleText": "自定义样式颜色"
-			}
-		},
-		{
-			"path": "pages/demos/demo10/demo10",
-			"style": {
-				"navigationBarTitleText": "相关事件"
-			}
-		},
-		{
-			"path": "pages/demos/demo11/demo11",
-			"style": {
-				"navigationBarTitleText": "异步加载整体数据"
-			}
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFF",
-		"backgroundColor": "#FFF"
-	},
-	"easycom": {
-		"autoscan": true,
-		"custom": {
-			"lb-picker": "@/components/lb-picker/index.vue"
-		}
-	}
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "lb-picker选择器"
+      }
+    },
+    {
+      "path": "pages/demos/demo1/demo1",
+      "style": {
+        "navigationBarTitleText": "单选"
+      }
+    },
+    {
+      "path": "pages/demos/demo2/demo2",
+      "style": {
+        "navigationBarTitleText": "多级联动"
+      }
+    },
+    {
+      "path": "pages/demos/demo12/demo12",
+      "style": {
+        "navigationBarTitleText": "多级非联动"
+      }
+    },
+    {
+      "path": "pages/demos/demo3/demo3",
+      "style": {
+        "navigationBarTitleText": "省市区选择"
+      }
+    },
+    {
+      "path": "pages/demos/demo16/demo16",
+      "style": {
+        "navigationBarTitleText": "日期选择"
+      }
+    },
+    {
+      "path": "pages/demos/demo13/demo13",
+      "style": {
+        "navigationBarTitleText": "inline默认显示"
+      }
+    },
+    {
+      "path": "pages/demos/demo14/demo14",
+      "style": {
+        "navigationBarTitleText": "formatter自定义显示"
+      }
+    },
+    {
+      "path": "pages/demos/demo15/demo15",
+      "style": {
+        "navigationBarTitleText": "长按Toast提示"
+      }
+    },
+    {
+      "path": "pages/demos/demo4/demo4",
+      "style": {
+        "navigationBarTitleText": "自定义确定取消文字及颜色"
+      }
+    },
+    {
+      "path": "pages/demos/demo5/demo5",
+      "style": {
+        "navigationBarTitleText": "插槽自定义选择器各部分"
+      }
+    },
+    {
+      "path": "pages/demos/demo6/demo6",
+      "style": {
+        "navigationBarTitleText": "可视区自定义滚动个数"
+      }
+    },
+    {
+      "path": "pages/demos/demo7/demo7",
+      "style": {
+        "navigationBarTitleText": "自定义数据结构"
+      }
+    },
+    {
+      "path": "pages/demos/demo9/demo9",
+      "style": {
+        "navigationBarTitleText": "自定义样式颜色"
+      }
+    },
+    {
+      "path": "pages/demos/demo10/demo10",
+      "style": {
+        "navigationBarTitleText": "相关事件"
+      }
+    },
+    {
+      "path": "pages/demos/demo11/demo11",
+      "style": {
+        "navigationBarTitleText": "异步加载整体数据"
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#FFF",
+    "backgroundColor": "#FFF"
+  },
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "lb-picker": "@/components/lb-picker/index.vue"
+    }
+  }
 }