cnhis-design-vue 3.1.20-beta.2 → 3.1.20-beta.4

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

@@ -178,7 +178,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         originY: endY.value,
         endY: endY.value
       };
-      if (painIndex.value === 0) {
+      if (painIndex.value === 0 && left.yScaleValue.length > 1) {
         obj.originY = originYLimit.value;
         obj.endY = originYLimit.value + painHeight.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {
@@ -193,7 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         originY: originY.value,
         endY: endY.value
       };
-      if (painIndex.value === 0) {
+      if (painIndex.value === 0 && left.yScaleValue.length > 1) {
         obj.originY = originYLimit.value + painHeight.value;
         obj.endY = endY.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {

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

@@ -458,7 +458,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     pointTipProps.list = [getListValue(), `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
     pointTipProps.show = true;
     function getListValue() {
-      const { value, drugReduce, physicsReduce } = data;
+      const { value = getYValue(type, point.top), drugReduce, physicsReduce } = data || {};
       if (drugReduce) {
         return `\u836F\u7269\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${drugReduce}${unit || ""}`;
       }

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

@@ -51,16 +51,21 @@ function useCanvasEvent(canvas, propItems, emits) {
         top: topY + 1,
         height: propItems[`${item.key}Height`] - 1
       };
+      selections2.push(drawRect({
+        left: iconsWidth,
+        width: endX - iconsWidth,
+        ...commonOptions
+      }, item.key + "All"));
       selections2.push(drawRect({
         left: iconsWidth,
         width: originX - iconsWidth,
         ...commonOptions
-      }, item.key));
+      }, item.key + "Title"));
       selections2.push(drawRect({
         left: originX,
         width: endX - originX,
         ...commonOptions
-      }, item.key + "Title"));
+      }, item.key));
     });
     selections2.push(drawRect({
       left: originX,

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

@@ -17,6 +17,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     itemList,
     painIndex,
     right,
+    canvasWidth,
+    canvasHeight,
     getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
@@ -267,6 +269,16 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       }
     });
   }
+  function drawBorder() {
+    canvas.value.add(new fabric.Rect({
+      left: iconsWidth,
+      top: 0,
+      width: canvasWidth - iconsWidth,
+      height: canvasHeight - 1,
+      fill: "transparent",
+      ...defaultBorderStyle
+    }));
+  }
   onMounted(() => {
     nextTick(() => {
       var _a;
@@ -275,9 +287,10 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
         yScaleValueList.push(getRightInfo);
       }
-      painIndex == 0 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
+      painIndex == 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
       painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
       drawScaleValue(yScaleValueList);
+      drawBorder();
       canvas.value.renderAll();
     });
   });

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

@@ -4,6 +4,7 @@ import { defaultStyle } from './useDraw2.js';
 
 function useOther(canvas, propItems, cumputedX) {
   const { other, vitalSignsOriginY, xCellWidth, yCellHeight } = propItems;
+  let textDiff = 0;
   function drawOther() {
     if (!(other == null ? void 0 : other.list))
       return false;
@@ -71,8 +72,9 @@ function useOther(canvas, propItems, cumputedX) {
     group && canvas.value.add(group);
     function hasNode(x, y, currentLenght) {
       return list.find((v) => {
-        const condition1 = y < v.top + v.trueHeight;
-        const condition2 = y + currentLenght * yCellHeight < v.top + v.trueHeight;
+        const trueY = y + textDiff;
+        const condition1 = trueY < v.top + v.trueHeight;
+        const condition2 = trueY + currentLenght * yCellHeight < v.top + v.trueHeight;
         return v.left === x && (condition1 || condition2);
       });
     }
@@ -87,12 +89,13 @@ function useOther(canvas, propItems, cumputedX) {
         ...defaultStyle,
         ...v.style || {}
       });
+      textDiff = (yCellHeight - (text.height || 0)) / 2;
       texts.push(text);
     });
     return new fabric.Group(texts, {
       originX: "center",
       left: x,
-      top: y,
+      top: y + textDiff,
       baseTop: v.baseTop,
       trueHeight: texts.length * yCellHeight
     });

package/es/components/form-config/index.d.ts

@@ -2512,6 +2512,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 [x: string]: any;
                 dependencies?: string[] | undefined;
                 target?: string | undefined;
+                effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
                 when?: string | boolean | undefined;
                 fulfill?: {
                     state?: import("../../../es/shared/types").AnyObject | undefined;
@@ -2525,6 +2526,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 [x: string]: any;
                 dependencies?: string[] | undefined;
                 target?: string | undefined;
+                effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
                 when?: string | boolean | undefined;
                 fulfill?: {
                     state?: import("../../../es/shared/types").AnyObject | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -2514,6 +2514,7 @@ declare const _default: import("vue").DefineComponent<{
                 [x: string]: any;
                 dependencies?: string[] | undefined;
                 target?: string | undefined;
+                effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
                 when?: string | boolean | undefined;
                 fulfill?: {
                     state?: import("../../../../es/shared/types").AnyObject | undefined;
@@ -2527,6 +2528,7 @@ declare const _default: import("vue").DefineComponent<{
                 [x: string]: any;
                 dependencies?: string[] | undefined;
                 target?: string | undefined;
+                effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
                 when?: string | boolean | undefined;
                 fulfill?: {
                     state?: import("../../../../es/shared/types").AnyObject | undefined;

package/es/components/form-config/src/components/FormConfigCreator.vue.d.ts

@@ -249,7 +249,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
+        formModel: import("../../../../../es/components/form-render").Form<{
             [x: string]: any;
         }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -1641,6 +1641,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../../../es/shared/types").AnyObject | undefined;
@@ -1654,6 +1655,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../../../es/shared/types").AnyObject | undefined;
@@ -1936,7 +1938,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
+        formModel: import("../../../../../es/components/form-render").Form<{
             [x: string]: any;
         }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;

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

@@ -235,7 +235,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<{
+    formModel: import("@formily/core/esm/models/Form").Form<{
         [x: string]: any;
     }>;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;

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

@@ -12,3 +12,4 @@ export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps2.js';
 export { useAnchor } from './src/hooks/useAnchor2.js';
 export { useFormContext } from './src/hooks/useFormContext2.js';
+export * from '@formily/core';

package/es/components/form-render/index2.js

@@ -7,7 +7,7 @@ import 'vue';
 import '@formily/path';
 import '@vue/shared';
 import 'date-fns';
-import '@formily/core';
+export * from '@formily/core';
 import '@formily/vue';
 import '../../shared/utils/tapable/SyncHook.js';
 import '../../shared/utils/tapable/SyncBailHook.js';

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

@@ -2,7 +2,12 @@ import { arrayed } from '../utils/index.js';
 import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {
+  function matchFieldName(matcher, target) {
+    return matcher.split("|").some((m) => m.trim() === target);
+  }
   function traverse(fieldList, visitorMap, key = "val_key") {
+    if (!visitorMap)
+      return fieldList;
     return fieldList.reduce((fin, field) => {
       if (Array.isArray(field.children)) {
         field.children = traverse(field.children, visitorMap, key);
@@ -13,7 +18,10 @@ function useFieldVisitor() {
       if (field.suffixConfig) {
         field.suffixConfig = traverse(arrayed(field.suffixConfig), visitorMap, key);
       }
-      const visitor = visitorMap == null ? void 0 : visitorMap[field[key]];
+      const visitorKey = Object.keys(visitorMap).find((matcher) => {
+        return matchFieldName(matcher, field[key]);
+      });
+      const visitor = visitorKey && visitorMap[visitorKey];
       let current = field;
       const before = [];
       const after = [];

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -1,7 +1,8 @@
 import { AnyObject, ArrayAble } from '../../../../../es/shared/types';
-import { SchemaTypes } from '@formily/vue';
+import { SchemaEffectTypes, SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
 import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../es/components/form-render';
+export * from '@formily/core';
 declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 export declare type ValidateItem = Partial<{
     /**
@@ -52,6 +53,7 @@ interface SwitchProperty {
 interface ReactionType {
     dependencies?: string[];
     target?: string;
+    effects?: SchemaEffectTypes[];
     when?: string | boolean;
     fulfill?: {
         state?: AnyObject;
@@ -228,4 +230,3 @@ export declare type FieldItem = {
     reactions: ArrayAble<ReactionType>;
     [key: string]: any;
 }>;
-export {};

package/es/components/form-render/src/types/fieldItem.js

@@ -1 +1 @@
-
+export * from '@formily/core';

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

@@ -1 +1 @@
-
+export * from '@formily/core';

package/es/components/index.js

@@ -30,6 +30,7 @@ export { ContextCollector, useChangeContext } from './form-render/src/hooks/useC
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps2.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor2.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext2.js';
+export * from '@formily/core';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts2.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature2.js';
 export { useColumnConfigAdaptor } from './big-table/src/hooks/useColumnConfigAdaptor2.js';

package/es/components/shortcut-setter/index.d.ts

@@ -1672,6 +1672,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../es/shared/types").AnyObject | undefined;
@@ -1685,6 +1686,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../es/shared/types").AnyObject | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -1674,6 +1674,7 @@ declare const _default: import("vue").DefineComponent<{
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../../es/shared/types").AnyObject | undefined;
@@ -1687,6 +1688,7 @@ declare const _default: import("vue").DefineComponent<{
             [x: string]: any;
             dependencies?: string[] | undefined;
             target?: string | undefined;
+            effects?: import("@formily/json-schema").SchemaEffectTypes[] | undefined;
             when?: string | boolean | undefined;
             fulfill?: {
                 state?: import("../../../../es/shared/types").AnyObject | undefined;
@@ -1940,7 +1942,7 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
+        formModel: import("../../../../es/components/form-render").Form<{
             [x: string]: any;
         }>;
         SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;

package/es/shared/global/variable.d.ts

@@ -1,2 +1 @@
 export declare const COMPONENT_NAMESPACE = "C";
-export declare const GROUP_TITLE_KEY = "group-show-title";

package/es/shared/global/variable.js

@@ -1 +1 @@
-export { COMPONENT_NAMESPACE, GROUP_TITLE_KEY } from './variable2.js';
+export { COMPONENT_NAMESPACE } from './variable2.js';

package/es/shared/global/variable2.js

@@ -1,4 +1,3 @@
 const COMPONENT_NAMESPACE = "C";
-const GROUP_TITLE_KEY = "group-show-title";
 
-export { COMPONENT_NAMESPACE, GROUP_TITLE_KEY };
+export { COMPONENT_NAMESPACE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.20-beta.2",
+  "version": "3.1.20-beta.4",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "6c6ab160bc65bb020fe6df41dc32ea11d40842af"
+  "gitHead": "0e27466bf48b9b2fc276b4e2e5ee200bbee7cdfa"
 }

package/es/shared/core/create.d.ts

@@ -1 +0,0 @@
-export default function _default(vm: any): any;