cnhis-design-vue 2.1.51 → 2.1.52

package/package.json

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

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

@@ -148,16 +148,16 @@ export default create({
       default: '0'
     },
     // 没有模板提示
-    noformatTips:{
+    noformatTips: {
       type: String,
       default: ''
     },
 
-    getOnceParamsAfter:{
+    getOnceParamsAfter: {
       type: Function
     },
 
-    getPrintParamsAfter:{
+    getPrintParamsAfter: {
       type: Function
     }
   },
@@ -170,8 +170,14 @@ export default create({
     formatTitle() {
       return this.currentFormatItem?.name || '格式选择';
     },
-    printExtraParams(){
-    return  this?.printConfig?.printExtraParams || {};
+    printExtraParams() {
+      return this?.printConfig?.printExtraParams || {};
+    },
+    queryParams() {
+      return {
+        formatId: this.currentFormatId,
+        templateId: this.getTemplateIdByFormatId(this.currentFormatId)
+      };
     }
   },
   data() {
@@ -278,7 +284,7 @@ export default create({
       this.currentFormatId = this.getDefaultFormatId(this.formatList, 'defaultFlag');
 
       if (!this.currentFormatId) {
-        this.$message.error(this.noformatTips ||'获取打印格式失败，请联系管理员！');
+        this.$message.error(this.noformatTips || '获取打印格式失败，请联系管理员！');
         return this.requestError();
       }
       if (!this.currentFormatId) {
@@ -384,8 +390,8 @@ export default create({
       if (i.type === 'DATETIME') {
         tVal = tableVal ? moment(tableVal).format('YYYY-MM-DD HH:mm:ss') : '';
       }
-      if(i.type === 'TEXT'){
-        tVal = String(tableVal) || ''
+      if (i.type === 'TEXT') {
+        tVal = String(tableVal) || '';
       }
 
       return val ? val : tVal;
@@ -446,8 +452,8 @@ export default create({
         ...(params || {}),
         ...(this.token ? { token: this.token } : {}),
         ...extraParams
-      }
-      if(typeof this.getPrintParamsAfter === 'function'){
+      };
+      if (typeof this.getPrintParamsAfter === 'function') {
         let t = this.getPrintParamsAfter(res);
         return t || res;
       }
@@ -461,7 +467,7 @@ export default create({
       // 聚合一条
       let params = {};
       let obj = {};
-      let cur = this.printParams?.[0] || {}
+      let cur = this.printParams?.[0] || {};
       if (this.templateParams?.customizeDataset?.length) {
         // 有模板数据
         const key = Object.keys(cur?.datasetData || {})?.[0] || '';
@@ -481,8 +487,8 @@ export default create({
         });
       }
       params = Object.assign({}, JSON.parse(this.getPrintParams(0)), obj);
-      if(typeof this.getOnceParamsAfter === 'function'){
-        let res = this.getOnceParamsAfter(params,obj);
+      if (typeof this.getOnceParamsAfter === 'function') {
+        let res = this.getOnceParamsAfter(params, obj);
         return res || params;
       }
       return JSON.stringify(params);
@@ -530,27 +536,30 @@ export default create({
                 });
             }
           } else {
+            const queryParams = {
+              ...this.queryParams,
+              printdlgshow: this.printdlgshow
+            };
             if (this.strategy === 'MULTI') {
               // 循环多条
               for (let i = 0; i < this.printParams.length; i++) {
-                const queryParams = {
-                  formatId: this.currentFormatId,
-                  templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                  params: this.getPrintParams(i),
-                  printdlgshow: this.printdlgshow
-                };
-                printInstance.printDirect(queryParams, callLocalServicesSuccessCb, this.callLocalServicesErrorCb);
+                if (i > 0) queryParams.printdlgshow = '0';
+                printInstance.printDirect(
+                  {
+                    ...queryParams,
+                    params: this.getPrintParams(i)
+                  },
+                  callLocalServicesSuccessCb,
+                  this.callLocalServicesErrorCb
+                );
               }
             } else {
               // 聚合一条
-              const queryParams = {
-                formatId: this.currentFormatId,
-                templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                params: this.getOnceParams(),
-                printdlgshow: this.printdlgshow
-              };
               printInstance.printDirect(
-                queryParams,
+                {
+                  ...queryParams,
+                  params: this.getOnceParams()
+                },
                 res => {
                   this.callLocalServicesSuccessCb(res, 'print');
                 },
@@ -614,36 +623,17 @@ export default create({
               });
           } else {
             const IS_MULTI = this.strategy === 'MULTI';
-            if (IS_MULTI) {
-              // 循环多条
-              for (let i = 0; i < this.printParams.length; i++) {
-                const queryParams = {
-                  formatId: this.currentFormatId,
-                  templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                  params: this.getPrintParams(i)
-                };
-                printInstance.preview(
-                  queryParams,
-                  res => {
-                    this.callLocalServicesSuccessCb(res, 'preview');
-                  },
-                  this.callLocalServicesErrorCb
-                );
-              }
-            } else {
-              const queryParams = {
-                formatId: this.currentFormatId,
-                templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                params: this.getOnceParams()
-              };
-              printInstance.preview(
-                queryParams,
-                res => {
-                  this.callLocalServicesSuccessCb(res, 'preview');
-                },
-                this.callLocalServicesErrorCb
-              );
-            }
+
+            printInstance.preview(
+              {
+                ...this.queryParams,
+                params: IS_MULTI ? this.getPrintParams() : this.getOnceParams()
+              },
+              res => {
+                this.callLocalServicesSuccessCb(res, 'preview');
+              },
+              this.callLocalServicesErrorCb
+            );
           }
         })
         .finally(() => {
@@ -681,8 +671,7 @@ export default create({
       this.identityVerification.visible = false;
 
       const queryParams = {
-        formatId: this.currentFormatId,
-        templateId: this.getTemplateIdByFormatId(this.currentFormatId),
+        ...this.queryParams,
         params: this.getPrintParams(),
         token
       };

package/packages/fabric-chart/src/const/defaultVaule.js

@@ -1,59 +1,59 @@
-const data = {
-  style: {
-    evented: false,
-    selectable: false
-  },
-  rectStyle: {
-    fill: 'transparent',
-    stroke: '#999',
-    strokeWidth: 1
-  },
-  textStyle: {
-    fontFamily: '微软雅黑',
-    fontSize: 12,
-    fill: '#000',
-    lineHeight: 1
-  },
-  borderStyle: {
-    stroke: '#999',
-    strokeWidth: 1,
-    selectable: false,
-    evented: false
-  },
-  // 折线图中的点
-  pointStyle: {
-    fill: '#ffffff', // 填充色
-    stroke: '#000000', // 描边色
-    originX: 'center',
-    originY: 'center'
-  },
-  // 折线图中的线
-  lineStyle: {
-    stroke: '#000', // 描边色
-    strokeWidth: 1, // 描边宽度
-    originX: 'center',
-    originY: 'center'
-  },
-  topSpaceHeight: 10, // templateData.top.spaceHeight
-  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
-  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
-  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
-  topTotal: {
-    title: '总量',
-    width: 0,
-    style: {
-      fontFamily: '微软雅黑',
-      fontSize: 12,
-      fill: '#000',
-      lineHeight: 1
-    }
-  },
-  criticalStyle: { // 危急值样式
-    stroke: 'purple', // 颜色 默认 #999
-    strokeWidth: 1, // 线宽 默认 1
-    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
-  },
-  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
-};
-
-export default data;
+const data = {
+  style: {
+    evented: false,
+    selectable: false
+  },
+  rectStyle: {
+    fill: 'transparent',
+    stroke: '#999',
+    strokeWidth: 1
+  },
+  textStyle: {
+    fontFamily: '微软雅黑',
+    fontSize: 12,
+    fill: '#000',
+    lineHeight: 1
+  },
+  borderStyle: {
+    stroke: '#999',
+    strokeWidth: 1,
+    selectable: false,
+    evented: false
+  },
+  // 折线图中的点
+  pointStyle: {
+    fill: '#ffffff', // 填充色
+    stroke: '#000000', // 描边色
+    originX: 'center',
+    originY: 'center'
+  },
+  // 折线图中的线
+  lineStyle: {
+    stroke: '#000', // 描边色
+    strokeWidth: 1, // 描边宽度
+    originX: 'center',
+    originY: 'center'
+  },
+  topSpaceHeight: 10, // templateData.top.spaceHeight
+  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
+  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
+  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
+  topTotal: {
+    title: '总量',
+    width: 0,
+    style: {
+      fontFamily: '微软雅黑',
+      fontSize: 12,
+      fill: '#000',
+      lineHeight: 1
+    }
+  },
+  criticalStyle: { // 危急值样式
+    stroke: 'purple', // 颜色 默认 #999
+    strokeWidth: 1, // 线宽 默认 1
+    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
+  },
+  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
+};
+
+export default data;