cnhis-design-vue 3.1.25 → 3.1.26-beta.0

package/es/components/fabric-chart/src/FabricChart.js

@@ -269,7 +269,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       painYCell: painYCell.value,
       event: event.value,
       itemList: itemList.value,
-      getRightInfo: getRightInfo.value
+      getRightInfo: getRightInfo.value,
+      config: props.data.config || {}
     });
     function computedYCell(type) {
       const { yScaleValue } = props.data.left;

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -40,7 +40,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     event,
     vitalSignsOriginY,
     painOriginY,
-    hospitalizationDate
+    hospitalizationDate,
+    config
   } = propItems;
   const pointTipProps = reactive({
     show: false,
@@ -256,100 +257,176 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      var _a;
       const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
-      const {
-        pointAttr = {},
-        lineAttr = {},
-        type: pointType = "circle",
-        upArrowShow = false,
-        limitValueShow = false
-      } = _item;
       const points = getPointer(v, scaleValue);
-      const nextV = item.list[index + 1];
-      const nextPoint = getPointer(nextV, scaleValue);
-      let reduceLine, reducePoint, noRiseText, arrowGroup, riseText, verifiedText;
-      if ((points == null ? void 0 : points.length) && (type === "temperature" || type === "pain")) {
-        if (v.noRise && noRiseStyle.show) {
-          if (typeof v.noRise === "string") {
-            noRiseText = drawText([points[0], points[1] + 5], {
-              value: v.noRise.split("").join("\n"),
-              originY: "top",
-              ...noRiseStyle
-            });
-            otherList.push(noRiseText);
-          } else {
-            const top = points[1] + yCellHeight * 2;
-            arrowGroup = drawArrow([points[0], points[1], top], noRiseStyle);
-            otherList.push(arrowGroup);
-          }
+      const otherObj = {};
+      otherObj.value = drawValue(points, v, _item);
+      drawOther(points, v, _item, otherObj);
+      drawPulseOther(points, v, _item, otherObj);
+      drawPointLine(points, v, index, _item, otherObj);
+    });
+    type === "pulse" && shadowPointCache.push(pointList);
+    Promise.all(pointList).then((res) => {
+      const lineListFilter = lineList.filter((v) => v);
+      let prevPoint = null;
+      res = res.filter((v) => {
+        if (v && prevPoint) {
+          prevPoint.nextPoint = v;
+          v.prevPoint = prevPoint;
         }
-        if (v.rise && riseStyle.show) {
-          riseText = drawText([points[0], points[1] - 5], {
-            value: v.rise.split("").join("\n"),
-            originY: "bottom",
-            ...riseStyle
+        prevPoint = v || prevPoint;
+        v == null ? void 0 : v.bringToFront();
+        return v;
+      });
+      Promise.all(otherList).then((r) => {
+        canvas.value.add(...lineListFilter, ...res, ...r);
+        res.forEach((v) => {
+          v == null ? void 0 : v.bringToFront();
+        });
+      });
+    });
+    function drawValue(points, v, _item) {
+      if (!(points == null ? void 0 : points.length) || !config.showValue)
+        return;
+      const { lineAttr = {} } = _item;
+      const y = points[1] <= vitalSignsOriginY.originY + yCellHeight ? points[1] + yCellHeight : points[1] - yCellHeight;
+      const value = drawText([points[0], y], {
+        value: v.value,
+        originX: "center",
+        originY: "center",
+        fill: lineAttr.stroke || "#000"
+      });
+      otherList.push(value);
+      return {
+        obj: value,
+        top: -yCellHeight
+      };
+    }
+    function drawOther(points, v, _item, otherObj) {
+      var _a;
+      if (!(points == null ? void 0 : points.length) || !["temperature", "pain"].includes(type))
+        return;
+      const { lineAttr = {} } = _item;
+      const { value } = otherObj;
+      let reduceLine, reducePoint, noRiseText, arrowGroup, riseText, verifiedText;
+      if (v.noRise && noRiseStyle.show) {
+        if (typeof v.noRise === "string") {
+          noRiseText = drawText([points[0], points[1] + 5], {
+            value: v.noRise.split("").join("\n"),
+            originY: "top",
+            ...noRiseStyle
           });
-          otherList.push(riseText);
+          otherList.push(noRiseText);
+        } else {
+          const top = points[1] + yCellHeight * 2;
+          arrowGroup = drawArrow([points[0], points[1], top], noRiseStyle);
+          otherList.push(arrowGroup);
         }
-        if (v.verified) {
-          verifiedText = drawText([points[0], points[1] - 5], {
-            value: "v",
-            originX: "center",
-            originY: "bottom",
-            ...verifiedStyle
-          });
-          otherList.push(verifiedText);
+      }
+      if (v.rise && riseStyle.show) {
+        riseText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
+          value: v.rise.split("").join("\n"),
+          originY: "bottom",
+          ...riseStyle
+        });
+        otherList.push(riseText);
+      }
+      if (v.verified) {
+        verifiedText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
+          value: "v",
+          originX: "center",
+          originY: "bottom",
+          ...verifiedStyle
+        });
+        otherList.push(verifiedText);
+      }
+      if (v.physicsReduce || v.drugReduce) {
+        const reduceY = cumputedY(type, scaleValue.list, v.physicsReduce || v.drugReduce);
+        reduceLine = drawLine([...points, points[0], reduceY], {
+          ...lineAttr,
+          ...reduceStyle.line,
+          ...defaultStyle
+        });
+        reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
+          left: points[0],
+          top: reduceY,
+          ...reduceStyle.point,
+          ...defaultStyle
+        });
+        reduceLine && otherList.push(reduceLine);
+        reducePoint && otherList.push(reducePoint);
+      }
+      Object.assign(otherObj, {
+        reduceLine: {
+          obj: reduceLine,
+          type: "line"
+        },
+        noRiseText: {
+          obj: noRiseText,
+          top: 5
+        },
+        arrowGroup: {
+          obj: arrowGroup,
+          top: yCellHeight * 2
+        },
+        riseText: {
+          obj: riseText,
+          top: (value ? -yCellHeight : 0) - 5
+        },
+        verifiedText: {
+          obj: verifiedText,
+          top: (value ? -yCellHeight : 0) - 5
         }
-        if (v.physicsReduce || v.drugReduce) {
-          const reduceY = cumputedY(type, scaleValue.list, v.physicsReduce || v.drugReduce);
-          reduceLine = drawLine([...points, points[0], reduceY], {
-            ...lineAttr,
-            ...reduceStyle.line,
-            ...defaultStyle
-          });
-          reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
-            left: points[0],
-            top: reduceY,
-            ...reduceStyle.point,
-            ...defaultStyle
-          });
-          reduceLine && otherList.push(reduceLine);
-          reducePoint && otherList.push(reducePoint);
+      });
+    }
+    function drawPulseOther(points, v, _item, otherObj) {
+      if (!(points == null ? void 0 : points.length) || !["pulse"].includes(type))
+        return;
+      let upArrow, limitValue;
+      const { upArrowShow = false, limitValueShow = false } = _item;
+      if (upArrowShow && v.value > 180) {
+        let top = points[1] - yCellHeight * 2.5;
+        let yArr = [points[1] - yCellHeight / 2, top];
+        if (top < vitalSignsOriginY.originY) {
+          top = points[1] + yCellHeight * 2.5;
+          yArr = [top, points[1] + yCellHeight / 2];
         }
+        upArrow = drawArrow([points[0], yArr[0], yArr[1]], upArrowStyle, "up");
+        otherList.push(upArrow);
       }
-      if ((points == null ? void 0 : points.length) && type === "pulse") {
-        let upArrow;
-        if (upArrowShow && v.value > 180) {
-          let top = points[1] - yCellHeight * 2.5;
-          let yArr = [points[1] - yCellHeight / 2, top];
-          if (top < vitalSignsOriginY.originY) {
-            top = points[1] + yCellHeight * 2.5;
-            yArr = [top, points[1] + yCellHeight / 2];
-          }
-          upArrow = drawArrow([points[0], yArr[0], yArr[1]], upArrowStyle, "up");
-          otherList.push(upArrow);
+      if (limitValueShow) {
+        const commonOptions = {
+          value: v.value,
+          originX: "center",
+          originY: "center",
+          ...limitValueStyle
+        };
+        if (v.value > Math.max(...scaleValue.list)) {
+          const top = upArrow ? points[1] + yCellHeight / 2 + upArrow.height : points[1] + yCellHeight;
+          limitValue = drawText([points[0], top], commonOptions);
+          otherList.push(limitValue);
         }
-        if (limitValueShow) {
-          const commonOptions = {
-            value: v.value,
-            originX: "center",
-            originY: "center",
-            ...limitValueStyle
-          };
-          if (v.value > Math.max(...scaleValue.list)) {
-            const top = upArrow ? points[1] + yCellHeight / 2 + upArrow.height : points[1] + yCellHeight;
-            const limitValue = drawText([points[0], top], commonOptions);
-            otherList.push(limitValue);
-          }
-          if (v.value < Math.min(...scaleValue.list)) {
-            const limitValue = drawText([points[0], points[1] - yCellHeight], commonOptions);
-            otherList.push(limitValue);
-          }
+        if (v.value < Math.min(...scaleValue.list)) {
+          limitValue = drawText([points[0], points[1] - yCellHeight], commonOptions);
+          otherList.push(limitValue);
         }
       }
+      Object.assign(otherObj, {
+        upArrow: {
+          obj: upArrow
+        },
+        limitValue: {
+          obj: limitValue,
+          top: -yCellHeight
+        }
+      });
+    }
+    function drawPointLine(points, v, index, _item, otherObj) {
       let point;
       let line;
+      const { pointAttr = {}, lineAttr = {}, title = "", key, type: pointType = "circle" } = _item;
+      const nextV = item.list[index + 1];
+      const nextPoint = getPointer(nextV, scaleValue);
       if (points && nextPoint && !v.breakpoint) {
         line = drawLine([...points, ...nextPoint], {
           ...lineAttr
@@ -368,20 +445,16 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const pointAttrNew = {
         origin: {
           data: v,
-          title: _item.title,
-          key: _item.key || "",
+          title,
+          key: key || "",
           unit: scaleValue.unit,
           type,
           dataIndex,
           index
         },
-        noRiseText,
-        arrowGroup,
-        verifiedText,
         leftLine: previousLine,
         rightLine: line,
-        reduceLine,
-        reducePoint,
+        otherObj,
         lockMovementX: true,
         ...v.pacemakerShow && type == "pulse" ? pacemaker.style : pointAttr,
         ...propItems.event
@@ -405,7 +478,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
-        if (_item.title.includes("\u8109\u640F")) {
+        if (title.includes("\u8109\u640F")) {
           maiboPoints.add(point);
         } else {
           otherPoints.add(point);
@@ -413,27 +486,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         setPointEvent(point);
         pointList.push(point);
       }
-    });
-    type === "pulse" && shadowPointCache.push(pointList);
-    Promise.all(pointList).then((res) => {
-      const lineListFilter = lineList.filter((v) => v);
-      let prevPoint = null;
-      res = res.filter((v) => {
-        if (v && prevPoint) {
-          prevPoint.nextPoint = v;
-          v.prevPoint = prevPoint;
-        }
-        prevPoint = v || prevPoint;
-        v == null ? void 0 : v.bringToFront();
-        return v;
-      });
-      Promise.all(otherList).then((r) => {
-        canvas.value.add(...lineListFilter, ...res, ...r);
-        res.forEach((v) => {
-          v == null ? void 0 : v.bringToFront();
-        });
-      });
-    });
+    }
   }
   function setPointEvent(point) {
     if (event.hovered) {
@@ -494,30 +547,17 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     }
   }
   function updateLine(point) {
-    if (point.leftLine) {
-      point.leftLine.setCoords();
-      point.leftLine.set({ x2: point.left, y2: point.top });
-    }
-    if (point.rightLine) {
-      point.rightLine.setCoords();
-      point.rightLine.set({ x1: point.left, y1: point.top });
-    }
-    if (point.reduceLine) {
-      point.reduceLine.setCoords();
-      point.reduceLine.set({ x1: point.left, y1: point.top });
-    }
-    if (point.noRiseText) {
-      point.noRiseText.setCoords();
-      point.noRiseText.set({ left: point.left, top: point.top + 5 });
-    }
-    if (point.arrowGroup) {
-      point.arrowGroup.setCoords();
-      point.arrowGroup.set({ left: point.left, top: point.top });
-    }
-    if (point.verifiedText) {
-      point.verifiedText.setCoords();
-      point.verifiedText.set({ left: point.left, top: point.top - 5 });
-    }
+    var _a, _b;
+    (_a = point.leftLine) == null ? void 0 : _a.setCoords().set({ x2: point.left, y2: point.top });
+    (_b = point.rightLine) == null ? void 0 : _b.setCoords().set({ x1: point.left, y1: point.top });
+    Object.values(point.otherObj).forEach((o) => {
+      const { obj, type = "", top = 0 } = o;
+      if (type === "line") {
+        obj == null ? void 0 : obj.setCoords().set({ x1: point.left, y1: point.top });
+      } else {
+        obj == null ? void 0 : obj.setCoords().set({ left: point.left, top: point.top + top });
+      }
+    });
     drawShaDow(point);
   }
   function isLimit(time) {

package/es/components/fabric-chart/src/interface.d.ts

@@ -64,6 +64,7 @@ export interface IPropItems {
     event: Partial<IEvent>;
     itemList: Array<any>;
     getRightInfo: AnyObject;
+    config: AnyObject;
 }
 export interface IPoint {
     time: string;
@@ -114,6 +115,7 @@ export interface IData {
     left: ILeft;
     right?: IRight;
     bottom: any;
+    config?: any;
 }
 export interface ICoordinateValue {
     x: number;

package/es/components/form-render/src/components/renderer/searchCascade.js

@@ -1,8 +1,8 @@
-import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
+import { defineComponent, ref, computed, inject, watch, createVNode, nextTick } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual, isArray } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
-import { InjectAsyncQueue } from '../../constants/index.js';
+import { InjectAsyncQueue, InjectionFormUUID } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
 import '../../utils/index.js';
@@ -92,8 +92,9 @@ const script = defineComponent({
       }
     }
     const asyncQueue = inject(InjectAsyncQueue);
-    function fetchData(option) {
-      return props.filterable ? fetchFullData() : fetchGradeData(option);
+    async function fetchData(option) {
+      props.filterable ? await fetchFullData() : await fetchGradeData(option);
+      await syncPosition();
     }
     async function fetchFullData() {
       if (!props.urlConfig || remoteOptions.value && props.requestCache)
@@ -178,6 +179,15 @@ const script = defineComponent({
         return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
       }
     }
+    const uuid = inject(InjectionFormUUID);
+    const uniClassname = `form-render__cascade--menu-${uuid}`;
+    async function syncPosition() {
+      await nextTick();
+      const target = document.querySelector(`.${uniClassname} .v-vl`);
+      if (!target)
+        return;
+      target.dispatchEvent(new CustomEvent("scroll"));
+    }
     const {
       injectValueValidate,
       injectValueWatchFromEmpty,
@@ -214,6 +224,10 @@ const script = defineComponent({
         "key": key.value,
         "remote": remote.value,
         "filterable": props.filterable,
+        "menu-props": {
+          class: uniClassname,
+          onClick: syncPosition
+        },
         "checkStrategy": "child",
         "show": !!show.value,
         "onUpdate:show": updateShow,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.25",
+	"version": "3.1.26-beta.0",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "f51ff7746243e9e72dc93d5e0e883f1ad4082fe3"
+	"gitHead": "1bced75ada75e3cd1fe13e6b6c88d7ea29202122"
 }