cnhis-design-vue 3.1.38-beta.1 → 3.1.38-beta.2

package/README.md

@@ -1,123 +1,123 @@
-# 安装
-
-```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. 注意
-
-由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-
-import { CGrid } from 'cnhis-design-vue';
-// 或者
-import { CBigTable } from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(CGrid);
-// 或者
-app.use(CBigTable);
-app.mount('#app');
-```
-
-## 4.FAQ
-
-### 4.1 项目打包后样式丢失
-
-> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  rollupOptions: {
-    // ..otherOptions
-    output: {
-      dir: './dist',
-      manualChunks(id: string) {
-        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
-          return 'vendor';
-        }
-      }
-    }
-  }
-});
-```
-
-### 4.2 找不到文件
-
-> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
-
-```javascript
-// vite.config.ts
-const config = {
-  // ...otherOptions
-  resolve: {
-    // ...otherOptions
-    // 如果没有配置, 则不用考虑
-    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
-  }
-};
-```
+# 安装
+
+```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. 注意
+
+由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+
+import { CGrid } from 'cnhis-design-vue';
+// 或者
+import { CBigTable } from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(CGrid);
+// 或者
+app.use(CBigTable);
+app.mount('#app');
+```
+
+## 4.FAQ
+
+### 4.1 项目打包后样式丢失
+
+> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  rollupOptions: {
+    // ..otherOptions
+    output: {
+      dir: './dist',
+      manualChunks(id: string) {
+        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
+          return 'vendor';
+        }
+      }
+    }
+  }
+});
+```
+
+### 4.2 找不到文件
+
+> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
+
+```javascript
+// vite.config.ts
+const config = {
+  // ...otherOptions
+  resolve: {
+    // ...otherOptions
+    // 如果没有配置, 则不用考虑
+    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
+  }
+};
+```

package/es/components/fabric-chart/src/hooks/useBirthProcess.js

@@ -1,6 +1,6 @@
 import { useBirthProcessCumputedPoint } from './useCumputedPoint.js';
 import useGrid from './useGrid.js';
-import { drawLine, drawPoint, defaultTextStyle, drawText, defaultRectStyle } from './useDraw.js';
+import { drawLine, drawArrow, drawText, defaultTextStyle, drawPoint, defaultRectStyle } from './useDraw.js';
 import { fabric } from '../utils/index.js';
 import { getIndex, isEffectiveNode } from '../utils/utils.js';
 import { cloneDeep } from 'lodash-es';
@@ -48,6 +48,7 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
       var _a;
       const pointList = [];
       const lineList = [];
+      const otherList = [];
       (_a = item.data) == null ? void 0 : _a.forEach((v, index) => {
         const points = getPointer(v, item);
         drawPointLine(points, v, index);
@@ -61,18 +62,19 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
             v.prevPoint = prevPoint;
           }
           prevPoint = v || prevPoint;
-          v == null ? void 0 : v.bringToFront();
           return v;
         });
-        canvas.value.add(...lineListFilter, ...res);
-        res.forEach((v) => {
-          v == null ? void 0 : v.bringToFront();
+        Promise.all(otherList).then((r) => {
+          canvas.value.add(...lineListFilter, ...res, ...r);
+          res.forEach((point) => {
+            point == null ? void 0 : point.bringToFront();
+          });
         });
       });
       function drawPointLine(points, v, index) {
         let point;
         let line;
-        const { pointAttr = {}, lineAttr = {}, title = "", key, type: pointType = "circle" } = item;
+        const { pointAttr = {}, lineAttr = {}, title = "", key, type: pointType = "circle", childbirth = {} } = item;
         const nextV = item.data[index + 1];
         const nextPoint = getPointer(nextV, item);
         if (points && nextPoint && !v.breakpoint) {
@@ -85,6 +87,25 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
             ...lineAttr
           }) : null;
         }
+        let arrowGroup;
+        let arrowGroupText;
+        if (v.childbirth) {
+          const top = points[1] + yCellHeight;
+          arrowGroup = drawArrow([points[0], points[1], top], childbirth.style || {});
+          otherList.push(arrowGroup);
+          if (childbirth.text) {
+            arrowGroupText = drawText([points[0] + xCellWidth / 2, top - yCellHeight / 2], {
+              value: String(childbirth.text),
+              ...defaultTextStyle,
+              ...{
+                originX: "left",
+                originY: "center"
+              },
+              ...childbirth.style || {}
+            });
+            otherList.push(arrowGroupText);
+          }
+        }
         const previousLine = lineList[index - 1];
         const pointAttrNew = {
           origin: {
@@ -96,6 +117,8 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
           },
           leftLine: previousLine,
           rightLine: line,
+          arrowGroup,
+          arrowGroupText,
           ...pointAttr,
           ...propItems.event
         };
@@ -168,7 +191,6 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
         break;
       default: {
         const index2 = getIndex(data.time, item.data);
-        console.log("index :>> ", index2);
         item.data.splice(index2, 0, data);
         break;
       }
@@ -181,6 +203,8 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
       point && removePoints.push(point);
       (point == null ? void 0 : point.leftLine) && removePoints.push(point == null ? void 0 : point.leftLine);
       (point == null ? void 0 : point.rightLine) && removePoints.push(point == null ? void 0 : point.rightLine);
+      (point == null ? void 0 : point.arrowGroup) && removePoints.push(point == null ? void 0 : point.arrowGroup);
+      (point == null ? void 0 : point.arrowGroupText) && removePoints.push(point == null ? void 0 : point.arrowGroupText);
     });
     return removePoints;
   }
@@ -191,9 +215,11 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
     drawPolyLine();
   }
   function updateLine(point) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     (_a = point.leftLine) == null ? void 0 : _a.setCoords().set({ x2: point.left, y2: point.top });
     (_b = point.rightLine) == null ? void 0 : _b.setCoords().set({ x1: point.left, y1: point.top });
+    (_c = point.arrowGroup) == null ? void 0 : _c.setCoords().set({ left: point.left, top: point.top });
+    (_d = point.arrowGroupText) == null ? void 0 : _d.setCoords().set({ left: point.left + xCellWidth / 2, top: point.top + yCellHeight / 2 });
   }
   function moveLimit(point) {
     const limitLeft = point.prevPoint ? point.prevPoint.left : originX;
@@ -282,7 +308,6 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
     }
   }
   function clickMenu({ item, target }) {
-    console.log("item :>> ", item);
     const params = {
       ...item.origin
     };
@@ -303,54 +328,109 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
   function drawOther() {
     const lineData = Object.values(other);
     const lines = [];
+    const alertData = {};
+    const alertItem = yScaleValue.find((item) => item.key === "cervix");
+    const alertStartPoint = alertItem.data.find((_data) => +_data.value === 3);
     lineData.forEach((line) => {
       if (!line.show)
         return;
       const { key } = line;
-      if (key === "fetalPresentation") {
-        const { range } = yScaleValue.find((item) => item.key === key);
-        const y = cumputedY(key, range, 0);
-        lines.push(
-          drawLine([originX, y, endX, y], {
-            ...line
-          })
-        );
-      }
-      if (key === "alert") {
-        const item = yScaleValue.find((item2) => item2.key === "cervix");
-        const { data = [], key: key2, range } = item || {};
-        const startPoint = data.find((_data) => +_data.value === 3);
-        if (startPoint) {
-          const _time = 6 * 60 * 60 * 1e3;
-          const endPoint = {
-            time: format(new Date(new Date(startPoint.time).getTime() + _time), "yyyy-MM-dd HH:mm"),
-            value: 10
-          };
-          const [x1, y1] = [cumputedX(startPoint.time) - originX, endY - cumputedY(key2, range, startPoint.value)];
-          const [x2, y2] = [cumputedX(endPoint.time) - originX, endY - cumputedY(key2, range, endPoint.value)];
-          const k = (y2 - y1) / (x1 + x2);
-          const b = y1 - x1 * k;
-          let pointer1 = [-(b / k), 0];
-          if (pointer1[0] < 0) {
-            pointer1 = [originX, endY - b];
-          } else {
-            pointer1 = [originX + b / k, endY];
-          }
-          const _originY = cumputedY(key2, range, 10);
-          let pointer2 = [(endY - _originY - b) / k, endY - _originY];
-          if (pointer2[0] > endX - originX) {
-            pointer2 = [endX, endY - (k * (endX - originX) + b)];
-          } else {
-            pointer2 = [originX + (endY - _originY - b) / k, _originY];
-          }
+      switch (key) {
+        case "fetalPresentation": {
+          const { range } = yScaleValue.find((item) => item.key === key);
+          const y = cumputedY(key, range, 0);
           lines.push(
-            drawLine([...pointer1, ...pointer2], {
+            drawLine([originX, y, endX, y], {
               ...line
             })
           );
+          break;
+        }
+        case "alert": {
+          if (alertStartPoint) {
+            const { key: key2, range } = alertItem || {};
+            const _time = 6 * 60 * 60 * 1e3;
+            const endPoint = {
+              time: format(new Date(new Date(alertStartPoint.time).getTime() + _time), "yyyy-MM-dd HH:mm"),
+              value: 10
+            };
+            const [x1, y1] = [
+              cumputedX(alertStartPoint.time) - originX,
+              endY - cumputedY(key2, range, alertStartPoint.value)
+            ];
+            const [x2, y2] = [cumputedX(endPoint.time) - originX, endY - cumputedY(key2, range, endPoint.value)];
+            const k = (y2 - y1) / (x2 - x1);
+            const b = y1 - x1 * k;
+            const pointer = computePointer(k, b);
+            if (pointer.length > 0) {
+              lines.push(
+                drawLine(pointer, {
+                  ...line
+                })
+              );
+              Object.assign(alertData, {
+                k,
+                b
+              });
+            }
+          }
+          break;
+        }
+        case "handling": {
+          if (alertStartPoint) {
+            const { k, b } = alertData;
+            const _time = 4 * 60 * 60 * 1e3;
+            const endTime = cumputedX(
+              format(new Date(new Date(alertStartPoint.time).getTime() + _time), "yyyy-MM-dd HH:mm")
+            );
+            const a = endTime - cumputedX(alertStartPoint.time);
+            const _b = b - a * k;
+            const pointer = computePointer(k, _b);
+            if (pointer.length > 0) {
+              lines.push(
+                drawLine(pointer, {
+                  ...line
+                })
+              );
+            }
+          }
+          break;
         }
       }
     });
+    function computePointer(k, b) {
+      const { key, range } = alertItem || {};
+      const _originY = cumputedY(key, range, 10);
+      const startPointer1 = [0, b];
+      const startPointer2 = [-(b / k), 0];
+      const endPointer1 = [(endY - _originY - b) / k, endY - _originY];
+      const endPointer2 = [endX - originX, k * (endX - originX) + b];
+      let startPointer = [];
+      let endPointer = [];
+      if (isLinePointer(startPointer1) && isLimit2(startPointer1)) {
+        startPointer = getActualValue(startPointer1);
+      }
+      if (isLinePointer(startPointer2) && isLimit2(startPointer2)) {
+        startPointer = getActualValue(startPointer2);
+      }
+      if (isLinePointer(endPointer1) && isLimit2(endPointer1)) {
+        endPointer = getActualValue(endPointer1);
+      }
+      if (isLinePointer(endPointer2) && isLimit2(endPointer2)) {
+        endPointer = getActualValue(endPointer2);
+      }
+      function isLinePointer([x, y]) {
+        return Math.abs(y - k * x - b) <= 1;
+      }
+      function isLimit2([x, y]) {
+        const [_x, _y] = [...getActualValue([x, y])];
+        return _x >= originX && _x <= endX && _y >= _originY && _y <= endY;
+      }
+      function getActualValue([x, y]) {
+        return [originX + x, endY - y];
+      }
+      return [...startPointer, ...endPointer];
+    }
     canvas.value.add(...lines);
   }
   function drawIcons() {

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

@@ -358,28 +358,25 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const { value } = otherObj;
       let reduceLine, reducePoint, noRiseText, arrowGroup, riseText, verifiedText;
       if (v.noRise && noRiseStyle.show) {
-        if (typeof v.noRise === "string") {
+        if (noRiseStyle.text) {
           noRiseText = drawText([points[0], points[1] + 5], {
-            value: v.noRise.split("").join("\n"),
+            value: noRiseStyle.text.split("").join("\n"),
             originY: "top",
-            ...noRiseStyle
+            ...noRiseStyle.style || {}
           });
           otherList.push(noRiseText);
         } else {
           const top = points[1] + yCellHeight * 2;
-          arrowGroup = drawArrow([points[0], points[1], top], noRiseStyle);
+          arrowGroup = drawArrow([points[0], points[1], top], noRiseStyle.style || {});
           otherList.push(arrowGroup);
         }
       }
       if (v.rise && riseStyle.show) {
-        if (typeof v.rise === "boolean") {
-          v.rise = "\u5347\u6E29";
-        }
-        if (typeof v.rise === "string") {
+        if (riseStyle.text) {
           riseText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
-            value: v.rise.split("").join("\n"),
+            value: riseStyle.text.split("").join("\n"),
             originY: "bottom",
-            ...riseStyle
+            ...riseStyle.style || {}
           });
           otherList.push(riseText);
         }

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

@@ -155,7 +155,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef) {
   const itemList = computed(() => {
     const { left } = props.data;
     return left.yScaleValue.map((item) => {
-      return item.dataList.map((v, dataIndex) => {
+      return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
         return {
           ...v,
           bigType: setOtherType(v.title, item.type),

package/es/components/info-header/index.d.ts

@@ -11,7 +11,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     patientInfo: {
         type: import("vue").PropType<Partial<{
             avatar: string;
+            avatarPreview: string;
             avatarProps: string;
+            avatarPreviewProps: string;
             name: string;
             sex: string;
             age: string;
@@ -69,7 +71,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         patientInfo: {
             type: import("vue").PropType<Partial<{
                 avatar: string;
+                avatarPreview: string;
                 avatarProps: string;
+                avatarPreviewProps: string;
                 name: string;
                 sex: string;
                 age: string;
@@ -190,6 +194,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     NTag: any;
     NScrollbar: any;
     NImage: any;
+    NPopover: any;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
             type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../es/shared/types").Func<any[], any>>;
@@ -334,7 +339,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     patientInfo: {
         type: import("vue").PropType<Partial<{
             avatar: string;
+            avatarPreview: string;
             avatarProps: string;
+            avatarPreviewProps: string;
             name: string;
             sex: string;
             age: string;
@@ -387,7 +394,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     separator: string;
     patientInfo: Partial<{
         avatar: string;
+        avatarPreview: string;
         avatarProps: string;
+        avatarPreviewProps: string;
         name: string;
         sex: string;
         age: string;

package/es/components/info-header/src/InfoHeader.vue.d.ts

@@ -20,7 +20,9 @@ declare const _default: import("vue").DefineComponent<{
     patientInfo: {
         type: PropType<Partial<{
             avatar: string;
+            avatarPreview: string;
             avatarProps: string;
+            avatarPreviewProps: string;
             name: string;
             sex: string;
             age: string;
@@ -76,7 +78,9 @@ declare const _default: import("vue").DefineComponent<{
         patientInfo: {
             type: PropType<Partial<{
                 avatar: string;
+                avatarPreview: string;
                 avatarProps: string;
+                avatarPreviewProps: string;
                 name: string;
                 sex: string;
                 age: string;
@@ -184,6 +188,7 @@ declare const _default: import("vue").DefineComponent<{
     NTag: any;
     NScrollbar: any;
     NImage: any;
+    NPopover: any;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
             type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
@@ -328,7 +333,9 @@ declare const _default: import("vue").DefineComponent<{
     patientInfo: {
         type: PropType<Partial<{
             avatar: string;
+            avatarPreview: string;
             avatarProps: string;
+            avatarPreviewProps: string;
             name: string;
             sex: string;
             age: string;
@@ -379,7 +386,9 @@ declare const _default: import("vue").DefineComponent<{
     separator: string;
     patientInfo: Partial<{
         avatar: string;
+        avatarPreview: string;
         avatarProps: string;
+        avatarPreviewProps: string;
         name: string;
         sex: string;
         age: string;