cnhis-design-vue 3.1.33-beta.20 → 3.1.33-beta.21

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

@@ -5,6 +5,9 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    attrs: {
+        [x: string]: unknown;
+    };
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: import("vue").PropType<import("./src/interface").IMode>;
@@ -12,6 +15,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         };
     }>> & {}>>;
     isTemperature: import("vue").ComputedRef<boolean>;
+    style: import("vue").ComputedRef<import("vue").CSSProperties>;
     fabricChartRef: import("vue").Ref<any>;
     redrawPoints: () => void;
     select: (key: string) => void;

package/es/components/fabric-chart/src/FabricChart.vue.d.ts

@@ -1,4 +1,5 @@
-import { PropType } from 'vue';
+import { PropType, CSSProperties } from 'vue';
+import { AnyObject } from '../../../../es/shared/types';
 import { IMode } from './interface';
 declare const _default: import("vue").DefineComponent<{
     mode: {
@@ -6,6 +7,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    attrs: {
+        [x: string]: unknown;
+    };
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: PropType<IMode>;
@@ -13,6 +17,7 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>> & {}>>;
     isTemperature: import("vue").ComputedRef<boolean>;
+    style: import("vue").ComputedRef<CSSProperties>;
     fabricChartRef: import("vue").Ref<any>;
     redrawPoints: () => void;
     select: (key: string) => void;
@@ -135,7 +140,7 @@ declare const _default: import("vue").DefineComponent<{
                 show: boolean;
                 point: import("./interface").ICoordinateValue;
                 list: string[];
-                propItems: import("../../../shared/types").AnyObject;
+                propItems: AnyObject;
             };
             pointStyle: import("vue").ComputedRef<{
                 top: string;
@@ -246,8 +251,8 @@ declare const _default: import("vue").DefineComponent<{
             onDelete?: ((...args: any[]) => any) | undefined;
         }>>;
         emits: (event: "delete" | "change" | "add" | "select", ...args: any[]) => void;
-        leftScales: import("vue").ComputedRef<import("../../../shared/types").AnyObject[]>;
-        rightScales: import("vue").ComputedRef<import("../../../shared/types").AnyObject[]>;
+        leftScales: import("vue").ComputedRef<AnyObject[]>;
+        rightScales: import("vue").ComputedRef<AnyObject[]>;
         leftAddAreaWidth: number;
         rightAddAreaWidth: import("vue").ComputedRef<0 | 30>;
         originX: import("vue").ComputedRef<number>;
@@ -314,7 +319,7 @@ declare const _default: import("vue").DefineComponent<{
                 show: boolean;
                 point: import("./interface").ICoordinateValue;
                 list: string[];
-                propItems: import("../../../shared/types").AnyObject;
+                propItems: AnyObject;
             };
             pointStyle: import("vue").ComputedRef<{
                 top: string;

package/es/components/fabric-chart/src/FabricChart.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, unref, openBlock, createBlock, mergeProps } from 'vue';
+import { defineComponent, useAttrs, computed, ref, openBlock, createElementBlock, normalizeStyle, unref, createBlock, mergeProps } from 'vue';
 import TemperatureChart from './TemperatureChart.vue.js';
 import BirthProcessChart from './BirthProcessChart.vue.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
@@ -11,7 +11,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose }) {
     var _a;
     const props = __props;
+    const attrs = useAttrs();
     const isTemperature = computed(() => props.mode === "temperature");
+    const style = computed(() => {
+      const data = attrs.data;
+      const _style = {
+        width: ((data == null ? void 0 : data.width) || 800) + "px",
+        height: ((data == null ? void 0 : data.height) || 700) + "px",
+        position: "relative"
+      };
+      return _style;
+    });
     const fabricChartRef = ref();
     function redrawPoints() {
       var _a2;
@@ -28,11 +38,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       canvas
     });
     return (_ctx, _cache) => {
-      return unref(isTemperature) ? (openBlock(), createBlock(TemperatureChart, mergeProps({
-        key: 0,
-        ref_key: "fabricChartRef",
-        ref: fabricChartRef
-      }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(BirthProcessChart, { key: 1 }));
+      return openBlock(), createElementBlock("div", {
+        class: "c-fabric-chart-wrapper",
+        style: normalizeStyle(unref(style))
+      }, [
+        unref(isTemperature) ? (openBlock(), createBlock(TemperatureChart, mergeProps({
+          key: 0,
+          ref_key: "fabricChartRef",
+          ref: fabricChartRef
+        }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(BirthProcessChart, { key: 1 }))
+      ], 4);
     };
   }
 });

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

@@ -96,7 +96,7 @@ var PopupMenu = defineComponent({
     });
     return () => {
       return createVNode(Teleport, {
-        "to": ".c-fabric-chart"
+        "to": ".c-fabric-chart-wrapper"
       }, {
         default: () => [withDirectives(createVNode("ul", {
           "ref": popupRef,

package/es/components/fabric-chart/src/components/PopupTip.vue.js

@@ -14,7 +14,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const pointStyle = useStyle(props);
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(Teleport, { to: ".c-fabric-chart" }, [
+      return openBlock(), createBlock(Teleport, { to: ".c-fabric-chart-wrapper" }, [
         withDirectives(createElementVNode("ul", {
           class: "c-fabric-chart-popup-tip",
           style: normalizeStyle(unref(pointStyle))

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

@@ -441,14 +441,15 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         rightLine: line,
         otherObj,
         lockMovementX: true,
-        lockMoveMentY: currentPointType == 0 ? true : false,
         ...v.pacemakerShow && type == "pulse" ? pacemaker.style : pointAttr,
-        ...propItems.event
+        ...propItems.event,
+        ...isNonePain ? { selectable: false, evented: false } : {}
       };
       if (previousLine) {
+        const y = previousLine.get("y2");
         point = drawPoint(currentPointType, {
           left: previousLine.get("x2"),
-          top: previousLine.get("y2"),
+          top: isNonePain ? y - 5 : y,
           ...pointAttrNew
         });
       } else {
@@ -456,7 +457,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           pointAttrNew.leftLine = null;
           point = drawPoint(currentPointType, {
             left: points[0],
-            top: points[1],
+            top: isNonePain ? points[1] - 5 : points[1],
             ...pointAttrNew
           });
         }

package/es/components/iho-table/src/components/IhoTableColumn.js

@@ -45,7 +45,7 @@ const ColumnComponent = defineComponent({
       const result = {
         ...field.slots
       };
-      if (((_a = getLowCodeFieldFromField(props.field)) == null ? void 0 : _a.annotation) !== false) {
+      if (!field.type && ((_a = getLowCodeFieldFromField(props.field)) == null ? void 0 : _a.annotation) !== false) {
         result.header = (payload) => {
           var _a2;
           return renderHeader(payload, (_a2 = field.slots) == null ? void 0 : _a2.header);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.33-beta.20",
+	"version": "3.1.33-beta.21",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "734625bafa0e81d38994dfaeb6959f441fdc5f5c"
+	"gitHead": "049395e1d5612e05a3659f216d5d825c585c381e"
 }