cnhis-design-vue 3.3.3-beta.65 → 3.3.3-beta.67

package/README.md

@@ -1,87 +1,87 @@
-# 安装
-
-```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.FAQ
-
-### 3.1 项目打包后样式丢失
-
-处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    rollupOptions: {
-      // ..otherOptions
-      output: {
-        dir: './dist',
-        manualChunks: {
-          'cnhis-vendor': ['cnhis-design-vue']
-        }
-      }
-    }
-  }
-});
-```
+# 安装
+
+```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.FAQ
+
+### 3.1 项目打包后样式丢失
+
+处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      // ..otherOptions
+      output: {
+        dir: './dist',
+        manualChunks: {
+          'cnhis-vendor': ['cnhis-design-vue']
+        }
+      }
+    }
+  }
+});
+```

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

@@ -794,9 +794,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         templateId,
         params: curPrintParamList
       }).then(() => {
+        var _a;
         state.curPrintParamList = curPrintParamList;
         const paramsFirst = JSON.stringify(Object.assign({}, JSON.parse(getPrintParams()), curPrintParamList[0], printCustomProps.value));
         const params = props.strategy === "MULTI" ? paramsFirst : getOnceParams(curPrintParamList, templateCode);
+        const curFormatIdObj = (_a = state == null ? void 0 : state.formatList) == null ? void 0 : _a.find((item) => item.id == formatId);
         const queryParams = {
           formatId,
           templateId,
@@ -809,7 +811,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             resolution: props == null ? void 0 : props.resolution
           },
           params,
-          signature: props.signature
+          signature: props.signature,
+          formatItem: curFormatIdObj
         };
         printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "preview"), callLocalServicesErrorCb);
       }).catch(() => {
@@ -1184,6 +1187,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.originParams = formatSomeOriginParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
+      var _a;
       state.identityVerification.visible = false;
       if (isIReport(state.currentFormatId))
         return callLocalServicesSuccessCb({
@@ -1192,10 +1196,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, "edit");
       const paramsFirst = JSON.stringify(Object.assign({}, JSON.parse(getPrintParams()), state.curPrintParamList[0], printCustomProps.value));
       const params = props.strategy === "MULTI" ? paramsFirst : getOnceParams(state.curPrintParamList, getTemplateCodeByFormatId.value);
+      const curFormatIdObj = (_a = state == null ? void 0 : state.formatList) == null ? void 0 : _a.find((item) => item.id == state.currentFormatId);
       const queryParams = {
         formatId: state.currentFormatId,
         number: state.number,
         templateId: getTemplateIdByFormatId.value,
+        formatItem: curFormatIdObj,
         params,
         token
       };

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

@@ -446,7 +446,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         formatId: state.currentFormatId,
         templateId: getTemplateIdByFormatId.value
       }).then(() => {
+        var _a2;
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const curFormatIdObj = (_a2 = state == null ? void 0 : state.formatList) == null ? void 0 : _a2.find((item) => item.id == state.currentFormatId);
         const queryParams = {
           formatId: state.currentFormatId,
           iReportExecuteMode: state.iReportExecuteMode,
@@ -459,7 +461,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             resolution: props == null ? void 0 : props.resolution
           },
           params,
-          signature: props.signature
+          signature: props.signature,
+          formatItem: curFormatIdObj
         };
         printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "download"), callLocalServicesErrorCb);
       }).catch(() => {
@@ -723,13 +726,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.printParams = formatParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
+      var _a2;
       state.identityVerification.visible = false;
       if (isIReport(state.currentFormatId))
         return callLocalServicesSuccessCb(null, "edit");
+      const curFormatIdObj = (_a2 = state == null ? void 0 : state.formatList) == null ? void 0 : _a2.find((item) => item.id == state.currentFormatId);
       const queryParams = {
         formatId: state.currentFormatId,
         number: state.number,
         templateId: getTemplateIdByFormatId.value,
+        formatItem: curFormatIdObj,
         params: getPrintParams(),
         token
       };

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

@@ -57,8 +57,8 @@ export declare class Print {
         pageCount: any;
         formatId: string;
     };
-    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, apptype, printname, uuid, priority, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
-    _handleEventEditFormat({ templateId, formatId, number, params, token, messageTimeout }: AnyObject): Promise<any>;
+    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, apptype, printname, uuid, priority, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, watermark, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
+    _handleEventEditFormat({ templateId, formatId, number, watermark, params, token, messageTimeout }: AnyObject): Promise<any>;
     _queryProxyOrigin(): Promise<void>;
     _queryPrintFile(formatId: string, params?: string): Promise<any>;
     paramsSerializer(params: AnyObject): AnyObject;
@@ -85,6 +85,6 @@ export declare class Print {
         formatId: string;
     }>;
     printFileData({ formatId, file, printerName }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | AnyObject>;
-    editPrintFormat({ templateId, formatId, number, params, token, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
+    editPrintFormat({ templateId, formatId, number, formatItem, params, token, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
     addPrintFormat({ templateId, params, token }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
 }

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

@@ -699,6 +699,7 @@ class Print {
     signature,
     copies,
     printdlgshow = "0",
+    watermark,
     nobillnode = "1",
     btnprint = "1",
     messageTimeout = 0
@@ -717,6 +718,7 @@ class Print {
       cmdid,
       nobillnode,
       printdlgshow,
+      watermark,
       btnprint,
       copies,
       messageTimeout,
@@ -748,6 +750,7 @@ class Print {
     templateId,
     formatId = "",
     number,
+    watermark,
     params = "",
     token,
     messageTimeout = 0
@@ -763,6 +766,7 @@ class Print {
       templateId,
       formatId,
       number,
+      watermark,
       cmdid: "9",
       token,
       params: JSON.stringify(formatParams),
@@ -925,6 +929,7 @@ class Print {
     try {
       const hideButtonsValue = hideButtons ? hideButtons : (formatItem == null ? void 0 : formatItem.previewCanExport) === void 0 || (formatItem == null ? void 0 : formatItem.previewCanExport) ? void 0 : "Export";
       const btnprintValue = btnprint != "1" ? btnprint : (formatItem == null ? void 0 : formatItem.previewCanPrint) === false ? "0" : "1";
+      const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -932,6 +937,7 @@ class Print {
         params,
         paramsArr,
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
+        watermark,
         signature,
         btnprint: btnprintValue,
         hideButtons: hideButtonsValue,
@@ -1142,6 +1148,7 @@ class Print {
         this._notifyPrintQueueMap.callback.set(uuid, printQueueCallbackFn);
       }
       const printdlgshowValue = printdlgshow != "0" ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
+      const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -1152,6 +1159,7 @@ class Print {
         print,
         signature,
         printdlgshow: printdlgshowValue,
+        watermark,
         nobillnode,
         copies,
         svrUpdateIp,
@@ -1364,6 +1372,7 @@ class Print {
     templateId,
     formatId,
     number,
+    formatItem,
     params,
     token,
     messageTimeout = 0
@@ -1371,9 +1380,11 @@ class Print {
     const testResult = await this._testConnection();
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
+    const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
     const result = await this._handleEventEditFormat({
       templateId,
       formatId,
+      watermark,
       number,
       params,
       token,