cnhis-design-vue 3.4.0-beta.40 → 3.4.0-beta.43

package/README.md

@@ -1,87 +1,87 @@
-# 安装
-
-```shell
-npm i cnhis-design-vue@[版本号]
-# or
-yarn add cnhis-design-vue@[版本号] #推荐
-```
-
-## 1.全局引入
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-import 'cnhis-design-vue/es/packages/index.css';
-import cui from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(cui).mount('#app');
-```
-
-## 2. 按需引入
-
-组件现在支持了自动按需引入, 但是样式文件需要额外的处理
-
-### 2.1 样式处理方式1 (按需引入样式)
-
-```shell
-# 安装自动导入样式的插件
-npm i -d vite-plugin-style-import
-```
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-import { createStyleImportPlugin } from 'vite-plugin-style-import';
-
-export default defineConfig({
-  plugins: [
-    // ...otherPlugins
-    createStyleImportPlugin({
-      libs: [
-        {
-          libraryName: 'cnhis-design-vue',
-          esModule: true,
-          ensureStyleFile: true,
-          resolveStyle: name => {
-            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
-          }
-        }
-      ]
-    })
-  ]
-});
-```
-
-### 2.2 样式处理方式2 (全局引入样式)
-
-```typescript
-// main.ts
-import 'cnhis-design-vue/es/components/index.css';
-```
-
-## 3.FAQ
-
-### 3.1 项目打包后样式丢失
-
-处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    rollupOptions: {
-      // ..otherOptions
-      output: {
-        dir: './dist',
-        manualChunks: {
-          'cnhis-vendor': ['cnhis-design-vue']
-        }
-      }
-    }
-  }
-});
-```
+# 安装
+
+```shell
+npm i cnhis-design-vue@[版本号]
+# or
+yarn add cnhis-design-vue@[版本号] #推荐
+```
+
+## 1.全局引入
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+import 'cnhis-design-vue/es/packages/index.css';
+import cui from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(cui).mount('#app');
+```
+
+## 2. 按需引入
+
+组件现在支持了自动按需引入, 但是样式文件需要额外的处理
+
+### 2.1 样式处理方式1 (按需引入样式)
+
+```shell
+# 安装自动导入样式的插件
+npm i -d vite-plugin-style-import
+```
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+import { createStyleImportPlugin } from 'vite-plugin-style-import';
+
+export default defineConfig({
+  plugins: [
+    // ...otherPlugins
+    createStyleImportPlugin({
+      libs: [
+        {
+          libraryName: 'cnhis-design-vue',
+          esModule: true,
+          ensureStyleFile: true,
+          resolveStyle: name => {
+            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
+          }
+        }
+      ]
+    })
+  ]
+});
+```
+
+### 2.2 样式处理方式2 (全局引入样式)
+
+```typescript
+// main.ts
+import 'cnhis-design-vue/es/components/index.css';
+```
+
+## 3.FAQ
+
+### 3.1 项目打包后样式丢失
+
+处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      // ..otherOptions
+      output: {
+        dir: './dist',
+        manualChunks: {
+          'cnhis-vendor': ['cnhis-design-vue']
+        }
+      }
+    }
+  }
+});
+```

package/es/components/fabric-chart/src/hooks/electrocardiogram/hooks/useDetailEvent.js

@@ -48,6 +48,7 @@ function useDetailEvent(polyline, options) {
   function calcPointData(y) {
     return getYValue(y / scale);
   }
+  const detailCellWidth = xCellWidth * scale;
   const detailCellHeight = yCellHeight * scale;
   function clearDetailGroup() {
     var _a;
@@ -62,6 +63,7 @@ function useDetailEvent(polyline, options) {
     const target = event.target;
     if (!target.points)
       return;
+    const mainXLineOffsetX = event.pointer.x % xCellWidth;
     const { x: pointerX, y: pointerY } = event.pointer;
     const currentIdx = Math.floor((pointerX - target.left) / target.width * target.points.length) + lineStartIndex;
     let startIdx = currentIdx - detailRadius;
@@ -127,10 +129,11 @@ function useDetailEvent(polyline, options) {
     }
     function createGrid(points2, targetIdx2) {
       const subLineOptions = (idx) => idx % GRID_SUBLINE_NUMBER ? gridOptions.subLineStyle : null;
-      const subLineSpace = detailCellHeight / GRID_SUBLINE_NUMBER;
+      const subLineSpaceY = detailCellHeight / GRID_SUBLINE_NUMBER;
+      const subLineSpaceX = detailCellWidth / GRID_SUBLINE_NUMBER;
       const zeroPointY = EMPTY_TOP_SPACE + points2[maxIdx].y / Math.abs(points2[maxIdx].y - points2[minIdx].y) * polylineHeight;
-      const yTopCellNumber = Math.ceil(zeroPointY / subLineSpace);
-      const yBottomCellNumber = Math.ceil((renderHeight - zeroPointY) / subLineSpace);
+      const yTopCellNumber = Math.ceil(zeroPointY / subLineSpaceY);
+      const yBottomCellNumber = Math.ceil((renderHeight - zeroPointY) / subLineSpaceY);
       function createRowLine(y, idx) {
         return new fabric.Line([offset.x, offset.y + y, offset.x + renderWidth, offset.y + y], {
           ...gridOptions.mainLineStyle.x,
@@ -138,21 +141,21 @@ function useDetailEvent(polyline, options) {
         });
       }
       const rowLineGroup = new fabric.Group([
-        ...range(yBottomCellNumber).map((idx) => createRowLine(idx * subLineSpace + zeroPointY, idx)),
-        ...range(yTopCellNumber).map((idx) => createRowLine(-(idx * subLineSpace) + zeroPointY, idx))
+        ...range(yBottomCellNumber).map((idx) => createRowLine(idx * subLineSpaceY + zeroPointY, idx)),
+        ...range(yTopCellNumber).map((idx) => createRowLine(-(idx * subLineSpaceY) + zeroPointY, idx))
       ]);
-      const currentPointX = targetIdx2 / points2.length * renderWidth;
-      const xLeftCellNumber = Math.ceil(currentPointX / subLineSpace);
-      const xRightCellNumber = Math.ceil((renderWidth - currentPointX) / subLineSpace);
+      const currentPointX = targetIdx2 / points2.length * renderWidth - mainXLineOffsetX * scale;
+      const xLeftCellNumber = Math.ceil(currentPointX / subLineSpaceX);
+      const xRightCellNumber = Math.ceil((renderWidth - currentPointX) / subLineSpaceX);
       function createColumnLine(x, idx) {
         return new fabric.Line([offset.x + x, offset.y, offset.x + x, offset.y + renderHeight], {
           ...gridOptions.mainLineStyle.y,
-          ...idx === 0 ? gridOptions.subLineStyle : subLineOptions(idx)
+          ...subLineOptions(idx)
         });
       }
       const columnLineGroup = new fabric.Group([
-        ...range(xRightCellNumber).map((idx) => createColumnLine(idx * subLineSpace + currentPointX, idx)),
-        ...range(xLeftCellNumber).map((idx) => createColumnLine(-(idx * subLineSpace) + currentPointX, idx))
+        ...range(xRightCellNumber).map((idx) => createColumnLine(idx * subLineSpaceX + currentPointX, idx)),
+        ...range(xLeftCellNumber).map((idx) => createColumnLine(-(idx * subLineSpaceX) + currentPointX, idx))
       ]);
       return new fabric.Group([columnLineGroup, rowLineGroup]);
     }

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/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/ChatMain.vue2.js

@@ -601,7 +601,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [!unref(isAudioOrVideoMessage)(item.content) ? (openBlock(), createElementBlock(Fragment, {
             key: 0
-          }, [createCommentVNode(' <n-button\n												quaternary\n												size="tiny"\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\n											>\n												<template #icon>\n													<n-icon size="17" :component="HappyOutline" />\n												</template>\n											</n-button> '), createVNode(unref(NButton), {
+          }, [createCommentVNode(' <n-button\r\n												quaternary\r\n												size="tiny"\r\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\r\n											>\r\n												<template #icon>\r\n													<n-icon size="17" :component="HappyOutline" />\r\n												</template>\r\n											</n-button> '), createVNode(unref(NButton), {
             quaternary: "",
             size: "tiny",
             onClick: () => setReferenceMsg(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/iho-chat/src/components/PersonProfile.vue2.js

@@ -170,7 +170,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           round: "",
           size: 100,
           onClickCapture: _cache[0] || (_cache[0] = ($event) => showLargeAvatar.value = true)
-        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\n							<n-upload-trigger #="{ handleClick }" abstract>\n								<n-button\n									circle\n									secondary\n									class="edit-avatar"\n									v-show="userDetail.id === state.userInfo.id"\n									@click="handleClick"\n								>\n									<template #icon>\n										<n-icon size="16" color="#666666" :component="Camera" />\n									</template>\n								</n-button>\n							</n-upload-trigger>\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
+        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\r\n							<n-upload-trigger #="{ handleClick }" abstract>\r\n								<n-button\r\n									circle\r\n									secondary\r\n									class="edit-avatar"\r\n									v-show="userDetail.id === state.userInfo.id"\r\n									@click="handleClick"\r\n								>\r\n									<template #icon>\r\n										<n-icon size="16" color="#666666" :component="Camera" />\r\n									</template>\r\n								</n-button>\r\n							</n-upload-trigger>\r\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
           class: normalizeClass(["iho-chatRole", unref(isDoctorRole)(userDetail.roleInfo) ? "isDoctor" : ""])
         }, toDisplayString(unref(getRoleName)(userDetail.roleInfo)), 3), [[vShow, unref(getRoleName)(userDetail.roleInfo)]])]), createElementVNode("p", null, toDisplayString(userDetail.orgName), 1)]), createVNode(unref(NButton), {
           strong: "",

package/es/env.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
-
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';
+

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.40";
+var version = "3.4.0-beta.43";
 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.40",
+	"version": "3.4.0-beta.43",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "38feade657a5fc3ef92bbe001805e69547bb1fdf"
+	"gitHead": "f0a7f225fcd87a9e4607b79812a027d03e927a8f"
 }