Merge pull request #2740 from dataease/dev

dev merge

frontend/package.json

@@ -22,11 +22,9 @@
     "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.21.1",
     "core-js": "^2.6.5",
-    "css-color-function": "^1.3.3",
     "echarts": "^5.0.1",
     "element-resize-detector": "^1.2.3",
     "element-ui": "2.15.7",
-    "file-save": "^0.2.0",
     "file-saver": "^2.0.5",
     "fit2cloud-ui": "^1.8.0",
     "flv.js": "^1.6.2",
@@ -54,7 +52,6 @@
     "tinymce": "^5.8.2",
     "umy-ui": "^1.1.6",
     "vcolorpicker": "^1.1.0",
-    "videojs-flash": "^2.2.1",
     "vue": "2.6.10",
     "vue-axios": "3.2.4",
     "vue-clipboard2": "0.3.1",
@@ -90,8 +87,6 @@
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
-    "less": "^3.0.0",
-    "less-loader": "^5.0.0",
     "mockjs": "1.0.1-beta3",
     "runjs": "^4.1.3",
     "sass": "^1.33.0",

frontend/src/layout/components/Sidebar/index.vue

@@ -49,7 +49,7 @@ export default {
       // return this.$router.options.routes
       if (this.isCollapse) {
         return this.flatterRouter(
-          this.$store.state.permission.currentRoutes.children
+          JSON.parse(JSON.stringify(this.$store.state.permission.currentRoutes.children))
         );
       }
       return this.$store.state.permission.currentRoutes.children;

frontend/src/views/panel/template/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <de-container>
-    <de-aside-container isTemplate>
+  <de-container class="content-container">
+    <de-aside-container class="template-aside-container" is-template>
       <el-tabs v-model="currentTemplateType" @tab-click="handleClick">
         <el-tab-pane name="self">
           <span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.user_template') }}</span>
@@ -211,4 +211,13 @@ export default {
     height: 100%;
   }
 
+  .content-container{
+    padding: 20px!important;
+    overflow: hidden;
+    height: calc(100vh - 56px)!important;
+  }
+
+  .template-aside-container{
+    height: calc(100vh - 96px)!important;
+  }
 </style>

frontend/src/views/system/datasource/DsConfiguration.vue

@@ -1039,7 +1039,9 @@ export default {
 
           for (var j = 0; j < this.apiItem.fields.length; j++) {
             if(this.apiItem.fields[j].name === jsonFields[i].name){
-              jsonFields[i].checked = false;
+              this.$nextTick(() => {
+                jsonFields[i].checked = false;
+              })
               this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
               return
             }
@@ -1200,7 +1202,7 @@ export default {
       background-color: rgba(187, 191, 196, 0.5);
       height: 1px;
       top: 13px;
-      left: calc(50% + 22px);
+      left: calc(50% + 22px) !important;
       width: 100px;
       margin-right: 0px;