Merge remote-tracking branch 'origin/master'

chuanyi_client2/src/utils/luckysheettool.js

@@ -1,4 +1,5 @@
 import {showAlertWin, withDateFormatLength} from "@/utils/cqcy";
+import { parseString } from "cron-parser";
 import html2canvas from "html2canvas";
 
 function setCellSize(l, e, t, o) {
@@ -304,13 +305,17 @@ function calculateMinutes(time1, time2) {
 
 function changeValStr(str) {
     if (str) {
-        if (str.v && str.v.startsWith("${")) {
-            return "";
-        } else  {
-            if (JSON.stringify(str).startsWith("${")) {
-                return "";
-            }
-        }
+		if ((str + "").startsWith("${")) {
+			return "";
+		} else {
+			if (str.v && str.v.startsWith("${")) {
+			    return "";
+			} else  {
+			    if (JSON.stringify(str).startsWith("${")) {
+			        return "";
+			    }
+			}
+		}
         return str;
     } else {
         return str;

chuanyi_client2/src/views/report_template/index.vue

@@ -2168,6 +2168,7 @@ export default {
         let addrObj = {}
       let startX = 0;
       let startY = 0;
+	  console.log(this.chooseGroupItemList)
       for (let n = 0; n < this.itemShowParams.valLine; n++) {
           for (let i = 0; i < this.chooseGroupItemList.length; i++) {
               let item = this.chooseGroupItemList[i]
@@ -2177,6 +2178,9 @@ export default {
               let describe = item.describe
               // name = name.substring(name.lastIndexOf('.') + 1)
               let v = '${' + groupId + '.' + name + '}'
+			  if (item.itemReadName) {
+				  v = '${' + groupId + '.' + item.itemReadName + '}'
+			  }
               item.placeHolder = v
               item.standby = JSON.stringify({
                   'index': n,