cnhis-design-vue 2.1.90 → 2.1.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.90",
+  "version": "2.1.92",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/button/src/ButtonPrint/index.vue

@@ -45,7 +45,6 @@
  * @time 2021-06-08
  */
 
-let printInstance = null;
 let httpFn = null;
 import Print from './js/print.es.min';
 import IdentityVerification from './components/IdentityVerification';
@@ -194,7 +193,8 @@ export default create({
       },
       isInited: false,
       watchPrintParamsReformatFn: null,
-      spinTimer: null
+      spinTimer: null,
+      printInstance: null
     };
   },
   beforeCreate() {
@@ -208,7 +208,8 @@ export default create({
   },
   beforeDestroy() {
     // 创建Print实例的时候会在webview中注册一个事件, 需要调用printInstance.destroy()手动清除
-    printInstance?.destroy?.();
+    this.printInstance?.destroy?.();
+    this.printInstance = null;
   },
   watch: {
     // 监听变化, 重新格式化printParams
@@ -328,8 +329,8 @@ export default create({
     },
     /*  */
     instantiatePrintSDK() {
-      if (printInstance) return false;
-      printInstance = new Print();
+      if (this.printInstance) return false;
+      this.printInstance = new Print();
     },
     /*  */
     queryFormatList() {
@@ -514,7 +515,7 @@ export default create({
             if (this.strategy === 'MULTI') {
               for (let i = 0; i < this.params.length; i++) {
                 const params = this.getHisParams(i);
-                printInstance[printFn](7, params)
+                this.printInstance[printFn](7, params)
                   .then(res => {
                     console.log(res, '777777777777');
                   })
@@ -524,7 +525,7 @@ export default create({
               }
             } else {
               const params = this.getOnceHisParams();
-              printInstance[printFn](7, params)
+              this.printInstance[printFn](7, params)
                 .then(res => {
                   console.log(res, '777777777777');
                 })
@@ -541,7 +542,7 @@ export default create({
               // 循环多条
               for (let i = 0; i < this.printParams.length; i++) {
                 if (i > 0) queryParams.printdlgshow = '0';
-                printInstance.printDirect(
+                this.printInstance.printDirect(
                   {
                     ...queryParams,
                     params: this.getPrintParams(i)
@@ -552,7 +553,7 @@ export default create({
               }
             } else {
               // 聚合一条
-              printInstance.printDirect(
+              this.printInstance.printDirect(
                 {
                   ...queryParams,
                   params: this.getOnceParams()
@@ -611,7 +612,7 @@ export default create({
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
             const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
-            printInstance[printFn](8, params)
+            this.printInstance[printFn](8, params)
               .then(res => {
                 console.log(res, 88888888);
               })
@@ -621,7 +622,7 @@ export default create({
           } else {
             const IS_MULTI = this.strategy === 'MULTI';
 
-            printInstance.preview(
+            this.printInstance.preview(
               {
                 ...this.queryParams,
                 params: IS_MULTI ? this.getPrintParams() : this.getOnceParams()
@@ -649,7 +650,7 @@ export default create({
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
             const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
-            printInstance[printFn](9, params)
+            this.printInstance[printFn](9, params)
               .then(res => {
                 console.log(res, 999999);
               })
@@ -672,7 +673,7 @@ export default create({
         params: this.getPrintParams(),
         token
       };
-      printInstance.editPrintFormat(
+      this.printInstance.editPrintFormat(
         queryParams,
         res => {
           this.callLocalServicesSuccessCb(res, 'edit');

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -1796,7 +1796,7 @@ export default create({
     async handleSetLabelOptions(labelType, el) {
       let labelObj = {};
       let res = (await this.handleRequestedLabel(labelType)) || {};
-      let labelList = res?.data?.map?.rows ||[]
+      let labelList = res && Array.isArray(res) ? res : res?.data?.map?.rows || []
       labelList.forEach(n => {
         this.$set(n, 'isSelect', false);
         if (labelObj[n.typeName]) {