Merge pull request #3517 from dataease/pr@dev_eslint_auto_fix

Pr@dev eslint auto fix

frontend/src/styles/index.scss

@@ -1632,4 +1632,29 @@ div:focus {
     white-space: nowrap;
     height: 24px;
   }
+}
+
+.db-multiple-select-pop {
+  .selected::after {
+    content: '';
+    width: 6px;
+    height: 12px;
+    position: absolute;
+    right: 12px;
+    top: 9px;
+    border: 2px solid #3370ff;
+    border-top-color: rgba(0, 0, 0, 0);
+    border-left-color: rgba(0, 0, 0, 0);
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+}
+
+.role-add-name {
+  .el-select-dropdown__item.selected::after {
+    content: '';
+    position: absolute;
+    right: 12px;
+    top: 9px;
+  }
 }

frontend/src/views/chart/components/component-style/TitleSelector.vue

@@ -12,10 +12,10 @@
           :label="$t('chart.show')"
           class="form-item"
         >
-          <el-checkbox
+          <el-switch
             v-model="titleForm.show"
             @change="changeTitleStyle('show')"
-          >{{ $t('chart.show') }}</el-checkbox>
+          />
         </el-form-item>
         <div v-show="showProperty('show') && titleForm.show">
           <el-form-item

frontend/src/views/dataset/add/AddApi.vue

@@ -32,6 +32,7 @@
       <el-select
         v-model="dataSource"
         class="ds-list"
+        popper-class="db-multiple-select-pop"
         filterable
         :placeholder="$t('dataset.pls_slc_data_source')"
         size="small"
@@ -623,20 +624,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.db-select-pop {
-  .selected::after {
-    content: '';
-    width: 6px;
-    height: 12px;
-    position: absolute;
-    right: 12px;
-    top: 9px;
-    border: 2px solid #3370ff;
-    border-top-color: rgba(0, 0, 0, 0);
-    border-left-color: rgba(0, 0, 0, 0);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-}
-</style>

frontend/src/views/dataset/add/AddDB.vue

@@ -33,7 +33,7 @@
         v-model="dataSource"
         class="ds-list"
         filterable
-        popper-class="db-select-pop"
+        popper-class="db-multiple-select-pop"
         :placeholder="$t('dataset.pls_slc_data_source')"
         size="small"
       >
@@ -640,20 +640,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.db-select-pop {
-  .selected::after {
-    content: '';
-    width: 6px;
-    height: 12px;
-    position: absolute;
-    right: 12px;
-    top: 9px;
-    border: 2px solid #3370ff;
-    border-top-color: rgba(0, 0, 0, 0);
-    border-left-color: rgba(0, 0, 0, 0);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-}
-</style>

frontend/src/views/dataset/form.vue

@@ -21,7 +21,7 @@
             style="left: 55px"
             class="el-form-item__error"
           >
-            {{ $t('deDataset.already_Exists') }}
+            {{ $t('deDataset.already_exists') }}
           </div>
         </template>
         <template v-else>

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

@@ -291,9 +291,10 @@
           ['oracle', 'sqlServer', 'pg', 'redshift', 'db2'].includes(form.type)
         "
         class="schema-label"
+        prop="configuration.schema"
       >
         <template slot="label">
-          {{ $t('datasource.schema') }}
+          <span class="name">{{ $t('datasource.schema') }}<i class="required" /></span>
           <el-button
             type="text"
             icon="el-icon-plus"
@@ -895,6 +896,13 @@ export default {
             trigger: 'blur'
           }
         ],
+        'configuration.schema': [
+          {
+            required: true,
+            message: i18n.t('datasource.please_input_connect_timeout'),
+            trigger: 'blur'
+          }
+        ],
         url: [
           {
             required: true,
@@ -1617,4 +1625,20 @@ export default {
     }
   }
 }
+.schema-label {
+  ::v-deep.el-form-item__label {
+    display: flex;
+    justify-content: space-between;
+    &::after {
+      display: none;
+    }
+    .name {
+      .required::after {
+        content: "*";
+        color: #f54a45;
+        margin-left: 2px;
+      }
+    }
+  }
+}
 </style>

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

@@ -661,8 +661,11 @@ export default {
       })
     },
     getDatasourceDetail(id, showModel) {
+      this.formLoading = true
       return getDatasourceDetail(id).then((res) => {
         this.params = { ...res.data, showModel }
+      }).finally(() => {
+        this.formLoading = false
       })
     },
     queryTreeData() {
@@ -1062,7 +1065,7 @@ export default {
                 } else {
                   this.openMessageSuccess(
                     res.message.substring(0, 2500) + '......',
-                    'danger'
+                    'error'
                   )
                 }
               }
@@ -1082,7 +1085,7 @@ export default {
                   } else {
                     this.openMessageSuccess(
                       res.message.substring(0, 2500) + '......',
-                      'danger'
+                      'error'
                     )
                   }
                 }