Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai

# Conflicts: # yudao-ui-admin-vue3/pnpm-lock.yaml
2023-02-07 22:56:49 +08:00
parent 1b6124a0db 745d386e7f
commit 0d5daa69fb
64 changed files with 3276 additions and 1699 deletions
--- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/detail.vue
@@ -212,9 +212,9 @@ const { proxy } = getCurrentInstance()
 // ========== 审批信息 ==========
 const id = query.id as unknown as number
 const processInstanceLoading = ref(false) // 流程实例的加载中
-const processInstance = ref({}) // 流程实例
-const runningTasks = ref([]) // 运行中的任务
-const auditForms = ref([]) // 审批任务的表单
+const processInstance = ref<any>({}) // 流程实例
+const runningTasks = ref<any[]>([]) // 运行中的任务
+const auditForms = ref<any[]>([]) // 审批任务的表单
 const auditRule = reactive({
  reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }]
 })
@@ -260,7 +260,7 @@ const detailForm = ref({

 // ========== 审批记录 ==========
 const tasksLoad = ref(true)
-const tasks = ref([])
+const tasks = ref<any[]>([])

 const getTimelineItemIcon = (item) => {
  if (item.result === 1) {
@@ -304,7 +304,7 @@ const updateAssigneeRules = ref({
  assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }]
 })
 const updateAssigneeFormRef = ref()
-const userOptions = ref([])
+const userOptions = ref<any[]>([])

 // 处理转派审批人
 const handleUpdateAssignee = (task) => {
--- a/yudao-ui-admin-vue3/src/views/system/mail/log/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/mail/log/index.vue
@@ -16,7 +16,7 @@
      <template #toMail_default="{ row }">
        <div>{{ row.toMail }}</div>
        <div v-if="row.userType && row.userId">
-          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />{{ '(' + row.userId + ')' }}
+          <DictTag :type="DICT_TYPE.USER_TYPE" :value="row.userType" />{{ '(' + row.userId + ')' }}
        </div>
      </template>
      <template #actionbtns_default="{ row }">
@@ -46,6 +46,7 @@
 </template>
 <script setup lang="ts" name="MailLog">
 // 业务相关的 import
+import { DICT_TYPE } from '@/utils/dict'
 import { allSchemas } from './log.data'
 import * as MailLogApi from '@/api/system/mail/log'
 import * as MailAccountApi from '@/api/system/mail/account'
@@ -61,7 +62,7 @@ const [registerTable] = useXTable({
  params: queryParams,
  getListApi: MailLogApi.getMailLogPageApi
 })
-const accountOptions = ref([]) // 账号下拉选项
+const accountOptions = ref<any[]>([]) // 账号下拉选项

 // 弹窗相关的变量
 const modelVisible = ref(false) // 是否显示弹出层
--- a/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/mail/template/index.vue
@@ -152,7 +152,7 @@ const [registerTable, { reload, deleteData }] = useXTable({
  getListApi: MailTemplateApi.getMailTemplatePageApi,
  deleteApi: MailTemplateApi.deleteMailTemplateApi
 })
-const accountOptions = ref([]) // 账号下拉选项
+const accountOptions = ref<any[]>([]) // 账号下拉选项

 // 弹窗相关的变量
 const modelVisible = ref(false) // 是否显示弹出层
--- a/yudao-ui-admin-vue3/src/views/system/notify/template/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/notify/template/index.vue
@@ -202,7 +202,7 @@ const submitForm = async () => {
 const sendForm = ref({
  content: '',
  params: {},
-  userId: undefined,
+  userId: 0,
  templateCode: '',
  templateParams: {}
 })
--- a/yudao-ui-admin-vue3/src/views/system/post/PostForm.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/PostForm.vue
@@ -0,0 +1,93 @@
+<template>
+  <!-- 弹窗 -->
+  <XModal id="PostForm" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
+    <!-- 表单：添加/修改 -->
+    <Form
+      ref="formRef"
+      v-if="['create', 'update'].includes(actionType)"
+      :schema="allSchemas.formSchema"
+      :rules="rules"
+    />
+    <!-- 表单：详情 -->
+    <Descriptions
+      v-if="actionType === 'detail'"
+      :schema="allSchemas.detailSchema"
+      :data="detailData"
+    />
+    <template #footer>
+      <!-- 按钮：保存 -->
+      <XButton
+        v-if="['create', 'update'].includes(actionType)"
+        type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
+        @click="submitForm()"
+      />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
+    </template>
+  </XModal>
+</template>
+<script setup lang="ts">
+import type { FormExpose } from '@/components/Form'
+import * as PostApi from '@/api/system/post'
+import { rules, allSchemas } from './post.data'
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const emit = defineEmits(['success'])
+
+// 弹窗相关的变量
+const modelVisible = ref(false) // 是否显示弹出层
+const modelTitle = ref('edit') // 弹出层标题
+const modelLoading = ref(false) // 弹出层loading
+const actionType = ref('') // 操作按钮的类型
+const actionLoading = ref(false) // 按钮 Loading
+const formRef = ref<FormExpose>() // 表单 Ref
+const detailData = ref() // 详情 Ref
+
+const openModal = async (type: string, rowId?: number) => {
+  modelLoading.value = true
+  modelTitle.value = t('action.' + type)
+  actionType.value = type
+  modelVisible.value = true
+  // 设置数据
+  if (rowId) {
+    const res = await PostApi.getPostApi(rowId)
+    if (type === 'update') {
+      unref(formRef)?.setValues(res)
+    } else if (type === 'detail') {
+      detailData.value = res
+    }
+  }
+  modelLoading.value = false
+}
+
+// 提交新增/修改的表单
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  if (!elForm) return
+  elForm.validate(async (valid) => {
+    if (valid) {
+      actionLoading.value = true
+      // 提交请求
+      try {
+        const data = unref(formRef)?.formModel as PostApi.PostVO
+        if (actionType.value === 'create') {
+          await PostApi.createPostApi(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await PostApi.updatePostApi(data)
+          message.success(t('common.updateSuccess'))
+        }
+        modelVisible.value = false
+        emit('success')
+      } finally {
+        actionLoading.value = false
+      }
+    }
+  })
+}
+
+defineExpose({ openModal: openModal })
+</script>
--- a/yudao-ui-admin-vue3/src/views/system/post/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue
@@ -9,7 +9,7 @@
          preIcon="ep:zoom-in"
          :title="t('action.add')"
          v-hasPermi="['system:post:create']"
-          @click="openModel('create')"
+          @click="openModal('create')"
        />
        <!-- 操作：导出 -->
        <XButton
@@ -25,13 +25,13 @@
        <XTextButton
          preIcon="ep:edit"
          v-hasPermi="['system:post:update']"
-          @click="openModel('update', row.id)"
+          @click="openModal('update', row.id)"
        />
        <!-- 操作：详情 -->
        <XTextButton
          preIcon="ep:view"
          v-hasPermi="['system:post:query']"
-          @click="openModel('detail', row.id)"
+          @click="openModal('detail', row.id)"
        />
        <!-- 操作：删除 -->
        <XTextButton
@@ -42,43 +42,16 @@
      </template>
    </XTable>
  </ContentWrap>
-  <!-- 弹窗 -->
-  <XModal id="postModel" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
-    <!-- 表单：添加/修改 -->
-    <Form
-      ref="formRef"
-      v-if="['create', 'update'].includes(actionType)"
-      :schema="allSchemas.formSchema"
-      :rules="rules"
-    />
-    <!-- 表单：详情 -->
-    <Descriptions
-      v-if="actionType === 'detail'"
-      :schema="allSchemas.detailSchema"
-      :data="detailData"
-    />
-    <template #footer>
-      <!-- 按钮：保存 -->
-      <XButton
-        v-if="['create', 'update'].includes(actionType)"
-        type="primary"
-        :title="t('action.save')"
-        :loading="actionLoading"
-        @click="submitForm()"
-      />
-      <!-- 按钮：关闭 -->
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
-    </template>
-  </XModal>
+  <PostForm ref="modalRef" @success="reload()" />
 </template>
 <script setup lang="ts" name="Post">
-import type { FormExpose } from '@/components/Form'
 // 业务相关的 import
 import * as PostApi from '@/api/system/post'
-import { rules, allSchemas } from './post.data'
+import { allSchemas } from './post.data'
+import PostForm from './PostForm.vue'

 const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
+const modalRef = ref()
 // 列表相关的变量
 const [registerTable, { reload, deleteData, exportList }] = useXTable({
  allSchemas: allSchemas,
@@ -86,56 +59,8 @@ const [registerTable, { reload, deleteData, exportList }] = useXTable({
  deleteApi: PostApi.deletePostApi,
  exportListApi: PostApi.exportPostApi
 })
-// 弹窗相关的变量
-const modelVisible = ref(false) // 是否显示弹出层
-const modelTitle = ref('edit') // 弹出层标题
-const modelLoading = ref(false) // 弹出层loading
-const actionType = ref('') // 操作按钮的类型
-const actionLoading = ref(false) // 按钮 Loading
-const formRef = ref<FormExpose>() // 表单 Ref
-const detailData = ref() // 详情 Ref

-const openModel = async (type: string, rowId?: number) => {
-  modelLoading.value = true
-  modelTitle.value = t('action.' + type)
-  actionType.value = type
-  modelVisible.value = true
-  // 设置数据
-  if (rowId) {
-    const res = await PostApi.getPostApi(rowId)
-    if (type === 'update') {
-      unref(formRef)?.setValues(res)
-    } else if (type === 'detail') {
-      detailData.value = res
-    }
-  }
-  modelLoading.value = false
-}
-
-// 提交新增/修改的表单
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  if (!elForm) return
-  elForm.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      // 提交请求
-      try {
-        const data = unref(formRef)?.formModel as PostApi.PostVO
-        if (actionType.value === 'create') {
-          await PostApi.createPostApi(data)
-          message.success(t('common.createSuccess'))
-        } else {
-          await PostApi.updatePostApi(data)
-          message.success(t('common.updateSuccess'))
-        }
-        modelVisible.value = false
-      } finally {
-        actionLoading.value = false
-        // 刷新列表
-        reload()
-      }
-    }
-  })
+const openModal = (type: string, rowId?: number) => {
+  modalRef.value.openModal(type, rowId)
 }
 </script>