feat: 组织机构

backend/src/main/java/io/dataease/controller/sys/SysDeptController.java

 package io.dataease.controller.sys;
 
 import io.dataease.base.domain.SysDept;
+import io.dataease.controller.ResultHolder;
 import io.dataease.service.sys.DeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,7 +17,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @Api(tags = "系统：部门管理")
 @RequestMapping("/api/dept")
-public class SysDeptController {
+public class SysDeptController extends ResultHolder {
 
 
     @Resource
@@ -24,9 +25,9 @@ public class SysDeptController {
 
     @ApiOperation("查询部门")
     @PostMapping("/root")
-    public List<SysDept> rootData(){
+    public ResultHolder rootData(){
         List<SysDept> root = deptService.root();
-        return root;
+        return success(root);
     }
 
     @ApiOperation("新增部门")

frontend/package.json

@@ -46,7 +46,8 @@
     "vuedraggable": "^2.24.3",
     "vuex": "^3.1.2",
     "xml-js": "^1.6.11",
-    "yan-progress": "^1.0.3"
+    "yan-progress": "^1.0.3",
+    "@riophae/vue-treeselect": "0.4.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",

frontend/src/business/App.vue

@@ -15,7 +15,7 @@
         <!-- float right -->
         <ms-user/>
         <ms-language-switch/>
-        <ms-header-org-ws/>
+        <!-- <ms-header-org-ws/> -->
       </el-col>
     </el-row>
 

frontend/src/business/components/settings/router.js

@@ -14,7 +14,7 @@ export default {
     },
     {
       path: 'organization',
-      component: () => import('@/business/components/settings/system/Organization'),
+      component: () => import('@/business/components/settings/sys/dept'),
       meta: {system: true, title: 'commons.organization'}
     },
     // {

frontend/src/business/components/settings/sys/test.vue

+<template>
+<fu-search-bar quick-placeholder="按 姓名/邮箱 搜索" :components="components" @exec="search"/>
+  <!-- <layout-content>
+    <dynamic-table>
+      <fu-search-bar quick-placeholder="按 姓名/邮箱 搜索" :components="components" @exec="search"/>
+    </dynamic-table>
+  </layout-content> -->
+</template>
+
+<script>
+// import DynamicTable from "@/components/dynamic-table";
+// import LayoutContent from "@/components/layout/LayoutContent";
+
+export default {
+  name: "UserManagement",
+  // components: {LayoutContent, DynamicTable},
+  data() {
+    return {
+      components: [
+        {field: "name", label: "姓名", component: "FuInputComponent", defaultOperator: "eq"},
+        {field: "email", label: "Email", component: "FuInputComponent"},
+        {
+          field: "status",
+          label: "状态",
+          component: "FuSelectComponent",
+          options: [
+            {label: "运行中", value: "Running"},
+            {label: "成功", value: "Success"},
+            {label: "失败", value: "Fail"}
+          ],
+          multiple: true
+        },
+        {field: "create_time", label: "创建时间", component: "FuDateTimeComponent"},
+      ]
+    }
+  },
+  methods: {
+    search(condition) {
+      console.log(condition)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

frontend/src/business/main.js

 import Vue from 'vue';
 import ElementUI from 'element-ui';
+import Fit2CloudUI from 'fit2cloud-ui';
 import '../assets/theme/index.css';
 import icon from "../common/js/icon";
 import filters from "../common/js/filter";
@@ -31,6 +32,9 @@ Vue.use(icon);
 Vue.use(ElementUI, {
   i18n: (key, value) => i18n.t(key, value)
 });
+Vue.use(Fit2CloudUI, {
+  i18n: (key, value) => i18n.t(key, value)
+});
 Vue.use(filters);
 Vue.use(ajax);
 Vue.use(chart);

frontend/vue.config.js

@@ -28,7 +28,8 @@ module.exports = {
     }
   },
   configureWebpack: {
-    devtool: 'source-map',
+    // devtool: 'source-map',
+    devtool: 'eval-source-map',
     resolve: {
       alias: {
         '@': resolve('src')