From 7df820fb0df3aca3c5e3ca1da13f097d3ef3f471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=B5=B7=E9=80=9A?= <histone.wang@qq.com>
Date: Fri, 19 Mar 2021 19:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E7=9B=B4=E6=8E=A5=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DepartmentSelect/DepartmentSelect.vue     | 48 ++++++++++++
 _web/src/components/DepartmentSelect/index.js |  3 +
 _web/src/components/UserSelect/UserSelect.vue | 77 +++++++++++++++++++
 _web/src/components/UserSelect/index.js       |  3 +
 .../main/resources/template/addForm.vue.vm    | 14 ++++
 .../main/resources/template/editForm.vue.vm   | 14 ++++
 6 files changed, 159 insertions(+)
 create mode 100644 _web/src/components/DepartmentSelect/DepartmentSelect.vue
 create mode 100644 _web/src/components/DepartmentSelect/index.js
 create mode 100644 _web/src/components/UserSelect/UserSelect.vue
 create mode 100644 _web/src/components/UserSelect/index.js

diff --git a/_web/src/components/DepartmentSelect/DepartmentSelect.vue b/_web/src/components/DepartmentSelect/DepartmentSelect.vue
new file mode 100644
index 00000000..5203efdb
--- /dev/null
+++ b/_web/src/components/DepartmentSelect/DepartmentSelect.vue
@@ -0,0 +1,48 @@
+ <template>
+  <a-tree-select
+    :dropdownStyle="{ maxHeight: '300px', overflow: 'auto' }"
+    allowClear
+    :treeData="orgTree"
+    :placeholder="placeholder"
+    treeDefaultExpandAll
+    @change="onchange"
+  >
+    <span slot="title" slot-scope="{ id }">{{ id }}</span>
+  </a-tree-select>
+</template>
+<script>
+import { getOrgTree } from '@/api/modular/system/orgManage'
+
+export default {
+  name: 'DepartSelect',
+  props: {
+    placeholder: {
+      type: String
+    },
+    value: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      orgTree: []
+    }
+  },
+  created() {
+    this.getOrgData()
+  },
+  methods: {
+    getOrgData() {
+      getOrgTree().then((res) => {
+        this.orgTree = res
+      })
+    },
+    /**
+     * 选择树机构，初始化机构名称于表单中
+     */
+    onchange (value) {
+      this.$emit('change', value)
+    }
+  }
+}
+</script>
diff --git a/_web/src/components/DepartmentSelect/index.js b/_web/src/components/DepartmentSelect/index.js
new file mode 100644
index 00000000..68ac87d2
--- /dev/null
+++ b/_web/src/components/DepartmentSelect/index.js
@@ -0,0 +1,3 @@
+import DepartmentSelect from './DepartmentSelect'
+
+export default DepartmentSelect
diff --git a/_web/src/components/UserSelect/UserSelect.vue b/_web/src/components/UserSelect/UserSelect.vue
new file mode 100644
index 00000000..dc1e4e46
--- /dev/null
+++ b/_web/src/components/UserSelect/UserSelect.vue
@@ -0,0 +1,77 @@
+<template>
+  <a-select
+    :mode="model"
+    showSearch
+    :value="selectValue"
+    :filter-option="false"
+    :placeholder="placeholder"
+    :not-found-content="fetching ? undefined : null"
+    @search="fetchUser"
+    @change="handleChange"
+  >
+    <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+    <a-select-option v-for="d in data" :key="d.value">
+      {{ d.text }}
+    </a-select-option>
+  </a-select>
+</template>
+<script>
+import debounce from 'lodash/debounce'
+import { getUserPage } from '@/api/modular/system/userManage'
+
+export default {
+  name: 'UserSelect',
+  props: {
+    placeholder: {
+      type: String
+    },
+    value: {
+      type: String
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    const multiple = this.multiple
+    this.fetchUser = debounce(this.fetchUser, 800)
+    return {
+      data: [],
+      fetching: false,
+      selectValue: multiple ? [] : undefined,
+      model: multiple ? 'multiple' : 'default'
+    }
+  },
+  methods: {
+    fetchUser(key) {
+      console.log('fetching user', key)
+      this.data = []
+      this.fetching = true
+
+      const params = {
+        pageNo: 1,
+        pageSize: 10,
+        searchValue: key
+      }
+      this.userFetching = true
+
+      getUserPage(params).then((res) => {
+        this.data = res.rows.map(user => ({
+          text: `${user.name} ${user.account}`,
+          value: user.id
+        }))
+      }).finally(() => {
+        this.fetching = false
+      })
+    },
+    handleChange(value) {
+      Object.assign(this, {
+        selectValue: value,
+        fetching: false
+      })
+      this.$emit('change', value)
+    }
+  }
+}
+</script>
diff --git a/_web/src/components/UserSelect/index.js b/_web/src/components/UserSelect/index.js
new file mode 100644
index 00000000..813c0558
--- /dev/null
+++ b/_web/src/components/UserSelect/index.js
@@ -0,0 +1,3 @@
+import UserSelect from './UserSelect'
+
+export default UserSelect
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
index 9b609848..1a2f62ea 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/addForm.vue.vm
@@ -26,6 +26,20 @@
           has-feedback
         >
 #end
+#if (${column.effectType} == "user")
+    #if (${column.whetherRequired} == "Y")
+      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+    #else
+      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+    #end
+#end
+#if (${column.effectType} == "depart")
+    #if (${column.whetherRequired} == "Y")
+      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+    #else
+      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+    #end
+#end
 #if (${column.effectType} == "input")
 #if (${column.whetherRequired} == "Y")
           <a-input placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
diff --git a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
index 15c3c93b..7c7b944a 100644
--- a/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
+++ b/xiaonuo-base/xiaonuo-gen/src/main/resources/template/editForm.vue.vm
@@ -28,6 +28,20 @@
           has-feedback
         >
 #end
+#if (${column.effectType} == "user")
+    #if (${column.whetherRequired} == "Y")
+      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+    #else
+      <user-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+    #end
+#end
+#if (${column.effectType} == "depart")
+    #if (${column.whetherRequired} == "Y")
+      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />
+    #else
+      <depart-select placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}']" />
+    #end
+#end
 #if (${column.effectType} == "input")
 #if (${column.whetherRequired} == "Y")
           <a-input placeholder="请输入${column.columnComment}" v-decorator="['${column.javaName}', {rules: [{required: true, message: '请输入${column.columnComment}！'}]}]" />