zydx-plus 1.33.409 → 1.33.410

package/package.json

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

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

@@ -19,7 +19,11 @@ export default defineComponent({
     reset: {
       type: Boolean,
       default: false
-    }
+    }, 
+    activeColor: {
+      type: String,
+      default: '#00ff00'
+    },
   },
   data() {
     return {
@@ -83,13 +87,15 @@ 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 btn = h(
             <button
-              class={this.active_state[idx] ? 'z-button active' : 'z-button'}
+              class={this.active_state[idx] ?  'z-button z-active' : 'z-button'}
               data-id={data_id}
               onClick={() => { onClick(); ignore ? () => null : trackClick(idx) }
               }
               disabled={disabled}
+              style={style}
             >
             </button>,
             {
@@ -236,9 +242,12 @@ export default defineComponent({
   border: none;
 }
 
-.z-button.active {
-  color: #00ff00 !important;
-}
+/* 
+ */
+/* .z-button.textActivep {
+  color: rgba(75, 12, 119, 1) !important;
+}  */
+
 
 .z-button:disabled {
   background-color: #ffffff;

package/src/components/tagging/src/tagging.css

@@ -124,6 +124,9 @@
 }
 .list-left{
     flex: 1;
+    white-space: nowrap; /* 确保文本在一行内显示 */
+    overflow: hidden; /* 隐藏超出容器的内容 */
+    text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
 .list-left span{
     font-size: 16px;

package/src/components/tagging/src/tagging.vue

@@ -160,6 +160,7 @@ export default {
                 let text = data[i].offsetHeight
                 if ((pHeight + text) > max) {
                     const {start, end, size} = this.rows(data[i], max - pHeight)
+                    console.log(start, end, size);
                     html += `<p class="text"><span style="font-size: ${size}px">${start.data}</span></p>`
                     this.htmlArr.push(html)
                     pHeight = 0
@@ -215,8 +216,13 @@ export default {
             })
         },
         rows(data,num) {
+            let line = ''
+            if(window.getComputedStyle(data, null).lineHeight === 'normal') {
+                line = 16.8
+            } else {
+                line = parseInt(window.getComputedStyle(data, null).lineHeight)
+            }
             let size = parseInt(window.getComputedStyle(data, null).fontSize)
-            let line = parseInt(window.getComputedStyle(data, null).lineHeight)
             let width = data.offsetWidth
             let height = data.offsetHeight
             let rows = Math.round(num / line)  // 行数

package/src/index.js

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