cnhis-design-vue 3.4.0-beta.50 → 3.4.0-beta.52

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

@@ -1,5 +1,5 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
-import { useThrottleFn } from '@vueuse/core';
+import { useDebounceFn, useThrottleFn } from '@vueuse/core';
 import { range } from 'lodash-es';
 import { useDetailEvent } from './hooks/useDetailEvent.js';
 import { defaultStyle, drawLine } from '../useDraw.js';
@@ -71,15 +71,17 @@ function useElectrocardiogram(canvas, propItems, flag) {
       const { x, y, rowIdx, limitX } = lineItem.origin;
       const lineLength = lineItem.data.length;
       const showLength = idx < ECG.MAXLINENUMBER - 1 ? getShowLength(lineItem.data) : lineLength;
-      const points = lineItem.data.reduce((res, value, _idx) => {
-        let _res = _idx >= startIdx && _idx <= startIdx + showLength ? [{ x: computedX(res.length + 1), y: computedY(-+value) + y }] : [];
-        if (_res.length) {
-          if (idx < ECG.MAXLINENUMBER - 1 && _res[0].x > limitX) {
-            _res = [];
-          }
+      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) {
+          break;
         }
-        return res.concat(_res);
-      }, []);
+        points.push(point);
+        pointIndex++;
+      }
       const polyline = new fabric.Polyline(points, {
         ...lineStyle,
         fill: "transparent",
@@ -105,8 +107,7 @@ function useElectrocardiogram(canvas, propItems, flag) {
         detailRadius: 370,
         beforeEvent: () => flag.value && Promise.reject()
       });
-      polyline.startIdx = startIdx;
-      if (idx < dataList.length - 1 || overflowIsScroll) {
+      if (idx < ECG.MAXLINENUMBER - 1 || overflowIsScroll) {
         gridPoints.add(polyline);
       } else {
         fixedPointsCache.add(polyline);
@@ -187,22 +188,30 @@ function useElectrocardiogram(canvas, propItems, flag) {
     });
     canvas.value.add(...lines);
   }
-  const updatePolyline = useThrottleFn((percent) => {
-    const showLength = getShowLength(dataList[dataList.length - 1].data);
-    if (showLength === dataList[0].data.length)
+  let currentStartIdx = -1;
+  let isUpdating = false;
+  const debouncedUpdate = useDebounceFn((startIdx) => {
+    if (isUpdating || currentStartIdx === startIdx)
       return;
-    const totalLength = dataList[dataList.length - 1].data.length;
-    const startIdx = ~~(percent * totalLength);
+    isUpdating = true;
+    currentStartIdx = startIdx;
     fabric.util.requestAnimFrame(() => {
       if (gridPoints.size) {
-        const [firstPoint] = [...gridPoints];
-        if (firstPoint.startIdx === startIdx)
-          return;
-        [...gridPoints].forEach((point) => canvas.value.remove(point));
+        const pointsArray = [...gridPoints];
+        canvas.value.remove(...pointsArray);
         gridPoints.clear();
       }
       drawPolyLine(startIdx);
+      isUpdating = false;
     });
+  }, 100);
+  const updatePolyline = useThrottleFn((percent) => {
+    const showLength = getShowLength(dataList[dataList.length - 1].data);
+    if (showLength === dataList[0].data.length)
+      return;
+    const totalLength = dataList[dataList.length - 1].data.length;
+    const startIdx = ~~(percent * totalLength);
+    debouncedUpdate(startIdx);
   }, 150);
   function drawBorder() {
     const { strokeWidth } = borderStyle;

package/es/components/form-render/src/hooks/useFormEvent.js

@@ -133,7 +133,7 @@ function useFormExposeEvent({
       wordbookSettingHandler2.triggerDisabled = options.avoidWordbookSettingConnection;
       operationalFormHandler.triggerDisabled = options.avoidOperationalFormConnection;
       if (options.needSplitExtendKey) {
-        values = splitExtendKey(getFieldList(), values);
+        values = splitExtendKey(getFieldList(), values, !!options.overwrite);
       }
       if (options.avoidFormChangeEvent) {
         emitFormChange.value = false;

package/es/components/form-render/src/utils/index.d.ts

@@ -18,7 +18,7 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}, any, {}>>>;
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
-export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject, overwrite: boolean): AnyObject;
 export declare function isNestedType(type?: string): boolean | "" | undefined;
 export declare function isNestedFieldType(field: FieldItem | GeneralField): boolean | "" | undefined;
 export declare function renderOptionLabel(option: AnyObject, labelKey: string): any;

package/es/components/form-render/src/utils/index.js

@@ -136,7 +136,7 @@ function combineExtendKey(fieldList, values) {
   });
   return result;
 }
-function splitExtendKey(fieldList, values) {
+function splitExtendKey(fieldList, values, overwrite) {
   const fieldListWithExtendKey = findExtendKeyField(fieldList);
   if (!fieldListWithExtendKey.length)
     return values;
@@ -156,7 +156,10 @@ function splitExtendKey(fieldList, values) {
   }) => {
     if (Reflect.has(result, val_key))
       return;
-    result[val_key] = queryFieldValue(extendKey)[val_key];
+    const value = queryFieldValue(extendKey)[val_key];
+    if (value == null && !overwrite)
+      return;
+    result[val_key] = value;
   });
   return result;
 }

package/es/shared/package.json.js

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