zydx-plus 1.33.441 → 1.33.443

package/package.json

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

package/src/components/seek/src/word.css

@@ -150,9 +150,9 @@
     word-break: break-all;
     text-justify: distribute;
 }
-.buts-actives{
+/* .buts-actives{
     color: #00ff00 !important;
-}
+} */
 input[name='check'] {
     width: 15px;
     height: 15px;

package/src/components/seek/src/word.vue

@@ -10,7 +10,7 @@
                 v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
                                  <b :style="{right: -item.right + 'px', top: item.top + 'px'}" ref="b">
-                                       <button class="but" :disabled="it.disabled" v-for="(it) in item.customBut" :class="{'buts-actives': it.active&&it.butStart,'buts-disabled': it.disabled}" @click="customButTap(it,item)">{{ it.active? it.nameActive: it.name }}</button>
+                                       <button class="but" :disabled="it.disabled" v-for="(it) in item.customBut" :class="{'buts-actives theme-text': it.active&&it.butStart,'buts-disabled': it.disabled}" @click="customButTap(it,item)">{{ it.active? it.nameActive: it.name }}</button>
                                    </b>
                                </i>
                            </span>
@@ -149,6 +149,7 @@ export default {
     },
     init() {
       const val = JSON.parse(JSON.stringify(this.data))
+      let copy = this.value.length?this.value:[]
       this.value = val.map((item, index) => { // 转换html
         item.choice = true
         item.right = 0
@@ -178,6 +179,14 @@ export default {
         }
         return item
       })
+      if( copy.length && this.value.length) {
+        copy.forEach((item, index) => {
+          if(item.resourceId===this.value[index].resourceId){
+            this.value[index].open = item.open
+            this.value[index].customBut[0].active = item.open
+          }
+        })
+      }
       this.$nextTick(() => {  // 保证所有的数据都渲染完毕
         const w = this.$refs.parer.offsetWidth // 获取父级宽度
         for (let i = 0; i < this.$refs?.subject?.length; i++) {

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

@@ -82,7 +82,7 @@
                   </div>
                 </div>
                 <div v-if="item.type === 'select'" style="display: inline-block;width: 300px;">
-                  <Select :options="item.option" :readonly="item.disabled"
+                  <Select :options="item.option" :readonly="item.disabled" @select="item.select"
                           v-model:value="item.selectValue"></Select>
                 </div>
                 <div class="cal" v-if="item.type === 'calender'">
@@ -95,7 +95,7 @@
                          v-model="item.value" :disabled="item.disabled"/>
                   <Year v-if="tipYear" style="top: 35px;" @confirm="confirmYear($event,item)"></Year>
                 </div>
-                <div v-if="item.type === 'text'" class="text">{{ item.value }}</div>
+                <div v-if="item.type === 'text'" class="text" v-html="item.value"></div>
                 <div v-if="item.type === 'code'" class="ph-code">
                   <input type="text" v-model="item.value" :maxlength="item.maxlength" :placeholder="item.placeholder"/>
                   <button ref="tipID" @click="item.codeTap($refs.tipID[0],inputArr)">{{

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

@@ -1,30 +1,22 @@
 <template>
     <div class="list-tree">
         <div class="list-cont" v-if="list.length > 0">
-            <div :class="{'list-li':true, 'theme-text': active === index}"
+            <div :class="{'list-li':true, 'theme-text': active === index, pos: multiple}"
                  :style="{'border-bottom': (link)? '1px solid #ccc': '0', 'color': (active === index)? activeColor : '#333'}"
-                 @click="listTap(item,index)" v-for="(item,index) in list" :key="index">
-                <div class="list-title">
-                    <!-- <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}">{{
-                        index + 1
-                        }}. {{ (angleBrackets) ? '《' : '' }} {{ item[column[0].label] }} {{
-                        (angleBrackets) ? '》' : ''
-                        }}</span> -->
+                 v-for="(item,index) in listCopy" :key="index">
+                <input v-if="multiple" :checked="item.box" @change="checkboxChange($event,index)" class="box-list" type="checkbox" name="boxList" />
+                <div class="list-title" @click="listTap(item,index)">
                     <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
                     <button v-if="delShow" @click="del(item)" v-html="delText"></button>
                 </div>
                 <div class="list-cont" v-if="open">
                     <div class="list-li-cont">
-                        <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{
-                            item[it.label]
-                            }}</p>
+                        <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{ item[it.label] }}</p>
                     </div>
                 </div>
                 <div class="list-cont" v-else>
                     <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>
+                        <p v-for="(it,ind) in column.slice(1, column.length)" :key="ind">{{ it.name }}：{{ item[it.label] }}</p>
                     </div>
                 </div>
             </div>
@@ -39,6 +31,7 @@ export default {
     data() {
         return {
             active: this.actives,
+            listCopy: []
         }
     },
     props: {
@@ -77,16 +70,42 @@ export default {
         delText: {
             type: String,
             default: '删除'
-        }
+        },
+      multiple: {
+        type: Boolean,
+        default: false
+      }
     },
     watch: {
         actives(val) {
-            console.log(val)
             if (val === -1) return
             this.active = val
-        }
+        },
+      list: {
+        handler(val) {
+          let list = JSON.parse(JSON.stringify(val))
+          this.listCopy = list.map(x => {
+            x.box = false
+            return x
+          })
+        },
+        deep: true,
+        immediate: true
+      }
     },
     methods: {
+      multipleChoice(v) {
+        this.listCopy.map(x => {
+          x.box = v
+          return x
+        })
+        this.$emit('multipleData', v?this.listCopy:[])
+      },
+      checkboxChange(e,v) {
+        this.listCopy[v].box = e.target.checked
+        const data = this.listCopy.filter(x => x.box)
+        this.$emit('multipleData', data)
+      },
         del(data) {
             this.$emit('del', data)
         },
@@ -99,6 +118,16 @@ export default {
 </script>
 
 <style scoped>
+.pos{
+  position: relative;
+  padding-left: 20px;
+}
+.box-list{
+  position: absolute;
+  top: 9px;
+  left: 0;
+  z-index: 1;
+}
 .wu {
     text-align: center;
     font-size: 18px;

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.441',
+    version: '1.33.443',
     install,
     Calendar,
     Message,