zydx-plus 1.34.460 → 1.34.462

package/package.json

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

package/src/components/calendar/src/Calendar.vue

@@ -78,6 +78,7 @@
            </div>
         </div>
         <div class="cle-but-right">
+          <button class="cle-but" @click="cancel">取消</button>
           <button class="cle-but" @click="confirm">确认</button>
         </div>
       </div>
@@ -220,6 +221,9 @@ export default {
         };
     },
     methods: {
+      cancel() {
+         this.$emit('cancel')
+      },
         confirm() {
             let date = {start: this.dayChange}
             if(this.rangeMode) {

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

@@ -3,9 +3,9 @@
         <div class="list-cont" v-if="list.length > 0">
             <div :class="{'list-li':true, 'theme-text': active === index, pos: multiple}"
                  :style="{'border-bottom': (link)? '1px solid #ccc': '0', 'color': (active === index)? activeColor : '#333'}"
-                 v-for="(item,index) in listCopy" :key="index">
+                 v-for="(item,index) in listCopy" :key="index" @click="listTap(item,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)">
+                <div class="list-title">
                     <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>

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

@@ -148,7 +148,7 @@
     height: 21px;
 }
 .buts-actives{
-    color: #00ff00 !important;
+    color: #4B0C77 !important;
 }
 input[name='check'] {
     width: 15px;

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

@@ -98,7 +98,7 @@
             </tr>
             <tr>
               <td>占&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;比</td>
-              <td v-for="(ts,ind) in item.itemList">{{ ts.percentage === null ? 0 : ts.percentage }}%</td>
+              <td v-for="(ts,ind) in item.itemList">{{ ts.percentage === null ? 0 + '%' : ts.percentage }}</td>
             </tr>
           </table>
         </div>

package/src/index.js

@@ -85,7 +85,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.34.460',
+    version: '1.34.462',
     install,
     Calendar,
     Message,