From 843ccce44133260a481be81db276d768ea9e2c47 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 20 九月 2024 13:20:27 +0800
Subject: [PATCH] 非正常值，去掉注释
---
src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue b/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
index 08b1351..2a79d2a 100644
--- a/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
+++ b/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
@@ -156,20 +156,20 @@
const currentRs = ref<AmisDockConfig>(null);
const getWithTemplateDataCommentSql = (sql: string, data: any) => {
+ const reg = new RegExp(`^\\s*(\\s*--\\s*".*"\\s*:.*\\n)+`);
+ const isMatchReg = reg.test(sql);
if (!Array.isArray(data)) {
- return sql;
+ return isMatchReg ? sql.replace(reg, '') : sql;
}
const first = data[0];
if (!_.isObjectLike(first)) {
- return sql;
+ return isMatchReg ? sql.replace(reg, '') : sql;
}
const firstKeyList = Object.keys(first);
// 鍊间负瀵硅薄
if (_.isObjectLike(first[firstKeyList[0]])) {
- return sql;
+ return isMatchReg ? sql.replace(reg, '') : sql;
}
-
-
let comment = '';
firstKeyList.map((key, index, array) => {
@@ -177,14 +177,13 @@
comment += `-- "${key}": ${value}\n`;
});
- const reg = new RegExp(`^\\s*(\\s*--\\s*".*"\\s*:.*\\n)+`)
// 宸茬粡瀛樺湪锛屼竴瀹氳鏇挎崲鎴愭渶鏂扮殑
- if (reg.test(sql)) {
- const replaceStr = sql.replace(reg,comment);
+ if (isMatchReg) {
+ const replaceStr = sql.replace(reg, comment);
return replaceStr;
}
- const result = comment+sql;
+ const result = comment + sql;
return result;
};
const dockRowChange = (row) => {
@@ -197,7 +196,7 @@
};
const templateData = extraInfoMap.value.get(row.recordId).templateData;
- currentDockConfig.value.sql = getWithTemplateDataCommentSql(currentDockConfig.value.sql,templateData)
+ currentDockConfig.value.sql = getWithTemplateDataCommentSql(currentDockConfig.value.sql, templateData);
};
const currentDockConfig = ref(null);
/** @description 璺緞鍒嗛殧绗� */
--
Gitblit v1.9.3