Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

 Conflicts:

	build/vite/optimize.ts

src/views/bpm/definition/index.vue

@@ -87,7 +87,7 @@
     <MyProcessViewer
       key="designer"
       v-model="bpmnXML"
-      :value="bpmnXML"
+      :value="bpmnXML as any"
       v-bind="bpmnControlForm"
       :prefix="bpmnControlForm.prefix"
     />

src/views/bpm/group/UserGroupForm.vue

@@ -68,7 +68,7 @@ const formRules = reactive({
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const userList = ref([]) // 用户列表
+const userList = ref<any[]>([]) // 用户列表
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {

src/views/bpm/group/index.vue

@@ -117,6 +117,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as UserGroupApi from '@/api/bpm/userGroup'
 import * as UserApi from '@/api/system/user'
 import UserGroupForm from './UserGroupForm.vue'
+import { UserVO } from '@/api/system/user'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -131,7 +132,7 @@ const queryParams = reactive({
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
-const userList = ref([]) // 用户列表
+const userList = ref<UserVO[]>([]) // 用户列表
 
 /** 查询列表 */
 const getList = async () => {

src/views/bpm/model/editor/index.vue

@@ -16,7 +16,7 @@
     <!-- 流程属性器，负责编辑每个流程节点的属性 -->
     <MyProcessPenal
       key="penal"
-      :bpmnModeler="modeler"
+      :bpmnModeler="modeler as any"
       :prefix="controlForm.prefix"
       class="process-panel"
       :model="model"

src/views/bpm/model/index.vue

@@ -219,7 +219,7 @@
     <MyProcessViewer
       key="designer"
       v-model="bpmnXML"
-      :value="bpmnXML"
+      :value="bpmnXML as any"
       v-bind="bpmnControlForm"
       :prefix="bpmnControlForm.prefix"
     />

src/views/bpm/oa/leave/detail.vue

@@ -28,7 +28,7 @@ const props = defineProps({
   id: propTypes.number.def(undefined)
 })
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref({}) // 详情数据
+const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
 
 /** 获得数据 */

src/views/bpm/processInstance/create/index.vue

@@ -43,7 +43,7 @@
       </el-col>
     </el-card>
     <!-- 流程图预览 -->
-    <ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML" />
+    <ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML as any" />
   </ContentWrap>
 </template>
 <script setup lang="ts" name="BpmProcessInstanceCreate">

src/views/infra/build/index.vue

@@ -33,6 +33,12 @@
 import FcDesigner from '@form-create/designer'
 import { useClipboard } from '@vueuse/core'
 import { isString } from '@/utils/is'
+
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import xml from 'highlight.js/lib/languages/java'
+import json from 'highlight.js/lib/languages/json'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息
 
@@ -112,10 +118,6 @@ const copy = async (text: string) => {
 /**
  * 代码高亮
  */
-import hljs from 'highlight.js' // 导入代码高亮文件
-import 'highlight.js/styles/github.css' // 导入代码高亮样式
-import xml from 'highlight.js/lib/languages/java'
-import json from 'highlight.js/lib/languages/json'
 const highlightedCode = (code) => {
   // 处理语言和代码
   let language = 'json'

src/views/infra/codegen/PreviewCode.vue

@@ -59,6 +59,14 @@ import { useClipboard } from '@vueuse/core'
 import { handleTree2 } from '@/utils/tree'
 import * as CodegenApi from '@/api/infra/codegen'
 
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import java from 'highlight.js/lib/languages/java'
+import xml from 'highlight.js/lib/languages/java'
+import javascript from 'highlight.js/lib/languages/javascript'
+import sql from 'highlight.js/lib/languages/sql'
+import typescript from 'highlight.js/lib/languages/typescript'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -184,13 +192,6 @@ const copy = async (text: string) => {
 /**
  * 代码高亮
  */
-import hljs from 'highlight.js' // 导入代码高亮文件
-import 'highlight.js/styles/github.css' // 导入代码高亮样式
-import java from 'highlight.js/lib/languages/java'
-import xml from 'highlight.js/lib/languages/java'
-import javascript from 'highlight.js/lib/languages/javascript'
-import sql from 'highlight.js/lib/languages/sql'
-import typescript from 'highlight.js/lib/languages/typescript'
 const highlightedCode = (item) => {
   const language = item.filePath.substring(item.filePath.lastIndexOf('.') + 1)
   const result = hljs.highlight(language, item.code || '', true)

src/views/system/dict/data/DictDataForm.vue

@@ -122,7 +122,9 @@ const open = async (type: string, id?: number, dictType?: string) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  formData.value.dictType = dictType
+  if (dictType) {
+    formData.value.dictType = dictType
+  }
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

src/views/system/notice/NoticeForm.vue

@@ -17,9 +17,9 @@
         <el-select v-model="formData.type" clearable placeholder="请选择公告类型">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE)"
-            :key="parseInt(dict.value)"
+            :key="parseInt(dict.value as any)"
             :label="dict.label"
-            :value="parseInt(dict.value)"
+            :value="parseInt(dict.value as any)"
           />
         </el-select>
       </el-form-item>
@@ -27,9 +27,9 @@
         <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="parseInt(dict.value)"
+            :key="parseInt(dict.value as any)"
             :label="dict.label"
-            :value="parseInt(dict.value)"
+            :value="parseInt(dict.value as any)"
           />
         </el-select>
       </el-form-item>

src/views/system/notify/template/NotifyTemplateSendForm.vue

@@ -44,7 +44,6 @@
   </Dialog>
 </template>
 <script lang="ts" name="SystemNotifyTemplateSendForm" setup>
-import * as SmsTemplateApi from '@/api/system/sms/smsTemplate'
 import * as UserApi from '@/api/system/user'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 const message = useMessage() // 消息弹窗
@@ -102,8 +101,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as SmsTemplateApi.SendSmsReqVO
-    const logId = await SmsTemplateApi.sendSms(data)
+    const data = formData.value as unknown as NotifyTemplateApi.NotifySendReqVO
+    const logId = await NotifyTemplateApi.sendNotify(data)
     if (logId) {
       message.success('提交发送成功！发送结果，见发送日志编号：' + logId)
     }
@@ -121,7 +120,7 @@ const resetForm = () => {
     mobile: '',
     templateCode: '',
     templateParams: new Map()
-  }
+  } as any
   formRef.value?.resetFields()
 }
 </script>

src/views/system/oauth2/token/index.vue

@@ -80,7 +80,7 @@
           <el-button
             link
             type="danger"
-            @click="handleForceLogout(scope.row.id)"
+            @click="handleForceLogout(scope.row.accessToken)"
             v-hasPermi="['system:oauth2-token:delete']"
           >
             强退
@@ -142,12 +142,12 @@ const resetQuery = () => {
 }
 
 /** 强制退出操作 */
-const handleForceLogout = async (id: number) => {
+const handleForceLogout = async (accessToken: string) => {
   try {
     // 删除的二次确认
     await message.confirm('是否要强制退出用户')
     // 发起删除
-    await OAuth2AccessTokenApi.deleteAccessToken(id)
+    await OAuth2AccessTokenApi.deleteAccessToken(accessToken)
     message.success(t('common.success'))
     // 刷新列表
     await getList()

src/views/system/post/PostForm.vue

@@ -117,7 +117,7 @@ const resetForm = () => {
     sort: undefined,
     status: CommonStatusEnum.ENABLE,
     remark: ''
-  }
+  } as any
   formRef.value?.resetFields()
 }
 </script>