Merge branch 'main' of github.com:dataease/dataease into main

frontend/src/utils/request.js

@@ -35,8 +35,8 @@ service.interceptors.request.use(
       config.headers[LinkTokenKey] = linkToken
     }
 
-    if (store.getters.language) {
-      config.headers['Accept-Language'] = store.getters.language
+    if (i18n.locale) {
+      config.headers['Accept-Language'] = i18n.locale
     }
     // 增加loading
 

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

@@ -28,11 +28,13 @@
       </el-form-item>
       <el-form-item :label="$t('commons.organization')" prop="dept">
         <treeselect
+          ref="deptTreeSelect"
           v-model="form.deptId"
           :options="depts"
           :load-options="loadDepts"
           :auto-load-root-options="false"
           :placeholder="$t('user.choose_org')"
+          @open="filterData"
         />
       </el-form-item>
       <el-form-item :label="$t('commons.role')" prop="roleIds">
@@ -257,6 +259,15 @@ export default {
     },
     backToList() {
       this.$router.push({ name: '用户管理' })
+    },
+    filterData(instanceId) {
+      const results = this.depts.map(node => {
+        if (node.hasChildren) {
+          node.children = null
+        }
+        return node
+      })
+      this.depts = results
     }
   }
 }

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

@@ -175,7 +175,7 @@ export default {
         }
       ],
       searchConfig: {
-        useQuickSearch: false,
+        useQuickSearch: true,
         quickPlaceholder: '按姓名搜索',
         components: [
           { field: 'nick_name', label: '姓名', component: 'FuComplexInput' },