cnhis-design-vue 3.1.20-beta.4.1 → 3.1.21-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/README.md +123 -123
  2. package/es/components/big-table/index.d.ts +1 -1
  3. package/es/components/big-table/src/BigTable.vue.d.ts +1 -1
  4. package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js +1 -1
  5. package/es/components/button-print/index.d.ts +1 -1
  6. package/es/components/button-print/src/ButtonPrint.vue.d.ts +1 -1
  7. package/es/components/button-print/src/components/IdentityVerification.vue.d.ts +1 -1
  8. package/es/components/drag-layout/index.d.ts +1 -1
  9. package/es/components/drag-layout/src/DragLayout.vue.d.ts +1 -1
  10. package/es/components/fabric-chart/src/FabricChart.js +4 -3
  11. package/es/components/fabric-chart/src/hooks/useLeft2.js +8 -5
  12. package/es/components/fabric-chart/src/hooks/useOther2.js +21 -32
  13. package/es/components/fabric-chart/src/hooks/useRight2.js +3 -3
  14. package/es/components/fabric-chart/src/hooks/useTop2.js +5 -3
  15. package/es/components/form-config/index.d.ts +2 -2
  16. package/es/components/form-config/src/FormConfig.vue.d.ts +2 -2
  17. package/es/components/form-config/src/components/FormConfigCreator.vue.d.ts +1 -1
  18. package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts +1 -1
  19. package/es/components/form-render/index.d.ts +1 -1
  20. package/es/components/form-render/src/FormRender.vue.d.ts +1 -1
  21. package/es/components/form-render/src/components/renderer/inputGroup.d.ts +1 -1
  22. package/es/components/form-table/index.d.ts +1 -1
  23. package/es/components/form-table/src/FormTable.vue.d.ts +1 -1
  24. package/es/components/form-table/src/components/index.d.ts +1 -1
  25. package/es/components/form-table/src/components/table-age.vue.d.ts +1 -1
  26. package/es/components/info-header/index.d.ts +1 -1
  27. package/es/components/info-header/src/InfoHeader.vue.d.ts +1 -1
  28. package/es/components/scale-view/index.d.ts +1 -1
  29. package/es/components/scale-view/src/ScaleView.vue.d.ts +1 -1
  30. package/es/components/scale-view/src/hooks/use-component.d.ts +2 -2
  31. package/es/components/select-label/index.d.ts +4 -4
  32. package/es/components/select-label/src/LabelFormContent.vue.d.ts +2 -2
  33. package/es/components/select-label/src/SelectLabel.vue.d.ts +2 -2
  34. package/es/components/select-person/index.d.ts +1 -1
  35. package/es/components/select-person/src/SelectPerson.vue.d.ts +1 -1
  36. package/es/components/shortcut-setter/index.d.ts +1 -1
  37. package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts +1 -1
  38. package/es/components/time-line/index.d.ts +1 -1
  39. package/es/components/time-line/src/TimeLine.vue.d.ts +1 -1
  40. package/package.json +2 -2
  41. package/es/components/bpmn-workflow/src/BpmnWorkflow.d.ts +0 -0
  42. package/es/components/bpmn-workflow/types/BpmnViewer.d.ts +0 -1
  43. package/es/components/bpmn-workflow/types/ModelingModule.d.ts +0 -1
  44. package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts +0 -1
  45. package/es/components/fabric-chart/src/utils/index.d.ts +0 -6823
  46. package/es/shared/utils/tapable/index.d.ts +0 -139
package/README.md CHANGED
@@ -1,123 +1,123 @@
1
- # 安装
2
-
3
- ```shell
4
- npm i cnhis-design-vue@[版本号]
5
- # or
6
- yarn add cnhis-design-vue@[版本号] #推荐
7
- ```
8
-
9
- ## 1.全局引入
10
-
11
- ```typescript
12
- // main.ts
13
- import { createApp } from 'vue';
14
- import App from './App.vue';
15
- import 'cnhis-design-vue/es/packages/index.css';
16
- import cui from 'cnhis-design-vue';
17
-
18
- const app = createApp(App);
19
- app.use(cui).mount('#app');
20
- ```
21
-
22
- ## 2. 按需引入
23
-
24
- 组件现在支持了自动按需引入, 但是样式文件需要额外的处理
25
-
26
- ### 2.1 样式处理方式 1(按需引入样式)
27
-
28
- ```shell
29
- # 安装自动导入样式的插件
30
- npm i -d vite-plugin-style-import
31
- ```
32
-
33
- ```typescript
34
- // vite.config.ts
35
- import { defineConfig } from 'vite';
36
- import { createStyleImportPlugin } from 'vite-plugin-style-import';
37
-
38
- export default defineConfig({
39
- plugins: [
40
- // ...otherPlugins
41
- createStyleImportPlugin({
42
- libs: [
43
- {
44
- libraryName: 'cnhis-design-vue',
45
- esModule: true,
46
- ensureStyleFile: true,
47
- resolveStyle: name => {
48
- return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
49
- }
50
- }
51
- ]
52
- })
53
- ]
54
- });
55
- ```
56
-
57
- ### 2.2 样式处理方式 2(全局引入样式)
58
-
59
- ```typescript
60
- // main.ts
61
- import 'cnhis-design-vue/es/components/index.css';
62
- ```
63
-
64
- ## 3. 注意
65
-
66
- 由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
67
-
68
- ```typescript
69
- // main.ts
70
- import { createApp } from 'vue';
71
- import App from './App.vue';
72
-
73
- import { CGrid } from 'cnhis-design-vue';
74
- // 或者
75
- import { CBigTable } from 'cnhis-design-vue';
76
-
77
- const app = createApp(App);
78
- app.use(CGrid);
79
- // 或者
80
- app.use(CBigTable);
81
- app.mount('#app');
82
- ```
83
-
84
- ## 4.FAQ
85
-
86
- ### 4.1 项目打包后样式丢失
87
-
88
- > 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
89
-
90
- ```typescript
91
- // vite.config.ts
92
- import { defineConfig } from 'vite';
93
-
94
- export default defineConfig({
95
- rollupOptions: {
96
- // ..otherOptions
97
- output: {
98
- dir: './dist',
99
- manualChunks(id: string) {
100
- if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
101
- return 'vendor';
102
- }
103
- }
104
- }
105
- }
106
- });
107
- ```
108
-
109
- ### 4.2 找不到文件
110
-
111
- > 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
112
-
113
- ```javascript
114
- // vite.config.ts
115
- const config = {
116
- // ...otherOptions
117
- resolve: {
118
- // ...otherOptions
119
- // 如果没有配置, 则不用考虑
120
- extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
121
- }
122
- };
123
- ```
1
+ # 安装
2
+
3
+ ```shell
4
+ npm i cnhis-design-vue@[版本号]
5
+ # or
6
+ yarn add cnhis-design-vue@[版本号] #推荐
7
+ ```
8
+
9
+ ## 1.全局引入
10
+
11
+ ```typescript
12
+ // main.ts
13
+ import { createApp } from 'vue';
14
+ import App from './App.vue';
15
+ import 'cnhis-design-vue/es/packages/index.css';
16
+ import cui from 'cnhis-design-vue';
17
+
18
+ const app = createApp(App);
19
+ app.use(cui).mount('#app');
20
+ ```
21
+
22
+ ## 2. 按需引入
23
+
24
+ 组件现在支持了自动按需引入, 但是样式文件需要额外的处理
25
+
26
+ ### 2.1 样式处理方式 1(按需引入样式)
27
+
28
+ ```shell
29
+ # 安装自动导入样式的插件
30
+ npm i -d vite-plugin-style-import
31
+ ```
32
+
33
+ ```typescript
34
+ // vite.config.ts
35
+ import { defineConfig } from 'vite';
36
+ import { createStyleImportPlugin } from 'vite-plugin-style-import';
37
+
38
+ export default defineConfig({
39
+ plugins: [
40
+ // ...otherPlugins
41
+ createStyleImportPlugin({
42
+ libs: [
43
+ {
44
+ libraryName: 'cnhis-design-vue',
45
+ esModule: true,
46
+ ensureStyleFile: true,
47
+ resolveStyle: name => {
48
+ return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
49
+ }
50
+ }
51
+ ]
52
+ })
53
+ ]
54
+ });
55
+ ```
56
+
57
+ ### 2.2 样式处理方式 2(全局引入样式)
58
+
59
+ ```typescript
60
+ // main.ts
61
+ import 'cnhis-design-vue/es/components/index.css';
62
+ ```
63
+
64
+ ## 3. 注意
65
+
66
+ 由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
67
+
68
+ ```typescript
69
+ // main.ts
70
+ import { createApp } from 'vue';
71
+ import App from './App.vue';
72
+
73
+ import { CGrid } from 'cnhis-design-vue';
74
+ // 或者
75
+ import { CBigTable } from 'cnhis-design-vue';
76
+
77
+ const app = createApp(App);
78
+ app.use(CGrid);
79
+ // 或者
80
+ app.use(CBigTable);
81
+ app.mount('#app');
82
+ ```
83
+
84
+ ## 4.FAQ
85
+
86
+ ### 4.1 项目打包后样式丢失
87
+
88
+ > 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
89
+
90
+ ```typescript
91
+ // vite.config.ts
92
+ import { defineConfig } from 'vite';
93
+
94
+ export default defineConfig({
95
+ rollupOptions: {
96
+ // ..otherOptions
97
+ output: {
98
+ dir: './dist',
99
+ manualChunks(id: string) {
100
+ if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
101
+ return 'vendor';
102
+ }
103
+ }
104
+ }
105
+ }
106
+ });
107
+ ```
108
+
109
+ ### 4.2 找不到文件
110
+
111
+ > 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
112
+
113
+ ```javascript
114
+ // vite.config.ts
115
+ const config = {
116
+ // ...otherOptions
117
+ resolve: {
118
+ // ...otherOptions
119
+ // 如果没有配置, 则不用考虑
120
+ extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
121
+ }
122
+ };
123
+ ```
@@ -883,7 +883,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
883
883
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
884
884
  class: import("vue").Ref<string | undefined>;
885
885
  mergedClsPrefix: import("vue").Ref<string>;
886
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
886
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
887
887
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
888
888
  [key: string]: any;
889
889
  }> | (() => import("vue").VNodeChild)>;
@@ -881,7 +881,7 @@ declare const _default: import("vue").DefineComponent<{
881
881
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
882
882
  class: import("vue").Ref<string | undefined>;
883
883
  mergedClsPrefix: import("vue").Ref<string>;
884
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
884
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
885
885
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
886
886
  [key: string]: any;
887
887
  }> | (() => import("vue").VNodeChild)>;
@@ -1464,7 +1464,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
1464
1464
  checked: setChecked,
1465
1465
  row,
1466
1466
  index: $rowIndex,
1467
- records: checkedRow
1467
+ records: table.getCheckboxRecords()
1468
1468
  });
1469
1469
  setChecked && emit("handlerClickRow", row, $rowIndex);
1470
1470
  };
@@ -383,7 +383,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
383
383
  key: string;
384
384
  render: () => import("vue").VNodeChild;
385
385
  }[]>;
386
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
386
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
387
387
  readonly label: StringConstructor;
388
388
  readonly labelWidth: import("vue").PropType<string | number>;
389
389
  readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;
@@ -387,7 +387,7 @@ declare const _default: import("vue").DefineComponent<{
387
387
  key: string;
388
388
  render: () => import("vue").VNodeChild;
389
389
  }[]>;
390
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
390
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
391
391
  readonly label: StringConstructor;
392
392
  readonly labelWidth: import("vue").PropType<string | number>;
393
393
  readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;
@@ -210,7 +210,7 @@ declare const _default: import("vue").DefineComponent<{
210
210
  key: string;
211
211
  render: () => import("vue").VNodeChild;
212
212
  }[]>;
213
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
213
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
214
214
  readonly label: StringConstructor;
215
215
  readonly labelWidth: import("vue").PropType<string | number>;
216
216
  readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;
@@ -205,7 +205,7 @@ declare const DragLayout: SFCWithInstall<import("vue").DefineComponent<{
205
205
  } | null>;
206
206
  validate: import("naive-ui/es/form/src/interface").FormItemValidate;
207
207
  restoreValidation: () => void;
208
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
208
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
209
209
  readonly label: StringConstructor;
210
210
  readonly labelWidth: import("vue").PropType<string | number>;
211
211
  readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;
@@ -205,7 +205,7 @@ declare const _default: import("vue").DefineComponent<{
205
205
  } | null>;
206
206
  validate: import("naive-ui/es/form/src/interface").FormItemValidate;
207
207
  restoreValidation: () => void;
208
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
208
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
209
209
  readonly label: StringConstructor;
210
210
  readonly labelWidth: import("vue").PropType<string | number>;
211
211
  readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;
@@ -45,10 +45,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
45
45
  return ((_a = top.operationDays) == null ? void 0 : _a.show) && (top.operationDays.height || defaultHeight) || 0;
46
46
  });
47
47
  const xScalevalueHeight = computed(() => {
48
- var _a, _b;
48
+ var _a, _b, _c;
49
49
  const { top } = props.data;
50
50
  const height = ((_a = top.xScalevalue) == null ? void 0 : _a.show) && (top.xScalevalue.height || defaultHeight) || 0;
51
- const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? top.dayHeight || 0 : 0;
51
+ const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? (_c = top.dayHeight) != null ? _c : 0 : 0;
52
52
  return height + dayHeight;
53
53
  });
54
54
  const breathingHeight = computed(() => {
@@ -89,8 +89,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
89
89
  return height - endHeight;
90
90
  });
91
91
  const originY = computed(() => {
92
+ var _a;
92
93
  const { top } = props.data;
93
- const dayHeight = top.xScalevalue.show && (top.dayHeight || defaultHeight) || 0;
94
+ const dayHeight = top.xScalevalue.show && ((_a = top.dayHeight) != null ? _a : 0) || 0;
94
95
  const xScaleHeight = top.xScalevalue.show && (top.xScalevalue.height || defaultHeight) || 0;
95
96
  const topHeight = dateHeight.value + dayHeight + xScaleHeight + hospitalDaysHeight.value + operationDaysHeight.value;
96
97
  return topHeight;
@@ -281,14 +281,17 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
281
281
  }
282
282
  onMounted(() => {
283
283
  nextTick(() => {
284
- var _a;
284
+ var _a, _b;
285
285
  iconsWidth && drawIcons();
286
- const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain");
287
- if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
286
+ const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain" && v.show);
287
+ if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left" && ((_b = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _b.show)) {
288
288
  yScaleValueList.push(getRightInfo);
289
289
  }
290
- painIndex == 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
291
- painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
290
+ if (painIndex > 0 && left.yScaleValue[painIndex].show) {
291
+ const painObj = left.yScaleValue[painIndex];
292
+ painIndex === 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(painObj);
293
+ painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(painObj);
294
+ }
292
295
  drawScaleValue(yScaleValueList);
293
296
  drawBorder();
294
297
  canvas.value.renderAll();
@@ -29,55 +29,43 @@ function useOther(canvas, propItems, cumputedX) {
29
29
  otherList.forEach((item) => {
30
30
  let topY = vitalSignsOriginY.originY;
31
31
  let leftX = item.left;
32
- let textHeight = 0;
33
32
  item.vertical.forEach((v, i) => {
34
- var _a;
35
- const valueLenght = String(v.value).length;
33
+ var _a, _b;
34
+ const baseTop = (v.baseTop || 0) * yCellHeight;
36
35
  const lastLeft = ((_a = list.at(-1)) == null ? void 0 : _a.left) || 0;
37
36
  if (i === 0 && item.left <= lastLeft) {
38
37
  leftX = lastLeft + xCellWidth;
39
38
  }
40
- topY += (v.baseTop || 0) + textHeight;
41
- const valueHeight = valueLenght * yCellHeight;
42
- const node = hasNode(leftX, topY, valueLenght);
43
- if (node) {
44
- topY += node.trueHeight + node.baseTop;
45
- }
46
- if (topY + valueHeight > vitalSignsOriginY.endY) {
47
- leftX += xCellWidth;
48
- topY = (v.baseTop || 0) + vitalSignsOriginY.originY;
49
- textHeight = 0;
50
- } else {
51
- textHeight = valueHeight || textHeight;
39
+ const leftList = list.filter((v2) => v2.trueLeft === leftX);
40
+ if (leftList.length) {
41
+ const valueLenght = String(v.value).length;
42
+ const valueHeight = valueLenght * yCellHeight;
43
+ const lastHeight = ((_b = list.at(-1)) == null ? void 0 : _b.trueHeight) || 0;
44
+ topY += lastHeight;
45
+ if (topY + valueHeight + baseTop > vitalSignsOriginY.endY) {
46
+ topY = vitalSignsOriginY.originY;
47
+ leftX += xCellWidth;
48
+ }
52
49
  }
50
+ topY += baseTop;
53
51
  if (String(v.value).length) {
54
52
  list.push(getText(v, leftX, topY));
55
53
  }
56
54
  });
57
55
  item.horizontal.forEach((v, i) => {
58
- const y = vitalSignsOriginY.originY + (v.baseTop || 0);
59
- if (i > 0 || item.vertical.length) {
60
- leftX += xCellWidth;
61
- }
62
- const node = hasNode(leftX, y, String(v.value).length);
63
- if (node) {
64
- leftX = xCellWidth + node.left;
56
+ var _a;
57
+ const topY2 = vitalSignsOriginY.originY + (v.baseTop || 0) * yCellHeight;
58
+ const lastLeft = ((_a = list.at(-1)) == null ? void 0 : _a.left) || 0;
59
+ if (item.left <= lastLeft) {
60
+ leftX = lastLeft + xCellWidth;
65
61
  }
66
62
  if (String(v.value).length) {
67
- list.push(getText(v, leftX, topY));
63
+ list.push(getText(v, leftX, topY2));
68
64
  }
69
65
  });
70
66
  });
71
67
  const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
72
68
  group && canvas.value.add(group);
73
- function hasNode(x, y, currentLenght) {
74
- return list.find((v) => {
75
- const trueY = y + textDiff;
76
- const condition1 = trueY < v.top + v.trueHeight;
77
- const condition2 = trueY + currentLenght * yCellHeight < v.top + v.trueHeight;
78
- return v.left === x && (condition1 || condition2);
79
- });
80
- }
81
69
  }
82
70
  function getText(v, x, y) {
83
71
  const texts = [];
@@ -96,7 +84,8 @@ function useOther(canvas, propItems, cumputedX) {
96
84
  originX: "center",
97
85
  left: x,
98
86
  top: y + textDiff,
99
- baseTop: v.baseTop,
87
+ baseTop: (v.baseTop || 0) * yCellHeight,
88
+ trueLeft: x,
100
89
  trueHeight: texts.length * yCellHeight
101
90
  });
102
91
  }
@@ -6,9 +6,9 @@ function useRight(canvas, propItems, drawScaleValue) {
6
6
  const { left, right, getRightInfo, canvasWidth, endY, endX, originY } = propItems;
7
7
  onMounted(() => {
8
8
  nextTick(() => {
9
- var _a;
10
- const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
11
- if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
9
+ var _a, _b;
10
+ const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right" && v.show);
11
+ if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right" && ((_b = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _b.show)) {
12
12
  yScaleValueList.push(getRightInfo);
13
13
  }
14
14
  if ((right == null ? void 0 : right.width) || yScaleValueList.length > 0) {
@@ -35,7 +35,8 @@ function useTop(canvas, propItems) {
35
35
  group && canvas.value.add(group);
36
36
  }
37
37
  function drawTime(item, list, topY) {
38
- const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
38
+ var _a;
39
+ const dayHeight = top.xScalevalue.show ? (_a = top.dayHeight) != null ? _a : 0 : 0;
39
40
  const height = xScalevalueHeight - dayHeight;
40
41
  const title = drawTextGroup({
41
42
  width: originX - iconsWidth,
@@ -61,9 +62,10 @@ function useTop(canvas, propItems) {
61
62
  width: xCellWidth,
62
63
  height
63
64
  }, {
64
- value: v,
65
+ value: v.value,
65
66
  ...defaultTextStyle,
66
- ...item.style || {}
67
+ ...item.style || {},
68
+ ...v.style || {}
67
69
  }, {
68
70
  left,
69
71
  top: topY + dayHeight
@@ -609,7 +609,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
609
609
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
610
610
  class: import("vue").Ref<string | undefined>;
611
611
  mergedClsPrefix: import("vue").Ref<string>;
612
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
612
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
613
613
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
614
614
  [key: string]: any;
615
615
  }> | (() => import("vue").VNodeChild)>;
@@ -3031,7 +3031,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
3031
3031
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
3032
3032
  class: import("vue").Ref<string | undefined>;
3033
3033
  mergedClsPrefix: import("vue").Ref<string>;
3034
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
3034
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
3035
3035
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
3036
3036
  [key: string]: any;
3037
3037
  }> | (() => import("vue").VNodeChild)>;
@@ -611,7 +611,7 @@ declare const _default: import("vue").DefineComponent<{
611
611
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
612
612
  class: import("vue").Ref<string | undefined>;
613
613
  mergedClsPrefix: import("vue").Ref<string>;
614
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
614
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
615
615
  readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
616
616
  [key: string]: any;
617
617
  }> | (() => import("vue").VNodeChild)>;
@@ -3033,7 +3033,7 @@ declare const _default: import("vue").DefineComponent<{
3033
3033
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
3034
3034
  class: import("vue").Ref<string | undefined>;
3035
3035
  mergedClsPrefix: import("vue").Ref<string>;
3036
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
3036
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
3037
3037
  readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
3038
3038
  [key: string]: any;
3039
3039
  }> | (() => import("vue").VNodeChild)>;
@@ -471,7 +471,7 @@ declare const _default: import("vue").DefineComponent<{}, {
471
471
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
472
472
  class: import("vue").Ref<string | undefined>;
473
473
  mergedClsPrefix: import("vue").Ref<string>;
474
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
474
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
475
475
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
476
476
  [key: string]: any;
477
477
  }> | (() => import("vue").VNodeChild)>;
@@ -2160,7 +2160,7 @@ declare const _default: import("vue").DefineComponent<{}, {
2160
2160
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
2161
2161
  class: import("vue").Ref<string | undefined>;
2162
2162
  mergedClsPrefix: import("vue").Ref<string>;
2163
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
2163
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
2164
2164
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
2165
2165
  [key: string]: any;
2166
2166
  }> | (() => import("vue").VNodeChild)>;
@@ -457,7 +457,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
457
457
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
458
458
  class: import("vue").Ref<string | undefined>;
459
459
  mergedClsPrefix: import("vue").Ref<string>;
460
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
460
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
461
461
  readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
462
462
  [key: string]: any;
463
463
  }> | (() => import("vue").VNodeChild)>;
@@ -457,7 +457,7 @@ declare const _default: import("vue").DefineComponent<{
457
457
  style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
458
458
  class: import("vue").Ref<string | undefined>;
459
459
  mergedClsPrefix: import("vue").Ref<string>;
460
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
460
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
461
461
  readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
462
462
  [key: string]: any;
463
463
  }> | (() => import("vue").VNodeChild)>;
@@ -4,7 +4,7 @@ export declare const INPUT_GROUP: import("vue").DefineComponent<{
4
4
  [x: symbol]: never;
5
5
  }, {
6
6
  mergedClsPrefix: import("vue").ComputedRef<string>;
7
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
7
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
8
8
  [x: string]: never;
9
9
  [x: number]: never;
10
10
  [x: symbol]: never;
@@ -217,7 +217,7 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
217
217
  [x: symbol]: never;
218
218
  }, {
219
219
  mergedClsPrefix: import("vue").ComputedRef<string>;
220
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
220
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
221
221
  [x: string]: never;
222
222
  [x: number]: never;
223
223
  [x: symbol]: never;
@@ -217,7 +217,7 @@ declare const _default: import("vue").DefineComponent<{
217
217
  [x: symbol]: never;
218
218
  }, {
219
219
  mergedClsPrefix: import("vue").ComputedRef<string>;
220
- }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
220
+ }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
221
221
  [x: string]: never;
222
222
  [x: number]: never;
223
223
  [x: symbol]: never;