cnhis-design-vue 3.3.3-beta.67 → 3.3.3-beta.69

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/calendar/src/Calendar.vue2.js

@@ -114,7 +114,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       eventContent: eventContentRender,
       resourceLabelContent: resourceLabelContentRender,
       select: (...args) => emit("select", ...args),
-      eventDrop: (...args) => emit("eventDrag", ...args),
+      eventDrop: (...args) => {
+        var _a, _b;
+        const [info] = args;
+        const eventId = info.event.id;
+        const targetEvent = props.events.find((event) => event.id === eventId);
+        if (targetEvent && targetEvent.resourceEditable === false) {
+          const oldResourceId = (_a = info.oldResource) == null ? void 0 : _a.id;
+          const newResourceId = (_b = info.newResource) == null ? void 0 : _b.id;
+          if (oldResourceId !== newResourceId) {
+            return;
+          }
+        }
+        emit("eventDrag", ...args);
+      },
       eventResize: (...args) => emit("eventResize", ...args),
       eventClick: (...args) => emit("eventClick", ...args)
     });
@@ -200,10 +213,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     watch(() => props.events, (events) => {
-      calendarOptions.events = cloneDeep(events).map((event) => ({
-        ...event,
-        resourceEditable: false
-      }));
+      calendarOptions.events = cloneDeep(events);
     }, {
       deep: true,
       immediate: true

package/es/components/classification/src/components/table-modal/index.vue.d.ts

@@ -175,6 +175,9 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     } & {
+        /**
+         * 改变弹窗大小
+         */
         itemKey?: string | Function | undefined;
     }>, {
         move: Function;

package/es/components/classification/src/index.vue.d.ts

@@ -708,9 +708,6 @@ declare const _default: import("vue").DefineComponent<{
                 }[];
                 handleEditDisplayCategory: (item: import("../../../components/table-filter/src/types").ICategoryItemType) => void;
                 handleDisplayCategoryAddState: () => void;
-                /**
-                 * 改变展示方式
-                 */
                 findConditionByDisplayCategory: (sid: string) => unknown;
                 handleDisplayCategorySelectProxy: (item: import("../../../components/table-filter/src/types").ICategoryItemType) => void;
                 clearFormData: () => void;

package/es/components/fabric-chart/src/hooks/temperature/useOther.d.ts

@@ -1,4 +1,4 @@
 import { Ref } from 'vue';
 import { fabric } from '../../../../../shared/utils/fabricjs';
 import { IPropItems, IObject } from '../../../../../components/fabric-chart/src/interface';
-export declare function useOther(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: Function, computedX: Function, computedY: Function, fixedNoRisePoints: Set<IObject>): void;
+export declare function useOther(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: Function, computedX: Function, computedY: Function, fixedNoRisePoints: Set<IObject>, getXValue: Function): void;

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

@@ -1,7 +1,7 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle } from '../useDraw.js';
-import 'date-fns';
-import { cloneDeep, last } from 'lodash-es';
+import { parse, isBefore, addDays, getDate } from 'date-fns';
+import { last, cloneDeep } from 'lodash-es';
 import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';
@@ -14,14 +14,15 @@ import '@vueuse/core';
 import '../surgicalAnesthesia/useOther.js';
 import '../../../../../shared/utils/index.js';
 
-function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints) {
+function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints, getXValue) {
   const {
     left: leftObj,
     other,
     vitalSignsOriginY,
     xCellWidth,
     yCellHeight,
-    endX
+    endX,
+    originX
   } = propItems;
   const getYCellHeight = () => {
     const fontSize = Math.min(...((other == null ? void 0 : other.list) || []).map((item) => {
@@ -32,11 +33,35 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   };
   const _yCellHeight = getYCellHeight();
   let textDiff = 0;
-  function drawOther() {
-    var _a, _b;
+  function handleCrossDayLayout(currentTime, itemLeft, lastLeft, eventList) {
+    const newLeft = itemLeft + xCellWidth;
+    const nextTime = getXValue(newLeft);
+    if (isCrossDay(currentTime, nextTime)) {
+      adjustEventsForCrossDay(eventList);
+      return itemLeft;
+    } else {
+      return lastLeft + xCellWidth;
+    }
+  }
+  function adjustEventsForCrossDay(eventList) {
+    const currentColumnEvents = [...eventList];
+    const sortedEvents = currentColumnEvents.sort((a, b) => (b.trueLeft || 0) - (a.trueLeft || 0));
+    for (let i = 0; i < sortedEvents.length; i++) {
+      const event = sortedEvents[i];
+      const nextEvent = sortedEvents[i + 1];
+      const prevLeft = event.trueLeft - xCellWidth;
+      if (prevLeft >= originX) {
+        event.set("left", prevLeft);
+        event.trueLeft = prevLeft;
+      }
+      if (nextEvent && (event.trueLeft || 0) - (nextEvent.trueLeft || 0) > xCellWidth + 1) {
+        break;
+      }
+    }
+  }
+  function createOtherList() {
     if (!(other == null ? void 0 : other.list))
-      return false;
-    const list = [];
+      return [];
     const otherList = [];
     cloneDeep(other.list).forEach((item, index) => {
       item.value = item.value || "";
@@ -44,19 +69,29 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       const left = computedX(item.time, true);
       if (left > endX)
         return;
-      const obj = otherList.find((v) => v.left == left);
-      if (obj) {
-        obj[align].push(item);
+      const existingGroup = otherList.find((v) => v.left === left);
+      if (existingGroup) {
+        existingGroup[align].push(item);
       } else {
-        const initObj = {
+        const newGroup = {
           left,
           vertical: [],
           horizontal: []
         };
-        initObj[align].push(item);
-        otherList.push(initObj);
+        newGroup[align].push(item);
+        otherList.push(newGroup);
       }
     });
+    return otherList;
+  }
+  function drawOther() {
+    var _a, _b;
+    if (!(other == null ? void 0 : other.list))
+      return;
+    const list = [];
+    const otherList = createOtherList();
+    if (otherList.length === 0)
+      return false;
     const scaleList = (_b = (_a = leftObj.yScaleValue) == null ? void 0 : _a.find((item) => item.type === "temperature")) == null ? void 0 : _b.list;
     const fixedTop = (scaleList == null ? void 0 : scaleList.length) ? computedY("temperature", 35) : 0;
     const isFixed = (v) => v.fixed && fixedTop && (v.fixedValue || v.value);
@@ -99,7 +134,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
         fixedTopY = fixedTop;
         const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
         if (item.left <= lastLeft + 0.1) {
-          leftX = lastLeft + xCellWidth;
+          leftX = handleCrossDayLayout(v.time, item.left, lastLeft, list);
         }
         if (String(v.value).length) {
           list.push(drawEventText(v, leftX, topY2));
@@ -197,5 +232,13 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   }
   drawOther();
 }
+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);
+}
 
 export { useOther };

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

@@ -399,7 +399,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
       } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, computedY, getXValue, getYValue, isAddPoint, updateData, gridPoints);
       useRight(canvas, propItems, drawScaleValue);
       useBottom(canvas, propItems);
-      useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints);
+      useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints, getXValue);
       const {
         select: _select
       } = useCanvasEvent(canvas, propItems, emits);

package/es/components/iho-chat/index.d.ts

@@ -3649,7 +3649,7 @@ declare const IhoChat: SFCWithInstall<import("vue").DefineComponent<{
             };
             isForward: boolean;
         };
-        trtc: import("trtc-sdk-v5").TRTC;
+        trtc: import("trtc-sdk-v5").default;
         timing: import("vue").Ref<string>;
         voiceClose: import("vue").Ref<boolean>;
         isAudio: import("vue").ComputedRef<boolean>;

package/es/components/iho-chat/src/Index.vue.d.ts

@@ -3650,7 +3650,7 @@ declare const _default: import("vue").DefineComponent<{
             };
             isForward: boolean;
         };
-        trtc: import("trtc-sdk-v5").TRTC;
+        trtc: import("trtc-sdk-v5").default;
         timing: import("vue").Ref<string>;
         voiceClose: import("vue").Ref<boolean>;
         isAudio: import("vue").ComputedRef<boolean>;

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

@@ -603,7 +603,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

@@ -225,7 +225,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/iho-chat/src/components/Video.vue.d.ts

@@ -58,7 +58,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         };
         isForward: boolean;
     };
-    trtc: import("trtc-sdk-v5").TRTC;
+    trtc: import("trtc-sdk-v5").default;
     timing: import("vue").Ref<string>;
     voiceClose: import("vue").Ref<boolean>;
     isAudio: import("vue").ComputedRef<boolean>;

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.3.3-beta.67";
+var version = "3.3.3-beta.69";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.67",
+	"version": "3.3.3-beta.69",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "0d3b16a90e477c41a401d8753454bfbd52332077"
+	"gitHead": "9d93ee205dff646c62e3b97d0787942d3df46bb4"
 }