cnhis-design-vue 2.1.75 → 2.1.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.75",
+  "version": "2.1.77",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/fabric-chart/src/components/TimeScaleValue.vue

@@ -37,7 +37,6 @@ export default {
     return {
       cFabricChart: null,
       scrollEvent: null,
-      top: 0,
       popupStyle: {
         width: '1000px',
         height: '80px',
@@ -48,6 +47,18 @@ export default {
       isShow: false
     };
   },
+  computed: {
+    popupTop() {
+      return this.$attrs.templateData.top?.xScalevalue?.popupTop ?? 0;
+    }
+  },
+  watch: {
+    popupTop: {
+      handler(value) {
+        this.popupStyle.top = `${value}px`;
+      }
+    }
+  },
   mounted() {
     this._timer = setInterval(() => {
       if (document.readyState === 'complete') {
@@ -63,10 +74,10 @@ export default {
       const { canvasWidth, spaceHeight, xCellWidth } = this.propItems;
       this.cFabricChart = this.canvas.wrapperEl.parentNode.parentNode;
       // this.bodyHeight = document.body.getBoundingClientRect().height;
-      this.top = this.cFabricChart?.getBoundingClientRect()?.top || 0;
+
       this.popupStyle = {
         left: `${this.cFabricChart?.getBoundingClientRect()?.left || 0}px`,
-        top: `${xScalevalue?.popupTop || 0}px`,
+        top: `${this.popupTop}px`,
         width: `${canvasWidth}px`,
         height: `${spaceHeight}px`,
         fontSize: `${xScalevalue.style?.fontSize || 12}px`
@@ -74,22 +85,22 @@ export default {
       // const spaceGridNumber = xScalevalue.spaceGridNumber || 3;
       // this.marginLeft = `${xCellWidth * spaceGridNumber}px`;
       // 节流的间隔时间不宜太大，因为实际top值不准，会造成判断条件不准确
-      this.scrollEvent = vexutils.throttle(this.scroll, 100);
-      window.addEventListener('scroll', this.scrollEvent, true);
+      if (!this.scrollEvent) {
+        this.scrollEvent = vexutils.debounce(this.scroll, 80);
+        window.addEventListener('scroll', this.scrollEvent, true);
+      }
     },
     scroll() {
       if (this.cFabricChart) {
         const { originYTime } = this.propItems;
         const top = this.cFabricChart.getBoundingClientRect().top;
-        const { xScalevalue } = this.$attrs.templateData.top || {};
-        const popupTop = xScalevalue?.popupTop || 0;
-        this.isShow = top + originYTime < popupTop ? true : false;
+        this.isShow = top + originYTime < this.popupTop ? true : false;
       }
     }
   },
   beforeDestroy() {
     this._timer && clearInterval(this._timer);
-    window.removeEventListener('scroll', this.scroll, true);
+    window.removeEventListener('scroll', this.scrollEvent, true);
   }
 };
 </script>

package/packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue

@@ -165,7 +165,8 @@ export default {
     drawTopTotal(topTotalList) {
       const { endX, canvasWidth, yCellHeightTop, topTotal, endYTop, spaceHeight, originYTop } = this.propItems;
       const textList = [];
-      const left = endX + (canvasWidth - endX) / 2;
+      const totalWidth = canvasWidth - endX;
+      const left = endX + totalWidth / 2;
       topTotalList.forEach((v, i) => {
         const top = i * yCellHeightTop + yCellHeightTop / 2 + originYTop;
         const text = v
@@ -178,10 +179,16 @@ export default {
               originY: 'center'
             })
           : null;
-        text && textList.push(text);
+        if (!text) return;
+        if (text.width > totalWidth)
+          text.set({
+            originX: 'right',
+            left: canvasWidth - 1
+          });
+        textList.push(text);
       });
       const title = this.drawTextGroup(
-        { width: canvasWidth - endX, height: spaceHeight, strokeWidth: 1 },
+        { width: totalWidth, height: spaceHeight, strokeWidth: 1 },
         { text: String(topTotal.title), ...(topTotal.style || defaultVaule.textStyle) },
         { left: endX, top: originYTop > 0 ? 0 : endYTop }
       );

package/packages/grid/src/grid.js

@@ -8,7 +8,7 @@ import 'xe-utils';
 import VXETable from 'vxe-table';
 import VXETablePluginAntd from 'vxe-table-plugin-antd'
 import Grid from 'vxe-table/lib/grid';
-import 'vxe-table/lib/style.css';
+// import 'vxe-table/lib/style.css';
 import 'vxe-table-plugin-antd/dist/style.css'
 
 VXETable.use(VXETablePluginAntd);

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -46,7 +46,7 @@
           </div>
           <slot name="classification"></slot>
           <li v-if="showQuickSearch" ref="quickSearchLi">
-            <a-button class="search-default" type="default" @click="foldQuickSearch">
+            <a-button class="search-default" type="default" @click="foldQuickSearch" :class="{'search-default-count': qqConObjCount}">
               <svg-icon icon-class="anniushaixuan" style="color: inherit; margin-right: 6px"></svg-icon>
               筛选 {{ qqConObjCount ? `(${qqConObjCount})` : '' }}
             </a-button>
@@ -2355,6 +2355,13 @@ export default create({
           border-color: #d5d5d5;
           color: #212121;
         }
+        &.search-default-count {
+          border-color: #2d7aff;
+          color: #2d7aff;
+          .ant-btn {
+            color: #2d7aff;
+          }
+        }
       }
       /deep/ .out-filter-input {
         width: 200px;