cnhis-design-vue 3.4.0-beta.10 → 3.4.0-beta.12

package/es/components/button-print/src/components/NewPrintComponent.vue2.js

@@ -623,7 +623,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           return;
         state.isClickOuterPrint = isOuterClick;
         state.currentFormatId = formatId;
-        const printToParam = (isPrintAllType.value == 3 ? state.originFormatIdParams[formatId] : state.originParams[templateCode]) || [];
+        const printToParam = state.originParams[templateCode] || [];
         handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam);
       });
     };
@@ -1112,7 +1112,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 const curTypeItem = showSettingItems.value.find((item) => item.key == key);
                 if (curTypeItem) {
                   const tmpParam = state.printParams[curTypeItem == null ? void 0 : curTypeItem.templateCode];
-                  const printToParam = (isPrintAllType.value == 3 ? state.originFormatIdParams[curTypeItem.key] : originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode]) || [];
+                  if (!tmpParam)
+                    return;
+                  const printToParam = originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode] || [];
                   handleClickPrint(tmpParam, curTypeItem.templateCode, curTypeItem.templateId, curTypeItem.key, printToParam);
                 }
               } else {

package/es/components/fabric-chart/src/hooks/surgicalAnesthesia/useOther.js

@@ -295,11 +295,14 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
     const _endY = endY + extracorporealCirculationHeight;
     let prevLeft = 0;
     const pointerObj = {};
+    const xList = [];
     dataList.forEach((markItem, dataIndex) => {
       const { time, list = [] } = markItem;
       const x = computedX(time);
       if (!isLimitX(x))
         return;
+      pointerObj[`x_${x}`] = [];
+      pointerObj[`originx_${x}`] = [];
       let startTop = _endY + 1;
       list.forEach((item, index) => {
         var _a;
@@ -327,8 +330,12 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
         }
         const { topObj, startTop: _startTop, oldStartTop } = computedTop(startTop, pointHeight);
         startTop = _startTop;
-        if (!pointerObj[`x_${x}`])
-          pointerObj[`x_${x}`] = [];
+        xList.forEach((_x) => {
+          if (x - _x < xCellWidth) {
+            pointerObj[`x_${x}`].push(...pointerObj[`originx_${_x}`]);
+          }
+        });
+        pointerObj[`originx_${x}`].push([oldStartTop, startTop]);
         pointerObj[`x_${x}`].push([oldStartTop, startTop]);
         point.set("top", topObj.y2);
         gridPointsMap.get(key).push(point);
@@ -336,6 +343,7 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
         canvas.value.add(point);
       });
       prevLeft = x;
+      xList.push(x);
     });
     function computedTop(startTop, lineHeight) {
       const topObj = {};
@@ -368,7 +376,7 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
       return (_b = (_a = point.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.isStart;
     };
     const startPoint = __arr.find((point) => isStart(point));
-    const firstPoint = __arr.find((point) => !isStart(point) && point.left > startPoint.left);
+    const firstPoint = __arr.find((point) => !isStart(point) && point.left > (startPoint == null ? void 0 : startPoint.left));
     const otherPoints = __arr.filter((point) => !isStart(point));
     __arr.forEach((point) => {
       const limitX = {
@@ -376,10 +384,10 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
         x2: endX
       };
       if (isStart(point)) {
-        limitX.x2 = firstPoint.left;
+        limitX.x2 = firstPoint == null ? void 0 : firstPoint.left;
         point.otherPoints = otherPoints;
       } else {
-        limitX.x1 = startPoint.left;
+        limitX.x1 = startPoint == null ? void 0 : startPoint.left;
         point.startPoint = startPoint;
       }
       point.limitX = limitX;
@@ -541,8 +549,8 @@ function useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveL
         point.otherPoints.forEach((_point) => {
           _point.limitX.x1 = point.left;
         });
-      } else {
-        const otherPointsLeft = point.startPoint.otherPoints.map((_point) => _point.left);
+      } else if (point.startPoint) {
+        const otherPointsLeft = point.startPoint.otherPoints.map((_point) => _point.left) || [];
         const minLeft = Math.min(...otherPointsLeft);
         point.startPoint.limitX.x2 = minLeft;
       }

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.10";
+var version = "3.4.0-beta.12";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.10",
+	"version": "3.4.0-beta.12",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "4482cf6ed1bc2c75724062957ef7412cc268d696"
+	"gitHead": "af67ef48b1bacf575abecc9ba8b6a17fa09ff3cf"
 }