askbot-dragon 1.0.21 → 1.0.23

package/src/components/myPopup.vue

@@ -1,71 +1,71 @@
-<template>
-  <div class="container">
-    <div class="top-container">
-      <div class="close">取消</div>
-      <div class="sure">确定</div>
-    </div>
-    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :offset="1" @load="onload" class="list-container">
-      <van-cell v-for="item in list" :key="item.id" :title="item.name" />
-      <!-- <van-cell  title="123" />
-      <van-cell  title="asdasd" />
-      <van-cell  title="adszx" />
-      <van-cell  title="zxc zc" />
-      <van-cell  title="asdasd" />
-      <van-cell  title="wqeqweqwe" />
-      <van-cell  title="icvbncvbn" /> -->
-    </van-list>
-  </div>
-</template>
-<script>
-export default {
-  props: {
-    finished:{
-      type: Boolean,
-      default: false
-    },
-    list:{
-      type:Array,
-      default:() =>{
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      show: false,
-      loading: false
-    }
-  },
-  methods: {
-    onload() {
-      this.$emit('onload')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.container {
-  width: 100%;
-  height: 100%;
-  .top-container {
-    width: 100%;
-    height: 50px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 20px;
-    box-sizing: border-box;
-    .sure {
-      color: #366aff;
-    }
-    .close {
-      color: #cccccc;
-    }
-  }
-  .list-container {
-    width: 100%;
-    height: calc(100% - 50px);
-  }
-}
+<template>
+  <div class="container">
+    <div class="top-container">
+      <div class="close">取消</div>
+      <div class="sure">确定</div>
+    </div>
+    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :offset="1" @load="onload" class="list-container">
+      <van-cell v-for="item in list" :key="item.id" :title="item.name" />
+      <!-- <van-cell  title="123" />
+      <van-cell  title="asdasd" />
+      <van-cell  title="adszx" />
+      <van-cell  title="zxc zc" />
+      <van-cell  title="asdasd" />
+      <van-cell  title="wqeqweqwe" />
+      <van-cell  title="icvbncvbn" /> -->
+    </van-list>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    finished:{
+      type: Boolean,
+      default: false
+    },
+    list:{
+      type:Array,
+      default:() =>{
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      show: false,
+      loading: false
+    }
+  },
+  methods: {
+    onload() {
+      this.$emit('onload')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  width: 100%;
+  height: 100%;
+  .top-container {
+    width: 100%;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 20px;
+    box-sizing: border-box;
+    .sure {
+      color: #366aff;
+    }
+    .close {
+      color: #cccccc;
+    }
+  }
+  .list-container {
+    width: 100%;
+    height: calc(100% - 50px);
+  }
+}
 </style>

package/src/components/popup.vue

@@ -1,228 +1,228 @@
-<template>
-  <div class="popUp">
-    <div class="topBtn">
-      <span class="cancel" @click="closeBtn">取消</span>
-      <span class="sure" @click="sure">确定</span>
-    </div>
-    <slot name="popup-header" class="popup-header"></slot>
-    <div class="popup-content">
-      <div
-          class="filter-item"
-          v-for="(item,index) in options"
-          :key="index"
-          @click="checked(item,index)"
-      >
-        <div :class="[checkIdList.includes(item[props.value]) && 'setColor', 'label']">{{item[props.label]}}</div>
-      </div>
-    </div>
-    <div class="popup-footer">
-      <slot name="popup-footer"></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      checkOptions: [],
-      checkIdList:[],
-      visable:false
-    }
-  },
-  props: {
-    options: {
-      type: Array,
-      default:function() {
-        return []
-      }
-    },
-    defaultValue: {
-      type: Array,
-      default:function() {
-        return []
-      }
-    },
-    props: {
-      type: Object,
-      default(){
-        return{
-          label: 'label',
-          value: 'value'
-        }
-      }
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    checked(item) {
-      if(this.multiple) {
-        let count = this.checkIdList.findIndex(element => { return element == item[this.props.value] } )
-        if(count !== -1) {
-          this.checkIdList.splice(count,1)
-          this.checkOptions.splice(count,1)
-        } else {
-          this.checkIdList.push(item[this.props.value])
-          this.checkOptions.push(item)
-        }
-      } else {
-        this.checkIdList = []
-        this.checkOptions = []
-        this.checkIdList.push(item[this.props.value])
-        this.checkOptions.push(item)
-      }
-    },
-    sure() {
-      if(this.checkOptions.length == 0 && this.checkIdList == 0){
-        this.$emit('onConfim',false,false)
-        return
-      }
-      let option = JSON.parse(JSON.stringify(this.checkOptions))
-      let list = JSON.parse(JSON.stringify(this.checkIdList))
-      if(this.multiple) {
-        this.$emit('onConfim',option, list)
-      } else {
-        this.$emit('onConfim',option[0], list[0])
-      }
-    },
-    closeBtn(){
-      this.$emit('onclose')
-    }
-  },
-  watch: {
-    defaultValue: {
-      handler(value) {
-        console.log(value,'=====');
-        this.checkOptions = []
-        if(Array.isArray(this.defaultValue)) {
-          if (this.multiple){
-            let val = []
-            this.defaultValue.forEach(item=>{
-              item.forEach(items=>{
-                val.push(items)
-              })
-            })
-            this.checkIdList = [...val]
-          }
-          else {
-            this.checkIdList = [...this.defaultValue]
-          }
-
-          this.checkIdList.forEach(item =>{
-            if (Array.isArray(item)){
-              item.forEach(items=>{
-
-                this.options.forEach(res =>{
-                  console.debug('items',items,res[this.props.value])
-                  if(items == res[this.props.value]) {
-                    this.checkOptions.push(res)
-                  }
-                })
-              })
-            }
-            else {
-              this.options.forEach(res =>{
-                if(item == res[this.props.value]) {
-                  this.checkOptions.push(res)
-                }
-              })
-            }
-
-          })
-        }
-        console.debug('checkOptions',this.checkOptions)
-      },
-      deep: true,
-      immediate: true
-    },
-    visable(value) {
-      if(value) {
-        console.log(this.defaultValue,'=====');
-        this.checkOptions = []
-        if(Array.isArray(this.defaultValue)) {
-          this.checkIdList = [...this.defaultValue]
-          this.checkIdList.forEach(item =>{
-            this.options.forEach(res =>{
-              if(item == res[this.props.value]) {
-                this.checkOptions.push(res)
-              }
-            })
-          })
-        } 
-        // else {
-        //   this.checkIdList = this.defaultValue
-        //   let obj = this.options.find(item =>{ return item[this.props.value] == this.defaultValue[0] })
-        //   obj && this.checkOptions.push(obj)
-        // }
-      } else {
-        this.checkOptions = []
-        this.checkIdList = []
-      }
-    },
-  },
-  mounted() {
-    console.debug('options',this.options)
-
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.popup-content {
-  /*padding-top: 8px;*/
-  height: 240px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  .filter-item {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 48px;
-    cursor: pointer;
-    .setColor {
-      color: #366aff;
-    }
-    .label {
-      display: block;
-      width: 80%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space:nowrap;
-      text-align: center;
-    }
-  }
-}
-.topBtn {
-    width: 100%;
-    height: 40px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    box-sizing: border-box;
-    padding: 0 20px;
-    .cancel {
-      color: #606266;
-      cursor:pointer;
-    }
-    .sure {
-      color: #366aff;
-      cursor: pointer;
-    }
-  }
-.popup-footer {
-  position: absolute;
-  max-height: 50px;
-  bottom: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  color: #366aff;
-  background: #eff2f5;
-  /*border-radius: 28px;*/
-}
+<template>
+  <div class="popUp">
+    <div class="topBtn">
+      <span class="cancel" @click="closeBtn">取消</span>
+      <span class="sure" @click="sure">确定</span>
+    </div>
+    <slot name="popup-header" class="popup-header"></slot>
+    <div class="popup-content">
+      <div
+          class="filter-item"
+          v-for="(item,index) in options"
+          :key="index"
+          @click="checked(item,index)"
+      >
+        <div :class="[checkIdList.includes(item[props.value]) && 'setColor', 'label']">{{item[props.label]}}</div>
+      </div>
+    </div>
+    <div class="popup-footer">
+      <slot name="popup-footer"></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      checkOptions: [],
+      checkIdList:[],
+      visable:false
+    }
+  },
+  props: {
+    options: {
+      type: Array,
+      default:function() {
+        return []
+      }
+    },
+    defaultValue: {
+      type: Array,
+      default:function() {
+        return []
+      }
+    },
+    props: {
+      type: Object,
+      default(){
+        return{
+          label: 'label',
+          value: 'value'
+        }
+      }
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    checked(item) {
+      if(this.multiple) {
+        let count = this.checkIdList.findIndex(element => { return element == item[this.props.value] } )
+        if(count !== -1) {
+          this.checkIdList.splice(count,1)
+          this.checkOptions.splice(count,1)
+        } else {
+          this.checkIdList.push(item[this.props.value])
+          this.checkOptions.push(item)
+        }
+      } else {
+        this.checkIdList = []
+        this.checkOptions = []
+        this.checkIdList.push(item[this.props.value])
+        this.checkOptions.push(item)
+      }
+    },
+    sure() {
+      if(this.checkOptions.length == 0 && this.checkIdList == 0){
+        this.$emit('onConfim',false,false)
+        return
+      }
+      let option = JSON.parse(JSON.stringify(this.checkOptions))
+      let list = JSON.parse(JSON.stringify(this.checkIdList))
+      if(this.multiple) {
+        this.$emit('onConfim',option, list)
+      } else {
+        this.$emit('onConfim',option[0], list[0])
+      }
+    },
+    closeBtn(){
+      this.$emit('onclose')
+    }
+  },
+  watch: {
+    defaultValue: {
+      handler(value) {
+        console.log(value,'=====');
+        this.checkOptions = []
+        if(Array.isArray(this.defaultValue)) {
+          if (this.multiple){
+            let val = []
+            this.defaultValue.forEach(item=>{
+              item.forEach(items=>{
+                val.push(items)
+              })
+            })
+            this.checkIdList = [...val]
+          }
+          else {
+            this.checkIdList = [...this.defaultValue]
+          }
+
+          this.checkIdList.forEach(item =>{
+            if (Array.isArray(item)){
+              item.forEach(items=>{
+
+                this.options.forEach(res =>{
+                  console.debug('items',items,res[this.props.value])
+                  if(items == res[this.props.value]) {
+                    this.checkOptions.push(res)
+                  }
+                })
+              })
+            }
+            else {
+              this.options.forEach(res =>{
+                if(item == res[this.props.value]) {
+                  this.checkOptions.push(res)
+                }
+              })
+            }
+
+          })
+        }
+        console.debug('checkOptions',this.checkOptions)
+      },
+      deep: true,
+      immediate: true
+    },
+    visable(value) {
+      if(value) {
+        console.log(this.defaultValue,'=====');
+        this.checkOptions = []
+        if(Array.isArray(this.defaultValue)) {
+          this.checkIdList = [...this.defaultValue]
+          this.checkIdList.forEach(item =>{
+            this.options.forEach(res =>{
+              if(item == res[this.props.value]) {
+                this.checkOptions.push(res)
+              }
+            })
+          })
+        } 
+        // else {
+        //   this.checkIdList = this.defaultValue
+        //   let obj = this.options.find(item =>{ return item[this.props.value] == this.defaultValue[0] })
+        //   obj && this.checkOptions.push(obj)
+        // }
+      } else {
+        this.checkOptions = []
+        this.checkIdList = []
+      }
+    },
+  },
+  mounted() {
+    console.debug('options',this.options)
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.popup-content {
+  /*padding-top: 8px;*/
+  height: 240px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  .filter-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 48px;
+    cursor: pointer;
+    .setColor {
+      color: #366aff;
+    }
+    .label {
+      display: block;
+      width: 80%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space:nowrap;
+      text-align: center;
+    }
+  }
+}
+.topBtn {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 20px;
+    .cancel {
+      color: #606266;
+      cursor:pointer;
+    }
+    .sure {
+      color: #366aff;
+      cursor: pointer;
+    }
+  }
+.popup-footer {
+  position: absolute;
+  max-height: 50px;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  color: #366aff;
+  background: #eff2f5;
+  /*border-radius: 28px;*/
+}
 </style>