cnhis-design-vue 3.1.21-beta.12 → 3.1.21-beta.14

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

@@ -60,7 +60,7 @@ var PopupMenu = defineComponent({
         "align": "center"
       }, {
         default: () => [createVNode("span", null, [item.label]), createVNode(NInputNumber, {
-          "style": "width: 120px",
+          "style": "width: 110px",
           "size": "small",
           "value": item.value,
           "onUpdate:value": ($event) => item.value = $event,
@@ -68,6 +68,7 @@ var PopupMenu = defineComponent({
           "placeholder": "\u8BF7\u8F93\u5165\u6570\u503C",
           "max": props.target.origin.data.value,
           "min": min,
+          "showButton": false,
           "onFocus": () => emit("update:show", true)
         }, null)]
       });

package/es/components/fabric-chart/src/hooks/constant.d.ts

@@ -12,3 +12,43 @@ export declare const PAIN_MENU: {
     value: undefined;
     type: string;
 }[];
+export declare const OVERLAP: {
+    yemai: {
+        stroke: string;
+        strokeX: string;
+        strokeWidth: number;
+        strokeWidthX: number;
+        radius: number;
+        angle: number;
+    };
+    koumai: {
+        stroke: string;
+        strokeWidth: number;
+        radius: number;
+        radiusCircle: number;
+        fillCircle: string;
+    };
+    gangmai: {
+        radius: number;
+        radiusCircle: number;
+        stroke: string;
+        fillCircle: string;
+    };
+    xinmai: {
+        radius: number;
+        radiusCircle: number;
+        stroke: string;
+        fillCircle: string;
+    };
+    humai: {
+        radius: number;
+        fill: string;
+    };
+    ermai: {
+        stroke: string;
+        strokeWidth: number;
+        radius: number;
+        radiusCircle: number;
+        fillCircle: string;
+    };
+};

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

@@ -1 +1 @@
-export { PAIN_MENU, TEMPERATURE_MENU } from './constant2.js';
+export { OVERLAP, PAIN_MENU, TEMPERATURE_MENU } from './constant2.js';

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

@@ -32,5 +32,47 @@ const PAIN_MENU = [
     type: "physicsReduce"
   }
 ];
+const BLUE = "#2563F4";
+const RED = "#FF1818";
+const OVERLAP = {
+  yemai: {
+    stroke: RED,
+    strokeX: BLUE,
+    strokeWidth: 1,
+    strokeWidthX: 1,
+    radius: 6,
+    angle: 45
+  },
+  koumai: {
+    stroke: RED,
+    strokeWidth: 1,
+    radius: 6,
+    radiusCircle: 3,
+    fillCircle: BLUE
+  },
+  gangmai: {
+    radius: 6,
+    radiusCircle: 3,
+    stroke: BLUE,
+    fillCircle: RED
+  },
+  xinmai: {
+    radius: 6,
+    radiusCircle: 3,
+    stroke: RED,
+    fillCircle: RED
+  },
+  humai: {
+    radius: 6,
+    fill: "green"
+  },
+  ermai: {
+    stroke: RED,
+    strokeWidth: 1,
+    radius: 6,
+    radiusCircle: 3,
+    fillCircle: BLUE
+  }
+};
 
-export { PAIN_MENU, TEMPERATURE_MENU };
+export { OVERLAP, PAIN_MENU, TEMPERATURE_MENU };

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

@@ -3,7 +3,7 @@ import { fabric } from '../utils/index.js';
 import { drawLine, defaultStyle, drawPoint, drawText, drawArrow } from './useDraw2.js';
 import useGrid from './useGrid2.js';
 import { useShadow } from './useShadow2.js';
-import { TEMPERATURE_MENU, PAIN_MENU } from './constant2.js';
+import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant2.js';
 
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
@@ -154,17 +154,20 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
             itemList.forEach((v) => {
               if (!getEqualXTypes(x).includes(v.bigType)) {
-                pointMenuProps.list.push({
-                  renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
-                  origin: {
-                    title: v.title,
-                    unit: v.unit,
-                    type: v.bigType,
-                    dataIndex: v.dataIndex,
-                    key: v.key
-                  },
-                  pointer: event2.pointer
-                });
+                const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
+                if (y >= newY.originY && y <= newY.endY) {
+                  pointMenuProps.list.push({
+                    renderItem: addRenderItem ? addRenderItem(v) : () => v.title,
+                    origin: {
+                      title: v.title,
+                      unit: v.unit,
+                      type: v.bigType,
+                      dataIndex: v.dataIndex,
+                      key: v.key
+                    },
+                    pointer: event2.pointer
+                  });
+                }
               }
             });
             if (pointMenuProps.list.length === 1) {
@@ -193,7 +196,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       return;
     if (!pulseObj.dataList.some((item) => item.title.includes("\u8109\u640F")))
       return;
-    const overlap = left.overlap || {};
+    const overlap = Object.assign({}, OVERLAP, left.overlap || {});
     const points = [];
     maiboPoints.size && [...maiboPoints].forEach((item) => {
       [...otherPoints].forEach((obj) => {
@@ -232,6 +235,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   function drawPolyLine(item, dataIndex, scaleValue) {
     const {
       type,
+      riseStyle = {},
       noRiseStyle = {},
       verifiedStyle = {},
       reduceStyle = {},
@@ -256,9 +260,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
-      let reduceLine, reducePoint, noRiseText, arrowGroup, verifiedText;
+      let reduceLine, reducePoint, noRiseText, arrowGroup, riseText, verifiedText;
       if ((points == null ? void 0 : points.length) && (type === "temperature" || type === "pain")) {
-        if (v.noRise) {
+        if (v.noRise && noRiseStyle.show) {
           if (typeof v.noRise === "string") {
             noRiseText = drawText([points[0], points[1] + 5], {
               value: v.noRise.split("").join("\n"),
@@ -272,6 +276,14 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             otherList.push(arrowGroup);
           }
         }
+        if (v.rise && riseStyle.show) {
+          riseText = drawText([points[0], points[1] - 5], {
+            value: v.rise.split("").join("\n"),
+            originY: "bottom",
+            ...riseStyle
+          });
+          otherList.push(riseText);
+        }
         if (v.verified) {
           verifiedText = drawText([points[0], points[1] - 5], {
             value: "v",
@@ -348,8 +360,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const pointAttrNew = {
         origin: {
           data: v,
-          title: item.title,
-          key: item.key || "",
+          title: _item.title,
+          key: _item.key || "",
           unit: scaleValue.unit,
           type,
           dataIndex,
@@ -385,7 +397,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
-        if (item.title.includes("\u8109\u640F")) {
+        if (_item.title.includes("\u8109\u640F")) {
           maiboPoints.add(point);
         } else {
           otherPoints.add(point);

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

@@ -129,13 +129,11 @@ function drawPoint(type = "circle", style) {
         ...newStyle
       });
     case "image":
-      if (style == null ? void 0 : style.url) ; else {
-        return new fabric.Image(style.element, {
-          ...newStyle,
-          scale: 1
-        });
-      }
-    case "yemai":
+      return new fabric.Image(style.element, {
+        ...newStyle,
+        scale: 1
+      });
+    case "yemai": {
       const createAdd = () => {
         const width = ((style.radius || 5) + (style.strokeWidth || 1)) * 2;
         const subLineStyle = {
@@ -152,7 +150,8 @@ function drawPoint(type = "circle", style) {
         scale: 1,
         ...newStyle
       });
-    case "koumai":
+    }
+    case "koumai": {
       const left = (style.radius || 5) + (style.strokeWidth || 1);
       const circle = new fabric.Circle({
         objectCaching: false,
@@ -167,6 +166,7 @@ function drawPoint(type = "circle", style) {
         scale: 1,
         ...newStyle
       });
+    }
     default:
       style && Reflect.deleteProperty(style, "stroke");
       return new fabric.Text(String(type), {

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

@@ -235,8 +235,21 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   function isLimit(point) {
     return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
   }
+  function moveLimit(point) {
+    if (point.left >= originX && point.left <= endX) {
+      point.setCoords();
+      const newY = point.origin.type === "pain" ? painOriginY : vitalSignsOriginY;
+      if (point.top < newY.originY) {
+        point.set("top", newY.originY);
+      }
+      if (point.top > newY.endY) {
+        point.set("top", newY.endY);
+      }
+    }
+  }
   function setPointEvent(point) {
     point.on("moving", () => {
+      moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
       } else {

package/es/components/form-render/src/FormRender.js

@@ -1,4 +1,5 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
+import { arrayed } from '../../../shared/utils/index2.js';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
@@ -7,7 +8,7 @@ import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from './constants/index2.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle2.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides2.js';
-import { arrayed } from './utils/index.js';
+import './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
 import '../index2.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor2.js';

package/es/components/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate2.js

@@ -2,7 +2,7 @@ import { isField } from '@formily/core';
 import { flatten } from 'lodash-es';
 import { onMounted } from 'vue';
 import '../../../../../index2.js';
-import { arrayed } from '../../../../utils/index.js';
+import { arrayed } from '../../../../../../../shared/utils/index2.js';
 import { useFormField } from '../../../../hooks/useFormField2.js';
 
 function useDeepValidate() {

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

@@ -1,7 +1,8 @@
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isObject } from '@vueuse/core';
 import { cloneDeep, omit, pick } from 'lodash-es';
 import '../../index2.js';
-import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
+import { parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize2.js';
 import { fieldKeyEscape, createLinebarId } from '../utils/schema2.js';
 import { transformDateFormat } from '../utils/business2.js';

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

@@ -1,4 +1,4 @@
-import { arrayed } from '../utils/index.js';
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isFunction } from '@vueuse/core';
 
 function useFieldVisitor() {

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

@@ -1,5 +1,6 @@
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { isString } from 'lodash-es';
-import { arrayed } from '../utils/index.js';
+import '../utils/index.js';
 import { isFunction } from '@vueuse/core';
 import { isIdCard } from '../utils/business2.js';
 

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

@@ -5,7 +5,6 @@ export * from './business';
 export * from './dom';
 export * from './schema';
 export declare function formRenderLog(message: string): void;
-export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;

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

@@ -1,4 +1,5 @@
 import { computed, createVNode, Fragment, inject, provide } from 'vue';
+import { arrayed } from '../../../../shared/utils/index2.js';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { useMemoize } from '@vueuse/core';
@@ -9,11 +10,6 @@ import '@formily/core';
 function formRenderLog(message) {
   console.warn(`[FormRender]: ${message}`);
 }
-function arrayed(maybeArray) {
-  if (Array.isArray(maybeArray))
-    return maybeArray;
-  return [maybeArray];
-}
 function mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
   function traverse(_target, _fieldList) {
     _fieldList.forEach((field) => {
@@ -138,4 +134,4 @@ function optionMatcher(options, input, key, matcherOption = {
   }
 }
 
-export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };
+export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };