cnhis-design-vue 2.1.129 → 2.1.133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.129",
+  "version": "2.1.133",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -114,4 +114,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/big-table/src/assets/style/table-base.less

@@ -207,7 +207,7 @@ body {
     }
 
     .scan-multi-delete {
-      color: #F06F64;
+      color: #f06f64;
     }
 
     .vxe-table--header {
@@ -233,13 +233,21 @@ body {
       &::-webkit-scrollbar {
         width: 10px;
         height: 10px;
-        background-color: #f2f2f2;
+        background-color: transparent;
       }
-      // &:hover {
-      &::-webkit-scrollbar-thumb:hover {
+
+      &::-webkit-scrollbar-thumb {
         background-color: #b2b2b2;
+        background-clip: padding-box;
+        border-color: transparent;
+        border-style: dashed;
+        border-width: 3px;
+        border-radius: 5px;
+
+        &:hover {
+          background: #b2b2b2;
+        }
       }
-      // }
     }
     .vxe-footer--row .vxe-footer--column {
       > .vxe-cell .vxe-cell--item {
@@ -329,10 +337,10 @@ body {
   }
 
   .no-transition_a-switch {
-    .ant-switch{
-       transition:none;
-      &::after{
-        transition:none;
+    .ant-switch {
+      transition: none;
+      &::after {
+        transition: none;
       }
     }
   }
@@ -409,7 +417,6 @@ body {
   }
 }
 
-
 /deep/.vxe-table--body .tooltip-checkbox-item {
   .ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
     border-radius: 2px;

package/packages/big-table/src/utils/headerFilter.js

@@ -443,7 +443,8 @@ export default {
               this.$set(set, 'value', JSON.stringify(set.filter));
             });
             this.$set(el, 'CONVERT', []);
-            if (!this.isApiTable) {
+            let isHandleFilterSettingMap = !this.isApiTable && (!el.filterSettingMap || !Object.keys(el.filterSettingMap).length);
+            if (isHandleFilterSettingMap) {
               let filterSettingMap = this.handleFieldListFilter(el);
               this.$set(el, 'filterSettingMap', filterSettingMap);
             }

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

@@ -506,54 +506,19 @@ export default {
 
       const _endY = this.extracorporealCirculationHeight ? endY + this.extracorporealCirculationHeight : endY;
       const baseY = _endY + 2; // 目前固定10像素的下边距
-      const baseYLimit = endY - 2; // 目前固定10像素的上边距
+      const baseYTop = endY - 2; // 目前固定10像素的上边距
       const lineHeightText = (obj.style?.fontSize || 12) + 2;
       const lineHeightImg = (obj.iconStyle?.height || 12) + 2;
       const lineHeightSeq = (obj.seqStyle?.circle?.radius || 9) * 2 + 2;
-      let prevLeft = originX;
-      let prevCondition;
+      let prevLeft = 0;
       const pointerObj = {};
 
-      const setTop = (item, lineHeight, i, condition) => {
-        let _lineHeight = lineHeight;
-        if (item.desc && obj.showDesc) {
-          _lineHeight = lineHeight + lineHeightText;
-        }
-        if (!~condition.limitIndex) {
-          condition.y += i === 0 ? _lineHeight / 2 : _lineHeight;
-          if (condition.y >= endY + markHeight - _lineHeight / 2) {
-            condition.limitIndex++;
-            if (condition.limitIndex === 0) {
-              condition.y = baseYLimit;
-              condition.y -= _lineHeight / 2;
-            }
-          }
-        } else {
-          condition.y -= _lineHeight;
-        }
-        const y = condition.y;
-        let y1,
-          y2 = y;
-        if (item.desc && obj.showDesc) {
-          y1 = y + _lineHeight / 2 - lineHeight - lineHeightText / 2;
-          y2 = y + _lineHeight / 2 - lineHeight / 2;
-        }
-        return { y1, y2 };
-      };
       this.markData.forEach((item, index) => {
-        const condition = {
-          limitIndex: -1, // 标志点是否往上排列的标志，大于-1则表示需要往上排列
-          y: baseY
-        };
         const x = this.computedX(item[0]);
-        // 相隔小于或等于一个小格的宽度就继承上个时间标记的高度继续计算定位，即错位显示
-        const prevHasBelowShow = pointerObj[`x_${prevLeft}`]?.some(o => o > endY);
-        if (x - prevLeft <= xCellWidth && prevHasBelowShow) {
-          Object.assign(condition, prevCondition);
-        }
         if (this.isLimit(item[0])) {
-          const pointList = [];
           pointerObj[`x_${x}`] = [];
+          const pointList = [];
+          let startTop = baseY;
           item[1].forEach(async (v, i) => {
             const common = {
               data: v.data || {},
@@ -564,29 +529,82 @@ export default {
               objectCaching: false
             };
 
-            let conditionRes;
+            let lineHeight;
             if (this.isObject(v) && !v.value) {
-              conditionRes = setTop(v, lineHeightImg, i, condition);
-              pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
+              lineHeight = lineHeightImg;
             } else if (v.value) {
               if (v.seq) {
-                conditionRes = setTop(v, lineHeightSeq, i, condition);
-                pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
+                lineHeight = lineHeightSeq;
               } else {
-                conditionRes = setTop(v, lineHeightText, i, condition);
-                pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
+                lineHeight = lineHeightText;
               }
             }
-            pointerObj[`x_${x}`].push(conditionRes.y2);
+
+            if (lineHeight) {
+              const isShowDesc = v.desc && obj.showDesc;
+              // 错位显示处理
+              if (prevLeft && x - prevLeft <= xCellWidth) {
+                pointerObj[`x_${prevLeft}`].forEach(([y1, y2]) => {
+                  if (startTop + lineHeight + (isShowDesc ? lineHeightText : 0) >= endY + markHeight) {
+                    startTop = baseYTop;
+                  }
+                  if (y1 < y2 && startTop >= y1 && startTop < y2) {
+                    startTop = y2;
+                  }
+                  if (y1 > y2 && startTop > y2 && startTop <= y1) {
+                    startTop = y2;
+                  }
+                });
+              }
+              const { topObj, startTop: _startTop, oldStartTop } = computedTop(isShowDesc, startTop, lineHeight);
+              startTop = _startTop;
+              pointerObj[`x_${x}`].push([oldStartTop, startTop]);
+              pointList.push(this.drawMarkPoint(v, common, obj, topObj, x));
+            }
           });
           prevLeft = x;
-          prevCondition = condition;
           Promise.all(pointList).then(res => {
             this.markObjs.push(...res);
             this.canvas.add(...res);
           });
         }
       });
+
+      function computedTop(isShowDesc, startTop, lineHeight) {
+        const topObj = {};
+        let oldStartTop;
+        if (startTop > endY) {
+          let _top = startTop + lineHeight;
+          topObj.y2 = startTop + lineHeight / 2;
+          if (isShowDesc) {
+            _top += lineHeightText;
+            topObj.y1 = startTop + lineHeightText / 2;
+            topObj.y2 = startTop + lineHeightText + lineHeight / 2;
+          }
+          if (_top >= endY + markHeight) {
+            setTopY(baseYTop);
+          } else {
+            oldStartTop = startTop;
+            startTop = _top;
+          }
+        } else {
+          setTopY(startTop);
+        }
+
+        function setTopY(base) {
+          oldStartTop = base;
+          topObj.y2 = base - lineHeight / 2;
+          const _y = base - lineHeight;
+          if (isShowDesc) {
+            topObj.y1 = _y - lineHeightText / 2;
+            startTop = _y - lineHeightText;
+          } else {
+            startTop = _y;
+          }
+        }
+
+        return { topObj, startTop, oldStartTop };
+      }
     },
     async drawMarkPoint(v, option, obj, { y1, y2 }, x) {
       const positionObj = {

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

@@ -236,6 +236,7 @@
                 <!-- v-if="item.type == 'ADD'" -->
                 <li ref="rowTileBtnItem" class="rowTileBtn-item" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
                   <template v-if="isFrontendComponent(item) && !item.isHide">
+                    <!-- 读卡 -->
                     <slot name="frontendComponent" v-bind="$attrs" :curBtn="item"></slot>
                   </template>
                   <template v-else-if="item.type == 'ADD' || item.type == 'BATCH'">
@@ -318,7 +319,8 @@
                   <a-menu slot="overlay">
                     <template v-for="(b, j) in rowFoldBtnList">
                       <template v-if="isFrontendComponent(b)">
-                        <a-sub-menu v-if="visibleBtn(b)" title="读卡" :key="b.sid">
+                        <a-sub-menu v-if="visibleBtn(b)" :title="b.alias || b.name" :key="b.sid">
+                          <!-- 读卡 -->
                           <slot name="frontendComponent" v-bind="$attrs" comType="submenu" :curBtn="b"></slot>
                         </a-sub-menu>
                       </template>
@@ -349,7 +351,8 @@
                         <template slot="title"></template>
                         <template v-for="(b, j) in value.list">
                           <template v-if="isFrontendComponent(b)">
-                            <a-sub-menu v-if="visibleBtn(b)" title="读卡" :key="b.sid">
+                            <a-sub-menu v-if="visibleBtn(b)" :title="b.alias || b.name" :key="b.sid">
+                              <!-- 读卡 -->
                               <slot name="frontendComponent" v-bind="$attrs" comType="submenu" :curBtn="b"></slot>
                             </a-sub-menu>
                           </template>
@@ -2037,7 +2040,7 @@ export default create({
 
         if (result.method !== 'sync') return;
         // 同步刷新列表
-        this.editTableWrapper?.$refs?.editTable?.getTableList('', false, true, true);
+        this.editTableWrapper?.$refs?.editTable?.getTableList({setNum: true, isResetCondiTionDigital: true});
       } catch (error) {
         console.log('error', error);
       }

package/packages/table-filter/src/mixins/mixins.js

@@ -440,7 +440,7 @@ export const outQuickSearchDefCommon = {
         if (promises.length) {
           await Promise.allSettled(promises);
         }
-        let type = config?.type === 'reset' ? '' : 'outSearchInit';
+        let type = config?.type === 'reset' ? 'reset' : 'outSearchInit';
         this.outFilterChange({ type });
       } catch (err) {
         console.log(err);
@@ -732,6 +732,14 @@ export const outQuickSearchFn = {
               temp.value = useValue;
             }
           }
+          // 多选模式
+          if (String(advanceOptionSetting) === '1') {
+            // 多选模式非数组的值，转换为数组
+            if (!Array.isArray(useValue)) {
+              useValue = [useValue];
+              // temp.value = useValue;
+            }
+          }
           let hasArr = Array.isArray(useValue) && useValue.length > 0;
           if (item.comType == 'SelectMuiWordBook' && hasArr) {
             temp.value = useValue.join('|#|');