merge from "master" into "feature/vm-wizard"

docs/api/apis.remaining

@@ -3,14 +3,12 @@ createLBHealthCheckPolicy
 createManagementNetworkIpRange
 createNetworkACL
 createSnapshotFromVMSnapshot
-createStaticRoute
 createStorageNetworkIpRange
 createVlanIpRange
 dedicatePublicIpRange
 deleteLBHealthCheckPolicy
 deleteManagementNetworkIpRange
 deleteNetworkACL
-deleteStaticRoute
 deleteStorageNetworkIpRange
 deleteVlanIpRange
 findStoragePoolsForMigration

package.json

@@ -39,8 +39,8 @@
     "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
     "ant-design-vue": "~1.4.10",
-    "axios": "^0.19.0",
-    "core-js": "^3.6.1",
+    "axios": "^0.19.2",
+    "core-js": "^3.6.4",
     "enquire.js": "^2.1.6",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.15",
@@ -52,42 +52,42 @@
     "viser-vue": "^2.4.8",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
-    "vue-cropper": "0.4.9",
+    "vue-cropper": "0.5.0",
     "vue-i18n": "^8.15.3",
     "vue-ls": "^3.2.1",
-    "vue-router": "^3.1.3",
+    "vue-router": "^3.1.5",
     "vue-svg-component-runtime": "^1.0.1",
     "vuedraggable": "^2.23.2",
     "vuex": "^3.1.2"
   },
   "devDependencies": {
-    "@kazupon/vue-i18n-loader": "^0.4.1",
-    "@vue/cli": "^4.1.1",
-    "@vue/cli-plugin-babel": "^4.1.1",
-    "@vue/cli-plugin-eslint": "^4.1.1",
-    "@vue/cli-plugin-unit-jest": "^4.1.1",
-    "@vue/cli-service": "^4.1.1",
-    "@vue/eslint-config-standard": "^5.0.1",
+    "@kazupon/vue-i18n-loader": "^0.5.0",
+    "@vue/cli": "^4.1.2",
+    "@vue/cli-plugin-babel": "^4.1.2",
+    "@vue/cli-plugin-eslint": "^4.1.2",
+    "@vue/cli-plugin-unit-jest": "^4.1.2",
+    "@vue/cli-service": "^4.1.2",
+    "@vue/eslint-config-standard": "^5.1.0",
     "@vue/test-utils": "^1.0.0-beta.20",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^25.1.0",
     "babel-plugin-import": "^1.13.0",
     "eslint": "^6.8.0",
     "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-import": "^2.20.1",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-vue": "^6.0.1",
+    "eslint-plugin-vue": "^6.1.2",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
-    "node-sass": "^4.13.0",
-    "sass-loader": "^8.0.0",
-    "vue-cli-plugin-i18n": "^0.6.0",
+    "node-sass": "^4.13.1",
+    "sass-loader": "^8.0.2",
+    "vue-cli-plugin-i18n": "^0.6.1",
     "vue-svg-icon-loader": "^2.1.1",
     "vue-template-compiler": "^2.6.11",
-    "webpack": "^4.41.4"
+    "webpack": "^4.41.5"
   },
   "eslintConfig": {
     "root": true,

src/layouts/ResourceLayout.vue

@@ -18,11 +18,11 @@
 <template>
   <div class="page-header-index-wide page-header-wrapper-grid-content-main">
     <a-row :gutter="12">
-      <a-col :md="24" :lg="8" style="margin-bottom: 12px">
+      <a-col :md="24" :lg="7" style="margin-bottom: 12px">
         <slot name="left">
         </slot>
       </a-col>
-      <a-col :md="24" :lg="16">
+      <a-col :md="24" :lg="17">
         <slot name="right">
         </slot>
       </a-col>

src/locales/en.json

@@ -467,6 +467,7 @@
 "label.add.primary.storage": "Add Primary Storage",
 "label.add.region": "Add Region",
 "label.add.role": "Add Role",
+"label.add.route": "Add Route",
 "label.add.rule": "Add Rule",
 "label.add.secondary.storage": "Add Secondary Storage",
 "label.add.security.group": "Add Security Group",
@@ -492,6 +493,7 @@
 "label.change.ipaddress": "Change IP address for NIC",
 "label.change.service.offering": "Change service offering",
 "label.change.value": "Change value",
+"label.cidr.destination.network": "Destination Network CIDR",
 "label.configure": "Configure",
 "label.configure.ldap": "Configure LDAP",
 "label.configure.vpc": "Configure VPC",

src/style/ant-overwrite/ant-form.less

@@ -0,0 +1,20 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  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.
+
+.ant-form .ant-form-item {
+  margin-bottom: 6px;
+}

src/style/index.less

@@ -30,6 +30,7 @@
 @import "layout/inverted-mode";
 @import "ant-overwrite/ant-layout-header";
 @import "ant-overwrite/ant-progress";
+@import "ant-overwrite/ant-form";
 
 @import "frame/content";
 @import "frame/search";