cnhis-design-vue 2.1.66 → 2.1.68

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

@@ -127,12 +127,11 @@ export default {
       this.canvas.on('mouse:up', event => {
         if (event.button === 3) {
           const { x, y } = event.pointer;
-          const { originX, originY, endX, endY } = this.$propItems();
-          if (!(x < originX || x > endX || y < originY || y > endY)) {
+          if (this.isGridLimit(x, y)) {
             this.activeEvent = event;
-            document.querySelector('.upper-canvas').addEventListener('contextmenu', this.addEventListenerContextmenu, true);
+            !this.isAddEventListenerContextmenu && document.querySelector('.upper-canvas').addEventListener('contextmenu', this.addEventListenerContextmenu, true);
+            this.isAddEventListenerContextmenu = true;
           }
-          // this.willUpdateLine = line;
         }
         // 左键松开鼠标-批量删除
         this.isSelectArea = false;
@@ -464,7 +463,7 @@ export default {
           top: top - 5
         });
       };
-      const isDraw = (isMaxOrMin, maxOrMin) => isMaxOrMin && (!maxOrMin?.flickerable || attr !== 'critical');
+      const isDraw = (isMaxOrMin, maxOrMin) => isMaxOrMin && !maxOrMin?.flickerable;
 
       if (isDraw(isMax, max)) {
         const line = drawLine(max);
@@ -490,7 +489,7 @@ export default {
      */
     drawPolyline(polyline, polylineIndex, polylineType, polylineTypeId) {
       const { originY, endY } = this.propItems;
-      const { pointAttr, lineAttr, list = [], critical = {} } = polyline;
+      const { pointAttr, lineAttr, list = [], critical = {}, diffValue = {} } = polyline;
       this._iconClassName = polyline.type === 'img' && pointAttr.iconClassName ? pointAttr.iconClassName : '';
 
       const pointList = [];
@@ -566,17 +565,24 @@ export default {
         this.canvas.add(...lineList, ...res);
 
         // 缓存需要闪烁的节点
-        const { max, min } = critical;
-        if (max?.flickerable || min?.flickerable) {
-          const maxVal = max?.value;
-          const minVal = min?.value;
-          if (maxVal && max?.flickerable) {
-            this.flickerablePoints.push(...res.filter(point => +point.__value >= +maxVal));
-          }
-          if (minVal && min?.flickerable) {
-            this.flickerablePoints.push(...res.filter(point => +point.__value <= +minVal));
+        setFlickerablePoints.call(this, critical);
+        setFlickerablePoints.call(this, diffValue);
+        function setFlickerablePoints(diffObj) {
+          const { max, min } = diffObj;
+          if (max?.flickerable || min?.flickerable) {
+            const maxVal = max?.value;
+            const minVal = min?.value;
+            if (maxVal && max?.flickerable) {
+              this.flickerablePoints.push(...res.filter(point => +point.__value >= +maxVal).filter(point => !this.flickerablePoints.some(_point => isSamePoint(point, _point))));
+            }
+            if (minVal && min?.flickerable) {
+              this.flickerablePoints.push(...res.filter(point => +point.__value <= +minVal).filter(point => !this.flickerablePoints.some(_point => isSamePoint(point, _point))));
+            }
           }
         }
+        function isSamePoint(point, _point) {
+          return point.polylineTypeId == _point.polylineTypeId && point.polylineIndex === _point.polylineIndex && point.pointIndex === _point.pointIndex;
+        }
       });
 
       const params = { polyline, polylineIndex, polylineType, polylineTypeId };
@@ -1015,14 +1021,15 @@ export default {
       }
     },
     // 打开右键菜单
-    openRightModal(event) {
+    openRightModal() {
+      const { clientX, pageX, clientY, pageY } = this.activeEvent.e;
       this.rightPos = {
-        clientX: event.e.clientX || event.e.pageX,
-        clientY: event.e.clientY || event.e.pageY
+        clientX: clientX ?? pageX,
+        clientY: clientY ?? pageY
       };
       this.isRightVisible = false;
-      const target = event.target;
-      const id = target ? target.id : '';
+      const target = this.activeEvent.target;
+      const id = target?.id || '';
       this.$nextTick(() => {
         if (id && id.includes('_polylinePoint_')) {
           this._currentPoint = target;

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

@@ -117,23 +117,24 @@ export default {
       this.canvas.on('mouse:up', event => {
         if (event.button === 3) {
           const { x, y } = event.pointer;
-          const { originX, originY, endX, endY } = this.$propItems();
-          if (!(x < originX || x > endX || y < originY || y > endY)) {
+          if (this.isGridLimit(x, y)) {
             this.activeEvent = event;
-            document.querySelector('.upper-canvas').addEventListener('contextmenu', this.addEventListenerContextmenu, true);
+            !this.isAddEventListenerContextmenu && document.querySelector('.upper-canvas').addEventListener('contextmenu', this.addEventListenerContextmenu, true);
+            this.isAddEventListenerContextmenu = true;
           }
         }
       });
     },
     // 打开右键菜单
-    openRightModal(event) {
+    openRightModal() {
+      const { clientX, pageX, clientY, pageY } = this.activeEvent.e;
       this.rightPos = {
-        clientX: event.e.clientX || event.e.pageX,
-        clientY: event.e.clientY || event.e.pageY
+        clientX: clientX ?? pageX,
+        clientY: clientY ?? pageY
       };
       this.isRightVisible = false;
-      const target = event.target;
-      const id = target ? target.id : '';
+      const target = this.activeEvent.target;
+      const id = target?.id || '';
       this.$nextTick(() => {
         if (id && id.includes('_other')) {
           this._currentPoint = target || '';

package/packages/fabric-chart/src/mixins/eventCommon.js

@@ -7,7 +7,8 @@ export default {
         y: 0
       },
       dropTimer: null,
-      isRightVisible: false
+      isRightVisible: false,
+      isAddEventListenerContextmenu: false
     };
   },
   watch: {
@@ -79,13 +80,12 @@ export default {
       event.preventDefault();
       const x = event.offsetX;
       const y = event.offsetY;
-      const { originX, originY, endX, endY } = this.$propItems();
-      if (!(x < originX || x > endX || y < originY || y > endY)) {
+      if (this.isGridLimit(x, y)) {
         this._active = {
           left: x,
           top: y
         };
-        this.openRightModal(this.activeEvent);
+        this.openRightModal();
       }
       return false;
     },

package/packages/fabric-chart/src/mixins/fabricCommon.js

@@ -31,18 +31,6 @@ export default {
     }
   },
   methods: {
-    // 根据x轴坐标获取对应的时间点
-    // getXValue(left) {
-    //   const { xScaleList, xScaleCell, originX } = this.propItems;
-    //   const minScale = Math.min(...xScaleList);
-    //   const time = minScale + (left - originX) / xScaleCell;
-    //   let d = new Date(time);
-    //   const month = `00${d.getMonth() + 1}`.slice(-2);
-    //   const day = `00${d.getDate()}`.slice(-2);
-    //   const hours = `00${d.getHours()}`.slice(-2);
-    //   const minute = `00${d.getMinutes()}`.slice(-2);
-    //   return `${d.getFullYear()}-${month}-${day} ${hours}:${minute}`;
-    // },
     getXValue(left) {
       const { xScaleCellList, originX, endX, xScaleList } = this.propItems;
       let time;
@@ -80,16 +68,14 @@ export default {
       !~index && (index = xScaleCellList.length);
       const obj = xScaleCellList[index - 1];
       return obj.x + (time - obj.time) / obj.xScaleTime;
+    },
+    isGridLimit(x, y) {
+      const { originX, originY, endX, endY } = this.propItems;
+      return x >= originX && x <= endX && y >= originY && y <= endY;
+    },
+    isTopTreeAndGridLimit(x, y) {
+      const { endX, endYTop, originYTop } = this.propItems;
+      return x >= 0 && x <= endX && y >= originYTop && y <= endYTop;
     }
-    // // 根据时间戳计算x轴坐标
-    // cumputedX(value) {
-    //   if (!value) {
-    //     return '';
-    //   }
-    //   const { xScaleList, xScaleCell, originX } = this.propItems;
-    //   const time = new Date(value).getTime();
-    //   const minScale = Math.min(...xScaleList);
-    //   return originX + (time - minScale) * xScaleCell;
-    // },
   }
 };

package/packages/scale-view/formitem/r-choice.vue

@@ -17,6 +17,7 @@
         :value="o[choiceUseKey]"
         :disabled="isLock"
         :style="{ color: choiceColor(o) }"
+        :class="{'choice-radio-presuffix':showPreSuffix(o)}"
       >
         <template v-if="showImgWrap(o)">
           <span class="scale-choice-img-wrap" @click.stop.prevent>
@@ -28,11 +29,11 @@
         </template>
         <template>
           <template v-if="isRadioItem && showPreSuffix(o)">
-            <span
+            <template
               v-if="o.prefix"
               class="prefix-span"
               :style="{ color: choiceColor(o) }"
-            >{{ o.prefix }}</span>
+            >{{ o.prefix }}</template>
             <a-input
               v-model="optionsPreSuffixObj[o.key]"
               :disabled="isLock || inputLock"
@@ -40,11 +41,11 @@
               :style="{ color: choiceColor(o) }"
               placeholder="请输入"
             />
-            <span
+            <template
               v-if="o.suffix"
               class="suffix-span"
               :style="{ color: choiceColor(o) }"
-            >{{ o.suffix }}</span>
+            >{{ o.suffix }}</template>
           </template>
           <span v-else :style="{ color: choiceColor(o) }">{{ o.label }}</span>
           <a-input
@@ -76,6 +77,7 @@
           :value="o[choiceUseKey]"
           :disabled="isLock"
           :style="{ color: choiceColor(o) }"
+          :class="{'choice-checkbox-presuffix':showPreSuffix(o)}"
         >
           <template v-if="showImgWrap(o)">
             <span class="scale-choice-img-wrap" @click.stop.prevent>
@@ -87,11 +89,11 @@
           </template>
           <template>
             <template v-if="isCheckboxItem && showPreSuffix(o)">
-              <span
+              <template
                 v-if="o.prefix"
                 class="prefix-span"
                 :style="{ color: choiceColor(o) }"
-              >{{ o.prefix }}</span>
+              >{{ o.prefix }}</template>
               <a-input
                 v-model="optionsPreSuffixObj[o.key]"
                 :disabled="isLock || inputLock"
@@ -99,11 +101,11 @@
                 :style="{ color: choiceColor(o) }"
                 placeholder="请输入"
               />
-              <span
+              <template
                 v-if="o.suffix"
                 class="suffix-span"
                 :style="{ color: choiceColor(o) }"
-              >{{ o.suffix }}</span>
+              >{{ o.suffix }}</template>
             </template>
             <span
               v-else
@@ -630,13 +632,8 @@ export default {
       border-color: transparent !important;
       border-bottom: 1px solid #d9d9d9 !important;
     }
-    .prefix-span {
-      padding-right: 8px;
-    }
-    .suffix-span {
-      padding-left: 8px;
-    }
   }
+  
   /deep/ .ant-select {
     min-width: 160px;
   }
@@ -726,6 +723,24 @@ export default {
     /deep/ .ant-checkbox-inner {
       vertical-align: top;
     }
+
+    /deep/ .choice-radio-presuffix,
+    /deep/ .choice-checkbox-presuffix {
+      width: 100%;
+      box-sizing: border-box;
+      > span:last-child {
+        display: inline-table;
+        width: calc(100% - 20px);
+        max-width: calc(100% - 20px);
+        flex-wrap: wrap;
+      }
+      input {
+        flex: unset;
+        width: unset;
+        max-width: 300px;
+        min-width: 80px;
+      }
+    }
   }
 }
 </style>

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

@@ -390,7 +390,7 @@
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import vexutils from '@/utils/vexutils';
 import { Button, Icon, Dropdown, Select, Upload, DatePicker, Input, Menu } from 'ant-design-vue';
 import resize from 'vue-resize-directive';
@@ -1026,11 +1026,11 @@ export default create({
       if (!this.validConObj(obj, this.searchFieldList, this.searchFieldLimit)) return false;
       let copy = [];
       if (this.outSearchFieldList.length) {
-        copy = _.cloneDeep(this.outSearchFieldList, true);
+        copy = cloneDeep(this.outSearchFieldList, true);
       }
       let copyRelation = [];
       if (this.outRelationQuickSearch.length) {
-        copyRelation = _.cloneDeep(this.outRelationQuickSearch, true);
+        copyRelation = cloneDeep(this.outRelationQuickSearch, true);
       }
       this.$emit('onSave', obj, isOutFilter, copy, copyRelation, config);
       this.modalVisible = false;
@@ -1476,7 +1476,7 @@ export default create({
         if (!(btn.isShow == '1' && btn.type != 'LINK')) return;
         btn.isHide = false;
         btn.isButtonGroup = false;
-        let cloneBtn = _.cloneDeep(btn);
+        let cloneBtn = cloneDeep(btn);
         this.setBtnStatus(cloneBtn);
         // 按钮自适应 即使折叠也平铺显示出来
         if (this.isShowSetting('buttonAdaption')) {
@@ -1758,7 +1758,7 @@ export default create({
         this.handlerInitSearchItem(item.fieldList);
       });
       if (this.lastOutSearchFieldList.length > 0) {
-        this.outSearchFieldList = _.cloneDeep(this.lastOutSearchFieldList);
+        this.outSearchFieldList = cloneDeep(this.lastOutSearchFieldList);
       }
       if (this.lastOutRelationQuickSearch.length) {
         this.outRelationQuickSearch = this.$utils.clone(this.lastOutRelationQuickSearch, true);
@@ -1863,7 +1863,7 @@ export default create({
       return paramsArray;
     },
     setPrintNumberToBtnList(printNumberList = [], btnList = []) {
-      let cloneList = _.cloneDeep(btnList);
+      let cloneList = cloneDeep(btnList);
 
       printNumberList.forEach((item, index) => {
         const i = cloneList.findIndex(v => v.settingObj[0].trigger_id == item.id);

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -728,7 +728,7 @@ import tableSearchCon from "../mixins/tableSearchCon";
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 // antd
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { Button, Icon, Dropdown, Select, Upload, DatePicker, Input, Menu, Radio, Checkbox, Row, Tag, InputNumber, Col, Form, Modal, Tooltip } from 'ant-design-vue';
 import rangeAge from '../components/range-age/index';
 import multiSelect from '../components/multi-select/multi-select';
@@ -917,7 +917,7 @@ export default create({
       deep: true,
       handler(newVal) {
         if (newVal && this.lastQuickSearchData.length > 0) {
-          this.quickSearch = _.cloneDeep(this.lastQuickSearchData);
+          this.quickSearch = cloneDeep(this.lastQuickSearchData);
         }
       }
     }
@@ -939,10 +939,10 @@ export default create({
       this.birthdayTeam = this.dateTeam.filter(
         item => item.con != "THIS_YEAR" && item.con != "NEXT_YEAR" && item.con != "UP_YEAR"
       );
-      let copyList = _.cloneDeep(this.searchFieldList);
+      let copyList = cloneDeep(this.searchFieldList);
       let mySearchFieldList = copyList.filter(i => i.isShowSearch == 1 && i.filterExplicit != 1) || [];
       // let relationTableList = JSON.parse(JSON.stringify(this.relationTableList));
-      let relationTableList = _.cloneDeep(this.relationTableList);
+      let relationTableList = cloneDeep(this.relationTableList);
 
       // 跨表
       let relationQuickSearch = relationTableList.map(item => {