zydx-plus 1.5.24 → 1.6.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.5.24",
+  "version": "1.6.25",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/tipBox/index.js

@@ -16,7 +16,7 @@ const Confirm = ({ type, url ,title, promptContent, middle, cancelShow, inputArr
             let val = []
             if(type === 'input') {
                 for(let i=0; i< inputArr.length; i++) {
-                    if(inputArr[i].type === 'input') {
+                    if(inputArr[i].type === 'input' || inputArr[i].type === 'calender') {
                         val.push(inputArr[i].value)
                     }else {
                         val.push(inputArr[i].selectValue)

package/src/components/tipBox/src/main.vue

@@ -18,6 +18,10 @@
                 <div style="display: inline-block;">
                   <Select v-if="item.type === 'select'" :options="item.option" v-model:value="item.selectValue"></Select>
                 </div>
+                <div class="cal" v-if="item.type === 'calender'">
+                  <input type="text" :placeholder="item.placeholder" @focus="focus" v-model="item.value" :disabled="item.disabled" />
+                  <Calendar v-if="tip" style="top: 35px;" @confirm="confirm($event,item)"></Calendar>
+                </div>
                 <div v-if="item.type === 'text'" class="text">{{ item.value }}</div>
               </div>
             </div>
@@ -34,9 +38,15 @@
 
 <script>
 import Select from '../../select/src/select.vue'
+import Calendar from '../../calendar/src/Calendar'
 export default {
   name: 'zydx-tip-box',
-  components: {Select},
+  components: {Select,Calendar},
+  data() {
+    return {
+      tip: false
+    }
+  },
   props: {
     type: { // 弹窗的提示标题
       type: String,
@@ -75,6 +85,15 @@ export default {
       type: Function,
       default: () => {}
     }
+  },
+  methods: {
+    focus() {
+      this.tip = true
+    },
+    confirm(e,data) {
+      data.value = e.start
+      this.tip = false
+    },
   }
 }
 </script>

package/src/components/tipBox/src/zydxStyle.css

@@ -100,7 +100,7 @@ font-size: 12px;
   line-height: 30px;
   padding-right: 10px;
 }
-.tip-input>input{
+.tip-input input{
   width: 211px;
   height: 32px;
   box-sizing: border-box;
@@ -126,3 +126,7 @@ font-size: 12px;
   width: 210px;
   text-align: left;
 }
+.cal{
+  display: inline-block;
+  position: relative;
+}

package/src/components/treeList/index.js

@@ -0,0 +1,6 @@
+import main from './src/treeList';
+
+main.install = function(Vue) {
+    Vue.component(main.name, main);
+};
+export default main;

package/src/components/treeList/src/treeList.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="list">
+    <div class="list-cont">
+      <div class="list-li" @click="listTap(item,index)" :class="{'list-active': active === index}" v-for="(item,index) in list" :key="index">
+        <div class="list-title">
+          <span>{{ index + 1 }}. {{ item[column[0].label] }}</span>
+          <button v-if="delShow" @click="del(item)">删除</button>
+        </div>
+        <div class="list-li-cont" v-if="active === index">
+          <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{ item[it.label] }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "zydx-tree-list",
+  data() {
+    return {
+      active: 0,
+    }
+  },
+  props: {
+    list: { // 数据列表
+      type: Array,
+      default: () => []
+    },
+    column: { // 数据列表
+      type: Array,
+      default: () => []
+    },
+    delShow: { //是否显示取消按钮
+      type: Boolean,
+      default: false
+    },
+  },
+  methods: {
+    del() {
+      this.$emit('del',data)
+    },
+    listTap(data,index) {
+      this.active = index
+      this.$emit('confirm',data)
+    },
+  }
+}
+</script>
+
+<style scoped>
+.list-title{
+  display: flex;
+  justify-content: center;
+  line-height: 30px;
+}
+.list-title>span{
+  flex: 1;
+}
+.list-title>button{
+  margin-left: 5px;
+  margin-top: 4px;
+  font-size: 12px;
+  background-color: transparent;
+  border: 1px solid #000;
+  border-radius: 3px;
+  padding: 2px 5px;
+  cursor: pointer;
+  height: 22px;
+  min-width: 60px;
+}
+.list{
+  padding: 0 10px;
+  cursor: pointer;
+}
+.list-li>span{
+  font-size: 16px;
+  line-height: 30px;
+}
+.list-li-cont{
+  font-size: 14px;
+  padding-left: 10px;
+}
+.list-active{
+  color: #e20808;
+}
+</style>

package/src/index.js

@@ -10,6 +10,7 @@ import Year from './components/year/index';
 import Table from './components/data_table/index';
 import buttonGroup from './components/buttonGroup/index';
 import spinner from './components/spinner/index';
+import treeList from './components/treeList/index';
 
 const components = [
     Calendar,
@@ -21,7 +22,8 @@ const components = [
     Select,
     Year,
     Table,
-    buttonGroup
+    buttonGroup,
+    treeList
 ];
 
 function install(app) {
@@ -33,7 +35,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.5.24',
+    version: '1.6.25',
     install,
     Calendar,
     Message,
@@ -46,6 +48,7 @@ export default {
     Select,
     Year,
     Table,
-    buttonGroup
+    buttonGroup,
+    treeList
 };