From d16bed4ad7e28dcda7646930e59f3292959bf69b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 31 Mar 2024 17:58:44 +0800
Subject: [PATCH] =?UTF-8?q?form-create-designer:=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictSelect/src/DictSelect.vue  |  9 +-----
 .../src/config/useUserSelectRule.ts           | 20 ++-----------
 src/plugins/formCreate/index.ts               |  4 ++-
 src/utils/dict.ts                             |  6 ++--
 .../system/user/components/UserSelect.vue     | 28 +++++++++++++++++++
 5 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 src/views/system/user/components/UserSelect.vue

diff --git a/src/components/DictSelect/src/DictSelect.vue b/src/components/DictSelect/src/DictSelect.vue
index c0d585ab..0b4e258a 100644
--- a/src/components/DictSelect/src/DictSelect.vue
+++ b/src/components/DictSelect/src/DictSelect.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-select :model-value="modelValue" class="w-1/1" v-bind="attrs" @change="changeValue">
+  <el-select class="w-1/1" v-bind="attrs">
     <template v-if="valueType === 'int'">
       <el-option
         v-for="(dict, index) in getIntDictOptions(dictType)"
@@ -43,11 +43,4 @@ withDefaults(defineProps<Props>(), {
 })
 const attrs = useAttrs()
 defineOptions({ name: 'DictSelect' })
-const emits = defineEmits<{
-  (e: 'update:modelValue', v: any): void
-}>()
-const changeValue = (value: any) => {
-  console.log(value)
-  emits('update:modelValue', value)
-}
 </script>
diff --git a/src/components/FormCreate/src/config/useUserSelectRule.ts b/src/components/FormCreate/src/config/useUserSelectRule.ts
index 23521134..07f70836 100644
--- a/src/components/FormCreate/src/config/useUserSelectRule.ts
+++ b/src/components/FormCreate/src/config/useUserSelectRule.ts
@@ -1,22 +1,9 @@
 import { generateUUID } from '@/utils'
-import * as UserApi from '@/api/system/user'
-import { localeProps, makeOptionsRule, makeRequiredRule } from '@/components/FormCreate/src/utils'
+import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
 
 export const useUserSelectRule = () => {
-  const label = 'aa选择器'
-  const name = 'select'
-  const userOptions = ref<{ label: string; value: number }[]>([]) // 用户下拉数据
-  onMounted(async () => {
-    const data = await UserApi.getSimpleUserList()
-    if (!data || data.length === 0) {
-      return
-    }
-    userOptions.value =
-      data?.map((item: UserApi.UserVO) => ({
-        label: item.nickname,
-        value: item.id
-      })) ?? []
-  })
+  const label = '用户选择器'
+  const name = 'UserSelect'
   return {
     icon: 'icon-select',
     label,
@@ -33,7 +20,6 @@ export const useUserSelectRule = () => {
     props(_, { t }) {
       return localeProps(t, name + '.props', [
         makeRequiredRule(),
-        makeOptionsRule(t, 'options', userOptions.value),
         { type: 'switch', field: 'multiple', title: '是否多选' },
         {
           type: 'switch',
diff --git a/src/plugins/formCreate/index.ts b/src/plugins/formCreate/index.ts
index 9e083641..2e4fc5d8 100644
--- a/src/plugins/formCreate/index.ts
+++ b/src/plugins/formCreate/index.ts
@@ -20,6 +20,7 @@ import install from '@form-create/element-ui/auto-import'
 //======================= 自定义组件 =======================
 import { UploadFile, UploadImg, UploadImgs } from '@/components/UploadFile'
 import { DictSelect } from '@/components/DictSelect'
+import UserSelect from '@/views/system/user/components/UserSelect.vue'
 
 const components = [
   ElAside,
@@ -37,7 +38,8 @@ const components = [
   UploadImg,
   UploadImgs,
   UploadFile,
-  DictSelect
+  DictSelect,
+  UserSelect
 ]
 
 // 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 1c94df38..89f1afd9 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -1,8 +1,8 @@
 /**
  * 数据字典工具类
  */
-import { useDictStoreWithOut } from '@/store/modules/dict'
-import { ElementPlusInfoType } from '@/types/elementPlus'
+import {useDictStoreWithOut} from '@/store/modules/dict'
+import {ElementPlusInfoType} from '@/types/elementPlus'
 
 const dictStore = useDictStoreWithOut()
 
@@ -137,7 +137,7 @@ export enum DICT_TYPE {
   INFRA_FILE_STORAGE = 'infra_file_storage',
 
   // ========== BPM 模块 ==========
-  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
+  BPM_MODEL_FORM_TYPE = 'bpm_model_category',
   BPM_TASK_CANDIDATE_STRATEGY = 'bpm_task_candidate_strategy',
   BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
   BPM_TASK_STATUS = 'bpm_task_status',
diff --git a/src/views/system/user/components/UserSelect.vue b/src/views/system/user/components/UserSelect.vue
new file mode 100644
index 00000000..4a94a745
--- /dev/null
+++ b/src/views/system/user/components/UserSelect.vue
@@ -0,0 +1,28 @@
+<!-- TODO puhui999: 先单独一个后面封装成通用选择组件 -->
+<template>
+  <el-select class="w-1/1" v-bind="attrs">
+    <el-option
+      v-for="(dict, index) in userOptions"
+      :key="index"
+      :label="dict.nickname"
+      :value="dict.id"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import * as UserApi from '@/api/system/user'
+
+defineOptions({ name: 'UserSelect' })
+
+const attrs = useAttrs()
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户下拉数据
+
+onMounted(async () => {
+  const data = await UserApi.getSimpleUserList()
+  if (!data || data.length === 0) {
+    return
+  }
+  userOptions.value = data
+})
+</script>