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

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

@@ -2537,7 +2537,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             modelValue: boolean;
         };
         emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-        form: any;
+        form: {
+            account: string;
+            password: string;
+        };
         rules: import("naive-ui").FormRules;
         style: {
             width: string;

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

@@ -2541,7 +2541,10 @@ declare const _default: import("vue").DefineComponent<{
             modelValue: boolean;
         };
         emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-        form: any;
+        form: {
+            account: string;
+            password: string;
+        };
         rules: import("naive-ui").FormRules;
         style: {
             width: string;

package/es/packages/button-print/src/components/IdentityVerification.js

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, ref, onMounted, watch, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, createVNode, createTextVNode } from 'vue';
+import { defineComponent, reactive, ref, watch, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, createVNode, createTextVNode } from 'vue';
 import { useMessage, NModal, NForm, NFormItem, NInput, NButton } from 'naive-ui';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
@@ -19,7 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       account: "",
       password: ""
     };
-    let form = reactive(JSON.parse(JSON.stringify(DEFAULT_FORM)));
+    let form = reactive({ ...DEFAULT_FORM });
     const rules = {
       account: { required: true, message: "\u8BF7\u8F93\u5165\u8D26\u53F7" },
       password: { required: true, message: "\u8BF7\u8F93\u5165\u5BC6\u7801" }
@@ -33,9 +33,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const submit = async () => {
       var _a;
-      const { data = {} } = await props.verifyUser(form);
+      const { data = {} } = await props.verifyUser(form) || {};
       if (data.result !== "SUCCESS") {
-        $message.error(data.resultMsg);
+        $message.error(data.resultMsg || "\u8BF7\u6DFB\u52A0\u8EAB\u4EFD\u6821\u9A8C\u63A5\u53E3\u914D\u7F6E");
         return false;
       }
       emit("success", (_a = data.map) == null ? void 0 : _a.token);
@@ -51,12 +51,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    onMounted(() => {
-    });
     watch(() => props.modelValue, (val) => {
       if (val)
         return;
-      form = JSON.parse(JSON.stringify(DEFAULT_FORM));
+      Object.assign(form, DEFAULT_FORM);
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NModal), {

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

@@ -26,7 +26,10 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: boolean;
     };
     emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-    form: any;
+    form: {
+        account: string;
+        password: string;
+    };
     rules: FormRules;
     style: {
         width: string;

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

@@ -260,7 +260,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const list = (item == null ? void 0 : item.list) || [];
       if (!list.length)
         return 0;
-      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / item.spaceGridNumber);
+      return yCellHeight.value / ((list[1] - list[0]) / item.spaceGridNumber);
     }
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);

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

@@ -1,7 +1,7 @@
 const TEMPERATURE_MENU = [
   {
     label: "\u5347\u6E29",
-    value: false,
+    value: true,
     type: "rise"
   },
   {

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

@@ -3,25 +3,75 @@ import { fabric } from '../utils/index.js';
 import { defaultStyle } from './useDraw.js';
 
 function useOther(canvas, propItems, cumputedX) {
-  const { originY, other, vitalSignsOriginY } = propItems;
+  const { other, vitalSignsOriginY } = propItems;
   function drawOther() {
-    if (!other || !other.list)
+    if (!(other == null ? void 0 : other.list))
       return false;
     const list = [];
-    other.list.forEach((v, i) => {
-      var _a;
-      const text = new fabric.Text(String(v.value.toString().split("").join("\n")), {
-        originX: "center",
-        top: (((_a = v.style) == null ? void 0 : _a.baseTop) || 0) + vitalSignsOriginY.originY,
-        left: cumputedX(v.time),
-        textAlign: "center",
-        ...defaultStyle,
-        ...v.style || {}
+    const otherList = [];
+    other.list.forEach((item) => {
+      const align = item.align || "vertical";
+      const left = cumputedX(item.time);
+      const obj = otherList.find((v) => v.left == left);
+      if (obj) {
+        obj[align].push(item);
+      } else {
+        const initObj = {
+          left,
+          vertical: [],
+          horizontal: []
+        };
+        initObj[align].push(item);
+        otherList.push(initObj);
+      }
+    });
+    let textWidth = 0;
+    otherList.forEach((item) => {
+      let topY = vitalSignsOriginY.originY;
+      let leftX = item.left;
+      let textHeight = 0;
+      item.vertical.forEach((v) => {
+        const { commonOptions, value } = getTextData(v);
+        topY += (v.baseTop || 0) + textHeight;
+        const text = new fabric.Text(value, {
+          top: topY,
+          left: item.left,
+          ...commonOptions
+        });
+        textHeight = text.height || 0;
+        setTextWidth(text);
+      });
+      item.horizontal.forEach((v, i) => {
+        if (i > 0 || item.vertical.length) {
+          leftX += textWidth;
+        }
+        const { commonOptions, value } = getTextData(v);
+        const text = new fabric.Text(value, {
+          top: vitalSignsOriginY.originY,
+          left: leftX,
+          ...commonOptions
+        });
+        setTextWidth(text);
       });
-      list.push(text);
     });
+    function setTextWidth(text) {
+      if (!textWidth) {
+        textWidth = text.width || 0;
+      }
+      list.push(text);
+    }
+    function getTextData(v) {
+      return {
+        commonOptions: {
+          originX: "center",
+          textAlign: "center",
+          ...defaultStyle,
+          ...v.style || {}
+        },
+        value: String(v.value.toString().split("").join("\n"))
+      };
+    }
     const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-    group && group.sendToBack();
     group && canvas.value.add(group);
   }
   onMounted(() => {

package/es/packages/form-config/style/index.css

@@ -69,7 +69,7 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
-  width: 220px;
+  width: 240px;
   background: white;
 }
 .form-config__configHeader {

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

@@ -54,6 +54,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       effects() {
         onFieldValueChange("*", async (field) => {
           const fieldKey = field.props.name.toString();
+          businessCollector.trigger(fieldKey);
+          formItemDepsCollector.trigger(fieldKey);
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
@@ -61,8 +63,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value: field.value,
             context: await changeContextCollector.getContext(fieldKey)
           });
-          businessCollector.trigger(fieldKey);
-          formItemDepsCollector.trigger(fieldKey);
         });
       }
     });

package/es/packages/form-render/src/hooks/useTypeNormalize.js

@@ -8,7 +8,8 @@ function useTypeNormalize() {
         validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
         val_key: item.val_key_unit,
         html_type: "SELECT",
-        option: item.option
+        option: item.option,
+        urlConfig: item.urlConfig
       }
     ];
   }

package/es/packages/index.css

@@ -3248,7 +3248,7 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
-  width: 220px;
+  width: 240px;
   background: white;
 }
 .form-config__configHeader {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.10",
+  "version": "3.1.16-beta.13",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -31,9 +31,9 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@formily/core": "^2.1.9",
-    "@formily/path": "^2.1.9",
-    "@formily/vue": "^2.1.9",
+    "@formily/core": "2.1.9",
+    "@formily/path": "2.1.9",
+    "@formily/vue": "2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",