cnhis-design-vue 3.4.0-beta.49 → 3.4.0-beta.52

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/useElectrocardiogram.d.ts

@@ -2,5 +2,5 @@ import { AnyObject } from '../../../../../shared/types';
 import { fabric } from '../../../../../shared/utils/fabricjs';
 import { type Ref } from 'vue';
 export declare function useElectrocardiogram(canvas: Ref<fabric.Canvas>, propItems: AnyObject, flag: Ref<boolean>): {
-    updatePolyline: (value: number) => void;
+    updatePolyline: (percent: number) => void;
 };

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

@@ -1,5 +1,5 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
-import { useThrottleFn } from '@vueuse/core';
+import { useDebounceFn, useThrottleFn } from '@vueuse/core';
 import { range } from 'lodash-es';
 import { useDetailEvent } from './hooks/useDetailEvent.js';
 import { defaultStyle, drawLine } from '../useDraw.js';
@@ -59,24 +59,29 @@ function useElectrocardiogram(canvas, propItems, flag) {
     drawPolyLine();
   }
   function getShowLength(list = []) {
-    const showLength = ~~(list.length / columnNumber);
+    const overflowIsScroll = config.overflow === "scroll";
+    const showLength = ~~(list.length / columnNumber / (overflowIsScroll ? 2 : 1));
     return showLength * (config.mainXCellValue / ECG.DEFAULTMAINXCELLVALUE);
   }
   function drawPolyLine(startIdx = 0) {
+    const overflowIsScroll = config.overflow === "scroll";
     dataList.forEach((lineItem, idx) => {
-      if (idx === dataList.length - 1 && arguments.length)
+      if (idx === ECG.MAXLINENUMBER - 1 && arguments.length && !overflowIsScroll)
         return;
       const { x, y, rowIdx, limitX } = lineItem.origin;
-      const showLength = getShowLength(lineItem.data);
-      const points = lineItem.data.reduce((res, value, _idx) => {
-        let _res = idx < ECG.MAXLINENUMBER - 1 && _idx >= startIdx && _idx <= startIdx + showLength || idx === ECG.MAXLINENUMBER - 1 ? [{ x: computedX(res.length + 1), y: computedY(-+value) + y }] : [];
-        if (_res.length) {
-          if (idx < ECG.MAXLINENUMBER - 1 && _res[0].x > limitX) {
-            _res = [];
-          }
+      const lineLength = lineItem.data.length;
+      const showLength = idx < ECG.MAXLINENUMBER - 1 ? getShowLength(lineItem.data) : lineLength;
+      const points = [];
+      let pointIndex = 0;
+      for (let _idx = startIdx; _idx <= startIdx + showLength && _idx < lineLength; _idx++) {
+        const value = lineItem.data[_idx];
+        const point = { x: computedX(pointIndex + 1), y: computedY(-+value) + y };
+        if (idx < ECG.MAXLINENUMBER - 1 && point.x > limitX) {
+          break;
         }
-        return res.concat(_res);
-      }, []);
+        points.push(point);
+        pointIndex++;
+      }
       const polyline = new fabric.Polyline(points, {
         ...lineStyle,
         fill: "transparent",
@@ -102,8 +107,7 @@ function useElectrocardiogram(canvas, propItems, flag) {
         detailRadius: 370,
         beforeEvent: () => flag.value && Promise.reject()
       });
-      polyline.startIdx = startIdx;
-      if (idx < dataList.length - 1) {
+      if (idx < ECG.MAXLINENUMBER - 1 || overflowIsScroll) {
         gridPoints.add(polyline);
       } else {
         fixedPointsCache.add(polyline);
@@ -184,24 +188,30 @@ function useElectrocardiogram(canvas, propItems, flag) {
     });
     canvas.value.add(...lines);
   }
-  const updatePolyline = useThrottleFn((value) => {
-    const showLength = getShowLength(dataList[dataList.length - 1].data);
-    if (showLength === dataList[0].data.length)
+  let currentStartIdx = -1;
+  let isUpdating = false;
+  const debouncedUpdate = useDebounceFn((startIdx) => {
+    if (isUpdating || currentStartIdx === startIdx)
       return;
-    const totalLength = dataList[dataList.length - 1].data.length;
-    const centerIdx = value / 100 * totalLength;
-    const _startIdx = centerIdx - showLength / 2;
-    const startIdx = _startIdx + showLength > totalLength ? totalLength - showLength : Math.max(0, _startIdx);
+    isUpdating = true;
+    currentStartIdx = startIdx;
     fabric.util.requestAnimFrame(() => {
       if (gridPoints.size) {
-        const [firstPoint] = [...gridPoints];
-        if (firstPoint.startIdx === startIdx)
-          return;
-        [...gridPoints].forEach((point) => canvas.value.remove(point));
+        const pointsArray = [...gridPoints];
+        canvas.value.remove(...pointsArray);
         gridPoints.clear();
       }
       drawPolyLine(startIdx);
+      isUpdating = false;
     });
+  }, 100);
+  const updatePolyline = useThrottleFn((percent) => {
+    const showLength = getShowLength(dataList[dataList.length - 1].data);
+    if (showLength === dataList[0].data.length)
+      return;
+    const totalLength = dataList[dataList.length - 1].data.length;
+    const startIdx = ~~(percent * totalLength);
+    debouncedUpdate(startIdx);
   }, 150);
   function drawBorder() {
     const { strokeWidth } = borderStyle;

package/es/components/form-render/src/hooks/useFormEvent.js

@@ -133,7 +133,7 @@ function useFormExposeEvent({
       wordbookSettingHandler2.triggerDisabled = options.avoidWordbookSettingConnection;
       operationalFormHandler.triggerDisabled = options.avoidOperationalFormConnection;
       if (options.needSplitExtendKey) {
-        values = splitExtendKey(getFieldList(), values);
+        values = splitExtendKey(getFieldList(), values, !!options.overwrite);
       }
       if (options.avoidFormChangeEvent) {
         emitFormChange.value = false;

package/es/components/form-render/src/utils/index.d.ts

@@ -18,7 +18,7 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}, any, {}>>>;
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;
 export declare function combineExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
-export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject): AnyObject;
+export declare function splitExtendKey(fieldList: FieldItem[], values: AnyObject, overwrite: boolean): AnyObject;
 export declare function isNestedType(type?: string): boolean | "" | undefined;
 export declare function isNestedFieldType(field: FieldItem | GeneralField): boolean | "" | undefined;
 export declare function renderOptionLabel(option: AnyObject, labelKey: string): any;

package/es/components/form-render/src/utils/index.js

@@ -136,7 +136,7 @@ function combineExtendKey(fieldList, values) {
   });
   return result;
 }
-function splitExtendKey(fieldList, values) {
+function splitExtendKey(fieldList, values, overwrite) {
   const fieldListWithExtendKey = findExtendKeyField(fieldList);
   if (!fieldListWithExtendKey.length)
     return values;
@@ -156,7 +156,10 @@ function splitExtendKey(fieldList, values) {
   }) => {
     if (Reflect.has(result, val_key))
       return;
-    result[val_key] = queryFieldValue(extendKey)[val_key];
+    const value = queryFieldValue(extendKey)[val_key];
+    if (value == null && !overwrite)
+      return;
+    result[val_key] = value;
   });
   return result;
 }

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/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.49";
+var version = "3.4.0-beta.52";
 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.49",
+	"version": "3.4.0-beta.52",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "9a75b9c7efb1397e6387422b56297b3b4750328a"
+	"gitHead": "577e344e6eb94688fb0152288073d483d17e9a0f"
 }