cnhis-design-vue 3.1.39-beta.2 → 3.1.39-beta.4

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

@@ -64,6 +64,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    directPrint: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: import("./src/utils").Print | null;
@@ -130,6 +134,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        directPrint: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -154,6 +162,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
     getTemplateIdByFormatId: import("vue").ComputedRef<any>;
+    buttonClick: (origin: string) => Promise<false | undefined>;
     renderLabel: (option: import("naive-ui").MenuOption) => JSX.Element;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: unknown) => void;
@@ -179,7 +188,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     }, params?: any[]) => any;
     initCRM: (formatListResult: any) => Promise<boolean | undefined>;
     init: () => Promise<boolean>;
-    handleClickBtn: () => Promise<false | undefined>;
+    handleClickBtn: (visible?: boolean) => Promise<false | undefined>;
     reformatPrintParams: () => void;
     verifiySuccess: (token: string) => void;
     NDropdown: any;
@@ -1878,6 +1887,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    directPrint: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1897,5 +1910,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     noDataMsg: string;
     printdlgshow: string;
     btnprint: string;
+    directPrint: boolean;
 }>>;
 export default ButtonPrint;

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

@@ -69,6 +69,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    directPrint: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: Print | null;
@@ -138,6 +142,10 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        directPrint: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -162,6 +170,7 @@ declare const _default: import("vue").DefineComponent<{
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
     getTemplateIdByFormatId: import("vue").ComputedRef<any>;
+    buttonClick: (origin: string) => Promise<false | undefined>;
     renderLabel: (option: DropdownOption) => JSX.Element;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: unknown) => void;
@@ -187,7 +196,7 @@ declare const _default: import("vue").DefineComponent<{
     }, params?: any[]) => any;
     initCRM: (formatListResult: any) => Promise<boolean | undefined>;
     init: () => Promise<boolean>;
-    handleClickBtn: () => Promise<false | undefined>;
+    handleClickBtn: (visible?: boolean) => Promise<false | undefined>;
     reformatPrintParams: () => void;
     verifiySuccess: (token: string) => void;
     NDropdown: any;
@@ -1889,6 +1898,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    directPrint: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1908,5 +1921,6 @@ declare const _default: import("vue").DefineComponent<{
     noDataMsg: string;
     printdlgshow: string;
     btnprint: string;
+    directPrint: boolean;
 }>;
 export default _default;

package/es/components/button-print/src/ButtonPrint.vue2.js

@@ -71,6 +71,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     btnprint: {
       type: String,
       default: "1"
+    },
+    directPrint: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["success", "error", "clickoutside"],
@@ -118,6 +122,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       let find = state.formatList.find((item) => item.id === state.currentFormatId);
       return find == null ? void 0 : find.templateId;
     });
+    const buttonClick = async (origin) => {
+      if (props.directPrint) {
+        if (state.spinning)
+          return;
+        if (origin === "button") {
+          await handleClickBtn(false);
+          handleClickPrint();
+          return;
+        } else {
+          return handleClickBtn();
+        }
+      }
+      return handleClickBtn();
+    };
     const renderLabel = (option) => {
       return createVNode("span", {
         "class": {
@@ -402,7 +420,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.spinning = false;
       return true;
     };
-    const handleClickBtn = async () => {
+    const handleClickBtn = async (visible = true) => {
       var _a;
       const status = await props.clickPrevFn();
       if (!status)
@@ -416,7 +434,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (!result)
           return false;
       }
-      state.visible = !state.visible;
+      if (visible) {
+        state.visible = !state.visible;
+      }
     };
     const reformatPrintParams = () => {
       state.watchPrintParamsReformatFn && state.watchPrintParamsReformatFn();
@@ -475,17 +495,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           printVisible: state.visible
         }, () => [createVNode(unref(NButton), {
           class: "dropdown-button",
-          onClick: withModifiers(handleClickBtn, ["stop"])
+          onClick: _cache[1] || (_cache[1] = withModifiers(() => buttonClick("button"), ["stop"]))
         }, {
           default: withCtx(() => [createCommentVNode(' <n-spin v-show="state.spinning" size="small"></n-spin> '), createTextVNode(toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
-            component: unref(ChevronDown)
+            component: unref(ChevronDown),
+            style: {
+              "margin-left": "5px"
+            },
+            onClick: _cache[0] || (_cache[0] = withModifiers(() => buttonClick("icon"), ["stop"]))
           }, null, 8, ["component"])]),
           _: 1
-        }, 8, ["onClick"])])]),
+        })])]),
         _: 3
       }, 8, ["show", "options"]), createVNode(IdentityVerification, mergeProps(_ctx.$attrs, {
         modelValue: state.identityVerification.visible,
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.identityVerification.visible = $event),
+        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.identityVerification.visible = $event),
         formatId: state.currentFormatId,
         templateId: unref(getTemplateIdByFormatId),
         onSuccess: verifiySuccess

package/es/components/button-print/src/utils/print.d.ts

@@ -6,6 +6,7 @@ export declare class Print {
     private dialog;
     private dialogPreview;
     private instance;
+    private downloadPath;
     constructor();
     private readonly messageHandlerQueue;
     private messageHandler;

package/es/components/button-print/src/utils/print.js

@@ -27,6 +27,7 @@ class Print {
     this.dialog = new IdentityVerificationDialog();
     this.dialogPreview = new PreviewDialog();
     this.instance = null;
+    this.downloadPath = "";
     this.messageHandlerQueue = [];
     var _a;
     const _window = window;
@@ -35,13 +36,19 @@ class Print {
       return;
     this.currentMessageHandler = this.messageHandler.bind(this);
     this.webview.addEventListener("message", this.currentMessageHandler);
+    this.postMessage({ exec: "config", data: "" });
   }
   messageHandler(e) {
+    var _a;
     const handler = this.messageHandlerQueue.pop();
     if (!handler)
       return console.log("\u5F53\u524D\u56DE\u6267", e, "\u6CA1\u6709\u53EF\u7528\u7684handler");
     const { resolve, reject } = handler;
     try {
+      const { exec } = JSON.parse(e.data);
+      if (exec === "config") {
+        this.downloadPath = ((_a = JSON.parse(e.data).res) == null ? void 0 : _a.downloadpath) || "";
+      }
       console.log(e);
       resolve(JSON.parse(e.data).res);
     } catch (e2) {
@@ -311,6 +318,9 @@ class Print {
     return httpFn.get(PDF_URL, { params: { inputData } }).then(({ data }) => data);
   }
   downloadPDF(params, onResolve, onReject) {
+    if (this.webview && this.downloadPath) {
+      params.print.filename = this.downloadPath.replace(/\\/g, "/");
+    }
     this.printDirect(
       params,
       async (res) => {

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

@@ -351,7 +351,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       };
     }
     function drawOther(points, v, _item, otherObj) {
-      var _a2;
+      var _a2, _b;
       if (!(points == null ? void 0 : points.length) || !["temperature", "pain"].includes(type))
         return;
       const { lineAttr = {} } = _item;
@@ -391,13 +391,13 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         otherList.push(verifiedText);
       }
       if (isValidValue(v.physicsReduce) || isValidValue(v.drugReduce)) {
-        const reduceY = cumputedY(type, scaleValue.list, v.physicsReduce || v.drugReduce);
+        const reduceY = cumputedY(type, scaleValue.list, (_a2 = v.physicsReduce) != null ? _a2 : v.drugReduce);
         reduceLine = drawLine([...points, points[0], reduceY], {
           ...lineAttr,
           ...reduceStyle.line,
           ...defaultStyle
         });
-        reducePoint = drawPoint(((_a2 = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a2.type) || "circle", {
+        reducePoint = drawPoint(((_b = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _b.type) || "circle", {
           left: points[0],
           top: reduceY,
           ...reduceStyle.point,

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

@@ -304,7 +304,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
       new fabric.Rect({
         left: iconsWidth,
         top: 0,
-        width: canvasWidth - iconsWidth,
+        width: canvasWidth - iconsWidth - 1,
         height: canvasHeight - 1,
         fill: "transparent",
         ...defaultBorderStyle

package/es/components/scale-view/src/ScaleView.vue.d.ts

@@ -496,6 +496,9 @@ declare const _default: import("vue").DefineComponent<{
         showCountdown: import("vue").ComputedRef<any>;
         getTotalLen: () => void;
         countdown: (startTime: any) => void;
+        /**
+         * wacth
+         */
         clearTimer: () => void;
         init: () => void;
         checkType: (val: any) => string;

package/es/components/scale-view/src/ScaleView.vue.js

@@ -314,7 +314,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["c-scale", { "c-scale-nobtn": unref(showSaveBtn) }])
       }, [
-        createCommentVNode(' <template v-if="state.spinning">\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\n    </template> '),
+        createCommentVNode(' <template v-if="state.spinning">\r\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\r\n    </template> '),
         !state.spinning && !state.hasFrontAddress ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           unref(noDataState).noData ? (openBlock(), createBlock(NoData, {
             key: 0,

package/es/env.d.ts

@@ -1,24 +1,24 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';