cnhis-design-vue 3.4.0-beta.20 → 3.4.0-beta.22

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/temperature/useOther.js

@@ -1,6 +1,6 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle } from '../useDraw.js';
-import { parse, isBefore, addDays, getDate } from 'date-fns';
+import { parse } from 'date-fns';
 import { last, cloneDeep } from 'lodash-es';
 import '../useEvent.js';
 import '../useShadow.js';
@@ -25,12 +25,12 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   };
   const _yCellHeight = getYCellHeight();
   let textDiff = 0;
-  function handleCrossDayLayout(currentTime, itemLeft, lastLeft, eventList) {
-    const newLeft = itemLeft + xCellWidth;
+  function handleCrossDayLayout(currentTime, lastLeft, eventList) {
+    const newLeft = lastLeft + xCellWidth;
     const nextTime = getXValue(newLeft);
     if (isCrossDay(currentTime, nextTime)) {
       adjustEventsForCrossDay(eventList);
-      return itemLeft;
+      return lastLeft;
     } else {
       return lastLeft + xCellWidth;
     }
@@ -96,7 +96,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       item.vertical.forEach((v, i) => {
         var _a2, _b2, _c, _d, _e;
         const baseTop = (v.baseTop || 0) * yCellHeight;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (i === 0 && item.left <= lastLeft) {
           leftX = lastLeft + xCellWidth;
         }
@@ -124,9 +124,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
         var _a2, _b2;
         const topY2 = vitalSignsOriginY.originY + (v.baseTop || 0) * yCellHeight;
         fixedTopY = fixedTop;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (item.left <= lastLeft + 0.1) {
-          leftX = handleCrossDayLayout(v.time, item.left, lastLeft, list);
+          leftX = handleCrossDayLayout(v.time, lastLeft, list);
         }
         if (String(v.value).length) {
           list.push(drawEventText(v, leftX, topY2));
@@ -223,10 +223,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
 function isCrossDay(dateStr1, dateStr2) {
   const date1 = parse(dateStr1, "yyyy-MM-dd HH:mm", new Date());
   const date2 = parse(dateStr2, "yyyy-MM-dd HH:mm", new Date());
-  const earlierDate = isBefore(date1, date2) ? date1 : date2;
-  const laterDate = isBefore(date1, date2) ? date2 : date1;
-  const earlierDatePlusOneDay = addDays(earlierDate, 1);
-  return getDate(earlierDatePlusOneDay) === getDate(laterDate);
+  const date1String = `${date1.getFullYear()}-${date1.getMonth()}-${date1.getDate()}`;
+  const date2String = `${date2.getFullYear()}-${date2.getMonth()}-${date2.getDate()}`;
+  return date1String !== date2String;
 }
 
 export { useOther };

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/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/components/shortcut-provider/src/hooks/useShortcuts.d.ts

@@ -10,12 +10,14 @@ export declare class ShortcutManager {
     static log(message: string, dryRun?: boolean): string;
     constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, scope?: string | Symbol);
     get traverse(): Omit<ShortcutItem, "callback">[];
+    remove(key: string): void;
     private query;
     update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Promise<void>;
     register(shortcutItem: ShortcutItem): {
         stop: () => void;
         start: () => void;
         signature: () => string;
+        remove: () => void;
     };
     start(): this;
     destroy(): void;
@@ -26,6 +28,7 @@ export declare function useShortcuts(scope?: MaybeRef<string | Symbol | undefine
         stop: () => void;
         signature: () => string;
         start: () => void;
+        remove: () => void;
     };
     traverse: () => Omit<ShortcutItem, "callback">[];
     clear: () => void;

package/es/components/shortcut-provider/src/hooks/useShortcuts.js

@@ -23,6 +23,10 @@ class ShortcutManager {
   get traverse() {
     return [...Object.values(this.shortcutCache.value)].sort((a, b) => (a.order || 0) - (b.order || 0));
   }
+  remove(key) {
+    Reflect.deleteProperty(this.shortcutCache.value, key);
+    this.shortcutCallbackMap.delete(key);
+  }
   query(key) {
     return this.shortcutCache.value[key];
   }
@@ -61,6 +65,7 @@ class ShortcutManager {
     }
     this.shortcutCache.value[shortcutItem.key] = omit(shortcutItem, ["callback"]);
     this.shortcutCallbackMap.set(shortcutItem.currentKeySignature, shortcutItem.callback);
+    const that = this;
     return createHandler(this.shortcutCache.value[shortcutItem.key]);
     function createHandler(shortcut) {
       return {
@@ -70,7 +75,8 @@ class ShortcutManager {
         start: () => {
           shortcut.status = ShortcutStatus.ACTIVE;
         },
-        signature: () => shortcut.currentKeySignature
+        signature: () => shortcut.currentKeySignature,
+        remove: () => that.remove(shortcut.key)
       };
     }
   }
@@ -171,7 +177,7 @@ function useShortcuts(scope) {
     }
   }
   function register(shortcut) {
-    const { stop, signature, start } = unref(manager).register(createShortcutItem(shortcut));
+    const { stop, signature, start, remove } = unref(manager).register(createShortcutItem(shortcut));
     if (getCurrentInstance()) {
       onBeforeUnmount(stop);
       onDeactivated(stop);
@@ -179,7 +185,7 @@ function useShortcuts(scope) {
     } else {
       onceRegisterWarn();
     }
-    return { stop, signature, start };
+    return { stop, signature, start, remove };
   }
   function traverse() {
     return unref(manager).traverse;

package/es/components/shortcut-setter/index.d.ts

@@ -30,6 +30,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<impor
             stop: () => void;
             signature: () => string;
             start: () => void;
+            remove: () => void;
         };
         traverse: () => Omit<import("..").ShortcutItem, "callback">[];
         clear: () => void;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -33,6 +33,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             stop: () => void;
             signature: () => string;
             start: () => void;
+            remove: () => void;
         };
         traverse: () => Omit<import("../../../components/shortcut-provider").ShortcutItem, "callback">[];
         clear: () => void;

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.20";
+var version = "3.4.0-beta.22";
 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.20",
+	"version": "3.4.0-beta.22",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "5fb113aa91c1485451ca4c4e2887694a0f4c1a50"
+	"gitHead": "10bb1fa64ad98cbec8b8fdfbdbca6b4ed52dd771"
 }