diff --git a/src/frontend/devops-pipeline/package.json b/src/frontend/devops-pipeline/package.json index d86bac00ba61..e3002e0c948d 100755 --- a/src/frontend/devops-pipeline/package.json +++ b/src/frontend/devops-pipeline/package.json @@ -5,7 +5,7 @@ "private": true, "author": "", "scripts": { - "dev": "nx exec -- webpack-cli serve --mode development --progress", + "dev": "webpack-cli serve --mode development --progress", "dll": "webpack --mode production --config webpack.dll.config.js", "public": "npm run dll && webpack --mode production", "public:dev": "cross-env NODE_ENV=dev npm run public --", diff --git a/src/frontend/devops-pipeline/src/components/AtomFormComponent/Parameter/index.vue b/src/frontend/devops-pipeline/src/components/AtomFormComponent/Parameter/index.vue index 89fe028a61ab..3d693fcab9ee 100755 --- a/src/frontend/devops-pipeline/src/components/AtomFormComponent/Parameter/index.vue +++ b/src/frontend/devops-pipeline/src/components/AtomFormComponent/Parameter/index.vue @@ -20,6 +20,7 @@ :list-type="parameter.keyListType" :url="parameter.keyUrl" :list="parameter.keyList" + :title="parameter.key" > = import mixins from '../mixins' import parameterInput from './parameterInput' + import { isObject } from '@/utils/util' export default { name: 'parameter', @@ -141,7 +144,12 @@ this.isLoading = true this.$ajax.get(url).then((res) => { - const data = res.data || [] + const data = res.data.map(i => { + return { + ...i, + value: isObject(i.value) ? JSON.stringify(i.value) : i.value + } + }) this.parameters = data this.setValue() }).catch(e => this.$showTips({ message: e.message, theme: 'error' })).finally(() => (this.isLoading = false)) @@ -169,6 +177,9 @@ if (Array.isArray(param.value)) { // 去掉空字符串, 空字符串无意义 param.value = param.value.filter(v => v !== '') } + if (isObject(param.value)) { + param.value = JSON.stringify(param.value) + } }) this.updateParameters() }, diff --git a/src/frontend/devops-pipeline/src/components/AtomFormComponent/SubParameter/index.vue b/src/frontend/devops-pipeline/src/components/AtomFormComponent/SubParameter/index.vue index e66eafa31e5a..a73391a705ba 100644 --- a/src/frontend/devops-pipeline/src/components/AtomFormComponent/SubParameter/index.vue +++ b/src/frontend/devops-pipeline/src/components/AtomFormComponent/SubParameter/index.vue @@ -40,6 +40,7 @@ @@ -56,6 +57,7 @@ + + diff --git a/src/frontend/devops-pipeline/src/components/FileParamInput/index.vue b/src/frontend/devops-pipeline/src/components/atomFormField/FileParamInput/index.vue similarity index 98% rename from src/frontend/devops-pipeline/src/components/FileParamInput/index.vue rename to src/frontend/devops-pipeline/src/components/atomFormField/FileParamInput/index.vue index cac9022bf66f..748d58505d93 100644 --- a/src/frontend/devops-pipeline/src/components/FileParamInput/index.vue +++ b/src/frontend/devops-pipeline/src/components/atomFormField/FileParamInput/index.vue @@ -58,7 +58,7 @@