Merge pull request #4577 from dataease/dev

merge dev

backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java

@@ -880,6 +880,7 @@ public class OracleQueryProvider extends QueryProvider {
             ChartViewFieldDTO f = new ChartViewFieldDTO();
             f.setOriginName(datasetTableField.getOriginName());
             f.setDeType(0);
+            f.setType(datasetTableField.getType());
             xAxis.add(f);
         });
 
@@ -916,7 +917,7 @@ public class OracleQueryProvider extends QueryProvider {
                     continue;
                 }
                 String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
-                if(datasetTableField.getType().equals("DATE")){
+                if(xAxis.get(i).getType().equals("DATE")){
                     originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT);
                 }
                 String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName());

frontend/src/api/system/user.js

@@ -35,6 +35,7 @@ export const addUser = (data) => {
   return request({
     url: pathMap.createPath,
     method: 'post',
+    loading: true,
     data
   })
 }

frontend/src/views/system/user/UserEditer.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="formType == 'add' ? $t('user.create') : $t('user.modify')"
     :visible.sync="dialogVisible"
     class="user-editer-form"
@@ -229,6 +230,7 @@ import { pluginLoaded, defaultPwd, wecomStatus, dingtalkStatus, larkStatus } fro
 export default {
   data() {
     return {
+      loading: false,
       defaultProps: {
         children: 'children',
         label: 'label',
@@ -553,12 +555,13 @@ export default {
     save() {
       this.$refs.createUserForm.validate((valid) => {
         if (valid) {
-          // !this.form.deptId && (this.form.deptId = 0)
+          this.loading = true
           const method = this.formType === 'add' ? addUser : editUser
           method(this.form).then((res) => {
             this.$success(this.$t('commons.save_success'))
             this.reset()
             this.$emit('saved')
+            this.loading = false
           })
         } else {
           return false