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

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

@@ -5,6 +5,9 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    attrs: {
+        [x: string]: unknown;
+    };
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: import("vue").PropType<import("./src/interface").IMode>;
@@ -12,6 +15,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         };
     }>> & {}>>;
     isTemperature: import("vue").ComputedRef<boolean>;
+    style: import("vue").ComputedRef<import("vue").CSSProperties>;
     fabricChartRef: import("vue").Ref<any>;
     redrawPoints: () => void;
     select: (key: string) => void;

package/es/components/fabric-chart/src/FabricChart.vue.d.ts

@@ -1,4 +1,5 @@
-import { PropType } from 'vue';
+import { PropType, CSSProperties } from 'vue';
+import { AnyObject } from '../../../../es/shared/types';
 import { IMode } from './interface';
 declare const _default: import("vue").DefineComponent<{
     mode: {
@@ -6,6 +7,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    attrs: {
+        [x: string]: unknown;
+    };
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         mode: {
             type: PropType<IMode>;
@@ -13,6 +17,7 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>> & {}>>;
     isTemperature: import("vue").ComputedRef<boolean>;
+    style: import("vue").ComputedRef<CSSProperties>;
     fabricChartRef: import("vue").Ref<any>;
     redrawPoints: () => void;
     select: (key: string) => void;
@@ -135,7 +140,7 @@ declare const _default: import("vue").DefineComponent<{
                 show: boolean;
                 point: import("./interface").ICoordinateValue;
                 list: string[];
-                propItems: import("../../../shared/types").AnyObject;
+                propItems: AnyObject;
             };
             pointStyle: import("vue").ComputedRef<{
                 top: string;
@@ -246,8 +251,8 @@ declare const _default: import("vue").DefineComponent<{
             onDelete?: ((...args: any[]) => any) | undefined;
         }>>;
         emits: (event: "delete" | "change" | "add" | "select", ...args: any[]) => void;
-        leftScales: import("vue").ComputedRef<import("../../../shared/types").AnyObject[]>;
-        rightScales: import("vue").ComputedRef<import("../../../shared/types").AnyObject[]>;
+        leftScales: import("vue").ComputedRef<AnyObject[]>;
+        rightScales: import("vue").ComputedRef<AnyObject[]>;
         leftAddAreaWidth: number;
         rightAddAreaWidth: import("vue").ComputedRef<0 | 30>;
         originX: import("vue").ComputedRef<number>;
@@ -314,7 +319,7 @@ declare const _default: import("vue").DefineComponent<{
                 show: boolean;
                 point: import("./interface").ICoordinateValue;
                 list: string[];
-                propItems: import("../../../shared/types").AnyObject;
+                propItems: AnyObject;
             };
             pointStyle: import("vue").ComputedRef<{
                 top: string;

package/es/components/fabric-chart/src/FabricChart.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, unref, openBlock, createBlock, mergeProps } from 'vue';
+import { defineComponent, useAttrs, computed, ref, openBlock, createElementBlock, normalizeStyle, unref, createBlock, mergeProps } from 'vue';
 import TemperatureChart from './TemperatureChart.vue.js';
 import BirthProcessChart from './BirthProcessChart.vue.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
@@ -11,7 +11,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose }) {
     var _a;
     const props = __props;
+    const attrs = useAttrs();
     const isTemperature = computed(() => props.mode === "temperature");
+    const style = computed(() => {
+      const data = attrs.data;
+      const _style = {
+        width: ((data == null ? void 0 : data.width) || 800) + "px",
+        height: ((data == null ? void 0 : data.height) || 700) + "px",
+        position: "relative"
+      };
+      return _style;
+    });
     const fabricChartRef = ref();
     function redrawPoints() {
       var _a2;
@@ -28,11 +38,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       canvas
     });
     return (_ctx, _cache) => {
-      return unref(isTemperature) ? (openBlock(), createBlock(TemperatureChart, mergeProps({
-        key: 0,
-        ref_key: "fabricChartRef",
-        ref: fabricChartRef
-      }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(BirthProcessChart, { key: 1 }));
+      return openBlock(), createElementBlock("div", {
+        class: "c-fabric-chart-wrapper",
+        style: normalizeStyle(unref(style))
+      }, [
+        unref(isTemperature) ? (openBlock(), createBlock(TemperatureChart, mergeProps({
+          key: 0,
+          ref_key: "fabricChartRef",
+          ref: fabricChartRef
+        }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(BirthProcessChart, { key: 1 }))
+      ], 4);
     };
   }
 });

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -96,7 +96,7 @@ var PopupMenu = defineComponent({
     });
     return () => {
       return createVNode(Teleport, {
-        "to": ".c-fabric-chart"
+        "to": ".c-fabric-chart-wrapper"
       }, {
         default: () => [withDirectives(createVNode("ul", {
           "ref": popupRef,

package/es/components/fabric-chart/src/components/PopupTip.vue.js

@@ -14,7 +14,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const pointStyle = useStyle(props);
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(Teleport, { to: ".c-fabric-chart" }, [
+      return openBlock(), createBlock(Teleport, { to: ".c-fabric-chart-wrapper" }, [
         withDirectives(createElementVNode("ul", {
           class: "c-fabric-chart-popup-tip",
           style: normalizeStyle(unref(pointStyle))

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

@@ -441,14 +441,15 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         rightLine: line,
         otherObj,
         lockMovementX: true,
-        lockMoveMentY: currentPointType == 0 ? true : false,
         ...v.pacemakerShow && type == "pulse" ? pacemaker.style : pointAttr,
-        ...propItems.event
+        ...propItems.event,
+        ...isNonePain ? { selectable: false, evented: false } : {}
       };
       if (previousLine) {
+        const y = previousLine.get("y2");
         point = drawPoint(currentPointType, {
           left: previousLine.get("x2"),
-          top: previousLine.get("y2"),
+          top: isNonePain ? y - 5 : y,
           ...pointAttrNew
         });
       } else {
@@ -456,7 +457,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           pointAttrNew.leftLine = null;
           point = drawPoint(currentPointType, {
             left: points[0],
-            top: points[1],
+            top: isNonePain ? points[1] - 5 : points[1],
             ...pointAttrNew
           });
         }