cnhis-design-vue 3.4.0-beta.58 → 3.4.0-beta.60

package/es/components/fabric-chart/src/constants/index.d.ts

@@ -60,6 +60,5 @@ export declare const OVERLAP: {
 };
 export declare enum ECG {
     SMALLCELLNUMBER = 5,
-    MAXLINENUMBER = 13,
     DEFAULTMAINXCELLVALUE = 0.2
 }

package/es/components/fabric-chart/src/constants/index.js

@@ -82,7 +82,6 @@ const OVERLAP = {
 };
 var ECG = /* @__PURE__ */ ((ECG2) => {
   ECG2[ECG2["SMALLCELLNUMBER"] = 5] = "SMALLCELLNUMBER";
-  ECG2[ECG2["MAXLINENUMBER"] = 13] = "MAXLINENUMBER";
   ECG2[ECG2["DEFAULTMAINXCELLVALUE"] = 0.2] = "DEFAULTMAINXCELLVALUE";
   return ECG2;
 })(ECG || {});

package/es/components/fabric-chart/src/hooks/electrocardiogram/useElectrocardiogram.js

@@ -36,7 +36,8 @@ function useElectrocardiogram(canvas, propItems, flag) {
     titleStyle,
     titleOffset,
     config,
-    calibrationLineHeight
+    calibrationLineHeight,
+    maxLineNumber
   } = propItems;
   const gridPoints = /* @__PURE__ */ new Set();
   const fixedPointsCache = /* @__PURE__ */ new Set();
@@ -66,17 +67,17 @@ function useElectrocardiogram(canvas, propItems, flag) {
   function drawPolyLine(startIdx = 0) {
     const overflowIsScroll = config.overflow === "scroll";
     dataList.forEach((lineItem, idx) => {
-      if (idx === ECG.MAXLINENUMBER - 1 && arguments.length && !overflowIsScroll)
+      if (idx === maxLineNumber - 1 && arguments.length && !overflowIsScroll)
         return;
       const { x, y, rowIdx, limitX } = lineItem.origin;
       const lineLength = lineItem.data.length;
-      const showLength = idx < ECG.MAXLINENUMBER - 1 ? getShowLength(lineItem.data) : lineLength;
+      const showLength = idx < maxLineNumber - 1 ? getShowLength(lineItem.data) : lineLength;
       const points = [];
       let pointIndex = 0;
       for (let _idx = startIdx; _idx <= startIdx + showLength && _idx < lineLength; _idx++) {
         const value = lineItem.data[_idx];
         const point = { x: computedX(pointIndex + 1), y: computedY(-+value) + y };
-        if (idx < ECG.MAXLINENUMBER - 1 && point.x > limitX) {
+        if (idx < maxLineNumber - 1 && point.x > limitX) {
           break;
         }
         points.push(point);
@@ -107,7 +108,7 @@ function useElectrocardiogram(canvas, propItems, flag) {
         detailRadius: 370,
         beforeEvent: () => flag.value && Promise.reject()
       });
-      if (idx < ECG.MAXLINENUMBER - 1 || overflowIsScroll) {
+      if (idx < maxLineNumber - 1 || overflowIsScroll) {
         gridPoints.add(polyline);
       } else {
         fixedPointsCache.add(polyline);

package/es/components/fabric-chart/src/hooks/electrocardiogram/useElectrocardiogramChart.js

@@ -33,6 +33,7 @@ function useElectrocardiogramChart(canvas, props, emits, canvasRef, pointTipProp
     const list = cloneDeep(dataList);
     const matchItem = list.find((item) => config.lastDataKey && item.key === config.lastDataKey);
     const __dataList = matchItem ? [...list, matchItem] : list;
+    const maxLineNumber = list.length + 1;
     const { grid } = props.data;
     const totalLength = (_c = (_b = (_a = last(__dataList)) == null ? void 0 : _a.data) == null ? void 0 : _b.length) != null ? _c : 0;
     const totalSeconds = totalLength / config.hz;
@@ -47,9 +48,9 @@ function useElectrocardiogramChart(canvas, props, emits, canvasRef, pointTipProp
     const xCellWidth = (endX - originX) / gridXNumber;
     const yCellHeight = (endY - originY) / gridYNumber;
     const event = ((_e = props.data.grid) == null ? void 0 : _e.event) || { selectable: true, evented: true };
-    const { mode = "2-6" } = props.data;
-    const [columnNumber, rowNumber] = mode.split("-").map((n) => +n);
-    const rowSpace = Math.round(gridYNumber / (rowNumber + (totalLineLength === ECG.MAXLINENUMBER ? 1 : 0)));
+    const columnNumber = +(props.data.columnNumber || 2);
+    const rowNumber = Math.ceil(list.length / columnNumber);
+    const rowSpace = ~~(gridYNumber / (rowNumber + (totalLineLength === maxLineNumber ? 1 : 0)));
     const columnWidth = props.data.width / columnNumber;
     const baseYCellNumber = Math.ceil(rowSpace / 2);
     function getFirstRowLineMaxHeight() {
@@ -60,10 +61,10 @@ function useElectrocardiogramChart(canvas, props, emits, canvasRef, pointTipProp
       if (columnNumber !== 2) {
         return data1MaxHeight;
       }
-      const data7 = __dataList[6].data;
-      const data7Max = Math.max(...data7);
-      const data7MaxHeight = computedY(data7Max);
-      return Math.max(data1MaxHeight, data7MaxHeight);
+      const halfIndexData = __dataList[rowNumber].data;
+      const halfIndexDataMax = Math.max(...halfIndexData);
+      const halfIndexDataMaxHeight = computedY(halfIndexDataMax);
+      return Math.max(data1MaxHeight, halfIndexDataMaxHeight);
       function computedY(value) {
         const currentMV = valueUnit === "uv" ? value * 1e-3 : valueUnit === "v" ? value * 1e3 : value;
         return currentMV / mainYCellValue2 * yCellHeight;
@@ -74,8 +75,9 @@ function useElectrocardiogramChart(canvas, props, emits, canvasRef, pointTipProp
     const baseY = columnNumber === 1 || _baseY < firstRowLineMaxHeight ? yCellHeight * Math.ceil(firstRowLineMaxHeight / yCellHeight) : _baseY;
     const baseX = xCellWidth;
     const derivedDataList = __dataList.map((item, idx) => {
-      const itemRowIdx = ECG.MAXLINENUMBER === totalLineLength && idx === totalLineLength - 1 ? rowNumber : idx % rowNumber;
-      const itemColumnIdx = ECG.MAXLINENUMBER === totalLineLength && idx === totalLineLength - 1 ? 0 : Math.floor(idx / rowNumber);
+      const isLastLine = maxLineNumber === totalLineLength && idx === totalLineLength - 1;
+      const itemRowIdx = isLastLine ? rowNumber : idx % rowNumber;
+      const itemColumnIdx = isLastLine ? 0 : ~~(idx / rowNumber);
       return {
         ...item,
         origin: {
@@ -111,7 +113,8 @@ function useElectrocardiogramChart(canvas, props, emits, canvasRef, pointTipProp
       columnNumber,
       rowNumber,
       config: props.data.config,
-      calibrationLineHeight
+      calibrationLineHeight,
+      maxLineNumber
     };
   }
   const propItems = reactive(buildDerived());

package/es/components/iho-table/src/hooks/useColumnConfigAdaptor.js

@@ -85,7 +85,7 @@ function useColumnConfigAdaptor() {
           return;
         }
         result.formType = (_a = htmlTypeValueMap.get(value)) != null ? _a : value;
-        const multiple = value === "SEARCH" ? false : value === "SEARCH_MORE" ? true : value === "SELECT" ? fieldItem.multi_select === "0" : null;
+        const multiple = value === "SEARCH" ? false : ["SEARCH_MORE", "CHECKBOX", "CHECKBOX_BLOCK"].includes(value) ? true : value === "SELECT" ? fieldItem.multi_select === "0" : null;
         if (multiple) {
           result.componentProps = {
             multiple,

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.58";
+var version = "3.4.0-beta.60";
 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.58",
+	"version": "3.4.0-beta.60",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "e1fd269cd0c3d98a766885c3abe074ec04c136d0"
+	"gitHead": "8bd05157ab043e7ef037ee69e52191ef2c335bf3"
 }