cnhis-design-vue 3.4.0-beta.41 → 3.4.0-beta.44

package/es/components/fabric-chart/src/hooks/surgicalAnesthesia/useLeft.js

@@ -91,12 +91,12 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
       ...item,
       isExternal: true
     }));
-    const { projectNameMargin = [5, 30], titleWidth = 20 } = left;
+    const { projectNameMargin = [5, 30], titleWidth = 20, projectNameLineHeight = 10 } = left;
     let topY = endY + markHeight + extracorporealCirculationHeight - projectNameMargin[0];
     const leftX = titleWidth + projectNameMargin[1];
     const iconList = [];
     externalIconList.concat(list.reverse()).forEach((item) => {
-      topY -= 10;
+      topY -= projectNameLineHeight;
       const title = item.title;
       const { text, icon } = drawTextAndIconGroup(title, item, {
         text: {

package/es/components/fabric-chart/src/hooks/temperature/useCenter.js

@@ -190,7 +190,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             shadowLines.forEach((l) => {
               shadowLinesCache.add(l);
             });
-          } else {
+          } else if (!style.onlyBorder) {
             const finalData = getLineData(item);
             if (finalData.length > 0) {
               const otherFilters = otherLineData.filter(([[x1, _]]) => {

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -553,9 +553,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -594,9 +594,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

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

@@ -773,9 +773,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,9 +384,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hide: boolean;
     }>;
     draggable: boolean;
-    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
+    isHighlightRow: boolean;
     isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
     hideExpressionOption: AnyObject[];

package/es/components/form-render/src/components/renderer/radio_checkbox.js

@@ -94,7 +94,8 @@ function createComponent(name, Wrapper, Item) {
         set: (value) => emit("update:value", value)
       });
       const {
-        renderComplexOption
+        renderComplexOption,
+        hasComplexOption
       } = useComplexOptions(props, valueRef);
       const {
         labelKey,
@@ -179,7 +180,7 @@ function createComponent(name, Wrapper, Item) {
             style.width = percentWidth;
           }
         }
-        if (index === options.length - 1) {
+        if (index === options.length - 1 && hasComplexOption.value) {
           classList.push("form-render__lastOption");
         }
         return createVNode(Item, {

package/es/components/iho-chat/src/components/MultipleVideo.vue2.js

@@ -6,7 +6,7 @@ import { Close, Mic, MicOff, Videocam, VideocamOff, Call, PersonAdd, ResizeOutli
 import { getUserDetailApi } from '../api/index.js';
 import '@vueuse/core';
 import { $message } from '../utils/index.js';
-import 'lodash-es';
+import { remove } from 'lodash-es';
 import { CHAT_TYPE, SUBSCRIBE_MESSAGE_TYPE } from '../constants/index.js';
 import '../../../../shared/utils/index.js';
 import 'date-fns';
@@ -385,6 +385,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       try {
         removeUser(userId);
         console.log("Cleaned up resources for user:", userId);
+        remove(state.currentAVMsg.checkedIds, (id) => id === userId);
         setTimeout(() => {
           const user = findUser(userId);
           if (user) {

package/es/components/scale-view/index.d.ts

@@ -405,7 +405,7 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<import("v
     beforeCloseFn: () => Promise<unknown>;
     cancel: () => Promise<void>;
     getScaleData: () => any;
-    batchInjectFormNew: (data: import("../../shared/types").AnyObject, skipValid?: boolean) => Promise<void>;
+    batchInjectFormNew: (data: import("../../shared/types").AnyObject, skipValid?: boolean) => Promise<boolean>;
     readonly isCollection: (e: string) => boolean;
     NoData: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         noDataTip: {

package/es/components/scale-view/src/ScaleView.vue.d.ts

@@ -404,7 +404,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     beforeCloseFn: () => Promise<unknown>;
     cancel: () => Promise<void>;
     getScaleData: () => any;
-    batchInjectFormNew: (data: AnyObject, skipValid?: boolean) => Promise<void>;
+    batchInjectFormNew: (data: AnyObject, skipValid?: boolean) => Promise<boolean>;
     readonly isCollection: (e: string) => boolean;
     NoData: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         noDataTip: {

package/es/components/scale-view/src/ScaleView.vue2.js

@@ -1,5 +1,5 @@
 import { i18n } from '../../../_virtual/_virtual_i18n-methods.js';
-import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, normalizeClass, unref, Fragment, createBlock, mergeProps, createCommentVNode, createElementVNode, createVNode, withCtx, renderList, toDisplayString, createTextVNode, resolveDynamicComponent, renderSlot } from 'vue';
+import { defineComponent, reactive, ref, watch, nextTick, onUnmounted, openBlock, createElementBlock, normalizeClass, unref, Fragment, createBlock, mergeProps, createCommentVNode, createElementVNode, createVNode, withCtx, renderList, toDisplayString, createTextVNode, resolveDynamicComponent, renderSlot } from 'vue';
 import useNoData from './hooks/use-noData.js';
 import { ScaleViewProps } from './hooks/scaleview-props.js';
 import { getScaleViewState } from './hooks/scaleview-state.js';
@@ -219,12 +219,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const batchInjectFormNew = async (data, skipValid = false) => {
       window._beforeCloseFn = null;
-      await batchInjectForm(data, skipValid);
+      const batchStatus = await batchInjectForm(data, skipValid);
       if (!skipValid || !props.closeConfirm)
-        return;
+        return batchStatus;
       formChecker.setInitialSnapshot(state.form);
       window._beforeCloseFn = beforeCloseFn;
+      return batchStatus;
     };
+    onUnmounted(() => {
+      if (window._beforeCloseFn) {
+        window._beforeCloseFn = null;
+      }
+    });
     __expose({
       getScaleData,
       onSubmitForm,

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.41";
+var version = "3.4.0-beta.44";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.41",
+	"version": "3.4.0-beta.44",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "541f2445556b79280b933b0af407e4fd9048bb32"
+	"gitHead": "0ba92b692dccd0edb27b0d1daa3583718db6831c"
 }