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

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/bpmn-workflow/types/BpmnViewer.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -0,0 +1 @@
+declare module 'diagram-js/lib/navigation/movecanvas';

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

@@ -4,6 +4,7 @@ import { drawLine, drawPoint, defaultTextStyle, drawText, defaultRectStyle } fro
 import { fabric } from '../utils/index.js';
 import { getIndex, isEffectiveNode } from '../utils/utils.js';
 import { cloneDeep } from 'lodash-es';
+import { format } from 'date-fns';
 
 function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps, commonFunc) {
   const { cumputedX, cumputedY, getXValue, getYValue } = useBirthProcessCumputedPoint(propItems);
@@ -315,6 +316,40 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
           })
         );
       }
+      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];
+          }
+          lines.push(
+            drawLine([...pointer1, ...pointer2], {
+              ...line
+            })
+          );
+        }
+      }
     });
     canvas.value.add(...lines);
   }

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

@@ -1,5 +1,6 @@
 import { ref, reactive, computed, onMounted, nextTick } from 'vue';
 import { defaultBorderStyle } from './useDraw.js';
+import 'date-fns';
 import '../utils/index.js';
 import 'lodash-es';
 import './useShadow.js';

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

@@ -1,3 +1,5 @@
+import { format } from 'date-fns';
+
 function useCumputedPoint(propItems) {
   const { xScaleList, originX, endY, xCellWidth, left, vitalSignsOriginY, painOriginY, canvasWidth } = propItems;
   function cumputedX(value, setAllCenter = false) {
@@ -27,13 +29,7 @@ function useCumputedPoint(propItems) {
       const residueX = pointX - item.left;
       const residueTime = item.scaleCell * residueX;
       const time = item.start + residueTime;
-      const d = new Date(time);
-      const month = `00${d.getMonth() + 1}`.slice(-2);
-      const day = `00${d.getDate()}`.slice(-2);
-      const hours = `00${d.getHours()}`.slice(-2);
-      const minutes = `00${d.getMinutes()}`.slice(-2);
-      const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
-      return date;
+      return format(new Date(time), "yyyy-MM-dd HH:mm");
     }
   }
   function getYValue(type, pointY) {
@@ -64,13 +60,7 @@ function useBirthProcessCumputedPoint(propItems) {
   }
   function getXValue(pointX) {
     const time = (pointX - originX) * timeXCell + startTime;
-    const d = new Date(time);
-    const month = `00${d.getMonth() + 1}`.slice(-2);
-    const day = `00${d.getDate()}`.slice(-2);
-    const hours = `00${d.getHours()}`.slice(-2);
-    const minutes = `00${d.getMinutes()}`.slice(-2);
-    const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
-    return date;
+    return format(new Date(time), "yyyy-MM-dd HH:mm");
   }
   function getYValue(key, pointY) {
     const item = scaleValues.find((item2) => key === item2.key);

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

@@ -11,6 +11,7 @@ import { useEvent, useCanvasEvent } from './useEvent.js';
 import '../utils/index.js';
 import { setOtherType } from '../utils/utils.js';
 import 'lodash-es';
+import 'date-fns';
 import { useCommon } from './useCommon.js';
 
 function useTemperatureChart(canvas, props, emits, canvasRef) {