组件目录调整

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fs-admin",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "scripts": {
     "dev": "vite --host",
     "build": "run-p type-check build-only",

src/components.d.ts

@@ -10,9 +10,9 @@ export {}
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AddNode: typeof import('./components/workflow/addNode.vue')['default']
-    AdvancedForm: typeof import('./components/form/AdvancedForm.vue')['default']
+    AdvancedForm: typeof import('./components/core/form/AdvancedForm.vue')['default']
     ApproverDrawer: typeof import('./components/workflow/drawer/approverDrawer.vue')['default']
-    BasicForm: typeof import('./components/form/BasicForm.vue')['default']
+    BasicForm: typeof import('./components/core/form/BasicForm.vue')['default']
     ConditionDrawer: typeof import('./components/workflow/drawer/conditionDrawer.vue')['default']
     CopyerDrawer: typeof import('./components/workflow/drawer/copyerDrawer.vue')['default']
     Cropper: typeof import('./components/avatar/cropper.vue')['default']
@@ -20,7 +20,7 @@ declare module '@vue/runtime-core' {
     DesignerHeader: typeof import('./components/designer/DesignerHeader.vue')['default']
     DesignerRender: typeof import('./components/designer/DesignerRender.vue')['default']
     DesignerSetting: typeof import('./components/designer/DesignerSetting.vue')['default']
-    DialogForm: typeof import('./components/form/DialogForm.vue')['default']
+    DialogForm: typeof import('./components/core/form/DialogForm.vue')['default']
     DynamicFormEdit: typeof import('./components/DynamicFormEdit.vue')['default']
     Echarts: typeof import('./components/echarts/Echarts.vue')['default']
     ElArea: typeof import('./components/ElArea.vue')['default']
@@ -32,24 +32,24 @@ declare module '@vue/runtime-core' {
     EmployeesRoleDialog: typeof import('./components/workflow/dialog/employeesRoleDialog.vue')['default']
     ErrorDialog: typeof import('./components/workflow/dialog/errorDialog.vue')['default']
     Exception: typeof import('./components/Exception.vue')['default']
-    FormComp: typeof import('./components/form/FormComp.vue')['default']
+    FormComp: typeof import('./components/core/form/FormComp.vue')['default']
     FormDesigner: typeof import('./components/designer/FormDesigner.vue')['default']
-    GlobalAside: typeof import('./components/GlobalAside.vue')['default']
-    GlobalFooter: typeof import('./components/GlobalFooter.vue')['default']
-    GlobalHeader: typeof import('./components/GlobalHeader.vue')['default']
-    GlobalMenu: typeof import('./components/GlobalMenu.vue')['default']
-    GlobalNews: typeof import('./components/GlobalNews.vue')['default']
-    GlobalSetting: typeof import('./components/GlobalSetting.vue')['default']
-    GlobalSubMenu: typeof import('./components/GlobalSubMenu.vue')['default']
-    GlobalTabs: typeof import('./components/GlobalTabs.vue')['default']
+    GlobalAside: typeof import('./components/core/GlobalAside.vue')['default']
+    GlobalFooter: typeof import('./components/core/GlobalFooter.vue')['default']
+    GlobalHeader: typeof import('./components/core/GlobalHeader.vue')['default']
+    GlobalMenu: typeof import('./components/core/GlobalMenu.vue')['default']
+    GlobalNews: typeof import('./components/core/GlobalNews.vue')['default']
+    GlobalSetting: typeof import('./components/core/GlobalSetting.vue')['default']
+    GlobalSubMenu: typeof import('./components/core/GlobalSubMenu.vue')['default']
+    GlobalTabs: typeof import('./components/core/GlobalTabs.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload.vue')['default']
     NodeWrap: typeof import('./components/workflow/nodeWrap.vue')['default']
     OrgLayout: typeof import('./components/org/OrgLayout.vue')['default']
     OrgList: typeof import('./components/org/OrgList.vue')['default']
     PaneModel: typeof import('./components/splitpanes/PaneModel.vue')['default']
-    ProCardList: typeof import('./components/ProCardList.vue')['default']
-    ProForm: typeof import('./components/form/ProForm.vue')['default']
-    ProTable: typeof import('./components/ProTable.vue')['default']
+    ProCardList: typeof import('./components/core/ProCardList.vue')['default']
+    ProForm: typeof import('./components/core/form/ProForm.vue')['default']
+    ProTable: typeof import('./components/core/ProTable.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SelectBox: typeof import('./components/workflow/selectBox.vue')['default']

src/components/ElEmployees.vue

@@ -7,6 +7,7 @@ interface Props {
 }
 const props = defineProps<Props>()
 const emits = defineEmits(['update:modelValue'])
+
 const list = ref<any>([])
 const userList = ref<any>([])
 const data = ref<any>([])
@@ -16,23 +17,25 @@ const selectValue = computed({
     emits('update:modelValue', value)
   }
 })
+
+const employeesOption = ref<any>(null)
 const visibleDialog = ref<boolean>(false)
-const employeesoption = ref<any>(null)
 const handleTestTasks = (res: any) => {
-  employeesoption.value.blur()
+  employeesOption.value.blur()
   visibleDialog.value = true
 }
 const saveDialog = () => {
   selectValue.value = userList.value
   visibleDialog.value = false
 }
+
 getUserList(props.type).then(res => {
   data.value = res
 })
 </script>
 
 <template>
-  <el-select ref="employeesoption" v-model="selectValue" @focus="handleTestTasks">
+  <el-select ref="employeesOption" v-model="selectValue" @focus="handleTestTasks">
     <el-option v-for="item in list" :key="item.id" :label="item.name" :value="item.id">{{ item.name }} </el-option>
   </el-select>
   <el-dialog title="选择成员" v-model="visibleDialog" append-to-body>