From 0e70d24d7c2b13929458c69bdc4822fd83d16cef Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 6 Dec 2023 18:13:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/datasource/DatasourceService.java | 4 ++++ .../io/dataease/plugins/datasource/dm/query/DmConstants.java | 1 + .../plugins/datasource/kylin/query/KylinConstants.java | 2 +- .../io/dataease/plugins/datasource/dm/query/MaxConstants.java | 1 + .../dataease/plugins/datasource/dm/query/PrestoConstants.java | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index d69165c1c8..8c363c9a22 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -371,9 +371,11 @@ public class DatasourceService { String datasourceStatus = null; try { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); + System.out.println(datasourceProvider.getClass()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); + System.out.println(datasourceStatus); if (datasource.getType().equalsIgnoreCase("api")) { List apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken>() { }.getType()); @@ -398,6 +400,7 @@ public class DatasourceService { return ResultHolder.success("Success"); } catch (Exception e) { + e.printStackTrace(); datasourceStatus = "Error"; return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage()); } finally { @@ -405,6 +408,7 @@ public class DatasourceService { record.setStatus(datasourceStatus); DatasourceExample example = new DatasourceExample(); example.createCriteria().andIdEqualTo(datasource.getId()); + System.out.println(new Gson().toJson(record)); datasourceMapper.updateByExampleSelective(record, example); } } diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java index 7a392b73fe..5ed6068968 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java +++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java @@ -4,6 +4,7 @@ package io.dataease.plugins.datasource.dm.query; import io.dataease.plugins.common.constants.datasource.SQLConstants; +import static io.dataease.plugins.common.constants.DatasourceTypes.mysql; import static io.dataease.plugins.common.constants.DatasourceTypes.oracle; public class DmConstants extends SQLConstants { diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java index 05e13b06fd..250fcb2d82 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java +++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java @@ -9,7 +9,7 @@ public class KylinConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; - + public static final String ALIAS_FIX = "%s"; public static final String CAST = "CAST(%s AS %s)"; public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java index 26e1835eb8..248ce8a10d 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java @@ -11,6 +11,7 @@ public class MaxConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; + public static final String ALIAS_FIX = "%s"; public static final String UNIX_TIMESTAMP = "TO_MILLIS(%s)"; public static final String DATE_FORMAT = "to_char(%s, '%s')"; diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java index 696319e9bc..f948851f56 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java +++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java @@ -11,6 +11,7 @@ public class PrestoConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; + public static final String ALIAS_FIX = "%s"; public static final String UNIX_TIMESTAMP = "to_unixtime(%s)"; public static final String FROM_UNIXTIME = "from_unixtime(%s)"; From 39fd0813795dd740f7b8cd227b973bcd52fc0ab9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 7 Dec 2023 10:01:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/normal/LabelNormal.vue | 1 - .../src/views/panel/outerParamsSet/index.vue | 1 - .../system/datasource/DsConfiguration.vue | 1 - .../dm-frontend/build/build-async-plugins.js | 6 +++--- .../dm/dm-frontend/build/build.js | 6 +++--- .../dm/dm-frontend/build/check-versions.js | 7 ++----- .../build/build-async-plugins.js | 6 +++--- .../kingbase/kingbase-frontend/build/build.js | 6 +++--- .../kingbase-frontend/build/check-versions.js | 7 ++----- .../build/build-async-plugins.js | 6 +++--- .../kylin/kylin-frontend/build/build.js | 6 +++--- .../kylin-frontend/build/check-versions.js | 7 ++----- .../build/build-async-plugins.js | 6 +++--- .../maxcompute-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 7 ++----- .../build/build-async-plugins.js | 6 +++--- .../mongo/mongo-frontend/build/build.js | 6 +++--- .../mongo-frontend/build/check-versions.js | 9 +++----- .../build/build-async-plugins.js | 6 +++--- .../presto/presto-frontend/build/build.js | 6 +++--- .../presto-frontend/build/check-versions.js | 7 ++----- .../build/build-async-plugins.js | 6 +++--- .../view-3dpie-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 8 ++----- .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/DimensionExtItem.vue | 4 +--- .../src/components/views/DimensionItem.vue | 7 ++----- .../src/components/views/QuotaExtItem.vue | 5 +---- .../src/components/views/QuotaItem.vue | 7 ++----- .../view-3dpie-frontend/src/utils/3dpie.js | 21 +++++++++---------- .../view-3dpie-frontend/src/utils/map.js | 1 - .../src/views/highcharts/3dpie/index.vue | 2 -- .../build/build-async-plugins.js | 6 +++--- .../view-bubblemap-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 9 ++------ .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/DimensionExtItem.vue | 4 +--- .../src/components/views/DimensionItem.vue | 5 +---- .../src/components/views/QuotaExtItem.vue | 5 +---- .../src/components/views/QuotaItem.vue | 5 +---- .../build/build-async-plugins.js | 6 +++--- .../view-chartmix-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 10 ++++----- .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/DimensionExtItem.vue | 4 +--- .../src/components/views/DimensionItem.vue | 1 - .../src/components/views/QuotaExtItem.vue | 3 --- .../src/components/views/QuotaItem.vue | 3 --- .../view-chartmix-frontend/src/utils/map.js | 1 - .../src/views/antv/chartmix/data.vue | 3 --- .../build/build-async-plugins.js | 6 +++--- .../view-racebar-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 10 ++++----- .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/QuotaExtItem.vue | 3 --- .../src/components/views/QuotaItem.vue | 3 --- .../src/views/antv/racebar/data.vue | 3 --- .../src/views/antv/racebar/style.vue | 1 - .../build/build-async-plugins.js | 6 +++--- .../view-sankey-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 10 ++++----- .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/DimensionExtItem.vue | 4 +--- .../src/components/views/QuotaExtItem.vue | 3 --- .../components/views/SankeyDimensionItem.vue | 1 - .../src/components/views/SankeyQuotaItem.vue | 3 --- .../view-sankey-frontend/src/utils/map.js | 1 - .../build/build-async-plugins.js | 6 +++--- .../view-symbolmap-frontend/build/build.js | 6 +++--- .../build/check-versions.js | 10 ++++----- .../src/components/views/ChartDragItem.vue | 6 +----- .../src/components/views/DimensionExtItem.vue | 4 +--- .../src/components/views/QuotaExtItem.vue | 5 +---- .../src/components/views/QuotaItem.vue | 11 ++++------ .../view-symbolmap-frontend/src/utils/map.js | 5 ++--- 75 files changed, 144 insertions(+), 268 deletions(-) diff --git a/core/frontend/src/views/chart/components/normal/LabelNormal.vue b/core/frontend/src/views/chart/components/normal/LabelNormal.vue index 2b26bad78b..7d356bcad9 100644 --- a/core/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/core/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -255,7 +255,6 @@ export default { let flag = false const t = senior.threshold.labelThreshold[i] const tv = parseFloat(t.value) - console.log(t) if (t.term === 'eq') { if (value === tv) { if (!setBg) { diff --git a/core/frontend/src/views/panel/outerParamsSet/index.vue b/core/frontend/src/views/panel/outerParamsSet/index.vue index f36a64c5ce..01c63e0b02 100644 --- a/core/frontend/src/views/panel/outerParamsSet/index.vue +++ b/core/frontend/src/views/panel/outerParamsSet/index.vue @@ -421,7 +421,6 @@ export default { } }, viewInfoOnChange(targetViewInfo) { - console.log('test1=' + this.viewIdFieldArrayMap[targetViewInfo.targetViewId]) if (this.viewIdFieldArrayMap[targetViewInfo.targetViewId] && this.viewIdFieldArrayMap[targetViewInfo.targetViewId].length === 1 && this.viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 'empty') { targetViewInfo.targetFieldId = 'empty' } else { diff --git a/core/frontend/src/views/system/datasource/DsConfiguration.vue b/core/frontend/src/views/system/datasource/DsConfiguration.vue index 0b59837c3d..21fd7fa3ab 100644 --- a/core/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/core/frontend/src/views/system/datasource/DsConfiguration.vue @@ -1160,7 +1160,6 @@ export default { callback() }, isNumber(rule, value, callback) { - console.log(value) if (!value) { callback(new Error(i18n.t('datasource.please_input_query_timeout'))) return diff --git a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build.js b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/check-versions.js index 3ef972a08d..679e7164b0 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/dm/dm-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build.js b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/check-versions.js index 3ef972a08d..679e7164b0 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build.js b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/check-versions.js index 3ef972a08d..679e7164b0 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/kylin/kylin-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build.js b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/check-versions.js index 3ef972a08d..679e7164b0 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build.js b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/check-versions.js index 3ef972a08d..ca436a04b8 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/mongo/mongo-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) + console.warn() for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build.js b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build.js +++ b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/check-versions.js b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/check-versions.js index 3ef972a08d..679e7164b0 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-datasource/presto/presto-frontend/build/check-versions.js @@ -39,16 +39,13 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build-async-plugins.js b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build-async-plugins.js index 2303854531..02d6869c8c 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build-async-plugins.js +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build-async-plugins.js @@ -23,12 +23,12 @@ webpack(webpackConfig, function (err, stats) { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build.js b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build.js index 8f2ad8ad49..26d7185819 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build.js +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/build.js @@ -28,12 +28,12 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { }) + '\n\n') if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) + console.error(chalk.red(' Build failed with errors.\n')) process.exit(1) } - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( + console.warn(chalk.cyan(' Build complete.\n')) + console.warn(chalk.yellow( ' Tip: built files are meant to be served over an HTTP server.\n' + ' Opening index.html over file:// won\'t work.\n' )) diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/check-versions.js b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/check-versions.js index 3ef972a08d..f4e70f8c95 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/check-versions.js +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/build/check-versions.js @@ -39,16 +39,12 @@ module.exports = function () { } if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() - + console.warn(chalk.yellow('To use this template, you must update following to modules:')) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] - console.log(' ' + warning) + console.warn(' ' + warning) } - console.log() process.exit(1) } } diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/ChartDragItem.vue b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/ChartDragItem.vue index 53ae1e2ad0..a876a9fe33 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/ChartDragItem.vue +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/src/components/views/ChartDragItem.vue @@ -1,6 +1,6 @@