cnhis-design-vue 3.1.15 → 3.1.16-beta.10

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.js

@@ -28,6 +28,7 @@ function useColumnConfigAdaptor() {
           type,
           "select"
         ]),
+        ...["DATE"].map((type) => [type, "date"]),
         ...["INPUT"].map((type) => [type, "input"]),
         ...["DIGITAL"].map((type) => [type, "number"])
       ]);
@@ -40,13 +41,17 @@ function useColumnConfigAdaptor() {
       const validateHandler = (value, result) => {
         if (!isObject(value))
           return;
-        result.componentProps = Object.assign({}, result.comonentProps, {
-          maxlength: value.max_length,
-          minlength: value.min_length,
-          max: value.max_value,
-          min: value.min_value,
-          precision: value.decimal_length
-        });
+        const keyMap = {
+          maxlength: "max_length",
+          minlength: "min_length",
+          max: "max_value",
+          min: "min_value",
+          precision: "decimal_length"
+        };
+        result.componentProps = Object.assign({}, result.comonentProps, Object.entries(keyMap).reduce((res, [k, v]) => {
+          res[k] = value[v];
+          return res;
+        }, {}));
       };
       const dateRangeValidate = (value, result) => {
         if (!isObject(value))
@@ -71,14 +76,25 @@ function useColumnConfigAdaptor() {
         const option = { label: value.describe, ...value };
         result.options = isArray(result.options) ? [...result.options, option] : [option];
       };
+      const htmlTypeHandler = (value, result, fieldItem) => {
+        var _a;
+        if (!isString(value))
+          return;
+        if (value === "DATE") {
+          result.formType = isString(fieldItem.date_format) && fieldItem.date_format.startsWith("HH:mm") ? "time" : "date";
+          return;
+        }
+        result.formType = (_a = htmlTypeValueMap.get(value)) != null ? _a : value;
+      };
       const settingMap = new Map([
         ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
         ["is_null", isNullHandler],
         ["validate", validateHandler],
         ["dateValidate", dateRangeValidate],
+        ["date_format", "valueFormat"],
         ...["open", "close"].map((key) => [key, switchOptionHandler]),
         ["is_edit", { property: "isEdit", valueMap: isEditValueMap }],
-        ["html_type", { property: "formType", valueMap: htmlTypeValueMap }],
+        ["html_type", htmlTypeHandler],
         ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }],
         [
           "alias",

package/es/packages/big-table/src/hooks/useEdit.js

@@ -100,7 +100,7 @@ const useEdit = (props, state, emit, xGrid) => {
     } else {
       row[column.columnName] = value;
     }
-    if ((column == null ? void 0 : column.formType) === "date" && !value) {
+    if (((column == null ? void 0 : column.formType) === "date" || (column == null ? void 0 : column.formType) === "time") && !value) {
       row[column.columnName] = void 0;
     }
     emit("formChange", { value, row, column, index, oldValue });

package/es/packages/big-table/src/hooks/useEvent.d.ts

@@ -1,4 +1,4 @@
-export declare const useEvent: (props: any, state: any, emit: any, xGrid: any) => {
+export declare const useEvent: (props: any, state: any, emit: any, xGrid: any, anchorEvent: Function) => {
     keyDown: ({ $event }: {
         $event: KeyboardEvent;
     }) => void;

package/es/packages/big-table/src/hooks/useEvent.js

@@ -1,7 +1,7 @@
 import vexutils from '../../../../src/utils/vexutils';
 import { hideFilterWrap } from '../utils.js';
 
-const useEvent = (props, state, emit, xGrid) => {
+const useEvent = (props, state, emit, xGrid, anchorEvent) => {
   function keyDown({ $event }) {
     var _a, _b;
     let activeRow = null;
@@ -29,7 +29,7 @@ const useEvent = (props, state, emit, xGrid) => {
       if ($event.key === "ArrowDown" && index < ((_b = props.data) == null ? void 0 : _b.length) - 1) {
         activeIndex = index + 1;
       }
-      let row = xGridRef.getData(activeIndex);
+      const row = xGridRef.getData(activeIndex);
       xGridRef.setCurrentRow(row);
       xGridRef.scrollToRow(row);
       emitKeyBoard();
@@ -60,6 +60,7 @@ const useEvent = (props, state, emit, xGrid) => {
       hideFilterWrap(state, props);
     }
     scrollEvent(params);
+    anchorEvent(params);
   };
   return {
     keyDown,

package/es/packages/big-table/style/index.css

@@ -282,7 +282,7 @@ body > .vxe-table--tooltip-wrapper {
   height: 30px;
   line-height: 30px;
 }
-.custom-big-table .vxe-table .vxe-cell--checkbox.is--disabled .vxe-checkbox--icon {
+.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label {
   display: none;
 }
 .custom-big-table .filter-box {
@@ -307,7 +307,6 @@ body > .vxe-table--tooltip-wrapper {
 }
 .custom-big-table .disabled-checked-tips {
   position: absolute;
-  left: 6px;
   top: 50%;
   bottom: 0;
   right: 0;

package/es/packages/button-print/index.d.ts

@@ -4016,7 +4016,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+            preset: import("vue").PropType<"dialog" | "card" | "confirm">;
             to: import("vue").PropType<string | HTMLElement>;
             displayDirective: {
                 type: import("vue").PropType<"show" | "if">;
@@ -4978,7 +4978,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+            preset: import("vue").PropType<"dialog" | "card" | "confirm">;
             to: import("vue").PropType<string | HTMLElement>;
             displayDirective: {
                 type: import("vue").PropType<"show" | "if">;

package/es/packages/button-print/src/ButtonPrint.vue.d.ts

@@ -4020,7 +4020,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+            preset: import("vue").PropType<"dialog" | "card" | "confirm">;
             to: import("vue").PropType<string | HTMLElement>;
             displayDirective: {
                 type: import("vue").PropType<"show" | "if">;
@@ -4982,7 +4982,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+            preset: import("vue").PropType<"dialog" | "card" | "confirm">;
             to: import("vue").PropType<string | HTMLElement>;
             displayDirective: {
                 type: import("vue").PropType<"show" | "if">;

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/button-print/src/components/IdentityVerification.vue.d.ts

@@ -1505,7 +1505,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;
@@ -2467,7 +2467,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;

package/es/packages/drag-layout/index.d.ts

@@ -1888,7 +1888,7 @@ declare const DragLayout: SFCWithInstall<import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;
@@ -2850,7 +2850,7 @@ declare const DragLayout: SFCWithInstall<import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;

package/es/packages/drag-layout/src/DragLayout.vue.d.ts

@@ -1888,7 +1888,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;
@@ -2850,7 +2850,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
-        preset: import("vue").PropType<"dialog" | "confirm" | "card">;
+        preset: import("vue").PropType<"dialog" | "card" | "confirm">;
         to: import("vue").PropType<string | HTMLElement>;
         displayDirective: {
             type: import("vue").PropType<"show" | "if">;

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

@@ -115,7 +115,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const times = top.xScalevalue.times;
       let left = originX.value - xCellWidth.value;
       function getDate(date) {
-        return String(date).length < 9 ? `20${date}` : date;
+        const [year = "2022", month = "01", day = "01"] = String(date).match(/\d+/g) || [];
+        return `20${year}`.slice(-4) + "-" + `00${month}`.slice(-2) + "-" + `00${day}`.slice(-2);
       }
       const timeList = dateList.map((item) => {
         return times.map((v) => {

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/useLeft.js

@@ -65,12 +65,14 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     const list = [];
     if (item.showScale || item.showNumber) {
       const { lineXMain, textLeft } = getScaleInfo(item.position, iconsWidth, originX - iconsWidth);
+      const listLen = item.list.length;
       item.list.forEach((v, i) => {
         let top = painOriginY.endY - i * yCellHeight * item.spaceGridNumber;
         if (i === 0) {
           top = endY - 5;
         }
-        if (item.showNumber) {
+        const isMaxMinNumber = i === 0 || i === listLen - 1;
+        if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
           list.push(drawScaleNumber(v, item, textLeft, top));
         }
         if (item.showScale && i !== 0) {
@@ -117,20 +119,22 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
         const spaceScale = spaceGridNumber * yCellHeight / 5;
         const position = item.position || "center";
         const { lineXMain, lineXSub, textLeft } = getScaleInfo(item.position, rectLeft, rectWidth);
+        const listLen = item.list.length;
         item.list.forEach((v, i) => {
           const top = vitalSignsOriginY.endY - i * yCellHeight * spaceGridNumber;
-          if (item.showNumber) {
+          const isMaxMinNumber = i === 0 || i === listLen - 1;
+          if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
             const text = drawScaleNumber(v, item, textLeft, i === 0 ? top - 5 : top);
             list.push(text);
           }
-          if (item.showScale && i !== item.list.length - 1) {
+          if (item.showScale && i !== listLen - 1) {
             for (let j = 0; j < 5; j++) {
               if (j > 0 || !item.showNumber || position !== "center") {
                 const x1 = j == 0 ? lineXMain[0] : lineXSub[0];
                 const x2 = j == 0 ? lineXMain[1] : lineXSub[1];
                 const y = top - j * spaceScale;
                 createLine([x1, y, x2, y]);
-                if (i == item.list.length - 2 && j == 4) {
+                if (i == listLen - 2 && j == 4) {
                   createLine([lineXMain[0], y - spaceScale, lineXMain[1], y - spaceScale]);
                 }
               }

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/field-set/index.d.ts

@@ -6974,7 +6974,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onClose" | "onSave", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: import("vue").PropType<any[]>;
         default: () => never[];

package/es/packages/field-set/src/FieldSet.vue.d.ts

@@ -6954,7 +6954,7 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onClose" | "onSave", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: PropType<any[]>;
         default: () => never[];