cnhis-design-vue 3.4.0-beta.43 → 3.4.0-beta.45

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

@@ -134,6 +134,33 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const line = drawLine([originX, y, endX, y], scaleValue.positionLine);
     canvas.value.add(line);
   }
+  function creatShaDowBorder(points, mode, style) {
+    const borderGroup = new fabric.Group();
+    const lines = [];
+    const drawnLines = /* @__PURE__ */ new Set();
+    for (let i = 0; i < points.length; i++) {
+      const nextIndex = (i + 1) % points.length;
+      const startPoint = points[i];
+      const endPoint = points[nextIndex];
+      const lineKey1 = `${startPoint.x},${startPoint.y},${endPoint.x},${endPoint.y}`;
+      const lineKey2 = `${endPoint.x},${endPoint.y},${startPoint.x},${startPoint.y}`;
+      if (drawnLines.has(lineKey1) || drawnLines.has(lineKey2)) {
+        continue;
+      }
+      if (startPoint.x === endPoint.x && startPoint.y === endPoint.y || mode === "line" && startPoint.x === endPoint.x) {
+        continue;
+      }
+      drawnLines.add(lineKey1);
+      const line = new fabric.Line([startPoint.x, startPoint.y, endPoint.x, endPoint.y], {
+        ...defaultStyle,
+        ...style,
+        strokeWidth: 1
+      });
+      lines.push(line);
+    }
+    borderGroup.add(...lines).addWithUpdate();
+    return borderGroup;
+  }
   function drawShaDow(target) {
     var _a;
     const pulseObj = yScaleValue.find((item) => item.show && item.type === "pulse");
@@ -174,23 +201,19 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           x: v[0],
           y: v[1]
         }));
-        const polygon = new fabric.Polygon(points, {
+        const polygon = mode === "color" ? new fabric.Polygon(points, {
           ...defaultStyle,
           ...style,
           strokeWidth: 1
-        });
+        }) : creatShaDowBorder(points, mode, style);
         if (["slash", "line"].includes(mode)) {
-          polygon.set({
-            fill: "transparent",
-            stroke: style.stroke || "#f00"
-          });
           const shadowLines = [];
           if (["slash"].includes(mode)) {
             shadowLines.push(...createShadowLines(item, style._angle, style.space, omit(style, ["_angle", "space"])));
             shadowLines.forEach((l) => {
               shadowLinesCache.add(l);
             });
-          } else {
+          } else if (!style.onlyBorder) {
             const finalData = getLineData(item);
             if (finalData.length > 0) {
               const otherFilters = otherLineData.filter(([[x1, _]]) => {

package/es/components/scale-view/index.d.ts

@@ -405,7 +405,7 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<import("v
     beforeCloseFn: () => Promise<unknown>;
     cancel: () => Promise<void>;
     getScaleData: () => any;
-    batchInjectFormNew: (data: import("../../shared/types").AnyObject, skipValid?: boolean) => Promise<void>;
+    batchInjectFormNew: (data: import("../../shared/types").AnyObject, skipValid?: boolean) => Promise<boolean>;
     readonly isCollection: (e: string) => boolean;
     NoData: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         noDataTip: {

package/es/components/scale-view/src/ScaleView.vue.d.ts

@@ -404,7 +404,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     beforeCloseFn: () => Promise<unknown>;
     cancel: () => Promise<void>;
     getScaleData: () => any;
-    batchInjectFormNew: (data: AnyObject, skipValid?: boolean) => Promise<void>;
+    batchInjectFormNew: (data: AnyObject, skipValid?: boolean) => Promise<boolean>;
     readonly isCollection: (e: string) => boolean;
     NoData: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         noDataTip: {

package/es/components/scale-view/src/ScaleView.vue2.js

@@ -1,5 +1,5 @@
 import { i18n } from '../../../_virtual/_virtual_i18n-methods.js';
-import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, normalizeClass, unref, Fragment, createBlock, mergeProps, createCommentVNode, createElementVNode, createVNode, withCtx, renderList, toDisplayString, createTextVNode, resolveDynamicComponent, renderSlot } from 'vue';
+import { defineComponent, reactive, ref, watch, nextTick, onUnmounted, openBlock, createElementBlock, normalizeClass, unref, Fragment, createBlock, mergeProps, createCommentVNode, createElementVNode, createVNode, withCtx, renderList, toDisplayString, createTextVNode, resolveDynamicComponent, renderSlot } from 'vue';
 import useNoData from './hooks/use-noData.js';
 import { ScaleViewProps } from './hooks/scaleview-props.js';
 import { getScaleViewState } from './hooks/scaleview-state.js';
@@ -219,12 +219,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const batchInjectFormNew = async (data, skipValid = false) => {
       window._beforeCloseFn = null;
-      await batchInjectForm(data, skipValid);
+      const batchStatus = await batchInjectForm(data, skipValid);
       if (!skipValid || !props.closeConfirm)
-        return;
+        return batchStatus;
       formChecker.setInitialSnapshot(state.form);
       window._beforeCloseFn = beforeCloseFn;
+      return batchStatus;
     };
+    onUnmounted(() => {
+      if (window._beforeCloseFn) {
+        window._beforeCloseFn = null;
+      }
+    });
     __expose({
       getScaleData,
       onSubmitForm,

package/es/shared/package.json.js

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