zydx-plus 1.33.414 → 1.33.416

package/package.json

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

package/src/components/biz_header/src/bizHeader.vue

@@ -22,21 +22,21 @@
                         <template v-if="buttonInfo instanceof Object" v-for="(childButtonInfo, childButtonIndex) in buttonInfo">
                             <!-- 在课上渲染的 -->
                             <button class="defaultButton"
-                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
+                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
                                     v-if="item.level === 0 && buttonIndex === 'headLevel' && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
                             />
                             <!-- 单独在最低节点设置的按钮 -->
                             <button :ref="childButtonIndex + item.catalogId" class="defaultButton"
-                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
+                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
                                     v-if="item.level !== 0 && (!item.children || item.children.length === 0) && buttonIndex === 'lowLevel'  && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
                             />
                             <!-- 在非课和非最低节点 -->
                             <button class="defaultButton"
-                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
+                                    :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
                                     v-if="item.level !== 0 && item.children && item.children.length !== 0 && buttonIndex === 'otherLevel'  && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
@@ -44,7 +44,7 @@
                         </template>
                         <template v-else-if="buttonInfo != null && buttonInfo.constructor === String">
                             <button class="defaultButton"
-                                    :class="buttonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
+                                    :class="buttonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active theme-text' : ''"
                                     v-if="buttonIndex !== 'level0btn' && buttonInfo != null"
                                     @click="clickRightBtn(item, buttonIndex, buttonInfo)"
                                     v-html="buttonInfo"
@@ -245,7 +245,7 @@ export default {
     }
 
     .active{
-        color: rgba(0, 255, 0, 1) !important;
+        /* color: rgba(0, 255, 0, 1) !important; */
     }
     .padding0_10 {
         padding: 0px 10px;

package/src/components/buttonGroup/src/buttonGroup.vue

@@ -19,7 +19,7 @@ export default defineComponent({
     reset: {
       type: Boolean,
       default: false
-    }, 
+    },
     activeColor: {
       type: String,
       default: '#00ff00'
@@ -87,10 +87,10 @@ export default defineComponent({
       switch (type) {
         case 'button': {
           let curr_name = this.active_state[idx] ? active_name : name
-          let style = {color:this.active_state[idx] ? this.activeColor:'#000000'}
+          let style = {color:this.active_state[idx] ? this.activeColor:disabled?'#717171': '#000000'}
           let btn = h(
             <button
-              class={this.active_state[idx] ?  'z-button z-active' : 'z-button'}
+              class={this.active_state[idx] ?  'z-button z-active theme-text' : 'z-button'}
               data-id={data_id}
               onClick={() => { onClick(); ignore ? () => null : trackClick(idx) }
               }
@@ -242,11 +242,21 @@ export default defineComponent({
   border: none;
 }
 
-/* 
+<<<<<<< .mine
+.z-button.active {
+  /* color: #00ff00 !important; */
+}
+||||||| .r51551
+.z-button.active {
+  color: #00ff00 !important;
+}
+=======
+/*
  */
 /* .z-button.textActivep {
   color: rgba(75, 12, 119, 1) !important;
 }  */
+>>>>>>> .r52223
 
 
 .z-button:disabled {

package/src/components/tab/src/tab.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tabs cl" :ref="`tabs${id}`" :style="{'text-align': heiStart? 'left': 'center'}">
-    <div class="tabs-li" :class="{'tab-active': actives === index}" @click="listTap(index)"
+    <div class="tabs-li" :class="{'tab-active theme-text': actives === index}" @click="listTap(index)"
          v-for="(item,index) in list" :key="index" v-html="item[column[0]]"></div>
 <!--    <div v-if="addShow" @click="addTap" class="tabs-li tab-add">+</div>-->
   </div>
@@ -130,6 +130,6 @@ export default {
 
 .tab-active {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAeCAYAAACsYQl4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADImlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGQ0MwRjM3Q0FDMDAxMUU4OThCMjhFMkM4MzMyOEQ5MyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGQ0MwRjM3REFDMDAxMUU4OThCMjhFMkM4MzMyOEQ5MyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZDQzBGMzdBQUMwMDExRTg5OEIyOEUyQzgzMzI4RDkzIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZDQzBGMzdCQUMwMDExRTg5OEIyOEUyQzgzMzI4RDkzIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwv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") !important;
-  color: #00ff00 !important;
+  /* color: #00ff00 !important; */
 }
 </style>

package/src/index.js

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