cnhis-design-vue 3.1.21-beta.12 → 3.1.21-beta.13

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

@@ -60,7 +60,7 @@ var PopupMenu = defineComponent({
         "align": "center"
       }, {
         default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
-          "style": "width: 120px",
+          "style": "width: 110px",
           "size": "small",
           "value": item.value,
           "onUpdate:value": ($event) => item.value = $event,
@@ -68,6 +68,7 @@ var PopupMenu = defineComponent({
           "placeholder": "\u8BF7\u8F93\u5165\u6570\u503C",
           "max": props.target.origin.data.value,
           "min": min,
+          "showButton": false,
           "onFocus": () => emit("update:show", true)
         }, null)]
       });

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

@@ -154,17 +154,20 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
             itemList.forEach((v) => {
               if (!getEqualXTypes(x).includes(v.bigType)) {
-                pointMenuProps.list.push({
-                  renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
-                  origin: {
-                    title: v.title,
-                    unit: v.unit,
-                    type: v.bigType,
-                    dataIndex: v.dataIndex,
-                    key: v.key
-                  },
-                  pointer: event2.pointer
-                });
+                const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
+                if (y >= newY.originY && y <= newY.endY) {
+                  pointMenuProps.list.push({
+                    renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
+                    origin: {
+                      title: v.title,
+                      unit: v.unit,
+                      type: v.bigType,
+                      dataIndex: v.dataIndex,
+                      key: v.key
+                    },
+                    pointer: event2.pointer
+                  });
+                }
               }
             });
             if (pointMenuProps.list.length === 1) {
@@ -348,8 +351,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const pointAttrNew = {
         origin: {
           data: v,
-          title: item.title,
-          key: item.key || "",
+          title: _item.title,
+          key: _item.key || "",
           unit: scaleValue.unit,
           type,
           dataIndex,
@@ -385,7 +388,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
-        if (item.title.includes("\u8109\u640F")) {
+        if (_item.title.includes("\u8109\u640F")) {
           maiboPoints.add(point);
         } else {
           otherPoints.add(point);

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

@@ -235,8 +235,21 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   function isLimit(point) {
     return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
   }
+  function moveLimit(point) {
+    if (point.left >= originX && point.left <= endX) {
+      point.setCoords();
+      const newY = point.origin.type === "pain" ? painOriginY : vitalSignsOriginY;
+      if (point.top < newY.originY) {
+        point.set("top", newY.originY);
+      }
+      if (point.top > newY.endY) {
+        point.set("top", newY.endY);
+      }
+    }
+  }
   function setPointEvent(point) {
     point.on("moving", () => {
+      moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.21-beta.12",
+  "version": "3.1.21-beta.13",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "b4b62480f246f700b48b026a7a65eef54815713e"
+  "gitHead": "7b5157ff60722aaeea7a4e638304e7570b8a22db"
 }