cnhis-design-vue 3.1.16-beta.7 → 3.1.16-beta.8

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -228,7 +228,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           templateId: getTemplateIdByFormatId(state.currentFormatId),
           print: {
             print: "1",
-            type: "1"
+            type: "1",
+            callback: "1"
           },
           params
         };

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

@@ -7,12 +7,12 @@ const TEMPERATURE_MENU = [
   {
     label: "\u836F\u7269\u964D\u6E29",
     value: void 0,
-    type: "drugCooling"
+    type: "drugReduce"
   },
   {
     label: "\u7269\u7406\u964D\u6E29",
     value: void 0,
-    type: "physicalCooling"
+    type: "physicsReduce"
   },
   {
     label: "\u4E0D\u5347",
@@ -24,12 +24,12 @@ const PAIN_MENU = [
   {
     label: "\u836F\u7269\u964D\u75DB",
     value: void 0,
-    type: "drugReducePain"
+    type: "drugReduce"
   },
   {
     label: "\u7269\u7406\u964D\u75DB",
     value: void 0,
-    type: "physicalReducePain"
+    type: "physicsReduce"
   }
 ];
 

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

@@ -234,19 +234,19 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       lineAttr = {},
       noRiseStyle = {},
       verifiedStyle = {},
-      coolingStyle = {},
+      reduceStyle = {},
       type = "circle"
     } = item;
     const pointList = [];
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      var _a;
+      var _a, _b;
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
-      let coolLine, coolPoint, noRiseText, arrowGroup, verifiedText;
-      if (points && scaleValue.type === "temperature") {
+      let reduceLine, reducePoint, noRiseText, arrowGroup, verifiedText;
+      if ((points == null ? void 0 : points.length) && (scaleValue.type === "temperature" || scaleValue.type === "pain")) {
         if (v.noRise) {
           if (typeof v.noRise === "string") {
             noRiseText = drawText([points[0], points[1] + 5], {
@@ -285,24 +285,21 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           });
           otherList.push(verifiedText);
         }
-        if (v.physicalCooling || v.drugCooling) {
-          const coolingLineStyle = {
+        if (v.physicsReduce || v.drugReduce) {
+          const reduceY = cumputedY(scaleValue.type, scaleValue.list, v.physicsReduce || v.drugReduce);
+          reduceLine = drawLine([...points, points[0], reduceY], {
             ...lineAttr,
-            stroke: coolingStyle.stroke,
-            strokeDashArray: [3, 3]
-          };
-          const coolY = cumputedY(scaleValue.type, scaleValue.list, v.physicalCooling || v.drugCooling);
-          coolLine = drawLine([...points, points[0], coolY], {
-            ...coolingLineStyle
+            ...reduceStyle.line,
+            ...defaultStyle
           });
-          coolPoint = drawPoint("circle", {
+          reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
             left: points[0],
-            top: coolY,
-            ...coolingStyle,
+            top: reduceY,
+            ...reduceStyle.point,
             ...defaultStyle
           });
-          coolLine && otherList.push(coolLine);
-          coolPoint && otherList.push(coolPoint);
+          reduceLine && otherList.push(reduceLine);
+          reducePoint && otherList.push(reducePoint);
         }
       }
       let point;
@@ -312,7 +309,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           ...lineAttr
         });
       } else if (points && !nextPoint && !v.breakpoint && scaleValue.type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
-        const nextV2 = (_a = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _a[0];
+        const nextV2 = (_b = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _b[0];
         const nextLinePoint = getPointer(nextV2, scaleValue);
         line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
           ...lineAttr
@@ -338,8 +335,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         verifiedText,
         leftLine: previousLine,
         rightLine: line,
-        coolLine,
-        coolPoint,
+        reduceLine,
+        reducePoint,
         lockMovementX: true,
         ...pointAttr,
         ...propItems.event
@@ -456,9 +453,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       point.rightLine.setCoords();
       point.rightLine.set({ x1: point.left, y1: point.top });
     }
-    if (point.coolLine) {
-      point.coolLine.setCoords();
-      point.coolLine.set({ x1: point.left, y1: point.top });
+    if (point.reduceLine) {
+      point.reduceLine.setCoords();
+      point.reduceLine.set({ x1: point.left, y1: point.top });
     }
     if (point.noRiseText) {
       point.noRiseText.setCoords();

package/es/packages/fabric-chart/src/hooks/useDraw.js

@@ -44,12 +44,19 @@ function drawTextGroup(rectStyle, fontStyle, groupStyle) {
     ...defaultRectStyle,
     ...rectStyle
   });
-  const texts = new fabric.Text(String(fontStyle.value), {
+  const { value = "\u6807\u9898", textAlign = "center", verticalAlign = "center" } = fontStyle;
+  const textLeft = rectStyle.width / 2;
+  const textTop = rectStyle.height / 2;
+  const texts = new fabric.Text(String(value), {
     ...defaultTextStyle,
     ...fontStyle,
-    ...fontStyle.textAlign == "left" ? {
-      originX: "left",
-      left: -(rectStyle.width / 2)
+    ...textAlign == "left" || textAlign == "right" ? {
+      originX: textAlign,
+      left: textAlign == "left" ? -textLeft : textLeft
+    } : {},
+    ...verticalAlign == "top" || verticalAlign == "bottom" ? {
+      originY: verticalAlign,
+      top: verticalAlign == "top" ? -textTop : textTop
     } : {}
   });
   return new fabric.Group([rect, texts], {

package/es/packages/fabric-chart/src/hooks/useEvent.js

@@ -47,12 +47,20 @@ function useCanvasEvent(canvas, propItems, emits) {
       if (index > 0) {
         topY += propItems[`${topList[index - 1].key}Height`];
       }
-      selections2.push(drawRect({
-        left: iconsWidth,
+      const commonOptions = {
         top: topY + 1,
-        width: endX - iconsWidth,
         height: propItems[`${item.key}Height`] - 1
+      };
+      selections2.push(drawRect({
+        left: iconsWidth,
+        width: originX - iconsWidth,
+        ...commonOptions
       }, item.key));
+      selections2.push(drawRect({
+        left: originX,
+        width: endX - originX,
+        ...commonOptions
+      }, item.key + "Title"));
     });
     selections2.push(drawRect({
       left: originX,

package/es/packages/fabric-chart/src/hooks/useTop.js

@@ -24,7 +24,7 @@ function useTop(canvas, propItems) {
         topY += propItems[`${topList[index - 1].key}Height`];
       }
       if (item.key == "xScalevalue") {
-        drawDay(list, topY);
+        drawDay(item, list, topY);
         drawTime(item, list, topY);
       } else {
         propItems[`${item.key}Height`] && drawDate(item, list, topY);
@@ -35,7 +35,6 @@ function useTop(canvas, propItems) {
     group && canvas.value.add(group);
   }
   function drawTime(item, list, topY) {
-    var _a;
     const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
     const height = xScalevalueHeight - dayHeight;
     const title = drawTextGroup({
@@ -45,7 +44,7 @@ function useTop(canvas, propItems) {
     }, {
       value: top.xScalevalue.title,
       ...defaultTextStyle,
-      ...((_a = top.date) == null ? void 0 : _a.style) || {},
+      ...item.style || {},
       ...item.titleStyle || {}
     }, {
       left: iconsWidth,
@@ -57,7 +56,6 @@ function useTop(canvas, propItems) {
       timeList.push(top.xScalevalue.list);
     }
     timeList.flat().forEach((v, i) => {
-      var _a2;
       const left = originX + i * xCellWidth;
       const textGroup = drawTextGroup({
         width: xCellWidth,
@@ -65,7 +63,7 @@ function useTop(canvas, propItems) {
       }, {
         value: v,
         ...defaultTextStyle,
-        ...((_a2 = top.date) == null ? void 0 : _a2.style) || {}
+        ...item.style || {}
       }, {
         left,
         top: topY + dayHeight
@@ -73,8 +71,7 @@ function useTop(canvas, propItems) {
       list.push(textGroup);
     });
   }
-  function drawDay(list, topY) {
-    var _a;
+  function drawDay(item, list, topY) {
     if (!top.dayHeight)
       return false;
     const height = top.dayHeight;
@@ -89,7 +86,7 @@ function useTop(canvas, propItems) {
       }, {
         value,
         ...defaultTextStyle,
-        ...((_a = top.date) == null ? void 0 : _a.style) || {}
+        ...item.style || {}
       }, {
         left,
         top: topY

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

@@ -91,16 +91,16 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("..").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
@@ -1744,16 +1744,16 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("..").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
@@ -3498,16 +3498,16 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             date_format?: string | undefined;
             step_length?: string | number | undefined;
             urlConfig?: {
-                url?: string | undefined;
-                method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+                url: string;
+                method?: import("..").FormRequestType | undefined;
+                nameKey?: string | undefined;
+                valueKey?: string | undefined;
+                params?: import("../../../es/src/types").AnyObject | undefined;
                 dependKey?: string | Record<string, string> | (string | {
                     paramName: string;
                     paramValue?: string | undefined;
                     required?: boolean | undefined;
                 })[] | undefined;
-                params?: import("../../../es/src/types").AnyObject | undefined;
-                nameKey?: string | undefined;
-                valueKey?: string | undefined;
             } | undefined;
             suffixConfig?: any | any[] | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;

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

@@ -93,16 +93,16 @@ declare const _default: import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("../../../../es/packages/form-render").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
@@ -1746,16 +1746,16 @@ declare const _default: import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("../../../../es/packages/form-render").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;
@@ -3500,16 +3500,16 @@ declare const _default: import("vue").DefineComponent<{
             date_format?: string | undefined;
             step_length?: string | number | undefined;
             urlConfig?: {
-                url?: string | undefined;
-                method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+                url: string;
+                method?: import("../../../../es/packages/form-render").FormRequestType | undefined;
+                nameKey?: string | undefined;
+                valueKey?: string | undefined;
+                params?: import("../../../../es/src/types").AnyObject | undefined;
                 dependKey?: string | Record<string, string> | (string | {
                     paramName: string;
                     paramValue?: string | undefined;
                     required?: boolean | undefined;
                 })[] | undefined;
-                params?: import("../../../../es/src/types").AnyObject | undefined;
-                nameKey?: string | undefined;
-                valueKey?: string | undefined;
             } | undefined;
             suffixConfig?: any | any[] | undefined;
             fieldType?: import("@formily/json-schema").SchemaTypes | undefined;

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

@@ -76,16 +76,16 @@ declare const _default: import("vue").DefineComponent<{}, {
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("../../../../../es/packages/form-render").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;

package/es/packages/form-render/src/components/renderer/cascader.d.ts

@@ -1,17 +1,6 @@
-import { AnyObject, ArrayAble, Func } from '../../../../../../es/src/types';
-import { FormRequestType } from '../../types';
+import { AnyObject, Func } from '../../../../../../es/src/types';
+import { UrlConfig } from '../../../../../../es/packages/form-render';
 import { PropType } from 'vue';
-declare type DependKeyObj = {
-    paramName: string;
-    paramValue: string;
-};
-declare type UrlConfig = {
-    method?: FormRequestType;
-    nameKey?: string;
-    valueKey?: string;
-    dependKey?: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
-    url: string;
-};
 export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;
@@ -51,4 +40,3 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
 }, {
     options: AnyObject[];
 }>;
-export {};

package/es/packages/form-render/src/components/renderer/select.d.ts

@@ -1,14 +1,6 @@
 import { AnyObject, Func } from '../../../../../../es/src/types';
-import { FormRequestType } from '../../types';
+import { UrlConfig } from '../../types';
 import { PropType } from 'vue';
-declare type UrlConfig = {
-    method: FormRequestType;
-    dependKey?: string | string[];
-    nameKey: string;
-    url: string;
-    params?: AnyObject;
-    valueKey: string;
-};
 export declare const SELECT: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
@@ -53,4 +45,3 @@ export declare const SELECT: import("vue").DefineComponent<{
     options: AnyObject[];
     lazyRequest: boolean;
 }>;
-export {};

package/es/packages/form-render/src/components/renderer/select.js

@@ -1,8 +1,9 @@
 import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { cloneDeep, isEqual } from 'lodash-es';
+import { cloneDeep, isEqual, isString } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
+import { formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -61,9 +62,11 @@ const script = defineComponent({
       }
       if (remoteOptions.value)
         return;
-      remoteOptions.value = await asyncQueue.addAsync({
-        ...await createParams(configFor(props), field.value, fieldKey.value)
-      });
+      try {
+        remoteOptions.value = await asyncQueue.addAsync(await createParams(configFor(props), field.value, fieldKey.value));
+      } catch (e) {
+        isString(e) && formRenderLog(e, "warn");
+      }
       async function createParams(config, field2, key) {
         const _params = {};
         try {

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

@@ -1,7 +1,7 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
-import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
+import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../es/packages/form-render';
 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<{
     /**
@@ -36,6 +36,15 @@ interface FormRendererPayload {
 export interface FormRenderer {
     (payload: FormRendererPayload): ArrayAble<VNode> | any;
 }
+export declare type UrlConfig = {
+    url: string;
+} & Partial<{
+    method?: FormRequestType;
+    nameKey?: string;
+    valueKey?: string;
+    params?: AnyObject;
+    dependKey?: DependKeyType;
+}>;
 interface SwitchProperty {
     value?: any;
     describe?: string;
@@ -141,17 +150,7 @@ export declare type FieldItem = {
      * slider控件间距
      */
     step_length: string | number;
-    urlConfig: Partial<{
-        url: string;
-        method: 'post' | 'get' | 'put' | 'patch' | 'delete';
-        /**
-         * 请求参数依赖关系
-         */
-        dependKey: DependKeyType;
-        params: AnyObject;
-        nameKey: string;
-        valueKey: string;
-    }>;
+    urlConfig: UrlConfig;
     /**
      * 控件组
      */

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

@@ -106,16 +106,16 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("..").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;

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

@@ -108,16 +108,16 @@ declare const _default: import("vue").DefineComponent<{
         date_format?: string | undefined;
         step_length?: string | number | undefined;
         urlConfig?: {
-            url?: string | undefined;
-            method?: "delete" | "post" | "get" | "patch" | "put" | undefined;
+            url: string;
+            method?: import("../../../../es/packages/form-render").FormRequestType | undefined;
+            nameKey?: string | undefined;
+            valueKey?: string | undefined;
+            params?: import("../../../../es/src/types").AnyObject | undefined;
             dependKey?: string | Record<string, string> | (string | {
                 paramName: string;
                 paramValue?: string | undefined;
                 required?: boolean | undefined;
             })[] | undefined;
-            params?: import("../../../../es/src/types").AnyObject | undefined;
-            nameKey?: string | undefined;
-            valueKey?: string | undefined;
         } | undefined;
         suffixConfig?: any | any[] | undefined;
         fieldType?: import("@formily/json-schema").SchemaTypes | undefined;

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.7",
+  "version": "3.1.16-beta.8",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",