cnhis-design-vue 2.1.19 → 2.1.22

package/package.json

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

package/packages/big-table/src/BigTable.vue

@@ -593,6 +593,11 @@ export default create({
     setCurrentRow(row) {
       this.$refs.xGrid.setCurrentRow(row);
     },
+    setDefCheckboxRow(row) {
+      const vxeTable = this.$refs.xGrid;
+      let { tableData } = vxeTable.getTableData();
+      this.$refs.xGrid?.setCheckboxRow([tableData?.[0] || row], true);
+    },
     // 加载表格头部
     loadColumn(config) {
       this.isLoadColumn = false;
@@ -1288,7 +1293,7 @@ export default create({
       this.fieldKeyMap = {};
       const currentColumns = fieldList.map((item, index) => {
         this.fieldKeyMap[item.columnName] = item;
-        let filterField = item?.fieldSetting?.mapping?.type === 'manual' && item.isMerge != 1;
+        let filterField = item?.fieldSetting?.mapping?.type === 'manual' && item.isMerge != 1 && item.notParticipatingSearch != 1;
         // 是否排序 1 不可排序
         let notParticipatingSort = item?.fieldSetting?.notParticipatingSort || '';
         // 有子列表fixed会遮盖 所以主表不设置fixed

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

@@ -14,6 +14,32 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 
+/**
+ * @description: 递归遍历节点，设置颜色属性
+ * @param {fabric.Object[]} pointArr
+ * @param {string}} color
+ * @return {*}
+ */
+
+function resetPointColor(pointArr, color) {
+  pointArr.forEach(point => {
+    const { fill, stroke } = point;
+    if (fill && !fill.includes('#fff') && fill !== 'transparent') {
+      point.set({ fill: color });
+    }
+    if (stroke && !stroke.includes('#fff') && stroke !== 'transparent') {
+      point.set({ stroke: color });
+    }
+    if (point._objects?.length) {
+      resetPointColor(point._objects, color);
+    }
+  });
+}
+const setPointLineColor = (point, color, conditionHasLine2) => {
+  point.line1?.set({ stroke: color });
+  conditionHasLine2 && point.line2?.set({ stroke: color });
+};
+
 const isEffectiveNode = node => {
   return node?.time && (node?.value || node?.value === 0);
 };
@@ -470,6 +496,7 @@ export default {
             polylineTypeId,
             polylineIndex,
             pointerList,
+            color: lineAttr.stroke,
             pointList: res
           });
         }
@@ -572,45 +599,37 @@ export default {
       if (this.addPointList.length === 0) {
         this.$emit('pointChange', data);
       } else {
-        const last = this.addPointList.at(-1);
+        const lastPoint = this.addPointList.at(-1);
+        const position = this.polyline[point.polylineTypeId].position;
         // 如果是重合/连线节点
         if (point.get('scaleX') !== point.scale) {
-          const value = {
-            ...last,
+          const addOjb = {
+            ...lastPoint,
             value: {
-              time: this.getXValue(point.nextPoint.left),
-              value: this.getYValue(this.polyline[point.polylineTypeId].position, point.nextPoint.top)
+              time: this.getXValue(this._concatPoint?.left),
+              value: this.getYValue(position, this._concatPoint?.top)
             }
           };
-          if (point.line2) {
-            this.addPointList.splice(-1, 1, {
-              ...last,
-              value: {
-                time: this.getXValue(this._currentPoint.left),
-                value: this.getYValue(this.polyline[point.polylineTypeId].position, this._currentPoint.top)
-              }
-            });
-            this.addPointList.forEach(v => (v.isConcat = true));
+          if (lastPoint.value.time == addOjb.value.time) {
+            this.addPointList.splice(-1, 1, addOjb);
           } else {
-            if (last.left === point.left) {
-              this.addPointList.splice(-1, 1, value);
-            } else {
-              this.addPointList.push(value);
-              const [lastPoint, prePoint, ...list] = JSON.parse(JSON.stringify(this.addPointList)).reverse();
-              if (prePoint.value.time == lastPoint.value.time) {
-                this.addPointList.splice(-2, 1);
-              }
-            }
+            this.addPointList.push(addOjb);
           }
-        } else if (point.line2) {
+          this.addPointList.forEach(v => Object.assign(v, { isConcat: true, concatIndex: this._concatIndex }));
+        } else if (point.line2 || (point.nextPoint && lastPoint.left >= point.nextPoint.left)) {
+          // 1、存在右连线 2、无右侧连线，并且存在下一个节点的情况
           this.addPointList = [];
-          this.repaintPolyline(this.polyline[point.polylineTypeId].position, point.polylineIndex);
+          this.repaintPolyline(position, point.polylineIndex);
           return;
         }
         !point.line2 && this.addPointList.splice(0, 1);
         !point.id.includes('isTitle') && this.removePolyline(point.id);
-        this.$emit('pointOperation', 'increasePointBatch', this.addPointList);
-        this.addPointList = [];
+        if (this.addPointList.length > 0) {
+          this.$emit('pointOperation', 'increasePointBatch', this.addPointList);
+          this.addPointList = [];
+        } else {
+          this.repaintPolyline(position, point.polylineIndex);
+        }
       }
     },
     // 设置批量新增数据
@@ -622,7 +641,7 @@ export default {
       this.addPointList.push(data);
     },
     /**
-     * @description: 滑动批量新增节点
+     * @description: 拖动批量新增节点
      * @param {*} point 拖动的最后一个节点
      * @param {*} originLeft 拖动的源节点的left值
      * @param {*} originTop 拖动的源节点的top值
@@ -685,13 +704,7 @@ export default {
         // 复制点和线
         if (conditionNoLine2 || conditionHasLine2) {
           // point.line1 && this.removePolyline(point.line1.id);
-          point.line1?.set({
-            stroke: 'transparent'
-          });
-          conditionHasLine2 &&
-            point.line2?.set({
-              stroke: 'transparent'
-            });
+          setPointLineColor(point, 'transparent', conditionHasLine2);
           // if (i === 1) {
           this.addPointList.length == 0 && (await this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]));
           // }
@@ -731,14 +744,38 @@ export default {
       }
 
       // 检查是否显示重合连线放大节点的标识
-      if (conditionHasLine2) {
-        const { polylineTypeId, polylineIndex } = point;
-        const polylineObj = this.polylinePointList.find(v => v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex);
-        const pointObjI = polylineObj?.pointerList.findIndex(v => v + n > left);
-        pointObjI > -1 && concatPoint(polylineObj?.pointList[pointObjI]);
-        this._currentPoint = polylineObj?.pointList[pointObjI];
-      } else {
-        point.nextPoint && concatPoint(point.nextPoint);
+      const { polylineTypeId, polylineIndex } = point;
+      const polylineObj = this.polylinePointList.find(v => v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex);
+      polylineObj?.pointList.forEach(v => v.bringToFront());
+      if (point.nextPoint) {
+        this._concatIndex = polylineObj?.pointerList.findIndex(v => v + n > left && v > originLeft);
+        if (!~this._concatIndex) {
+          point.set({
+            scaleX: point.scale,
+            scaleY: point.scale
+          });
+        } else {
+          concatPoint(polylineObj?.pointList[this._concatIndex]);
+        }
+        this._concatPoint = polylineObj?.pointList?.[this._concatIndex] || null;
+
+        // 被覆盖节点置灰配置
+        polylineObj?.pointerList.forEach((v, i) => {
+          const obj = polylineObj?.pointList[i];
+          if (v > originLeft && v < left) {
+            // 此处需要递归遍历group节点的所有子节点，然后更改其颜色
+            resetPointColor([obj], '#999');
+            obj.line2?.set({ stroke: '#999' });
+          } else {
+            resetPointColor([obj], polylineObj.color);
+            obj.line2?.set({ stroke: polylineObj.color });
+          }
+        });
+        if ((point.line1 || point.line2) && left < originLeft + spaceWidth) {
+          setPointLineColor(point, polylineObj.color, true);
+        } else {
+          setPointLineColor(point, 'transparent', true);
+        }
       }
 
       // 如果往回拖动则删除经过的已存在的节点
@@ -747,13 +784,7 @@ export default {
         this.addPointList = this.addPointList.filter(v => v.left < left);
         const endLength = this.addPointList.length;
         if (endLength === 0) {
-          point.line1?.set({
-            stroke: point.stroke
-          });
-          conditionHasLine2 &&
-            point.line2?.set({
-              stroke: point.stroke
-            });
+          setPointLineColor(point, polylineObj?.color, conditionHasLine2);
           this.removePolyline('increasePointBatch', originLeft);
         }
         if (endLength > 0) {

package/packages/multi-chat/chat/chatFooter.vue

@@ -121,11 +121,7 @@
       destroyOnClose
       :okText="i18nText('1.2.1.11.6')"
       :footer="null"
-      @cancel="
-        () => {
-          this.modalShow = false;
-        }
-      "
+      @cancel="handleClose"
       @ok="handleOk"
     >
       <iframe id="toolbarIframe" v-if="modalData.targetType === 'LINK_ADDRESS'" width="100%" height="100%" frameborder="0" :src="modalData.address" allow="camera;midi"></iframe>

package/packages/multi-chat/chat/chatMain.vue

@@ -199,11 +199,7 @@
         destroyOnClose
         :okText="i18nText('1.2.1.11.6')"
         :footer="null"
-        @cancel="
-          () => {
-            this.modalShow = false;
-          }
-        "
+        @cancel="handleClose"
       >
         <iframe id="chat-footer-modal" v-if="modalData.targetType === 'LINK_ADDRESS'" width="100%" height="100%" frameborder="0" :src="modalData.address" allow="camera;midi"></iframe>
       </a-modal>
@@ -648,10 +644,38 @@ export default {
           this.modalData = Object.assign({}, data, {
             address
           });
+          this.$nextTick().then(() => {
+            window.addEventListener('message', this.iframeEvent);
+          });
           return;
         }
       }
     },
+    iframeEvent(event) {
+      const method = event?.data?.method;
+      this[method]?.(event);
+    },
+    // 发送
+    handleParentMessageSend({ data, source, origin }) {
+      let params = {
+        assemblyId: this.assemblyId,
+        sessionId: this.sessionId,
+        orgId: this.orgId
+      };
+      params = Object.assign(params, data.data);
+      return fetch.post('/chat/access/sendToolBarData', qs.stringify(params)).then(({ data }) => {
+        if (data.result === 'SUCCESS') {
+          source.postMessage({ status: 0, resultMsg: data.resultMsg }, origin);
+        } else {
+          source.postMessage({ status: 1, resultMsg: data.resultMsg }, origin);
+        }
+      });
+    },
+    // 关闭
+    handleClose() {
+      this.modalShow = false;
+      window.removeEventListener('message', this.iframeEvent);
+    },
     handleTemplateDetail(item) {
       let content = this.getContent(item) || {};
       let setting = content.customerSetting || {};

package/packages/table-filter/src/const/dataOptions.js

@@ -18,26 +18,26 @@ export const dataOptions = {
   ],
   dateTeam2: [
     { con: 'TODAY', title: '1.1.4.37', name: '今天' },
-    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
     { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
-    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
     { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
-    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
     { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
-    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
     { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
-    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
   ],
   dateTeam3: [
     { con: 'TODAY', title: '1.1.4.37', name: '今天' },
-    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
     { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
-    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
     { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
-    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
     { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
-    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
     { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
-    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
   ]
 };

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

@@ -245,6 +245,7 @@
                       :placeholder="getI18nText('1.1.4.53', '开始时间')"
                       style="width: 120px"
                       allowClear
+                      :disabledDate="current => disabledDatePicker(current, item)"
                     />
                      
                     <a-date-picker
@@ -256,6 +257,7 @@
                       v-model="item.DATE.end_val"
                       style="width: 120px"
                       allowClear
+                      :disabledDate="current => disabledDatePicker(current, item)"
                     />
                   </div>
                 </a-radio-group>
@@ -1849,6 +1851,30 @@ export default create({
         return this.$t ? this.$t.apply(this, i) : d;
       }
       return this.$t ? this.$t(i) : d;
+    },
+
+    /**
+     * 限制日期填写
+     */
+    disabledDatePicker(current,item){
+      /**
+       * 2 过去时间
+       * 3 未来时间
+       */
+      let type = String(item?.advanceOptionSetting);
+      if(!['2','3'].includes(type)) return false;
+      if(type === '2'){
+         return current >= this.$moment().endOf('day');
+      } else if(type==='3'){
+         return current && current < this.$moment().startOf('day');
+      }
+      return false
+    },
+    /**
+     * 限制时间
+     */
+    disabledTimePicker(current,item){
+
     }
   },
   directives: { resize }