From fc41a8f51986c4d012c667dd32f625e0d1e0c9c1 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 17 Sep 2019 13:59:32 +0800 Subject: [PATCH] instance/pages/list/_source/list.vue && package (#796) * package * Modify the workflow instance page status to run, prohibit deletion, delete the package.json package babel-runtime and jasmine-core --- escheduler-ui/package.json | 2 -- .../pages/projects/pages/instance/pages/list/_source/list.vue | 1 + escheduler-ui/src/lib/@analysys/ans-ui/package.json | 1 - escheduler-ui/src/lib/@fedor/io/package.json | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/escheduler-ui/package.json b/escheduler-ui/package.json index c1cd0c483e..c6a2a92e40 100644 --- a/escheduler-ui/package.json +++ b/escheduler-ui/package.json @@ -27,7 +27,6 @@ "babel-plugin-transform-runtime": "^6.23.0", "babel-plugin-transform-vue-jsx": "^3.5.0", "babel-preset-env": "^1.6.1", - "babel-runtime": "^6.26.0", "bootstrap": "3.3.7", "canvg": "1.5", "clipboard": "^2.0.1", @@ -77,7 +76,6 @@ ] }, "devDependencies": { - "jasmine-core": "^3.2.1", "jquery": "1.12.4", "vue": "^2.5.17", "vue-router": "2.7.0", diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue index 619407a61a..9efc9f721a 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue @@ -123,6 +123,7 @@ shape="circle" size="xsmall" data-toggle="tooltip" + :disabled="item.state === 'RUNNING_EXEUTION'" :title="$t('delete')"> diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/package.json b/escheduler-ui/src/lib/@analysys/ans-ui/package.json index cddb561eb3..061f54a7ad 100644 --- a/escheduler-ui/src/lib/@analysys/ans-ui/package.json +++ b/escheduler-ui/src/lib/@analysys/ans-ui/package.json @@ -53,7 +53,6 @@ "babel-plugin-transform-runtime": "^6.23.0", "babel-plugin-transform-vue-jsx": "^3.7.0", "babel-preset-env": "^1.5.2", - "babel-runtime": "^6.26.0", "cross-env": "^5.2.0", "css-loader": "0.28.8", "cssnano": "^4.0.3", diff --git a/escheduler-ui/src/lib/@fedor/io/package.json b/escheduler-ui/src/lib/@fedor/io/package.json index 0066dfa8f0..20563bedeb 100644 --- a/escheduler-ui/src/lib/@fedor/io/package.json +++ b/escheduler-ui/src/lib/@fedor/io/package.json @@ -23,7 +23,6 @@ "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.5.2", - "babel-runtime": "^6.26.0", "body-parser": "^1.17.2", "chai": "^4.1.1", "cors": "^2.8.4",