cnhis-design-vue 3.4.0-beta.14 → 3.4.0-beta.15

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

@@ -70,6 +70,7 @@ export declare class Print {
     _base64ToBlob(fileBase64: string, fileType: string): Blob;
     preview({ iReportExecuteMode, hideButtons, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, signature, btnprint, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<any>;
     printSync(data: AnyObject[], successCallbackFn: AnyFn, errorCallbackFn: AnyFn): Promise<void>;
+    isObject(o: any): boolean;
     printDirect({ iReportExecuteMode, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, print, signature, printdlgshow, nobillnode, copies, svrUpdateIp, apptype, uuid, printname, priority, isShowQueueProgressNotify, isDownloadFile, messageTimeout }: AnyObject, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn, printQueueCallbackFn?: AnyFn, mode?: string): Promise<false | undefined>;
     printToHiPrint({ templateId, formatId, params, authorizationKey }: any, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn): Promise<any>;
     private _downloadPDF;

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

@@ -308,11 +308,10 @@ class Print {
   }
   async getPicAndUpload(obj) {
     try {
-      const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
       if ((obj == null ? void 0 : obj.result) === "success" && (obj == null ? void 0 : obj.uploadTemplateFlag) == "Y" && !(obj == null ? void 0 : obj.filebase64) && this.queryServicesParams) {
-        const params = isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
+        const params = this.isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
         params.uploadTemplateFlag = "Y";
-        this.queryServicesParams.params = JSON.stringify(params);
+        this.queryServicesParams.params = params;
         this.queryServicesParams.cmdid = PRINT_CMD_ID;
         this.queryServicesParams.print = {
           print: 1,
@@ -320,7 +319,7 @@ class Print {
           zip: 0
         };
         this.queryServicesParams.paramsArr = [{
-          params: JSON.stringify(params)
+          params
         }];
         const data = await this._queryBase64ServicesPrint(this.queryServicesParams);
       }
@@ -991,6 +990,9 @@ class Print {
       this._handleMonitorNotify(error);
     }
   }
+  isObject(o) {
+    return Object.prototype.toString.call(o) === "[object Object]";
+  }
   async printDirect({
     iReportExecuteMode,
     templateId,
@@ -1014,7 +1016,7 @@ class Print {
     isDownloadFile = true,
     messageTimeout = 0
   }, successCallbackFn, errorCallbackFn, cancelCallbackFn, printQueueCallbackFn, mode = "printDirect") {
-    const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
+    params = this.isObject(params) || !params ? params : JSON.parse(params);
     const iReportStatus = isIReport(originFormatId);
     const formatId = this.getIReportFormatId(iReportStatus, originFormatId);
     if (iReportStatus && (isDomestic || iReportExecuteMode == 2)) {
@@ -1059,7 +1061,7 @@ class Print {
       return false;
     try {
       if (formatItem == null ? void 0 : formatItem.queuePrint) {
-        const printParams = isObject(params) ? cloneDeep(params) : params;
+        const printParams = this.isObject(params) ? cloneDeep(params) : params;
         paramsArr = [{
           params: printParams
         }];

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -553,9 +553,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -594,9 +594,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -773,9 +773,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,9 +384,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hide: boolean;
     }>;
     draggable: boolean;
-    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
+    isHighlightRow: boolean;
     isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
     hideExpressionOption: AnyObject[];

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.14";
+var version = "3.4.0-beta.15";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.14",
+	"version": "3.4.0-beta.15",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d07e324fa6a4e354c83f3898e8a8f81fbe7dc431"
+	"gitHead": "5550a536343c49dce585e0cff932473410fafacc"
 }