You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/02/15 04:01:25 UTC
[linkis] branch dev-1.3.2 updated: [ISSUES-1276]Upgrade some components of npm that the linkis console depends on (#4210)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new b47364d2a [ISSUES-1276]Upgrade some components of npm that the linkis console depends on (#4210)
b47364d2a is described below
commit b47364d2a5248c588b19962e2c54f23fe220b4f1
Author: QuantumXiecao <99...@users.noreply.github.com>
AuthorDate: Wed Feb 15 12:01:19 2023 +0800
[ISSUES-1276]Upgrade some components of npm that the linkis console depends on (#4210)
* [ISSUES-1276]Upgrade some components of npm that the linkis console depends on
---
.github/workflows/build-frontend.yml | 2 +-
.../engineconn/launch/EngineConnServer.scala | 2 +-
linkis-web/.eslintrc.js | 153 +++++++++++----------
linkis-web/package.json | 58 ++++----
.../apps/URM/module/functionManagement/index.vue | 22 +--
.../URM/module/udfManagement/addFunctionModal.vue | 22 +--
.../src/apps/URM/module/udfManagement/index.vue | 2 +-
.../src/apps/linkis/module/ECM/engineConn.vue | 12 +-
linkis-web/src/apps/linkis/module/ECM/index.vue | 12 +-
.../linkis/module/EnginePluginManagement/index.vue | 24 ++--
.../src/apps/linkis/module/codeQuery/index.vue | 6 +-
.../module/datasource/datasourceForm/index.vue | 4 +-
.../src/apps/linkis/module/datasource/index.vue | 2 +-
.../apps/linkis/module/datasourceAccess/index.vue | 6 +-
.../apps/linkis/module/datasourceAccess/service.js | 2 +-
.../src/apps/linkis/module/datasourceEnv/index.vue | 8 +-
.../apps/linkis/module/datasourceEnv/service.js | 2 +-
.../apps/linkis/module/datasourceType/index.vue | 6 +-
.../apps/linkis/module/datasourceType/service.js | 2 +-
.../apps/linkis/module/datasourceTypeKey/index.vue | 2 +-
.../engineConfigurationTemplate/EditForm/index.vue | 2 +-
.../module/engineConfigurationTemplate/index.vue | 10 +-
.../module/engineConfigurationTemplate/service.js | 2 +-
.../src/apps/linkis/module/errorCode/index.vue | 6 +-
.../src/apps/linkis/module/errorCode/service.js | 2 +-
.../apps/linkis/module/gatewayAuthToken/index.vue | 6 +-
.../apps/linkis/module/gatewayAuthToken/service.js | 2 +-
.../module/globalHistoryManagement/index.vue | 2 +-
.../module/globalHistoryManagement/viewHistory.vue | 4 +-
.../apps/linkis/module/ipListManagement/index.vue | 20 +--
.../module/resourceManagement/engineConn.vue | 6 +-
.../linkis/module/resourceManagement/index.vue | 6 +-
.../rmExternalResourceProvider/EditForm/index.vue | 2 +-
.../module/rmExternalResourceProvider/index.vue | 6 +-
.../module/rmExternalResourceProvider/service.js | 2 +-
.../linkis/module/tenantTagManagement/index.vue | 22 +--
.../linkis/module/udfManager/EditForm/index.vue | 2 +-
.../src/apps/linkis/module/udfManager/index.vue | 6 +-
.../src/apps/linkis/module/udfManager/service.js | 2 +-
.../src/apps/linkis/module/udfTree/index.vue | 6 +-
.../src/apps/scriptis/module/webSocket/index.js | 8 +-
linkis-web/src/common/helper/storage.js | 10 +-
linkis-web/src/common/service/api.js | 8 +-
linkis-web/src/common/service/mixin.js | 2 +-
linkis-web/src/common/service/moduleMixin.js | 2 +-
linkis-web/src/common/util/debug.js | 4 +-
.../src/components/consoleComponent/result.vue | 2 +-
.../components/consoleComponent/visualAnalysis.vue | 8 +-
linkis-web/src/dss/module/resourceSimple/job.vue | 2 +-
linkis-web/src/dynamic-apps.js | 2 +-
linkis-web/vue.config.js | 4 +
51 files changed, 264 insertions(+), 253 deletions(-)
diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml
index 210cce095..a84a805d4 100644
--- a/.github/workflows/build-frontend.yml
+++ b/.github/workflows/build-frontend.yml
@@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
- node-version: [14]
+ node-version: [16]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
index 92bd3cd75..4ed1e72c8 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
@@ -82,7 +82,7 @@ object EngineConnServer extends Logging {
val ecHooks = EngineConnHook.getEngineConnHooks(onceMode)
ecHooks.foreach(_.beforeCreateEngineConn(getEngineCreationContext))
logger.info("Finished to execute hook of beforeCreateEngineConn.")
- // 2. cresate EngineConn
+ // 2. create EngineConn
val engineConn = getEngineConnManager.createEngineConn(getEngineCreationContext)
logger.info(s"Finished to create ${engineConn.getEngineConnType} EngineConn.")
ecHooks.foreach(_.beforeExecutionExecute(getEngineCreationContext, engineConn))
diff --git a/linkis-web/.eslintrc.js b/linkis-web/.eslintrc.js
index 01d6071a9..71062ae70 100644
--- a/linkis-web/.eslintrc.js
+++ b/linkis-web/.eslintrc.js
@@ -5,90 +5,91 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
module.exports = {
- root: true,
- env: {
- node: true
- },
- extends: [
- 'eslint:recommended',
- 'plugin:vue/essential'
+ root: true,
+ env: {
+ node: true
+ },
+ extends: [
+ 'eslint:recommended',
+ 'plugin:vue/essential'
+ ],
+ rules: {
+ 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+ 'key-spacing': ['error'],
+ 'standard/no-callback-literal': 0,
+ 'handle-callback-err': 0,
+ 'no-return-assign': 0,
+ 'eqeqeq': 0,
+ 'comma-dangle': 0,
+ 'semi': 0,
+ 'space-before-function-paren': 0,
+ 'keyword-spacing': 0,
+ 'no-useless-escape': 0,
+ 'operator-linebreak': 0,
+ 'indent': [
+ 'error',
+ 2,
+ {
+ 'SwitchCase': 1
+ }
],
- rules: {
- 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
- 'key-spacing': ['error'],
- 'standard/no-callback-literal': 0,
- 'handle-callback-err': 0,
- 'no-return-assign': 0,
- 'eqeqeq': 0,
- 'comma-dangle': 0,
- 'semi': 0,
- 'space-before-function-paren': 0,
- 'keyword-spacing': 0,
- 'no-useless-escape': 0,
- 'operator-linebreak': 0,
- 'indent': [
- 'error',
- 2,
- {
- 'SwitchCase': 1
- }
- ],
- 'no-const-assign': 'warn',
- 'no-this-before-super': 'warn',
- "no-irregular-whitespace": 0,
- 'no-undef': 2,
- 'no-unreachable': 'warn',
- 'no-unused-vars': 2,
- 'constructor-super': 'warn',
- 'valid-typeof': 'warn',
- 'one-var': 'warn',
- 'max-len': 'off',
- 'no-trailing-spaces': 'off',
- 'require-jsdoc': 'warn',
- 'camelcase': 'warn',
- 'no-invalid-this': 'off',
- 'linebreak-style': 0,
- 'vue/no-parsing-error': [2, {
- 'x-invalid-end-tag': false,
- 'invalid-first-character-of-tag-name': false
- }],
- 'no-tabs': 0,
- 'vue/html-indent': [2, 2, {
- 'attribute': 1,
- 'closeBracket': 0,
- 'alignAttributesVertically': false
- }],
- 'vue/require-default-prop': 0,
- 'vue/component-name-in-template-casing': 0,
- 'vue/html-closing-bracket-spacing': 0,
- 'vue/html-closing-bracket-newline': 0,
- 'vue/singleline-html-element-content-newline': 0,
- 'vue/multiline-html-element-content-newline': 0,
- 'vue/attributes-order': 0,
- 'vue/html-self-closing': 0,
- 'no-useless-constructor': 0,
- 'no-mixed-operators': 0,
- 'no-new-func': 0,
- 'no-template-curly-in-string': 0,
- 'no-useless-call': 0,
- "one-var": 0,
- "camelcase": 0
- },
- parserOptions: {
- "parser": 'babel-eslint',
- "sourceType": "module"
- }
+ 'no-const-assign': 'warn',
+ 'no-this-before-super': 'warn',
+ "no-irregular-whitespace": 0,
+ 'no-undef': 2,
+ 'no-unreachable': 'warn',
+ 'no-unused-vars': 2,
+ 'constructor-super': 'warn',
+ 'valid-typeof': 'warn',
+ 'max-len': 'off',
+ 'no-trailing-spaces': 'off',
+ 'require-jsdoc': 'warn',
+ 'no-invalid-this': 'off',
+ 'linebreak-style': 0,
+ 'vue/no-parsing-error': [2, {
+ 'x-invalid-end-tag': false,
+ 'invalid-first-character-of-tag-name': false
+ }],
+ 'no-tabs': 0,
+ 'vue/html-indent': [2, 2, {
+ 'attribute': 1,
+ 'closeBracket': 0,
+ 'alignAttributesVertically': false
+ }],
+ 'vue/require-default-prop': 0,
+ 'vue/component-name-in-template-casing': 0,
+ 'vue/html-closing-bracket-spacing': 0,
+ 'vue/html-closing-bracket-newline': 0,
+ 'vue/singleline-html-element-content-newline': 0,
+ 'vue/multiline-html-element-content-newline': 0,
+ 'vue/attributes-order': 0,
+ 'vue/html-self-closing': 0,
+ 'no-useless-constructor': 0,
+ 'no-mixed-operators': 0,
+ 'no-new-func': 0,
+ 'no-template-curly-in-string': 0,
+ 'no-useless-call': 0,
+ // Rules below should be made open after refactoring front-end codes
+ "one-var": 0,
+ "camelcase": 0,
+ "vue/multi-word-component-names": "off",
+ "vue/no-reserved-component-names": "off",
+ "vue/no-mutating-props": "off"
+ },
+ parserOptions: {
+ "parser": 'babel-eslint',
+ "sourceType": "module"
+ }
}
diff --git a/linkis-web/package.json b/linkis-web/package.json
index 91022dc50..0b1b83855 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -7,7 +7,8 @@
"build": "vue-cli-service build",
"lint": "vue-cli-service lint --no-fix",
"fix": "eslint --ext .js,.vue src --fix",
- "precommit": "lint-staged"
+ "precommit": "lint-staged",
+ "preinstall": "npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions"
},
"husky": {
"hooks": {
@@ -23,54 +24,59 @@
},
"dependencies": {
"@form-create/iview": "2.5.27",
- "axios": "0.19.2",
+ "axios": "^0.21.4",
"babel-polyfill": "6.26.0",
- "core-js": "2.6.11",
- "dexie": "2.0.4",
- "dt-sql-parser": "1.2.1",
- "eslint": "6.8.0",
- "eslint-plugin-vue": "6.2.2",
- "highlight.js": "9.18.3",
+ "core-js": "3.27.2",
+ "dexie": "3.2.3",
+ "dt-sql-parser": "3.0.5",
+ "eslint": "7.21.0",
+ "eslint-plugin-vue": "9.6.0",
+ "highlight.js": "10.7.0",
"iview": "3.5.4",
"jsencrypt": "3.2.1",
- "lodash": "4.17.20",
+ "lodash": "^4.17.21",
"md5": "2.3.0",
"mitt": "1.2.0",
- "moment": "2.29.1",
- "monaco-editor": "0.19.3",
+ "moment": "^2.29.4",
+ "monaco-editor": "0.30.1",
"object-to-formdata": "4.2.2",
- "qs": "6.9.4",
+ "path-browserify": "^1.0.1",
+ "qs": "^6.11.0",
"reconnecting-websocket": "4.4.0",
"sql-formatter": "2.3.3",
- "svgo": "1.3.0",
+ "svgo": "^3.0.2",
"v-jsoneditor": "1.4.5",
"vue": "2.6.12",
"vue-i18n": "8.22.1",
"vue-router": "3.4.8",
"vuedraggable": "2.24.3",
"vuescroll": "4.16.1",
- "worker-loader": "2.0.0"
+ "worker-loader": "3.0.8"
},
"devDependencies": {
- "@kazupon/vue-i18n-loader": "0.4.1",
- "@vue/cli-plugin-babel": "3.12.1",
- "@vue/cli-plugin-eslint": "3.12.1",
- "@vue/cli-service": "3.12.1",
+ "@intlify/vue-i18n-loader": "1.0.0",
+ "@vue/cli-plugin-babel": "^5.0.8",
+ "@vue/cli-plugin-eslint": "^5.0.8",
+ "@vue/cli-service": "^5.0.8",
"@vue/eslint-config-standard": "4.0.0",
"archiver": "3.1.1",
"babel-eslint": "10.1.0",
- "copy-webpack-plugin": "4.6.0",
- "csp-html-webpack-plugin": "4.0.0",
- "filemanager-webpack-plugin": "3.1.1",
+ "copy-webpack-plugin": "^9.1.0",
+ "csp-html-webpack-plugin": "5.1.0",
+ "filemanager-webpack-plugin": "^7.0.0",
"husky": "1.3.1",
- "lint-staged": "8.2.1",
+ "lint-staged": "^13.1.1",
"material-design-icons": "3.0.1",
- "monaco-editor-webpack-plugin": "1.8.2",
- "node-sass": "4.14.1",
- "sass-loader": "10.2.0",
- "svg-sprite-loader": "5.0.0",
+ "monaco-editor-webpack-plugin": "6.0.0",
+ "node-sass": "^8.0.0",
+ "npm-force-resolutions": "^0.0.10",
+ "sass-loader": "^10.4.1",
+ "svg-sprite-loader": "6.0.0",
"vue-cli-plugin-mockjs": "0.1.3",
"vue-template-compiler": "2.6.12",
"webpack-virtual-modules": "0.3.2"
+ },
+ "resolutions": {
+ "postcss": "7.0.36"
}
}
diff --git a/linkis-web/src/apps/URM/module/functionManagement/index.vue b/linkis-web/src/apps/URM/module/functionManagement/index.vue
index 23a046785..14c076761 100644
--- a/linkis-web/src/apps/URM/module/functionManagement/index.vue
+++ b/linkis-web/src/apps/URM/module/functionManagement/index.vue
@@ -5,9 +5,9 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -105,9 +105,9 @@
@on-visible-change="changUserModalChange"
>
<span>{{$t('message.linkis.udf.changeUserTo')}}</span>
- <Select ref="userSelect" v-model="handleUser" filterable
+ <Select ref="userSelect" v-model="handleUser" filterable
v-if="allUsers.length"
- :remoteMethod="filterSelect"
+ :remoteMethod="filterSelect"
@on-query-change="queryChange"
:placeholder="$t('message.linkis.udf.inputUser')" style="width:200px;">
<Option
@@ -203,7 +203,7 @@ export default {
created() {
// 获取函数类型
// api.fetch('/configuration/engineType', 'get').then(res => {
- // console.log('res.engineType: ', res.engineType);
+ // window.console.log('res.engineType: ', res.engineType);
// this.getFunctionTypes = ['all', ...res.engineType]
// })
// this.getFunctionTypes = ['all', '0', '1,2']
@@ -402,7 +402,7 @@ export default {
this.loading = true
const params = {
udfUpdateVo: {
- id: this.handleRow.id,
+ id: this.handleRow.id,
udfName: data.name,
udfType: data.udfType,
description: data.description,
@@ -412,7 +412,7 @@ export default {
// sys: 'all',
// clusterName: data.clusterName,
// directory: data.directory
- }
+ }
}
api
.fetch('/udf/update', params, 'post')
@@ -576,7 +576,7 @@ export default {
this.search()
})
.catch(() => {
-
+
})
},
vlist(args) {
@@ -608,7 +608,7 @@ export default {
this.search()
})
.catch(() => {
-
+
})
}
},
@@ -621,7 +621,7 @@ export default {
this.search()
})
.catch(() => {
-
+
})
},
changeUser(args) {
@@ -651,7 +651,7 @@ export default {
this.search()
})
.catch(() => {
-
+
})
}
},
diff --git a/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue b/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
index 5efa0fa93..ae23a2499 100644
--- a/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
+++ b/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
@@ -5,9 +5,9 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -201,11 +201,11 @@
type="textarea"/>
</FormItem>
<FormItem :label="$t('message.linkis.udf.class')" prop="directory">
- <Select
- ref="directory"
+ <Select
+ ref="directory"
v-model="setting.directory"
- filterable
- :remoteMethod="filterAdd"
+ filterable
+ :remoteMethod="filterAdd"
@on-query-change="queryChange"
:disabled="isUdf && model === 1">
<Option
@@ -217,7 +217,7 @@
</FormItem>
<FormItem :label="$t('message.linkis.udf.clusterName')">
<Select v-model="setting.clusterName" :disabled="isUdf && model === 1">
- <Option
+ <Option
label="all"
value="all" />
</Select>
@@ -595,7 +595,7 @@ export default {
this.setting.pyPara = conver(',', ')', 'indexOf', 'lastIndexOf');
} else {
const type = rf.slice(rf.indexOf('[') + 1, rf.indexOf(']'));
- console.log(type, rf, '=====');
+ window.console.log(type, rf, '=====');
// 如果存在多个逗号，就只用使用格式来截取，否则会出现多个类型填入input异常的问题
if (type.indexOf(',') !== type.lastIndexOf(',')) {
// there are 2 case:
@@ -610,7 +610,7 @@ export default {
this.setting.scalaTypeL = type.split(',')[0];
this.setting.scalaTypeR = type.split(',').slice(1).toString();
}
-
+
this.showScalaRF = this.node.registerFormat;
} else {
this.setting.scalaTypeL = conver('[', ',', 'indexOf', 'indexOf');
@@ -826,7 +826,7 @@ export default {
height: 100% !important;
}
}
-
+
.ivu-modal-content {
height: 100% !important;
}
@@ -835,4 +835,4 @@ export default {
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/linkis-web/src/apps/URM/module/udfManagement/index.vue b/linkis-web/src/apps/URM/module/udfManagement/index.vue
index 269107963..b8f57ba81 100644
--- a/linkis-web/src/apps/URM/module/udfManagement/index.vue
+++ b/linkis-web/src/apps/URM/module/udfManagement/index.vue
@@ -201,7 +201,7 @@ export default {
created() {
// 获取函数类型
// api.fetch('/configuration/engineType', 'get').then(res => {
- // console.log('res.engineType: ', res.engineType);
+ // window.console.log('res.engineType: ', res.engineType);
// this.getFunctionTypes = ['all', ...res.engineType]
// })
// this.getFunctionTypes = ['all', '0', '1,2']
diff --git a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
index e13e662a3..01336a2da 100644
--- a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
@@ -281,7 +281,7 @@ export default {
content: 'Stop Success！！'
});
}).catch((err) => {
- console.err(err)
+ window.console.err(err)
});
}
})
@@ -332,7 +332,7 @@ export default {
content: 'Stop Success！！'
});
}).catch((err) => {
- console.err(err)
+ window.console.err(err)
});
} else {
this.$Message.warning(this.$t('message.linkis.noselection'));
@@ -375,7 +375,7 @@ export default {
})
this.loading = false;
} catch (err) {
- console.log(err)
+ window.console.log(err)
this.loading = false;
}
},
@@ -398,7 +398,7 @@ export default {
let list = healthyStatusList.nodeStatus || [];
this.healthyStatusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// Get a list of states for a search(获取搜索的状态列表)
@@ -408,13 +408,13 @@ export default {
let list = statusList.nodeStatus || [];
this.statusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// add tag(添加tag)
addEnter (key, value) {
this.formItem.labels.push({ key, value });
-
+
},
// Edit tags(修改标签)
editEnter(editInputKey, editInputValue,editedInputValue) {
diff --git a/linkis-web/src/apps/linkis/module/ECM/index.vue b/linkis-web/src/apps/linkis/module/ECM/index.vue
index ecd8902cf..5c1694949 100644
--- a/linkis-web/src/apps/linkis/module/ECM/index.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/index.vue
@@ -251,7 +251,7 @@ export default {
on: {
click: () => {
this.killModal = true;
- console.log(params.row);
+ window.console.log(params.row);
this.killInfo.curInstance = params.row.instance;
}
}
@@ -316,7 +316,7 @@ export default {
this.page.totalSize = this.tableData.length;
this.loading = false;
} catch (err) {
- console.log(err)
+ window.console.log(err)
this.loading = false;
}
},
@@ -340,7 +340,7 @@ export default {
let list = healthyStatusList.nodeHealthy || [];
this.healthyStatusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// Get a list of states for a search(获取搜索的状态列表)
@@ -350,7 +350,7 @@ export default {
let list = statusList.nodeStatus || [];
this.statusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// add tag(添加tag)
@@ -433,7 +433,7 @@ export default {
withMultiUserEngine: this.killInfo.all === 1 ? true : false,
}, 'post');
const { killEngineNum, memory, cores } = res.result
- console.log(res);
+ window.console.log(res);
this.killModal = false;
this.killInfo = {
curInstance: '',
@@ -442,7 +442,7 @@ export default {
// 传回的是Byte
this.$Message.success(this.$t('message.linkis.killFinishedInfo', { killEngineNum, memory: memory / 1024 / 1024 / 1024, cores }))
} catch (err) {
- console.warn(err);
+ window.console.warn(err);
this.killInfo = {
curInstance: '',
all: 0,
diff --git a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
index 2f2972c34..ecf60e038 100644
--- a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
@@ -84,7 +84,7 @@
<Radio label="no">{{$t('message.linkis.EnginePluginManagement.no')}}</Radio>
</RadioGroup>
</div>
-
+
</div>
<div slot="footer">
@@ -315,7 +315,7 @@ export default {
},
watch: {
ecType(newName, oldName) {
- console.log(oldName);
+ window.console.log(oldName);
if(!newName) return;
this.getTypeVersionList(newName)
}
@@ -363,13 +363,13 @@ export default {
formData.append('file', this.file);
this.isUploading = true;
api.fetch('/engineplugin/uploadEnginePluginBML', formData, {method: 'post', 'Content-Type': 'multipart/form-data'}).then(response => {
- console.log(response);
+ window.console.log(response);
this.$Message.success(response.msg);
this.getTypeList();
this.showFileOperate = false;
}).catch(e => {
this.isUploading = false
- console.log(e);
+ window.console.log(e);
this.$Message.error(e);
this.showFileOperate = false;
})
@@ -392,7 +392,7 @@ export default {
this.showFileOperate = false;
this.isUploading = false;
}).catch(e => {
- console.log(e);
+ window.console.log(e);
this.$Message.error(e);
this.showFileOperate = false;
this.isUploading = false;
@@ -418,18 +418,18 @@ export default {
}
})
api.fetch('/bml/deleteResources', {'resourceIds': reqList}, 'post').then(response => {
- console.log(response);
+ window.console.log(response);
api.fetch('/engineplugin/deleteEnginePluginBML', {'ecType': th.ecType, 'version': th.version}, 'get').then(response2 => {
th.getTypeList();
th.resetSearch();
this.$Message.success(response2.msg);
}).catch(e2 => {
- console.log(e2);
+ window.console.log(e2);
this.$Message.error(e2);
})
}).catch(e => {
th.$Message.error(e);
- console.log(e);
+ window.console.log(e);
})
//暂存后续相关bug修复后修改
@@ -437,7 +437,7 @@ export default {
// api.fetch('/engineplugin/deleteEnginePluginBML', {'ecType': th.ecType, 'version': th.version}, 'get').then(response => {
// this.$Message.success(response.mes);
// }).catch(e => {
- // console.log(e);
+ // window.console.log(e);
// this.$Message.error(e);
// })
},
@@ -451,7 +451,7 @@ export default {
this.showFileOperate = true
},
async tableActionHandler(row, type) {
- console.log(row);
+ window.console.log(row);
if(type === 'upd') {
this.ecType = row.engineConnType;
this.version = row.version;
@@ -478,9 +478,9 @@ export default {
th.showVersionList = true
}).catch(e => {
th.$Message.error(e);
- console.log(e);
+ window.console.log(e);
})
- console.log(th.currentVersionList);
+ window.console.log(th.currentVersionList);
},
changePage(value) {
this.page.pageNow = value
diff --git a/linkis-web/src/apps/linkis/module/codeQuery/index.vue b/linkis-web/src/apps/linkis/module/codeQuery/index.vue
index 07e164c92..1afef71a2 100644
--- a/linkis-web/src/apps/linkis/module/codeQuery/index.vue
+++ b/linkis-web/src/apps/linkis/module/codeQuery/index.vue
@@ -337,7 +337,7 @@ export default {
this.page.totalPage = res.tasks.totalElements
this.tableLoading = false
} catch (err) {
- console.warn(err);
+ window.console.warn(err);
this.tableLoading = false
}
},
@@ -407,7 +407,7 @@ export default {
border-color: transparent;
}
.modal {
-
+
.input-area {
padding: 20px 50px;
.item {
@@ -420,4 +420,4 @@ export default {
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue b/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
index 4776c8c70..c19af012d 100644
--- a/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
@@ -55,7 +55,7 @@ const type = {
self.file = file
source.props.value = res.data ? res.data.resourceId : res.data
file.url = res.id
- console.log("resourceId:"+res.data.resourceId);
+ window.console.log("resourceId:"+res.data.resourceId);
},
},
}
@@ -88,7 +88,7 @@ const typesMap = {
source.options = result.envList.map((item) => {
return { label: item.envName, value: '' + item.id }
})
- // console.log('self.rule',self.rule)
+ // window.console.log('self.rule',self.rule)
fApi.refreshOptions()
})
return { options: [] }
diff --git a/linkis-web/src/apps/linkis/module/datasource/index.vue b/linkis-web/src/apps/linkis/module/datasource/index.vue
index 39e43b9ae..21f98200f 100644
--- a/linkis-web/src/apps/linkis/module/datasource/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasource/index.vue
@@ -604,7 +604,7 @@ export default {
this.loadingForm = false
const sourceId = data.id || data.insertId || data.updateId
- console.log()
+ window.console.log()
if (
!this.currentSourceData.id ||
!this.isEqual(
diff --git a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
index c311e1e71..f1c80bed8 100644
--- a/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceAccess/index.vue
@@ -172,7 +172,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -236,7 +236,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -251,7 +251,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/datasourceAccess/service.js b/linkis-web/src/apps/linkis/module/datasourceAccess/service.js
index ecc809fc4..e25deabf9 100644
--- a/linkis-web/src/apps/linkis/module/datasourceAccess/service.js
+++ b/linkis-web/src/apps/linkis/module/datasourceAccess/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const dataSourceAccessBaseUrl = '/basedata-manager/datasource-access'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(dataSourceAccessBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
index 0eea389ea..5a2666f15 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/index.vue
@@ -283,7 +283,7 @@ export default {
for(let key in this.modalEditData) {
this.modalEditData[key] = ''
this.modalEditData.parameter = {}
- console.log(key);
+ window.console.log(key);
}
this.modalEditData.hasKeyTab = false;
},
@@ -314,7 +314,7 @@ export default {
if('uris' in formData) delete formData['uris'];
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- //console.log(data)
+ //window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -329,7 +329,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- //console.log(data)
+ //window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -344,7 +344,7 @@ export default {
}
})
}
- console.log(formData);
+ window.console.log(formData);
this.modalLoading=false
this.modalShow = false
})
diff --git a/linkis-web/src/apps/linkis/module/datasourceEnv/service.js b/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
index ad3091922..cb596a76d 100644
--- a/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
+++ b/linkis-web/src/apps/linkis/module/datasourceEnv/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const dataSourceEnvBaseUrl = '/basedata-manager/datasource-env'
const getList = (params)=> {
- //console.log(params)
+ //window.console.log(params)
return api.fetch(dataSourceEnvBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/index.vue b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
index aa8224ade..5a78fd92b 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceType/index.vue
@@ -179,7 +179,7 @@ export default {
},
methods: {
init() {
- //console.log(this.$route.query.isSkip);
+ //window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -207,7 +207,7 @@ export default {
this.modalShow = true
},
onTableDelete(row){
- //console.log(row)
+ //window.console.log(row)
this.$Modal.confirm({
title: this.$t('message.linkis.basedataManagement.modal.modalTitle'),
content: this.$t('message.linkis.basedataManagement.modal.modalFormat').format(row.name),
@@ -241,7 +241,7 @@ export default {
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/datasourceType/service.js b/linkis-web/src/apps/linkis/module/datasourceType/service.js
index 7c777efe1..b12f09183 100644
--- a/linkis-web/src/apps/linkis/module/datasourceType/service.js
+++ b/linkis-web/src/apps/linkis/module/datasourceType/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const dataSourceTypeBaseUrl = '/basedata-manager/datasource-type'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(dataSourceTypeBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
index 18a9a5450..42823c657 100644
--- a/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasourceTypeKey/index.vue
@@ -289,7 +289,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/EditForm/index.vue b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/EditForm/index.vue
index 638a7c6c4..4f991bb73 100644
--- a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/EditForm/index.vue
@@ -263,7 +263,7 @@ export default {
data: {
handler(newV) {
this.getData(newV)
- console.log(newV)
+ window.console.log(newV)
},
deep: true
},
diff --git a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/index.vue b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/index.vue
index 264dd91df..0a3edf4c3 100644
--- a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/index.vue
+++ b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/index.vue
@@ -35,9 +35,9 @@
<Col span="19">
<Card>
<Button type="success" class="enginBtn" @click="onTableEdit()">{{$t('message.linkis.basedataManagement.add')}}</Button>
- <Select v-model="model" multiple :max-tag-count="2" style="width: 300px" class="enginBtn">
- <Option v-for="item in showList" :value="item.value" :key="item.value">{{ item.label }}</Option>
- </Select>
+ <Select v-model="model" multiple :max-tag-count="2" style="width: 300px" class="enginBtn">
+ <Option v-for="item in showList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+ </Select>
<Table stripe :columns="columns" :data="showInTableList" height="600">
<template slot-scope="{ row,index }" slot="action">
<ButtonGroup size="small">
@@ -87,7 +87,7 @@ export default {
created(){
getEngineList().then((data) => {
this.engineList = data['success: '];
- console.log(this.engineList)
+ window.console.log(this.engineList)
})
this.queryEngineTemplateList(this.labelId);
},
@@ -281,7 +281,7 @@ export default {
this.modalEditData = {...tmp};
},
onModalOk(){
- //console.log(this.$refs['editForm'].formData);
+ //window.console.log(this.$refs['editForm'].formData);
this.modalShow = false;
changeTemplate(this.$refs['editForm'].formData, this.editType).then((data) => {
if(data['success: ']) {this.$Message.success('message.linkis.basedataManagement.engineConfigurationTemplate.ModSuccess'); this.queryEngineTemplateList(this.labelId);}
diff --git a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/service.js b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/service.js
index 2303a5f18..2186a0970 100644
--- a/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/service.js
+++ b/linkis-web/src/apps/linkis/module/engineConfigurationTemplate/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const dataSourceEnvBaseUrl = '/basedata-manager/configuration-template'
const getEngineList = ()=> {
- //console.log(params)
+ //window.console.log(params)
return api.fetch(dataSourceEnvBaseUrl + '/engin-list', 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/errorCode/index.vue b/linkis-web/src/apps/linkis/module/errorCode/index.vue
index b3cc038ae..332bb3405 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/index.vue
+++ b/linkis-web/src/apps/linkis/module/errorCode/index.vue
@@ -152,7 +152,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -216,7 +216,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -232,7 +232,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/errorCode/service.js b/linkis-web/src/apps/linkis/module/errorCode/service.js
index 8bc7e24b6..f02546a36 100644
--- a/linkis-web/src/apps/linkis/module/errorCode/service.js
+++ b/linkis-web/src/apps/linkis/module/errorCode/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const errorCodeBaseUrl = '/basedata-manager/error-code'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(errorCodeBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 403a99a33..ff9f490f3 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -193,7 +193,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -256,7 +256,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -272,7 +272,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js b/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
index c836b889c..27a10490b 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const authTokenBaseUrl = '/basedata-manager/gateway-auth-token'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(authTokenBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index dd7aec8c6..eb885f570 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -351,7 +351,7 @@ export default {
try {
sourceJson = JSON.parse(sourceJson)
} catch (error) {
- console.log(sourceJson)
+ window.console.log(sourceJson)
}
}
let fileName = ''
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
index b33a6b612..cde0d7105 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
@@ -326,7 +326,7 @@ export default {
}
this.isLoading = false
} catch (errorMsg) {
- console.error(errorMsg)
+ window.console.error(errorMsg)
this.isLoading = false
}
},
@@ -407,7 +407,7 @@ export default {
}
} catch (error) {
this.isLoading = false
- console.error(error)
+ window.console.error(error)
}
},
// go back to the last page(返回上一页)
diff --git a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
index c5462bef8..88b7d3d31 100644
--- a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
@@ -268,10 +268,10 @@ export default {
})
this.tableLoading = false;
} catch(err) {
- console.log(err);
+ window.console.log(err);
this.tableLoading = false;
}
-
+
},
async init() {
this.loading = true;
@@ -318,7 +318,7 @@ export default {
})
this.isRequesting = false
} catch (err) {
- console.log(err);
+ window.console.log(err);
this.isRequesting = false
}
}
@@ -357,7 +357,7 @@ export default {
}
this.isRequesting = true
await api.fetch(target, this.modalData, "post").then(async (res) => {
- console.log(res);
+ window.console.log(res);
await this.getTableData();
this.cancel();
this.$Message.success(this.$t('message.linkis.ipListManagement.addSuccessful'));
@@ -365,13 +365,13 @@ export default {
this.isRequesting = false
} catch(err) {
this.isRequesting = false
- console.log(err);
+ window.console.log(err);
}
} else {
this.$Message.error(this.$t('message.linkis.error.validate'));
}
})
-
+
},
edit(data) {
const {
@@ -395,7 +395,7 @@ export default {
await this.getTableData();
},
onCancel: () => {
- console.log('cancel');
+ window.console.log('cancel');
}
})
},
@@ -403,7 +403,7 @@ export default {
try {
await api.fetch('configuration/user-ip-mapping/delete-user-ip', {id: data.id}, 'get');
} catch(err) {
- console.log(err);
+ window.console.log(err);
}
},
async handleChange() {
@@ -446,7 +446,7 @@ export default {
<style lang="scss" scoped>
.modal {
-
+
.input-area {
padding: 20px 50px;
.item {
@@ -469,4 +469,4 @@ export default {
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue b/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
index de77bbdbb..25f14538c 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/engineConn.vue
@@ -251,7 +251,7 @@ export default {
this.engineTypes = data && data.engineType ? data.engineType : []
this.loading = false;
} catch (err) {
- console.log(err)
+ window.console.log(err)
this.loading = false;
}
},
@@ -274,7 +274,7 @@ export default {
let list = healthyStatusList.nodeStatus || [];
this.healthyStatusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// Get a list of states for a search(获取搜索的状态列表)
@@ -284,7 +284,7 @@ export default {
let list = statusList.nodeStatus || [];
this.statusList = [...list];
} catch (err) {
- console.log(err)
+ window.console.log(err)
}
},
// add tag(添加tag)
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index df39d6736..f9881a600 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -304,7 +304,7 @@ export default {
content: 'Stop Success！！'
});
}).catch((err) => {
- console.err(err)
+ window.console.err(err)
});
}
})
@@ -460,7 +460,7 @@ export default {
if(enginesList.length) await this.expandChange(enginesList[0])
this.loading = false;
} catch (err) {
- console.log(err)
+ window.console.log(err)
this.loading = false;
}
},
@@ -503,7 +503,7 @@ export default {
this.formItem.applicationName = this.tableData[0].engineType;
this.page.totalSize = this.tableData.length;
} catch (errorMsg) {
- console.error(errorMsg);
+ window.console.error(errorMsg);
this.loading = false;
}
},
diff --git a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/EditForm/index.vue b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/EditForm/index.vue
index ba4c71805..377b7bacf 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/EditForm/index.vue
@@ -135,7 +135,7 @@ export default {
methods: {
getData(data){
this.formData = {...data}
- console.log(this.formData)
+ window.console.log(this.formData)
if(this.formData.config.length>0){
this.formData.config = JSON.parse(this.formData.config)
}else{
diff --git a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
index 066959c3c..98181836d 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/index.vue
@@ -158,7 +158,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -225,7 +225,7 @@ export default {
formData.config = JSON.stringify(formData.config)
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -240,7 +240,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/service.js b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/service.js
index 34f2b3d85..126d9a93b 100644
--- a/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/service.js
+++ b/linkis-web/src/apps/linkis/module/rmExternalResourceProvider/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const resourceProviderBaseUrl = '/basedata-manager/rm-external-resource-provider'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(resourceProviderBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
index 0496322d6..253c8c57e 100644
--- a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
@@ -267,7 +267,7 @@ export default {
params[[keys[i]]] = this.confirmQuery[keys[i]];
}
}
-
+
params.pageNow = this.page.pageNow;
params.pageSize = this.page.pageSize;
await api.fetch("/configuration/tenant-mapping/query-tenant-list", params, "get")
@@ -281,10 +281,10 @@ export default {
})
this.tableLoading = false;
} catch(err) {
- console.log(err);
+ window.console.log(err);
this.tableLoading = false;
}
-
+
},
async init() {
this.loading = true;
@@ -332,7 +332,7 @@ export default {
})
this.isRequesting = false
} catch (err) {
- console.log(err);
+ window.console.log(err);
this.isRequesting = false
}
}
@@ -372,7 +372,7 @@ export default {
}
this.isRequesting = true;
await api.fetch(target, this.modalData, "post").then(async (res) => {
- console.log(res);
+ window.console.log(res);
await this.getTableData();
this.cancel();
this.$Message.success(this.$t('message.linkis.tenantTagManagement.addSuccessful'));
@@ -380,13 +380,13 @@ export default {
this.isRequesting = false;
} catch(err) {
this.isRequesting = false;
- console.log(err);
+ window.console.log(err);
}
} else {
this.$Message.error(this.$t('message.linkis.error.validate'));
}
})
-
+
},
edit(data) {
const {
@@ -410,7 +410,7 @@ export default {
await this.getTableData();
},
onCancel: () => {
- console.log('cancel');
+ window.console.log('cancel');
}
})
},
@@ -418,7 +418,7 @@ export default {
try {
await api.fetch('configuration/tenant-mapping/delete-tenant', {id: data.id}, 'get');
} catch(err) {
- console.log(err);
+ window.console.log(err);
}
},
async handleChange() {
@@ -445,7 +445,7 @@ export default {
<style lang="scss" src="./index.scss" scoped></style>
<style lang="scss" scoped>
.modal {
-
+
.input-area {
padding: 20px 50px;
.item {
@@ -458,4 +458,4 @@ export default {
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue b/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
index f588c49d9..564b8fc93 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/EditForm/index.vue
@@ -71,7 +71,7 @@ export default {
required: true,
len: 20,
validator: (rule, value)=>{
- console.log(rule,value,value.length)
+ window.console.log(rule,value,value.length)
return new Promise((resolve,reject)=>{
if(value.length>20){
reject(this.$t('message.linkis.basedataManagement.udfManager.userNameValidate.size'))
diff --git a/linkis-web/src/apps/linkis/module/udfManager/index.vue b/linkis-web/src/apps/linkis/module/udfManager/index.vue
index a1baddf8b..66319cd16 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfManager/index.vue
@@ -140,7 +140,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -205,7 +205,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -221,7 +221,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/linkis/module/udfManager/service.js b/linkis-web/src/apps/linkis/module/udfManager/service.js
index cb79f045a..16d8c3df8 100644
--- a/linkis-web/src/apps/linkis/module/udfManager/service.js
+++ b/linkis-web/src/apps/linkis/module/udfManager/service.js
@@ -20,7 +20,7 @@ import api from '@/common/service/api';
const udfManagerBaseUrl = '/basedata-manager/udf-manager'
const getList = (params)=> {
- console.log(params)
+ window.console.log(params)
return api.fetch(udfManagerBaseUrl, params , 'get')
}
diff --git a/linkis-web/src/apps/linkis/module/udfTree/index.vue b/linkis-web/src/apps/linkis/module/udfTree/index.vue
index 5660b1184..0ef454f9c 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/index.vue
@@ -190,7 +190,7 @@ export default {
},
methods: {
init() {
- console.log(this.$route.query.isSkip);
+ window.console.log(this.$route.query.isSkip);
},
load() {
let params = {
@@ -252,7 +252,7 @@ export default {
this.modalLoading = true
if(this.modalAddMode=='add') {
add(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
@@ -267,7 +267,7 @@ export default {
})
}else {
edit(formData).then((data)=>{
- console.log(data)
+ window.console.log(data)
if(data.result) {
this.$Message.success({
duration: 3,
diff --git a/linkis-web/src/apps/scriptis/module/webSocket/index.js b/linkis-web/src/apps/scriptis/module/webSocket/index.js
index ce69880f0..c4ed216c4 100644
--- a/linkis-web/src/apps/scriptis/module/webSocket/index.js
+++ b/linkis-web/src/apps/scriptis/module/webSocket/index.js
@@ -49,7 +49,7 @@ const module = {
});
manager.socket.on('inconnect', () => {
module.methods.downgrade();
- console.warn('socket连接失败，后续请求将使用http');
+ window.console.warn('socket连接失败，后续请求将使用http');
});
manager.socket.on('close', (e) => {
module.methods.clearTimer();
@@ -91,14 +91,14 @@ const module = {
module.methods.reconnect(data, 1001);
module.methods.reSend(data);
} else {
- console.warn(`socket readystate${manager.socket.readyState}：本次请求将使用http`);
+ window.console.warn(`socket readystate${manager.socket.readyState}：本次请求将使用http`);
module.methods.downgrade(data);
}
},
delaySend(data) {
if (manager.delayCounter > 10) {
manager.delayCounter = 0;
- console.warn(`socket readystate重试多次不为open：本次请求将使用http`);
+ window.console.warn(`socket readystate重试多次不为open：本次请求将使用http`);
return module.methods.downgrade(data);
}
module.methods.reSend(data);
@@ -121,7 +121,7 @@ const module = {
manager.socket.reconnect(data);
} else {
module.methods.downgrade(data);
- console.warn(`错误码${code}：本次请求将使用http`);
+ window.console.warn(`错误码${code}：本次请求将使用http`);
}
},
reSend(data) {
diff --git a/linkis-web/src/common/helper/storage.js b/linkis-web/src/common/helper/storage.js
index 73dd01336..5a5856f58 100644
--- a/linkis-web/src/common/helper/storage.js
+++ b/linkis-web/src/common/helper/storage.js
@@ -5,16 +5,16 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
/* \
|*|
@@ -158,7 +158,7 @@ export const storageManager = {
try {
window[storage].setItem(key, JSON.stringify(value));
} catch (e) {
- !isProd && console.error(e);
+ !isProd && window.console.error(e);
}
},
get: function(key, storage) {
@@ -169,7 +169,7 @@ export const storageManager = {
return window[storage].getItem(key);
}
} catch (e) {
- !isProd && console.error(e, key);
+ !isProd && window.console.error(e, key);
}
},
clear: function(storage) {
diff --git a/linkis-web/src/common/service/api.js b/linkis-web/src/common/service/api.js
index 86053d651..c95cd3bc1 100644
--- a/linkis-web/src/common/service/api.js
+++ b/linkis-web/src/common/service/api.js
@@ -137,7 +137,7 @@ const getData = function(data) {
result = result[pathArray[j]];
if (!result) {
if (j < pathArray.length - 1) {
- console.error(`【FEX】ConstructionOfResponse配置错误：${item}拿到的值是undefined，请检查配置`);
+ window.console.error(`【FEX】ConstructionOfResponse配置错误：${item}拿到的值是undefined，请检查配置`);
}
break;
}
@@ -150,7 +150,7 @@ const getData = function(data) {
const success = function(response) {
if (util.isNull(api.constructionOfResponse.codePath) || util.isNull(api.constructionOfResponse.successCode) ||
util.isNull(api.constructionOfResponse.messagePath) || util.isNull(api.constructionOfResponse.resultPath)) {
- console.error('【FEX】Api配置错误: 请调用setConstructionOfResponse来设置API的响应结构');
+ window.console.error('【FEX】Api配置错误: 请调用setConstructionOfResponse来设置API的响应结构');
return;
}
let data;
@@ -183,7 +183,7 @@ const success = function(response) {
}
})
if (hasBigData) {
- console.log(response.data, '潜在性能问题大数据量', len)
+ window.console.log(response.data, '潜在性能问题大数据量', len)
}
}
@@ -218,7 +218,7 @@ const fail = function(error) {
const param = function(url, data, option) {
let method = 'post';
if (util.isNull(url)) {
- return console.error('请传入URL');
+ return window.console.error('请传入URL');
} else if (!util.isNull(url) && util.isNull(data) && util.isNull(option)) {
option = {
method: method,
diff --git a/linkis-web/src/common/service/mixin.js b/linkis-web/src/common/service/mixin.js
index 3054c30bf..4eb679742 100644
--- a/linkis-web/src/common/service/mixin.js
+++ b/linkis-web/src/common/service/mixin.js
@@ -38,7 +38,7 @@ export default {
return vsBi.url;
},
getProjectJsonResult(key, name = 'visualis') {
- console.log(key,name)
+ window.console.log(key,name)
// Used to determine what return value to return(用于判断返回什么样的返回值)
const baseInfo = storage.get('baseInfo', 'local');
if (!baseInfo) {
diff --git a/linkis-web/src/common/service/moduleMixin.js b/linkis-web/src/common/service/moduleMixin.js
index 992af8d4e..079bbe02d 100644
--- a/linkis-web/src/common/service/moduleMixin.js
+++ b/linkis-web/src/common/service/moduleMixin.js
@@ -25,7 +25,7 @@ import storage from '@/common/helper/storage';
let module = function(config) {
if (!config.name) {
- return console.error('请配置独一无二的ModuleName');
+ return window.console.error('请配置独一无二的ModuleName');
}
// Control events thrown out(控制对外抛出的事件)
let dispatchs = config.dispatchs || [];
diff --git a/linkis-web/src/common/util/debug.js b/linkis-web/src/common/util/debug.js
index 96822922f..7da95a667 100644
--- a/linkis-web/src/common/util/debug.js
+++ b/linkis-web/src/common/util/debug.js
@@ -23,8 +23,8 @@
function debug_log (type = 'log', ...info) {
const isDev = process.env.NODE_ENV === 'dev'
if (isDev || window.debug_log === true) {
- if( console[type]) {
- console[type](...info)
+ if( window.console[type]) {
+ window.console[type](...info)
}
}
}
diff --git a/linkis-web/src/components/consoleComponent/result.vue b/linkis-web/src/components/consoleComponent/result.vue
index 4ab871918..f6dadd660 100644
--- a/linkis-web/src/components/consoleComponent/result.vue
+++ b/linkis-web/src/components/consoleComponent/result.vue
@@ -495,7 +495,7 @@ export default {
[headRows[index].columnName]: item,
});
} catch (error) {
- console.error(error, row.length, i);
+ window.console.error(error, row.length, i);
}
});
return newItem;
diff --git a/linkis-web/src/components/consoleComponent/visualAnalysis.vue b/linkis-web/src/components/consoleComponent/visualAnalysis.vue
index a14ce6cef..49b868e47 100644
--- a/linkis-web/src/components/consoleComponent/visualAnalysis.vue
+++ b/linkis-web/src/components/consoleComponent/visualAnalysis.vue
@@ -5,16 +5,16 @@
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
- ~
+ ~
~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
<template>
<div class="visual-analysis" v-if="project">
<iframe id="iframe" :src="visualSrc" frameborder="0"></iframe>
@@ -97,7 +97,7 @@ export default {
this.project.data = data;
}
} catch (error) {
- console.error(error);
+ window.console.error(error);
}
}
};
diff --git a/linkis-web/src/dss/module/resourceSimple/job.vue b/linkis-web/src/dss/module/resourceSimple/job.vue
index a3ed55030..1d384d5b3 100644
--- a/linkis-web/src/dss/module/resourceSimple/job.vue
+++ b/linkis-web/src/dss/module/resourceSimple/job.vue
@@ -133,7 +133,7 @@ export default {
this.$emit('update-job', tasks.length);
}).catch((err) => {
this.loading = false;
- console.error(err)
+ window.console.error(err)
});
},
// delete current job(删除当前工作)
diff --git a/linkis-web/src/dynamic-apps.js b/linkis-web/src/dynamic-apps.js
index 90a380e1f..dc71e4283 100644
--- a/linkis-web/src/dynamic-apps.js
+++ b/linkis-web/src/dynamic-apps.js
@@ -45,7 +45,7 @@ if (appsRoutes) {
routes.unshift(subRoutes)
-console.log(routes)
+window.console.log(routes)
// public internationalization(公共国际化)
const i18n = {
'en': require('./common/i18n/en.json'),
diff --git a/linkis-web/vue.config.js b/linkis-web/vue.config.js
index 757664b4c..19a389af7 100644
--- a/linkis-web/vue.config.js
+++ b/linkis-web/vue.config.js
@@ -188,6 +188,10 @@ module.exports = {
alias: {
'@': path.resolve(__dirname, './src'),
'@component': path.resolve(__dirname, './src/components')
+ },
+ fallback: {
+ "path": false,
+ "fs": false
}
},
plugins
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org