cnhis-design-vue 3.1.20 → 3.1.21-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/big-table/index.d.ts

@@ -883,7 +883,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
         class: import("vue").Ref<string | undefined>;
         mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | (() => import("vue").VNodeChild)>;

package/es/components/big-table/src/BigTable.vue.d.ts

@@ -881,7 +881,7 @@ declare const _default: import("vue").DefineComponent<{
         style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
         class: import("vue").Ref<string | undefined>;
         mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | (() => import("vue").VNodeChild)>;

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1464,7 +1464,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         checked: setChecked,
         row,
         index: $rowIndex,
-        records: checkedRow
+        records: table.getCheckboxRecords()
       });
       setChecked && emit("handlerClickRow", row, $rowIndex);
     };

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

@@ -383,7 +383,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
                 key: string;
                 render: () => import("vue").VNodeChild;
             }[]>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             readonly label: StringConstructor;
             readonly labelWidth: import("vue").PropType<string | number>;
             readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/button-print/src/ButtonPrint.vue.d.ts

@@ -387,7 +387,7 @@ declare const _default: import("vue").DefineComponent<{
                 key: string;
                 render: () => import("vue").VNodeChild;
             }[]>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             readonly label: StringConstructor;
             readonly labelWidth: import("vue").PropType<string | number>;
             readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/button-print/src/components/IdentityVerification.vue.d.ts

@@ -210,7 +210,7 @@ declare const _default: import("vue").DefineComponent<{
             key: string;
             render: () => import("vue").VNodeChild;
         }[]>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/drag-layout/index.d.ts

@@ -205,7 +205,7 @@ declare const DragLayout: SFCWithInstall<import("vue").DefineComponent<{
         } | null>;
         validate: import("naive-ui/es/form/src/interface").FormItemValidate;
         restoreValidation: () => void;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/drag-layout/src/DragLayout.vue.d.ts

@@ -205,7 +205,7 @@ declare const _default: import("vue").DefineComponent<{
         } | null>;
         validate: import("naive-ui/es/form/src/interface").FormItemValidate;
         restoreValidation: () => void;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

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

@@ -45,10 +45,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return ((_a = top.operationDays) == null ? void 0 : _a.show) && (top.operationDays.height || defaultHeight) || 0;
     });
     const xScalevalueHeight = computed(() => {
-      var _a, _b;
+      var _a, _b, _c;
       const { top } = props.data;
       const height = ((_a = top.xScalevalue) == null ? void 0 : _a.show) && (top.xScalevalue.height || defaultHeight) || 0;
-      const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? top.dayHeight || 0 : 0;
+      const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? (_c = top.dayHeight) != null ? _c : 0 : 0;
       return height + dayHeight;
     });
     const breathingHeight = computed(() => {
@@ -89,8 +89,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return height - endHeight;
     });
     const originY = computed(() => {
+      var _a;
       const { top } = props.data;
-      const dayHeight = top.xScalevalue.show && (top.dayHeight || defaultHeight) || 0;
+      const dayHeight = top.xScalevalue.show && ((_a = top.dayHeight) != null ? _a : 0) || 0;
       const xScaleHeight = top.xScalevalue.show && (top.xScalevalue.height || defaultHeight) || 0;
       const topHeight = dateHeight.value + dayHeight + xScaleHeight + hospitalDaysHeight.value + operationDaysHeight.value;
       return topHeight;

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

@@ -281,14 +281,17 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   onMounted(() => {
     nextTick(() => {
-      var _a;
+      var _a, _b;
       iconsWidth && drawIcons();
-      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain");
-      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain" && v.show);
+      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)) {
         yScaleValueList.push(getRightInfo);
       }
-      painIndex == 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
-      painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
+      if (painIndex > 0 && left.yScaleValue[painIndex].show) {
+        const painObj = left.yScaleValue[painIndex];
+        painIndex === 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(painObj);
+        painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(painObj);
+      }
       drawScaleValue(yScaleValueList);
       drawBorder();
       canvas.value.renderAll();

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

@@ -6,9 +6,9 @@ function useRight(canvas, propItems, drawScaleValue) {
   const { left, right, getRightInfo, canvasWidth, endY, endX, originY } = propItems;
   onMounted(() => {
     nextTick(() => {
-      var _a;
-      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
-      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
+      var _a, _b;
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right" && v.show);
+      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)) {
         yScaleValueList.push(getRightInfo);
       }
       if ((right == null ? void 0 : right.width) || yScaleValueList.length > 0) {

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

@@ -35,7 +35,8 @@ function useTop(canvas, propItems) {
     group && canvas.value.add(group);
   }
   function drawTime(item, list, topY) {
-    const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
+    var _a;
+    const dayHeight = top.xScalevalue.show ? (_a = top.dayHeight) != null ? _a : 0 : 0;
     const height = xScalevalueHeight - dayHeight;
     const title = drawTextGroup({
       width: originX - iconsWidth,
@@ -61,9 +62,10 @@ function useTop(canvas, propItems) {
         width: xCellWidth,
         height
       }, {
-        value: v,
+        value: v.value,
         ...defaultTextStyle,
-        ...item.style || {}
+        ...item.style || {},
+        ...v.style || {}
       }, {
         left,
         top: topY + dayHeight