From 21c5f168f123aeb9ce75285c4f9c174010f66a5b Mon Sep 17 00:00:00 2001
From: sen <90978650+PracticeThink@users.noreply.github.com>
Date: Thu, 19 Jun 2025 10:52:58 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E5=B7=B2=E5=BC=B9=E5=87=BA=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processInstance/detail/ProcessInstanceOperationButton.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 517c204b7..7a5559386 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -685,6 +685,7 @@ watch(
 
 /** 弹出气泡卡 */
 const openPopover = async (type: string) => {
+  if (popOverVisible.value[type] === true) return
   if (type === 'approve') {
     // 校验流程表单
     const valid = await validateNormalForm()

From b021a1784bf64234a83380ca26d717fe326a21c2 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 26 Jun 2025 11:02:54 +0800
Subject: [PATCH 02/30] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=94=9F=E6=88=90=E5=99=A8=E6=A0=91=E5=BD=A2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=B8=8D=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/formCreate/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/formCreate/index.ts b/src/plugins/formCreate/index.ts
index 07d2c51fe..4fb7ca160 100644
--- a/src/plugins/formCreate/index.ts
+++ b/src/plugins/formCreate/index.ts
@@ -54,7 +54,7 @@ import {
   ElMessage,
   ElCollapse,
   ElCollapseItem,
-  ElCard,
+  ElCard, ElTreeSelect
   // ElFormItem,
   // ElOption
 } from 'element-plus'
@@ -97,6 +97,7 @@ const components = [
   ElTableColumn,
   ElTabPane,
   ElTabs,
+  ElTreeSelect,
   ElDropdown,
   ElDropdownMenu,
   ElDropdownItem,

From 8f88c4a09bbd2eac0b2f9bde65ba66c3c81d801e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 6 Jul 2025 16:18:58 +0800
Subject: [PATCH 03/30] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=87=BD=E6=95=B0=E7=B1=BB=E5=9E=8B=20-=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=8F=98=E6=88=90=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formCreate.ts | 115 +++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 71 deletions(-)

diff --git a/src/utils/formCreate.ts b/src/utils/formCreate.ts
index 06fededec..5a0a49a3c 100644
--- a/src/utils/formCreate.ts
+++ b/src/utils/formCreate.ts
@@ -49,14 +49,17 @@ export const setConfAndFields2 = (
     detailPreview = detailPreview.value
   }
 
-  // 解析配置
+  // 修复所有函数类型（解决设计器保存后函数变成字符串的问题）。例如说：
+  // https://t.zsxq.com/rADff
+  // https://t.zsxq.com/ZfbGt
+  // https://t.zsxq.com/mHOoj
+  // https://t.zsxq.com/BSylB
   const option = JSON.parse(conf)
   const rule = decodeFields(fields)
-
   // 🔧 修复所有函数类型 - 解决设计器保存后函数变成字符串的问题
   const fixFunctions = (obj: any) => {
     if (obj && typeof obj === 'object') {
-      Object.keys(obj).forEach(key => {
+      Object.keys(obj).forEach((key) => {
         // 检查是否是函数相关的属性
         if (isFunctionProperty(key)) {
           // 如果不是函数类型，重新构建为函数
@@ -70,135 +73,107 @@ export const setConfAndFields2 = (
       })
     }
   }
-
   // 判断是否是函数属性
   const isFunctionProperty = (key: string): boolean => {
     const functionKeys = [
-      'beforeFetch',     // 请求前处理
-      'afterFetch',      // 请求后处理
-      'onSubmit',        // 表单提交
-      'onReset',         // 表单重置
-      'onChange',        // 值变化
-      'onInput',         // 输入事件
-      'onClick',         // 点击事件
-      'onFocus',         // 获取焦点
-      'onBlur',          // 失去焦点
-      'onMounted',       // 组件挂载
-      'onCreated',       // 组件创建
-      'onReload',        // 重新加载
-      'remoteMethod',    // 远程搜索方法
-      'parseFunc',       // 解析函数
-      'validator',       // 验证器
-      'asyncValidator',  // 异步验证器
-      'formatter',       // 格式化函数
-      'parser',          // 解析函数
-      'beforeUpload',    // 上传前处理
-      'onSuccess',       // 成功回调
-      'onError',         // 错误回调
-      'onProgress',      // 进度回调
-      'onPreview',       // 预览回调
-      'onRemove',        // 移除回调
-      'onExceed',        // 超出限制回调
-      'filterMethod',    // 过滤方法
-      'sortMethod',      // 排序方法
-      'loadData',        // 加载数据
-      'renderContent',   // 渲染内容
-      'render'           // 渲染函数
+      'beforeFetch', // 请求前处理
+      'afterFetch', // 请求后处理
+      'onSubmit', // 表单提交
+      'onReset', // 表单重置
+      'onChange', // 值变化
+      'onInput', // 输入事件
+      'onClick', // 点击事件
+      'onFocus', // 获取焦点
+      'onBlur', // 失去焦点
+      'onMounted', // 组件挂载
+      'onCreated', // 组件创建
+      'onReload', // 重新加载
+      'remoteMethod', // 远程搜索方法
+      'parseFunc', // 解析函数
+      'validator', // 验证器
+      'asyncValidator', // 异步验证器
+      'formatter', // 格式化函数
+      'parser', // 解析函数
+      'beforeUpload', // 上传前处理
+      'onSuccess', // 成功回调
+      'onError', // 错误回调
+      'onProgress', // 进度回调
+      'onPreview', // 预览回调
+      'onRemove', // 移除回调
+      'onExceed', // 超出限制回调
+      'filterMethod', // 过滤方法
+      'sortMethod', // 排序方法
+      'loadData', // 加载数据
+      'renderContent', // 渲染内容
+      'render' // 渲染函数
     ]
-
     // 检查是否以函数相关前缀开头
     const functionPrefixes = ['on', 'before', 'after', 'handle']
-
-    return functionKeys.includes(key) ||
-           functionPrefixes.some(prefix => key.startsWith(prefix))
+    return functionKeys.includes(key) || functionPrefixes.some((prefix) => key.startsWith(prefix))
   }
-
   // 根据函数名创建默认函数
   const createDefaultFunction = (key: string): Function => {
     switch (key) {
       case 'beforeFetch':
         return (config: any) => {
-          console.log('beforeFetch被调用:', config)
-
           // 添加认证头
           const token = localStorage.getItem('token')
           if (token) {
             config.headers = {
               ...config.headers,
-              'Authorization': 'Bearer ' + token
+              Authorization: 'Bearer ' + token
             }
           }
-
           // 添加通用请求头
           config.headers = {
             ...config.headers,
             'Content-Type': 'application/json',
             'X-Requested-With': 'XMLHttpRequest'
           }
-
           // 添加时间戳防止缓存
           config.params = {
             ...config.params,
             _t: Date.now()
           }
-
           return config
         }
-
       case 'afterFetch':
         return (data: any) => {
-          console.log('afterFetch被调用:', data)
           return data
         }
-
       case 'onSubmit':
-        return (formData: any) => {
-          console.log('onSubmit被调用:', formData)
+        return (_formData: any) => {
           return true
         }
-
       case 'onReset':
         return () => {
-          console.log('onReset被调用')
           return true
         }
-
       case 'onChange':
-        return (value: any, oldValue: any) => {
-          console.log('onChange被调用:', { value, oldValue })
-        }
-
+        return (_value: any, _oldValue: any) => {}
       case 'remoteMethod':
         return (query: string) => {
           console.log('remoteMethod被调用:', query)
         }
-
       case 'parseFunc':
         return (data: any) => {
-          console.log('parseFunc被调用:', data)
           // 默认解析逻辑：如果是数组直接返回，否则尝试获取list属性
           if (Array.isArray(data)) {
             return data
           }
           return data?.list || data?.data || []
         }
-
       case 'validator':
-        return (rule: any, value: any, callback: Function) => {
-          console.log('validator被调用:', { rule, value })
+        return (_rule: any, _value: any, callback: Function) => {
           callback()
         }
-
       case 'beforeUpload':
-        return (file: any) => {
-          console.log('beforeUpload被调用:', file)
+        return (_file: any) => {
           return true
         }
-
       default:
         // 通用默认函数
         return (...args: any[]) => {
-          console.log(`${key}被调用:`, args)
           // 对于事件处理函数，返回true表示继续执行
           if (key.startsWith('on') || key.startsWith('handle')) {
             return true
@@ -208,11 +183,9 @@ export const setConfAndFields2 = (
         }
     }
   }
-
-  // 修复option中的所有函数
+  // 修复 option 中的所有函数
   fixFunctions(option)
-
-  // 修复rule中的所有函数（包括组件的props）
+  // 修复 rule 中的所有函数（包括组件的 props）
   if (Array.isArray(rule)) {
     rule.forEach((item: any) => {
       fixFunctions(item)

From cfa25fc8d046533878d5b996bada7f93399dfc10 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 6 Jul 2025 16:40:59 +0800
Subject: [PATCH 04/30] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=94=9F=E6=88=90=E5=99=A8=E6=A0=91=E5=BD=A2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=B8=8D=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/formCreate/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/formCreate/index.ts b/src/plugins/formCreate/index.ts
index 4fb7ca160..01a57bebc 100644
--- a/src/plugins/formCreate/index.ts
+++ b/src/plugins/formCreate/index.ts
@@ -54,7 +54,8 @@ import {
   ElMessage,
   ElCollapse,
   ElCollapseItem,
-  ElCard, ElTreeSelect
+  ElCard,
+  ElTreeSelect
   // ElFormItem,
   // ElOption
 } from 'element-plus'
@@ -120,7 +121,7 @@ const components = [
   Editor,
   ElCollapse,
   ElCollapseItem,
-  ElCard,
+  ElCard
 ]
 
 // 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档

From 0efa1e986bf7cf7c8697a5b132268c94bacec627 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 6 Jul 2025 16:45:17 +0800
Subject: [PATCH 05/30] =?UTF-8?q?fix:=20form-create=20API=20=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=97=B6=EF=BC=8C=E7=BC=BA=E5=B0=91=20token=20?=
 =?UTF-8?q?=EF=BC=88https://t.zsxq.com/hK3FO=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formCreate.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/formCreate.ts b/src/utils/formCreate.ts
index 5a0a49a3c..19862f571 100644
--- a/src/utils/formCreate.ts
+++ b/src/utils/formCreate.ts
@@ -116,7 +116,8 @@ export const setConfAndFields2 = (
     switch (key) {
       case 'beforeFetch':
         return (config: any) => {
-          // 添加认证头
+          // 添加 Token 认证头。例如说：
+          // https://t.zsxq.com/hK3FO
           const token = localStorage.getItem('token')
           if (token) {
             config.headers = {

From e75ddc40ab06de93c6d9aad54bf2afcad3982296 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 8 Jul 2025 22:19:56 +0800
Subject: [PATCH 06/30] =?UTF-8?q?fix:=20=E4=B8=89=E6=96=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E7=BB=91=E5=AE=9A=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=20/system/social-user/get-bind-list=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/user/index.ts         |  7 ++++++-
 src/api/system/user/profile.ts              |  4 ----
 src/components/Cropper/src/CopperModal.vue  |  1 -
 src/views/Profile/components/UserAvatar.vue | 11 ++++++-----
 src/views/Profile/components/UserSocial.vue | 16 ++++++++--------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/api/system/social/user/index.ts b/src/api/system/social/user/index.ts
index f11231b71..9f1631dff 100644
--- a/src/api/system/social/user/index.ts
+++ b/src/api/system/social/user/index.ts
@@ -14,7 +14,7 @@ export interface SocialUserVO {
 }
 
 // 查询社交用户列表
-export const getSocialUserPage = async (params) => {
+export const getSocialUserPage = async (params: any) => {
   return await request.get({ url: `/system/social-user/page`, params })
 }
 
@@ -22,3 +22,8 @@ export const getSocialUserPage = async (params) => {
 export const getSocialUser = async (id: number) => {
   return await request.get({ url: `/system/social-user/get?id=` + id })
 }
+
+// 获得绑定社交用户列表
+export const getBindSocialUserList = async () => {
+  return await request.get({ url: '/system/social-user/get-bind-list' })
+}
diff --git a/src/api/system/user/profile.ts b/src/api/system/user/profile.ts
index 2e2790129..7ac8df1ce 100644
--- a/src/api/system/user/profile.ts
+++ b/src/api/system/user/profile.ts
@@ -16,10 +16,6 @@ export interface ProfileVO {
     id: number
     name: string
   }[]
-  socialUsers: {
-    type: number
-    openid: string
-  }[]
   email: string
   mobile: string
   sex: number
diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue
index 05b8d87b9..d9a4e341f 100644
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -181,7 +181,6 @@ function openModal() {
 }
 
 function closeModal() {
-  debugger
   dialogVisible.value = false
 }
 
diff --git a/src/views/Profile/components/UserAvatar.vue b/src/views/Profile/components/UserAvatar.vue
index 8f3bedbf1..23ecc3afe 100644
--- a/src/views/Profile/components/UserAvatar.vue
+++ b/src/views/Profile/components/UserAvatar.vue
@@ -18,7 +18,6 @@ import { useUserStore } from '@/store/modules/user'
 import { useUpload } from '@/components/UploadFile/src/useUpload'
 import { UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
 
-// TODO @芋艿：合并到 ProfileUser 组件中，更简洁一点
 defineOptions({ name: 'UserAvatar' })
 
 defineProps({
@@ -30,10 +29,12 @@ const userStore = useUserStore()
 const cropperRef = ref()
 const handelUpload = async ({ data }) => {
   const { httpRequest } = useUpload()
-  const avatar = ((await httpRequest({
-    file: data,
-    filename: 'avatar.png',
-  } as UploadRequestOptions)) as unknown as { data: string }).data
+  const avatar = (
+    (await httpRequest({
+      file: data,
+      filename: 'avatar.png'
+    } as UploadRequestOptions)) as unknown as { data: string }
+  ).data
   await updateUserProfile({ avatar })
 
   // 关闭弹窗，并更新 userStore
diff --git a/src/views/Profile/components/UserSocial.vue b/src/views/Profile/components/UserSocial.vue
index b7f955be8..8d2535471 100644
--- a/src/views/Profile/components/UserSocial.vue
+++ b/src/views/Profile/components/UserSocial.vue
@@ -23,7 +23,7 @@
 </template>
 <script lang="ts" setup>
 import { SystemUserSocialTypeEnum } from '@/utils/constants'
-import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
+import { getBindSocialUserList } from '@/api/system/social/user'
 import { socialAuthRedirect, socialBind, socialUnbind } from '@/api/system/user/socialUser'
 
 defineOptions({ name: 'UserSocial' })
@@ -32,19 +32,19 @@ defineProps<{
 }>()
 const message = useMessage()
 const socialUsers = ref<any[]>([])
-const userInfo = ref<ProfileVO>()
 
 const initSocial = async () => {
   socialUsers.value = [] // 重置避免无限增长
-  const res = await getUserProfile()
-  userInfo.value = res
+  // 获取已绑定的社交用户列表
+  const bindSocialUserList = await getBindSocialUserList()
+  // 检查该社交平台是否已绑定
   for (const i in SystemUserSocialTypeEnum) {
     const socialUser = { ...SystemUserSocialTypeEnum[i] }
     socialUsers.value.push(socialUser)
-    if (userInfo.value?.socialUsers) {
-      for (const j in userInfo.value.socialUsers) {
-        if (socialUser.type === userInfo.value.socialUsers[j].type) {
-          socialUser.openid = userInfo.value.socialUsers[j].openid
+    if (bindSocialUserList && bindSocialUserList.length > 0) {
+      for (const bindUser of bindSocialUserList) {
+        if (socialUser.type === bindUser.type) {
+          socialUser.openid = bindUser.openid
           break
         }
       }

From 2e495f131230742b45f7d81ed6e7020aaba70654 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 10 Jul 2025 13:29:43 +0800
Subject: [PATCH 07/30] =?UTF-8?q?fix:=20=E3=80=90SYSTEM=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E3=80=91=E6=9C=AA=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=EF=BC=8C=E4=B8=8D=E4=BD=BF=E7=94=A8=20url=20?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=A7=9F=E6=88=B7=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Login/components/LoginForm.vue    | 12 +++++++-----
 src/views/Login/components/RegisterForm.vue | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index fa6612362..37d8b8c7c 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -239,11 +239,13 @@ const getLoginFormCache = () => {
 }
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
-  const website = location.host
-  const res = await LoginApi.getTenantByWebsite(website)
-  if (res) {
-    loginData.loginForm.tenantName = res.name
-    authUtil.setTenantId(res.id)
+  if (loginData.tenantEnable === 'true') {
+    const website = location.host
+    const res = await LoginApi.getTenantByWebsite(website)
+    if (res) {
+      loginData.loginForm.tenantName = res.name
+      authUtil.setTenantId(res.id)
+    }
   }
 }
 const loading = ref() // ElLoading.service 返回的实例
diff --git a/src/views/Login/components/RegisterForm.vue b/src/views/Login/components/RegisterForm.vue
index 73f276ca0..a1243efa7 100644
--- a/src/views/Login/components/RegisterForm.vue
+++ b/src/views/Login/components/RegisterForm.vue
@@ -233,11 +233,13 @@ const getTenantId = async () => {
 
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
-  const website = location.host
-  const res = await LoginApi.getTenantByWebsite(website)
-  if (res) {
-    registerData.registerForm.tenantName = res.name
-    authUtil.setTenantId(res.id)
+  if (registerData.tenantEnable === 'true') {
+    const website = location.host
+    const res = await LoginApi.getTenantByWebsite(website)
+    if (res) {
+      registerData.registerForm.tenantName = res.name
+      authUtil.setTenantId(res.id)
+    }
   }
 }
 const loading = ref() // ElLoading.service 返回的实例

From a61fe176ce23c20fe8026e3731a1716a5b60814d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 14 Jul 2025 12:24:19 +0800
Subject: [PATCH 08/30] =?UTF-8?q?fix:=20=E3=80=90MALL=20=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E-=E6=BB=A1=E5=87=8F=E9=80=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E4=B8=AD=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E4=BF=9D=E5=AD=98=E4=B8=8D=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rewardActivity/components/RewardRuleCouponSelect.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
index ccadd0b9e..504e72275 100644
--- a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
+++ b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
@@ -107,16 +107,15 @@ const initGiveCouponList = async () => {
 
 /** 设置赠送的优惠券 */
 const setGiveCouponList = () => {
-  if (isEmpty(rewardRule.value) || isEmpty(list.value)) {
+  if (isEmpty(rewardRule.value)) {
     return
   }
+  // 核心：清空 rewardRule.value.giveCouponTemplateCounts，解决删除不生效的问题
+  rewardRule.value.giveCouponTemplateCounts = {}
 
   // 设置优惠券和其数量的对应
   list.value.forEach((rule) => {
-    if (!rewardRule.value.giveCouponTemplateCounts) {
-      rewardRule.value.giveCouponTemplateCounts = {}
-    }
-    rewardRule.value.giveCouponTemplateCounts[rule.id] = rule.giveCount!
+    rewardRule.value.giveCouponTemplateCounts![rule.id] = rule.giveCount!
   })
 }
 defineExpose({ setGiveCouponList })

From 6e9733dd55a571f2bdebef014cbaa203cf8adf15 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 14 Jul 2025 12:42:07 +0800
Subject: [PATCH 09/30] =?UTF-8?q?fix:=20=E3=80=90CRM=20=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E3=80=91=E8=B7=9F=E8=BF=9B?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E3=80=81=E5=9B=BE=E7=89=87=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/followup/index.vue | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/views/crm/followup/index.vue b/src/views/crm/followup/index.vue
index d0b22716e..720af8671 100644
--- a/src/views/crm/followup/index.vue
+++ b/src/views/crm/followup/index.vue
@@ -24,6 +24,38 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="跟进内容" prop="content" />
+      <el-table-column label="图片" align="center">
+        <template #default="scope">
+          <div v-if="scope.row.picUrls && scope.row.picUrls.length > 0" class="flex">
+            <el-image
+              v-for="(url, index) in scope.row.picUrls"
+              :key="index"
+              :src="url"
+              :preview-src-list="scope.row.picUrls"
+              class="w-10 h-10 mr-1"
+              :initial-index="index"
+              fit="cover"
+              preview-teleported
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" align="center">
+        <template #default="scope">
+          <div v-if="scope.row.fileUrls && scope.row.fileUrls.length > 0" class="flex flex-col">
+            <el-link
+              v-for="(url, index) in scope.row.fileUrls"
+              :key="index"
+              :href="url"
+              type="primary"
+              target="_blank"
+              download
+            >
+              {{ getFileName(url) }}
+            </el-link>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -97,6 +129,14 @@ import { BizTypeEnum } from '@/api/crm/permission'
 
 /** 跟进记录列表 */
 defineOptions({ name: 'FollowUpRecord' })
+
+const getFileName = (url: string) => {
+  if (!url) {
+    return ''
+  }
+  return url.substring(url.lastIndexOf('/') + 1)
+}
+
 const props = defineProps<{
   bizType: number
   bizId: number

From 288a134f874512f2446232440430754864821653 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Mon, 14 Jul 2025 14:39:17 +0800
Subject: [PATCH 10/30] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E5=8F=8A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Login/Login.vue                     |  2 +-
 .../Login/components/ForgetPasswordForm.vue   | 36 +++++++++----------
 src/views/Login/components/LoginForm.vue      | 36 +++++++++----------
 src/views/Login/components/MobileForm.vue     | 20 +++++------
 src/views/Login/components/QrCodeForm.vue     | 14 ++++----
 src/views/Login/components/RegisterForm.vue   | 24 ++++++-------
 src/views/Login/components/SSOLogin.vue       |  8 ++---
 7 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index b2ff3809c..30af14f6e 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -118,4 +118,4 @@ $prefix-cls: #{$namespace}-login;
     background-color: var(--login-bg-color);
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Login/components/ForgetPasswordForm.vue b/src/views/Login/components/ForgetPasswordForm.vue
index 0b6c56a72..0c3b2e04f 100644
--- a/src/views/Login/components/ForgetPasswordForm.vue
+++ b/src/views/Login/components/ForgetPasswordForm.vue
@@ -9,14 +9,14 @@
     label-width="120px"
     size="large"
   >
-    <el-row style="margin-right: -10px; margin-left: -10px">
+    <el-row class="mx-[-10px]">
       <!-- 租户名 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <LoginFormTitle style="width: 100%" />
+          <LoginFormTitle class="w-full" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item v-if="resetPasswordData.tenantEnable === 'true'" prop="tenantName">
           <el-input
             v-model="resetPasswordData.tenantName"
@@ -28,7 +28,7 @@
         </el-form-item>
       </el-col>
       <!-- 手机号 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="mobile">
           <el-input
             v-model="resetPasswordData.mobile"
@@ -45,7 +45,7 @@
         @success="getSmsCode"
       />
       <!-- 验证码 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="code">
           <el-row :gutter="5" justify="space-between" style="width: 100%">
             <el-col :span="24">
@@ -73,44 +73,44 @@
           </el-row>
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="password">
           <InputPassword
             v-model="resetPasswordData.password"
             :placeholder="t('login.passwordPlaceholder')"
-            style="width: 100%"
-            strength="true"
+            class="w-full"
+            :strength="true"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="check_password">
           <InputPassword
             v-model="resetPasswordData.check_password"
             :placeholder="t('login.checkPassword')"
-            style="width: 100%"
-            strength="true"
+            class="w-full"
+            :strength="true"
           />
         </el-form-item>
       </el-col>
       <!-- 登录按钮 / 返回按钮 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.resetPassword')"
-            class="w-[100%]"
+            class="w-full"
             type="primary"
             @click="resetPassword()"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.backLogin')"
-            class="w-[100%]"
+            class="w-full"
             @click="handleBackLogin()"
           />
         </el-form-item>
@@ -134,7 +134,7 @@ const verify = ref()
 
 const { t } = useI18n()
 const message = useMessage()
-const { currentRoute, push } = useRouter()
+const { currentRoute } = useRouter()
 const formSmsResetPassword = ref()
 const loginLoading = ref(false)
 const iconHouse = useIcon({ icon: 'ep:house' })
@@ -145,7 +145,7 @@ const { handleBackLogin, getLoginState, setLoginState } = useLoginState()
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD)
 const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文字
 
-const validatePass2 = (rule, value, callback) => {
+const validatePass2 = (_rule, value, callback) => {
   if (value === '') {
     callback(new Error('请再次输入密码'))
   } else if (value !== resetPasswordData.password) {
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 37d8b8c7c..3c4e1d1a9 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -9,13 +9,13 @@
     label-width="120px"
     size="large"
   >
-    <el-row style="margin-right: -10px; margin-left: -10px">
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+    <el-row class="mx-[-10px]">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <LoginFormTitle style="width: 100%" />
+          <LoginFormTitle class="w-full" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
           <el-input
             v-model="loginData.loginForm.tenantName"
@@ -26,7 +26,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="username">
           <el-input
             v-model="loginData.loginForm.username"
@@ -35,7 +35,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="password">
           <el-input
             v-model="loginData.loginForm.password"
@@ -49,7 +49,7 @@
       </el-col>
       <el-col
         :span="24"
-        style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
+        class="px-10px mt-[-20px] mb-[-20px]"
       >
         <el-form-item>
           <el-row justify="space-between" style="width: 100%">
@@ -60,7 +60,7 @@
             </el-col>
             <el-col :offset="6" :span="12">
               <el-link
-                style="float: right"
+                class="float-right"
                 type="primary"
                 @click="setLoginState(LoginStateEnum.RESET_PASSWORD)"
               >
@@ -70,12 +70,12 @@
           </el-row>
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.login')"
-            class="w-[100%]"
+            class="w-full"
             type="primary"
             @click="getCode()"
           />
@@ -89,27 +89,27 @@
         mode="pop"
         @success="handleLogin"
       />
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <el-row :gutter="5" justify="space-between" style="width: 100%">
             <el-col :span="8">
               <XButton
                 :title="t('login.btnMobile')"
-                class="w-[100%]"
+                class="w-full"
                 @click="setLoginState(LoginStateEnum.MOBILE)"
               />
             </el-col>
             <el-col :span="8">
               <XButton
                 :title="t('login.btnQRCode')"
-                class="w-[100%]"
+                class="w-full"
                 @click="setLoginState(LoginStateEnum.QR_CODE)"
               />
             </el-col>
             <el-col :span="8">
               <XButton
                 :title="t('login.btnRegister')"
-                class="w-[100%]"
+                class="w-full"
                 @click="setLoginState(LoginStateEnum.REGISTER)"
               />
             </el-col>
@@ -117,9 +117,9 @@
         </el-form-item>
       </el-col>
       <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <div class="w-[100%] flex justify-between">
+          <div class="w-full flex justify-between">
             <Icon
               v-for="(item, key) in socialList"
               :key="key"
@@ -133,9 +133,9 @@
         </el-form-item>
       </el-col>
       <el-divider content-position="center">萌新必读</el-divider>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <div class="w-[100%] flex justify-between">
+          <div class="w-full flex justify-between">
             <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
             <el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>
             <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">
diff --git a/src/views/Login/components/MobileForm.vue b/src/views/Login/components/MobileForm.vue
index 7f5d9942e..bb4f1a69f 100644
--- a/src/views/Login/components/MobileForm.vue
+++ b/src/views/Login/components/MobileForm.vue
@@ -9,14 +9,14 @@
     label-width="120px"
     size="large"
   >
-    <el-row style="margin-right: -10px; margin-left: -10px">
+    <el-row class="mx-[-10px]">
       <!-- 租户名 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <LoginFormTitle style="width: 100%" />
+          <LoginFormTitle class="w-full" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
           <el-input
             v-model="loginData.loginForm.tenantName"
@@ -28,7 +28,7 @@
         </el-form-item>
       </el-col>
       <!-- 手机号 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="mobileNumber">
           <el-input
             v-model="loginData.loginForm.mobileNumber"
@@ -38,7 +38,7 @@
         </el-form-item>
       </el-col>
       <!-- 验证码 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="code">
           <el-row :gutter="5" justify="space-between" style="width: 100%">
             <el-col :span="24">
@@ -68,23 +68,23 @@
         </el-form-item>
       </el-col>
       <!-- 登录按钮 / 返回按钮 -->
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.login')"
-            class="w-[100%]"
+            class="w-full"
             type="primary"
             @click="signIn()"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.backLogin')"
-            class="w-[100%]"
+            class="w-full"
             @click="handleBackLogin()"
           />
         </el-form-item>
diff --git a/src/views/Login/components/QrCodeForm.vue b/src/views/Login/components/QrCodeForm.vue
index 2670d000a..601052d52 100644
--- a/src/views/Login/components/QrCodeForm.vue
+++ b/src/views/Login/components/QrCodeForm.vue
@@ -1,17 +1,17 @@
 <template>
-  <el-row v-show="getShow" class="login-form" style="margin-right: -10px; margin-left: -10px">
-    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
-      <LoginFormTitle style="width: 100%" />
+  <el-row v-show="getShow" class="login-form mx-[-10px]">
+    <el-col :span="24" class="px-10px">
+      <LoginFormTitle class="w-full" />
     </el-col>
-    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+    <el-col :span="24" class="px-10px">
       <el-card class="mb-10px text-center" shadow="hover">
         <Qrcode :logo="logoImg" />
       </el-card>
     </el-col>
     <el-divider class="enter-x">{{ t('login.qrcode') }}</el-divider>
-    <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
-      <div class="mt-15px w-[100%]">
-        <XButton :title="t('login.backLogin')" class="w-[100%]" @click="handleBackLogin()" />
+    <el-col :span="24" class="px-10px">
+      <div class="mt-4 w-full">
+        <XButton :title="t('login.backLogin')" class="w-full" @click="handleBackLogin()" />
       </div>
     </el-col>
   </el-row>
diff --git a/src/views/Login/components/RegisterForm.vue b/src/views/Login/components/RegisterForm.vue
index a1243efa7..0636a1c82 100644
--- a/src/views/Login/components/RegisterForm.vue
+++ b/src/views/Login/components/RegisterForm.vue
@@ -9,13 +9,13 @@
     label-width="120px"
     size="large"
   >
-    <el-row style="margin-right: -10px; margin-left: -10px">
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+    <el-row class="mx-[-10px]">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
-          <LoginFormTitle style="width: 100%" />
+          <LoginFormTitle class="w-full" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item v-if="registerData.tenantEnable === 'true'" prop="tenantName">
           <el-input
             v-model="registerData.registerForm.tenantName"
@@ -27,7 +27,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="username">
           <el-input
             v-model="registerData.registerForm.username"
@@ -37,7 +37,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="username">
           <el-input
             v-model="registerData.registerForm.nickname"
@@ -47,7 +47,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="password">
           <el-input
             v-model="registerData.registerForm.password"
@@ -60,7 +60,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item prop="confirmPassword">
           <el-input
             v-model="registerData.registerForm.confirmPassword"
@@ -73,12 +73,12 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" class="px-10px">
         <el-form-item>
           <XButton
             :loading="loginLoading"
             :title="t('login.register')"
-            class="w-[100%]"
+            class="w-full"
             type="primary"
             @click="getCode()"
           />
@@ -93,7 +93,7 @@
         @success="handleRegister"
       />
     </el-row>
-    <XButton :title="t('login.hasUser')" class="w-[100%]" @click="handleBackLogin()" />
+    <XButton :title="t('login.hasUser')" class="w-full" @click="handleBackLogin()" />
   </el-form>
 </template>
 <script lang="ts" setup>
@@ -123,7 +123,7 @@ const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文
 
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER)
 
-const equalToPassword = (rule, value, callback) => {
+const equalToPassword = (_rule, value, callback) => {
   if (registerData.registerForm.password !== value) {
     callback(new Error('两次输入的密码不一致'))
   } else {
diff --git a/src/views/Login/components/SSOLogin.vue b/src/views/Login/components/SSOLogin.vue
index 5ce34fb9d..99e359ee0 100644
--- a/src/views/Login/components/SSOLogin.vue
+++ b/src/views/Login/components/SSOLogin.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-show="ssoVisible" class="form-cont">
     <!-- 应用名 -->
-    <LoginFormTitle style="width: 100%" />
+    <LoginFormTitle class="w-full" />
     <el-tabs class="form" style="float: none" value="uname">
       <el-tab-pane :label="client.name" name="uname" />
     </el-tabs>
@@ -15,17 +15,17 @@
               v-for="scope in queryParams.scopes"
               :key="scope"
               :value="scope"
-              style="display: block; margin-bottom: -10px"
+              class="block mb-[-10px]"
             >
               {{ formatScope(scope) }}
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <!-- 下方的登录按钮 -->
-        <el-form-item class="w-1/1">
+        <el-form-item class="w-full">
           <el-button
             :loading="formLoading"
-            class="w-6/10"
+            class="w-3/5"
             type="primary"
             @click.prevent="handleAuthorize(true)"
           >

From cb755278473ece96e95a77b4b9c59e9f3c2bed81 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Mon, 14 Jul 2025 14:39:47 +0800
Subject: [PATCH 11/30] fix: defineOptions name

---
 src/views/crm/customer/CustomerImportForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/crm/customer/CustomerImportForm.vue b/src/views/crm/customer/CustomerImportForm.vue
index 17721a180..e093c3f25 100644
--- a/src/views/crm/customer/CustomerImportForm.vue
+++ b/src/views/crm/customer/CustomerImportForm.vue
@@ -56,7 +56,7 @@ import type { UploadUserFile } from 'element-plus'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
-defineOptions({ name: 'SystemUserImportForm' })
+defineOptions({ name: 'CrmCustomerImportForm' })
 
 const message = useMessage() // 消息弹窗
 

From da1090562799e5d3a7173b28e7fbd4d3e32c6756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 16 Jul 2025 16:22:04 +0800
Subject: [PATCH 12/30] =?UTF-8?q?fix:=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E3=80=91=E5=88=A0=E9=99=A4=E2=80=9C=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=B9=BF=E5=91=8A=E2=80=9D=E5=90=8E=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=88=B0=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E9=A1=B5=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DiyEditor/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index 27d3fc110..082395a92 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -269,6 +269,10 @@ watch(
     if (!val || selectedComponentIndex.value === -1) {
       return
     }
+    // 如果是基础设置页，默认选中的索引改成-1，为了防止删除组件后切换到此页导致报错
+    if (props.showTabBar) {
+      selectedComponentIndex.value = -1
+    }
     pageComponents.value[selectedComponentIndex.value] = selectedComponent.value!
   },
   { deep: true }

From 71f1a70a8eaa3ed4b95461d51a1f6475832362ee Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 17 Jul 2025 00:27:55 +0800
Subject: [PATCH 13/30] =?UTF-8?q?feat=EF=BC=9A=E3=80=90AI=20=E5=A4=A7?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91AI=20=E8=81=8A=E5=A4=A9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=80=82=E9=85=8D=E9=BB=91=E8=89=B2=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conversation/ConversationList.vue         | 13 +++++-----
 .../index/components/message/MessageList.vue  | 14 +++++------
 .../chat/index/components/role/RoleHeader.vue |  4 ++--
 .../chat/index/components/role/RoleList.vue   | 10 ++++----
 .../index/components/role/RoleRepository.vue  | 14 +++++------
 src/views/ai/chat/index/index.vue             | 24 +++++++++++--------
 6 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/src/views/ai/chat/index/components/conversation/ConversationList.vue b/src/views/ai/chat/index/components/conversation/ConversationList.vue
index 54940f827..73a4d2a27 100644
--- a/src/views/ai/chat/index/components/conversation/ConversationList.vue
+++ b/src/views/ai/chat/index/components/conversation/ConversationList.vue
@@ -391,7 +391,8 @@ onMounted(async () => {
       line-height: 30px;
 
       &.active {
-        background-color: #e6e6e6;
+        background-color: var(--el-color-primary-light-9);
+        border: 1px solid var(--el-color-primary-light-7);
 
         .button {
           display: inline-block;
@@ -409,7 +410,7 @@ onMounted(async () => {
         max-width: 220px;
         font-size: 14px;
         font-weight: 400;
-        color: rgba(0, 0, 0, 0.77);
+        color: var(--el-text-color-regular);
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
@@ -430,7 +431,7 @@ onMounted(async () => {
         display: flex;
         flex-direction: row;
         justify-items: center;
-        color: #606266;
+        color: var(--el-text-color-regular);
 
         .btn {
           margin: 0;
@@ -447,8 +448,8 @@ onMounted(async () => {
     right: 0;
     //width: 100%;
     padding: 0 20px;
-    background-color: #f4f4f4;
-    box-shadow: 0 0 1px 1px rgba(228, 228, 228, 0.8);
+    background-color: var(--el-fill-color-extra-light);
+    box-shadow: 0 0 1px 1px var(--el-border-color-lighter);
     line-height: 35px;
     display: flex;
     justify-content: space-between;
@@ -458,7 +459,7 @@ onMounted(async () => {
     > div {
       display: flex;
       align-items: center;
-      color: #606266;
+      color: var(--el-text-color-regular);
       padding: 0;
       margin: 0;
       cursor: pointer;
diff --git a/src/views/ai/chat/index/components/message/MessageList.vue b/src/views/ai/chat/index/components/message/MessageList.vue
index 2840bf944..70f7604d2 100644
--- a/src/views/ai/chat/index/components/message/MessageList.vue
+++ b/src/views/ai/chat/index/components/message/MessageList.vue
@@ -215,13 +215,13 @@ onMounted(async () => {
       display: flex;
       flex-direction: column;
       overflow-wrap: break-word;
-      background-color: rgba(228, 228, 228, 0.8);
-      box-shadow: 0 0 0 1px rgba(228, 228, 228, 0.8);
+      background-color: var(--el-fill-color-light);
+      box-shadow: 0 0 0 1px var(--el-border-color-light);
       border-radius: 10px;
       padding: 10px 10px 5px 10px;
 
       .left-text {
-        color: #393939;
+        color: var(--el-text-color-primary);
         font-size: 0.95rem;
       }
     }
@@ -232,10 +232,10 @@ onMounted(async () => {
 
       .right-text {
         font-size: 0.95rem;
-        color: #fff;
+        color: var(--el-color-white);
         display: inline;
-        background-color: #267fff;
-        box-shadow: 0 0 0 1px #267fff;
+        background-color: var(--el-color-primary);
+        box-shadow: 0 0 0 1px var(--el-color-primary);
         border-radius: 10px;
         padding: 10px;
         width: auto;
@@ -270,7 +270,7 @@ onMounted(async () => {
 
   .btn-cus:hover {
     cursor: pointer;
-    background-color: #f6f6f6;
+    background-color: var(--el-fill-color-lighter);
   }
 }
 
diff --git a/src/views/ai/chat/index/components/role/RoleHeader.vue b/src/views/ai/chat/index/components/role/RoleHeader.vue
index 17b1693bd..104597023 100644
--- a/src/views/ai/chat/index/components/role/RoleHeader.vue
+++ b/src/views/ai/chat/index/components/role/RoleHeader.vue
@@ -29,14 +29,14 @@ defineProps({
   padding: 0 10px;
   white-space: nowrap;
   text-overflow: ellipsis;
-  background-color: #ececec;
+  background-color: var(--el-bg-color-page);
   width: 100%;
 
   .title {
     font-size: 20px;
     font-weight: bold;
     overflow: hidden;
-    color: #3e3e3e;
+    color: var(--el-text-color-primary);
     max-width: 220px;
   }
 
diff --git a/src/views/ai/chat/index/components/role/RoleList.vue b/src/views/ai/chat/index/components/role/RoleList.vue
index e0388d09b..2c270bfda 100644
--- a/src/views/ai/chat/index/components/role/RoleList.vue
+++ b/src/views/ai/chat/index/components/role/RoleList.vue
@@ -13,10 +13,10 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item :command="['edit', role]">
-                  <Icon icon="ep:edit" color="#787878" />编辑
+                  <Icon icon="ep:edit" color="var(--el-text-color-placeholder)" />编辑
                 </el-dropdown-item>
-                <el-dropdown-item :command="['delete', role]" style="color: red">
-                  <Icon icon="ep:delete" color="red" />删除
+                <el-dropdown-item :command="['delete', role]" style="color: var(--el-color-danger)">
+                  <Icon icon="ep:delete" color="var(--el-color-danger)" />删除
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -153,13 +153,13 @@ const handleTabsScroll = async () => {
         .title {
           font-size: 18px;
           font-weight: bold;
-          color: #3e3e3e;
+          color: var(--el-text-color-primary);
         }
 
         .description {
           margin-top: 10px;
           font-size: 14px;
-          color: #6a6a6a;
+          color: var(--el-text-color-regular);
         }
       }
 
diff --git a/src/views/ai/chat/index/components/role/RoleRepository.vue b/src/views/ai/chat/index/components/role/RoleRepository.vue
index 246dcb4fb..c205a666a 100644
--- a/src/views/ai/chat/index/components/role/RoleRepository.vue
+++ b/src/views/ai/chat/index/components/role/RoleRepository.vue
@@ -23,7 +23,7 @@
           @click="handlerAddRole"
           class="ml-20px"
         >
-          <Icon icon="ep:user" style="margin-right: 5px;" />
+          <Icon icon="ep:user" style="margin-right: 5px" />
           添加角色
         </el-button>
       </div>
@@ -64,15 +64,15 @@
 </template>
 
 <script setup lang="ts">
-import {ref} from 'vue'
+import { ref } from 'vue'
 import RoleHeader from './RoleHeader.vue'
 import RoleList from './RoleList.vue'
 import ChatRoleForm from '@/views/ai/model/chatRole/ChatRoleForm.vue'
 import RoleCategoryList from './RoleCategoryList.vue'
-import {ChatRoleApi, ChatRolePageReqVO, ChatRoleVO} from '@/api/ai/model/chatRole'
-import {ChatConversationApi, ChatConversationVO} from '@/api/ai/chat/conversation'
-import {Search} from '@element-plus/icons-vue'
-import {TabsPaneContext} from 'element-plus'
+import { ChatRoleApi, ChatRolePageReqVO, ChatRoleVO } from '@/api/ai/model/chatRole'
+import { ChatConversationApi, ChatConversationVO } from '@/api/ai/chat/conversation'
+import { Search } from '@element-plus/icons-vue'
+import { TabsPaneContext } from 'element-plus'
 
 const router = useRouter() // 路由对象
 
@@ -244,7 +244,7 @@ onMounted(async () => {
   right: 0;
   top: 0;
   bottom: 0;
-  background-color: #ffffff;
+  background-color: var(--el-bg-color);
   overflow: hidden;
   display: flex;
   flex-direction: column;
diff --git a/src/views/ai/chat/index/index.vue b/src/views/ai/chat/index/index.vue
index ec2b552ab..e5d76cefc 100644
--- a/src/views/ai/chat/index/index.vue
+++ b/src/views/ai/chat/index/index.vue
@@ -22,13 +22,16 @@
             <Icon icon="ep:setting" class="ml-10px" />
           </el-button>
           <el-button size="small" class="btn" @click="handlerMessageClear">
-            <Icon icon="heroicons-outline:archive-box-x-mark" color="#787878" />
+            <Icon
+              icon="heroicons-outline:archive-box-x-mark"
+              color="var(--el-text-color-placeholder)"
+            />
           </el-button>
           <el-button size="small" class="btn">
-            <Icon icon="ep:download" color="#787878" />
+            <Icon icon="ep:download" color="var(--el-text-color-placeholder)" />
           </el-button>
           <el-button size="small" class="btn" @click="handleGoTopMessage">
-            <Icon icon="ep:top" color="#787878" />
+            <Icon icon="ep:top" color="var(--el-text-color-placeholder)" />
           </el-button>
         </div>
       </el-header>
@@ -613,7 +616,8 @@ onMounted(async () => {
       line-height: 30px;
 
       &.active {
-        background-color: #e6e6e6;
+        background-color: var(--el-color-primary-light-9);
+        border: 1px solid var(--el-color-primary-light-7);
 
         .button {
           display: inline-block;
@@ -649,7 +653,7 @@ onMounted(async () => {
         display: flex;
         flex-direction: row;
         justify-items: center;
-        color: #606266;
+        color: var(--el-text-color-regular);
 
         .el-icon {
           margin-right: 5px;
@@ -669,7 +673,7 @@ onMounted(async () => {
     > div {
       display: flex;
       align-items: center;
-      color: #606266;
+      color: var(--el-text-color-regular);
       padding: 0;
       margin: 0;
       cursor: pointer;
@@ -683,15 +687,15 @@ onMounted(async () => {
 
 // 头部
 .detail-container {
-  background: #ffffff;
+  background: var(--el-bg-color);
 
   .header {
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    background: #fbfbfb;
-    box-shadow: 0 0 0 0 #dcdfe6;
+    background: var(--el-bg-color-page);
+    box-shadow: 0 0 0 0 var(--el-border-color-light);
 
     .title {
       font-size: 18px;
@@ -744,7 +748,7 @@ onMounted(async () => {
     display: flex;
     flex-direction: column;
     height: auto;
-    border: 1px solid #e3e3e3;
+    border: 1px solid var(--el-border-color);
     border-radius: 10px;
     margin: 10px 20px 20px 20px;
     padding: 9px 10px;

From 8afc7fd7aa0c52797eddaed8f64da0f239ee46f6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 19 Jul 2025 19:32:44 +0800
Subject: [PATCH 14/30] =?UTF-8?q?(=E3=80=83'=E2=96=BD'=E3=80=83)=20v2.6.1?=
 =?UTF-8?q?=20=E5=8F=91=E5=B8=83=EF=BC=9AVben5=20+=20antd=20=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E6=94=AF=E6=8C=81=20BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=81CRM=20=E5=AE=A2=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6259f142c..759fa17f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "2.6.0-snapshot",
+  "version": "2.6.1-snapshot",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,

From f28778723d9e1d0759532122741a16946b0b2088 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 20 Jul 2025 10:11:06 +0800
Subject: [PATCH 15/30] =?UTF-8?q?fix:=20=E3=80=90BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91=E4=BF=AE=E5=A4=8D=20BPMN=20=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E7=94=A8=E6=88=B7=E4=BB=BB=E5=8A=A1=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=86=85=E7=94=A8=E6=88=B7=E5=AD=97=E6=AE=B5=E7=9A=84=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/task-components/UserTask.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 81088ccc3..e4091b96e 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -354,12 +354,13 @@ const resetTaskForm = () => {
 const changeCandidateStrategy = () => {
   userTaskForm.value.candidateParam = []
   deptLevel.value = 1
-  if (userTaskForm.value.candidateStrategy === CandidateStrategy.FORM_USER) {
-    // 特殊处理表单内用户字段，当只有发起人选项时应选中发起人
-    if (!userFieldOnFormOptions.value || userFieldOnFormOptions.value.length <= 1) {
-      userTaskForm.value.candidateStrategy = CandidateStrategy.START_USER
-    }
-  }
+  // 注释 by 芋艿：这个交互很多用户反馈费解，https://t.zsxq.com/xNmas 所以暂时屏蔽
+  // if (userTaskForm.value.candidateStrategy === CandidateStrategy.FORM_USER) {
+  //   // 特殊处理表单内用户字段，当只有发起人选项时应选中发起人
+  //   if (!userFieldOnFormOptions.value || userFieldOnFormOptions.value.length <= 1) {
+  //     userTaskForm.value.candidateStrategy = CandidateStrategy.START_USER
+  //   }
+  // }
   updateElementTask()
 }
 

From 75220bfd8e4f9f551839ae3c029775304cb97163 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 20 Jul 2025 21:25:07 +0800
Subject: [PATCH 16/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=94=AF=E6=8C=81=20BPMN=20?=
 =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E4=BF=AE=E6=94=B9=E5=90=8E=EF=BC=8C=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=9B=B4=E6=96=B0=E5=88=B0=20BPMN=20XML=20=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BoundaryEventTimer.vue           | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/BoundaryEventTimer.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/BoundaryEventTimer.vue
index ca46b277a..77948ce0e 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/BoundaryEventTimer.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/BoundaryEventTimer.vue
@@ -28,7 +28,12 @@
           v-model="timeDuration"
           :min="1"
           controls-position="right"
-          @change="() => updateTimeModdle()"
+          @change="
+            () => {
+              updateTimeModdle()
+              updateElementExtensions()
+            }
+          "
         />
       </el-form-item>
       <el-select
@@ -55,7 +60,12 @@
         v-model="maxRemindCount"
         :min="1"
         :max="10"
-        @change="() => updateTimeModdle()"
+        @change="
+          () => {
+            updateTimeModdle()
+            updateElementExtensions()
+          }
+        "
       />
     </el-form-item>
   </div>
@@ -65,7 +75,7 @@
 import {
   TimeUnitType,
   TIME_UNIT_TYPES,
-  TIMEOUT_HANDLER_TYPES,
+  TIMEOUT_HANDLER_TYPES
 } from '@/components/SimpleProcessDesignerV2/src/consts'
 import { convertTimeUnit } from '@/components/SimpleProcessDesignerV2/src/utils'
 
@@ -195,6 +205,7 @@ const onTimeUnitChange = () => {
     timeDuration.value = 1
   }
   updateTimeModdle()
+  updateElementExtensions()
 }
 
 const updateTimeModdle = () => {

From a27d1a578f5d6a9c785b9219e15fbd031b4eae59 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 20 Jul 2025 21:57:06 +0800
Subject: [PATCH 17/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91BPMN=20=E4=BB=BB=E5=8A=A1=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E5=99=A8=EF=BC=8C=E2=80=9C=E7=9B=91=E5=90=AC=E5=99=A8?=
 =?UTF-8?q?=20ID=E2=80=9D=E3=80=81=E2=80=9C=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E2=80=9D=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/descriptor/flowableDescriptor.json         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
index 130b59413..c98c97236 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
@@ -1014,6 +1014,16 @@
           "name": "fields",
           "type": "Field",
           "isMany": true
+        },
+        {
+          "name": "id",
+          "type": "String",
+          "isAttr": true
+        },
+        {
+          "name": "eventDefinitions",
+          "type": "bpmn:TimerEventDefinition",
+          "isMany": true
         }
       ]
     },

From 3ea5bac27a23ef3f3e5325f99a9390d5744eda24 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 08:46:26 +0800
Subject: [PATCH 18/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=BB=B4=E6=8A=A4=E6=97=B6=EF=BC=8Ckey=20=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/form/BasicInfo.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/model/form/BasicInfo.vue b/src/views/bpm/model/form/BasicInfo.vue
index 03513f41e..b937b61a1 100644
--- a/src/views/bpm/model/form/BasicInfo.vue
+++ b/src/views/bpm/model/form/BasicInfo.vue
@@ -102,7 +102,7 @@
       </div>
       <div v-if="modelData.startUserType === 2" class="mt-2 flex flex-wrap gap-2">
         <div
-          v-for="dept in selectedStartDepts" 
+          v-for="dept in selectedStartDepts"
           :key="dept.id"
           class="bg-gray-100 h-35px rounded-3xl flex items-center pr-8px dark:color-gray-600 position-relative"
         >
@@ -186,7 +186,23 @@ const currentSelectType = ref<'start' | 'manager'>('start')
 
 const rules = {
   name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }],
-  key: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
+  key: [
+    { required: true, message: '流程标识不能为空', trigger: 'blur' },
+    {
+      validator: (_rule: any, value: string, callback: any) => {
+        if (!value) {
+          callback()
+          return
+        }
+        if (!/^[a-zA-Z_][\-_.0-9_a-zA-Z$]*$/.test(value)) {
+          callback(new Error('只能包含字母、数字、下划线、连字符和点号，且必须以字母或下划线开头'))
+          return
+        }
+        callback()
+      },
+      trigger: 'blur'
+    }
+  ],
   category: [{ required: true, message: '流程分类不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }],
   visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }],

From ab46ecb8ea6a4ebb79454f485a0231fac34d3eec Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 16:02:42 +0800
Subject: [PATCH 19/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E7=9A=84=E2=80=9C=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E2=80=9D=E5=90=8E=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/CategoryDraggableModel.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 0c6f36897..21020b789 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -510,10 +510,15 @@ const isManagerUser = (row: any) => {
 
 /** 处理模型的排序 **/
 const handleModelSort = () => {
-  // 保存初始数据
-  originalData.value = cloneDeep(props.categoryInfo.modelList)
-  isModelSorting.value = true
-  initSort()
+  if (isModelSorting.value) {
+    // 如果已经在排序状态，则取消排序
+    handleModelSortCancel()
+  } else {
+    // 保存初始数据
+    originalData.value = cloneDeep(props.categoryInfo.modelList)
+    isModelSorting.value = true
+    initSort()
+  }
 }
 
 /** 处理模型的排序提交 */

From 9ac6017ccce00eedf354bab4323640de5372b592 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 16:25:23 +0800
Subject: [PATCH 20/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=97=B6=EF=BC=8Cbpmn=20=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8Ckey=20=E5=92=8C=20name=20=E6=9C=AA=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/form/index.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 42183e4d4..7a2ae3d8d 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -216,6 +216,16 @@ const initData = async () => {
     // 特殊：复制场景
     if (route.params.type === 'copy') {
       delete formData.value.id
+      if (formData.value.bpmnXml) {
+        formData.value.bpmnXml = formData.value.bpmnXml.replaceAll(
+          formData.value.name,
+          formData.value.name + '副本'
+        )
+        formData.value.bpmnXml = formData.value.bpmnXml.replaceAll(
+          formData.value.key,
+          formData.value.key + '_copy'
+        )
+      }
       formData.value.name += '副本'
       formData.value.key += '_copy'
       tagsView.setTitle('复制流程')

From 1ee658fda5204382c51b58072cce3588026e4fc2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 16:44:34 +0800
Subject: [PATCH 21/30] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20pathResolve?=
 =?UTF-8?q?=20=E5=87=BD=E6=95=B0=E5=9C=A8=20path=20=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E8=BF=94=E5=9B=9E=20parentPath=20=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E9=81=BF=E5=85=8D=E6=8B=BC=E6=8E=A5=E5=87=BA?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/routerHelper.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts
index 7a87bd75d..cf1b36222 100644
--- a/src/utils/routerHelper.ts
+++ b/src/utils/routerHelper.ts
@@ -101,7 +101,7 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
     if (!route.children && route.parentId == 0 && route.component) {
       data.component = Layout
       data.meta = {
-        hidden: meta.hidden,
+        hidden: meta.hidden
       }
       data.name = toCamelCase(route.path, true) + 'Parent'
       data.redirect = ''
@@ -170,8 +170,9 @@ const generateRoutePath = (parentPath: string, path: string) => {
 }
 export const pathResolve = (parentPath: string, path: string) => {
   if (isUrl(path)) return path
-  const childPath = path.startsWith('/') || !path ? path : `/${path}`
-  return `${parentPath}${childPath}`.replace(/\/\//g, '/')
+  if (!path) return parentPath // 修复 path 为空时返回 parentPath，避免拼接出错 https://t.zsxq.com/QVr6b
+  const childPath = path.startsWith('/') ? path : `/${path}`
+  return `${parentPath}${childPath}`.replace(/\/+/g, '/')
 }
 
 // 路由降级

From 9c217972e18130cd45b4b3dbf2c8bdb627d8a1b3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 17:10:24 +0800
Subject: [PATCH 22/30] =?UTF-8?q?fix=EF=BC=9AuserInfo.permissions=20?=
 =?UTF-8?q?=E5=85=9C=E5=BA=95=E6=98=AF=E7=A9=BA=E6=83=85=E5=86=B5=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 6876043e8..aea2eda36 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -62,7 +62,7 @@ export const useUserStore = defineStore('admin-user', {
           userInfo = await getInfo()
         } catch (error) {}
       }
-      this.permissions = new Set(userInfo.permissions)
+      this.permissions = new Set(userInfo.permissions || []) // 兜底为 [] https://t.zsxq.com/xCJew
       this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true

From ab8761d44ce65d5f5da063fd350bc7f17fef1d47 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Tue, 22 Jul 2025 07:17:20 +0800
Subject: [PATCH 23/30] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?]=20Simple=20=E6=A8=A1=E5=9E=8B=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/SimpleProcessDesigner.vue             | 73 +++++++++++++------
 src/views/bpm/model/form/ProcessDesign.vue    |  4 +-
 src/views/bpm/model/index.vue                 |  5 +-
 src/views/bpm/simple/SimpleModelDesign.vue    | 11 ++-
 4 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
index 7823c2f86..b940d6f1f 100644
--- a/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
+++ b/src/components/SimpleProcessDesignerV2/src/SimpleProcessDesigner.vue
@@ -26,8 +26,7 @@
 <script setup lang="ts">
 import SimpleProcessModel from './SimpleProcessModel.vue'
 import { SimpleFlowNode, NodeType, NodeId, NODE_DEFAULT_TEXT } from './consts'
-import { getModel } from '@/api/bpm/model'
-import { getForm, FormVO } from '@/api/bpm/form'
+import { getForm } from '@/api/bpm/form'
 import { handleTree } from '@/utils/tree'
 import * as RoleApi from '@/api/system/role'
 import * as DeptApi from '@/api/system/dept'
@@ -43,18 +42,22 @@ defineOptions({
 const emits = defineEmits(['success']) // 保存成功事件
 
 const props = defineProps({
-  modelId: {
-    type: String,
-    required: false
-  },
-  modelKey: {
-    type: String,
-    required: false
-  },
   modelName: {
     type: String,
     required: false
   },
+  // 流程表单 ID
+  modelFormId: {
+    type: Number,
+    required: false,
+    default: undefined,
+  },
+   // 表单类型
+  modelFormType: {
+    type: Number,
+    required: false,
+    default: BpmModelFormType.NORMAL,
+  },
   // 可发起流程的人员编号
   startUserIds: {
     type: Array,
@@ -70,7 +73,31 @@ const props = defineProps({
 const processData = inject('processData') as Ref
 const loading = ref(false)
 const formFields = ref<string[]>([])
-const formType = ref(20)
+const formType = ref(props.modelFormType);
+
+// 监听 modelFormType 变化
+watch(
+  () => props.modelFormType,
+  (newVal) => {
+    formType.value = newVal;
+  },
+);
+
+// 监听 modelFormId 变化
+watch(
+  () => props.modelFormId,
+  async (newVal) => {
+    if (newVal) {
+      const form = await getForm(newVal);
+      formFields.value = form?.fields;
+    } else {
+      // 如果 modelFormId 为空，清空表单字段
+      formFields.value = [];
+    }
+  },
+  { immediate: true },
+);
+
 const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
 const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -90,6 +117,8 @@ provide('startUserIds', props.startUserIds)
 provide('startDeptIds', props.startDeptIds)
 provide('tasks', [])
 provide('processInstance', {})
+
+
 const message = useMessage() // 国际化
 const processNodeTree = ref<SimpleFlowNode | undefined>()
 provide('processNodeTree', processNodeTree)
@@ -169,17 +198,17 @@ const validateNode = (node: SimpleFlowNode | undefined, errorNodes: SimpleFlowNo
 onMounted(async () => {
   try {
     loading.value = true
-    // 获取表单字段
-    if (props.modelId) {
-      const bpmnModel = await getModel(props.modelId)
-      if (bpmnModel) {
-        formType.value = bpmnModel.formType
-        if (formType.value === BpmModelFormType.NORMAL && bpmnModel.formId) {
-          const bpmnForm = (await getForm(bpmnModel.formId)) as unknown as FormVO
-          formFields.value = bpmnForm?.fields
-        }
-      }
-    }
+    // // 获取表单字段
+    // if (props.modelId) {
+    //   const bpmnModel = await getModel(props.modelId)
+    //   if (bpmnModel) {
+    //     formType.value = bpmnModel.formType
+    //     if (formType.value === BpmModelFormType.NORMAL && bpmnModel.formId) {
+    //       const bpmnForm = (await getForm(bpmnModel.formId)) as unknown as FormVO
+    //       formFields.value = bpmnForm?.fields
+    //     }
+    //   }
+    // }
     // 获得角色列表
     roleOptions.value = await RoleApi.getSimpleRoleList()
     // 获得岗位列表
diff --git a/src/views/bpm/model/form/ProcessDesign.vue b/src/views/bpm/model/form/ProcessDesign.vue
index 565ae15ce..172e042a6 100644
--- a/src/views/bpm/model/form/ProcessDesign.vue
+++ b/src/views/bpm/model/form/ProcessDesign.vue
@@ -14,9 +14,9 @@
   <template v-else>
     <SimpleModelDesign
       v-if="showDesigner"
-      :model-id="modelData.id"
-      :model-key="modelData.key"
       :model-name="modelData.name"
+      :model-form-id="modelData.formId"
+      :model-form-type="modelData.formType"
       :start-user-ids="modelData.startUserIds"
       :start-dept-ids="modelData.startDeptIds"
       @success="handleDesignSuccess"
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index 08c9650bd..d272dcdc2 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -209,15 +209,18 @@ onActivated(() => {
 
 <style lang="scss" scoped>
 :deep() {
-  .el-table--fit .el-table__inner-wrapper:before {
+  .el-table--fit .el-table__inner-wrapper::before {
     height: 0;
   }
+
   .el-card {
     border-radius: 8px;
   }
+
   .el-form--inline .el-form-item {
     margin-right: 10px;
   }
+  
   .el-divider--horizontal {
     margin-top: 6px;
   }
diff --git a/src/views/bpm/simple/SimpleModelDesign.vue b/src/views/bpm/simple/SimpleModelDesign.vue
index 1dc5210ae..03235273b 100644
--- a/src/views/bpm/simple/SimpleModelDesign.vue
+++ b/src/views/bpm/simple/SimpleModelDesign.vue
@@ -1,12 +1,11 @@
 <template>
   <ContentWrap :bodyStyle="{ padding: '20px 16px' }">
     <SimpleProcessDesigner
-      :model-id="modelId"
-      :model-key="modelKey"
-      :model-name="modelName"
-      @success="handleSuccess"
+      :model-form-id="modelFormId"
+      :model-form-type="modelFormType"
       :start-user-ids="startUserIds"
       :start-dept-ids="startDeptIds"
+      @success="handleSuccess"
       ref="designerRef"
     />
   </ContentWrap>
@@ -19,9 +18,9 @@ defineOptions({
 })
 
 defineProps<{
-  modelId?: string
-  modelKey?: string
   modelName?: string
+  modelFormId?: number
+  modelFormType?: number
   startUserIds?: number[]
   startDeptIds?: number[]
 }>()

From f14dead55a1444717a4c64c68ce8281d561f99ce Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Tue, 22 Jul 2025 09:40:59 +0800
Subject: [PATCH 24/30] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?]=20=E6=9B=B4=E5=A4=9A=E8=AE=BE=E7=BD=AE=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=A1=A8=E5=8D=95=E9=A1=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/HttpRequestParamSetting.vue    | 59 +++++++++++--------
 .../components/HttpRequestSetting.vue         |  6 +-
 src/views/bpm/model/form/ExtraSettings.vue    | 28 +++++++++
 src/views/bpm/model/form/index.vue            |  5 +-
 4 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
index 9a0a9feff..7d617bada 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item label-position="top" label="请求头">
-    <div class="flex pt-2" v-for="(item, index) in props.header" :key="index">
+    <div class="flex pb-4" v-for="(item, index) in props.header" :key="index">
       <div class="mr-2">
         <el-form-item
           :prop="`${bind}.header.${index}.key`"
@@ -10,18 +10,20 @@
             trigger: 'blur'
           }"
         >
-          <el-input class="w-160px" v-model="item.key" />
+          <el-input v-model="item.key" style="width: 160px" />
         </el-form-item>
       </div>
       <div class="mr-2">
-        <el-select class="w-100px!" v-model="item.type">
-          <el-option
-            v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
-            :key="types.value"
-            :label="types.label"
-            :value="types.value"
-          />
-        </el-select>
+        <el-form-item>
+          <el-select v-model="item.type" style="width: 160px" @change="handleTypeChange(item)">
+            <el-option
+              v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
+              :key="types.value"
+              :label="types.label"
+              :value="types.value"
+            />
+          </el-select>
+        </el-form-item>
       </div>
       <div class="mr-2">
         <el-form-item
@@ -34,8 +36,8 @@
         >
           <el-input
             v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
-            class="w-160px"
             v-model="item.value"
+            style="width: 200px"
           />
         </el-form-item>
         <el-form-item
@@ -48,8 +50,8 @@
         >
           <el-select
             v-if="item.type === BpmHttpRequestParamTypeEnum.FROM_FORM"
-            class="w-160px!"
             v-model="item.value"
+            style="width: 200px"
           >
             <el-option
               v-for="(field, fIdx) in formFieldOptions"
@@ -70,7 +72,7 @@
     </el-button>
   </el-form-item>
   <el-form-item label-position="top" label="请求体">
-    <div class="flex pt-2" v-for="(item, index) in props.body" :key="index">
+    <div class="flex pb-4" v-for="(item, index) in props.body" :key="index">
       <div class="mr-2">
         <el-form-item
           :prop="`${bind}.body.${index}.key`"
@@ -80,18 +82,20 @@
             trigger: 'blur'
           }"
         >
-          <el-input class="w-160px" v-model="item.key" />
+          <el-input v-model="item.key" style="width: 160px" />
         </el-form-item>
       </div>
       <div class="mr-2">
-        <el-select class="w-100px!" v-model="item.type">
-          <el-option
-            v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
-            :key="types.value"
-            :label="types.label"
-            :value="types.value"
-          />
-        </el-select>
+        <el-form-item>
+          <el-select v-model="item.type" style="width: 160px" @change="handleTypeChange(item)">
+            <el-option
+              v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
+              :key="types.value"
+              :label="types.label"
+              :value="types.value"
+            />
+          </el-select>
+        </el-form-item>
       </div>
       <div class="mr-2">
         <el-form-item
@@ -104,8 +108,8 @@
         >
           <el-input
             v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
-            class="w-160px"
             v-model="item.value"
+            style="width: 200px"
           />
         </el-form-item>
         <el-form-item
@@ -118,8 +122,8 @@
         >
           <el-select
             v-if="item.type === BpmHttpRequestParamTypeEnum.FROM_FORM"
-            class="w-160px!"
             v-model="item.value"
+            style="width: 200px"
           >
             <el-option
               v-for="(field, fIdx) in formFieldOptions"
@@ -170,6 +174,13 @@ const props = defineProps({
 
 // 流程表单字段，发起人字段
 const formFieldOptions = useFormFieldsAndStartUser()
+
+/** 监听类型变化，清空值 */
+const handleTypeChange = (item: HttpRequestParam) => {
+  // 当类型改变时，清空值
+  item.value = ''
+}
+
 /** 添加请求配置项 */
 const addHttpRequestParam = (arr: HttpRequestParam[]) => {
   arr.push({
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestSetting.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestSetting.vue
index 13efe390f..b522275eb 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestSetting.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestSetting.vue
@@ -33,7 +33,7 @@
       />
     </el-form-item>
     <el-form-item>
-      <div class="flex pt-2" v-for="(item, index) in setting.response" :key="index">
+      <div class="flex pt-4" v-for="(item, index) in setting.response" :key="index">
         <div class="mr-2">
           <el-form-item
             :prop="`${formItemPrefix}.response.${index}.key`"
@@ -74,10 +74,12 @@
           />
         </div>
       </div>
+    </el-form-item>
+    <div class="pt-1">
       <el-button type="primary" text @click="addHttpResponseSetting(setting.response!)">
         <Icon icon="ep:plus" class="mr-5px" />添加一行
       </el-button>
-    </el-form-item>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
diff --git a/src/views/bpm/model/form/ExtraSettings.vue b/src/views/bpm/model/form/ExtraSettings.vue
index fa6947d44..9c5beaf60 100644
--- a/src/views/bpm/model/form/ExtraSettings.vue
+++ b/src/views/bpm/model/form/ExtraSettings.vue
@@ -232,6 +232,34 @@ import { ProcessVariableEnum } from '@/components/SimpleProcessDesignerV2/src/co
 import HttpRequestSetting from '@/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestSetting.vue'
 
 const modelData = defineModel<any>()
+const formFields = ref<string[]>([])
+   
+const props = defineProps({
+  // 流程表单 ID
+  modelFormId: {
+    type: Number,
+    required: false,
+    default: undefined,
+  }
+})
+
+
+// 监听 modelFormId 变化
+watch(
+  () => props.modelFormId,
+  async (newVal) => {
+    if (newVal) {
+      const form = await FormApi.getForm(newVal);
+      formFields.value = form?.fields;
+    } else {
+      // 如果 modelFormId 为空，清空表单字段
+      formFields.value = [];
+    }
+  },
+  { immediate: true },
+);
+// 暴露给子组件使用
+provide('formFields', formFields)
 
 /** 自定义 ID 流程编码 */
 const timeOptions = ref([
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 42183e4d4..b7cc4885f 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -77,7 +77,10 @@
 
         <!-- 第四步：更多设置 -->
         <div v-show="currentStep === 3" class="mx-auto w-700px">
-          <ExtraSettings v-model="formData" ref="extraSettingsRef" />
+          <ExtraSettings
+            ref="extraSettingsRef"   
+            v-model="formData" 
+            :model-form-id="formData.formId"/>
         </div>
       </div>
     </div>

From 2a06f6744d93bb8a9371a8e026dfb75dfa16a2fc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 22 Jul 2025 19:09:10 +0800
Subject: [PATCH 25/30] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E2=80=9C=E6=9F=A5=E7=9C=8B=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E2=80=9D=E6=8C=89=E9=92=AE=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/processInstance/index.ts                 |  1 +
 src/components/DiyEditor/index.vue                   |  3 ++-
 .../detail/ProcessInstanceTimeline.vue               | 12 ++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts
index 06392bc43..6b7921300 100644
--- a/src/api/bpm/processInstance/index.ts
+++ b/src/api/bpm/processInstance/index.ts
@@ -48,6 +48,7 @@ export type ApprovalNodeInfo = {
   status: number
   startTime?: Date
   endTime?: Date
+  processInstanceId?: string
   candidateUsers?: User[]
   tasks: ApprovalTaskInfo[]
 }
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index 082395a92..940ad664b 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -269,7 +269,8 @@ watch(
     if (!val || selectedComponentIndex.value === -1) {
       return
     }
-    // 如果是基础设置页，默认选中的索引改成-1，为了防止删除组件后切换到此页导致报错
+    // 如果是基础设置页，默认选中的索引改成 -1，为了防止删除组件后切换到此页导致报错
+    // https://gitee.com/yudaocode/yudao-ui-admin-vue3/pulls/792
     if (props.showTabBar) {
       selectedComponentIndex.value = -1
     }
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index 6b80b4e4d..ad2547f01 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -38,7 +38,13 @@
           </div>
         </div>
         <div v-if="activity.nodeType === NodeType.CHILD_PROCESS_NODE">
-          <el-button type="primary" plain size="small" @click="handleChildProcess(activity)">
+          <el-button
+            type="primary"
+            plain
+            size="small"
+            @click="handleChildProcess(activity)"
+            :disabled="!activity.processInstanceId"
+          >
             查看子流程
           </el-button>
         </div>
@@ -319,7 +325,9 @@ const handleUserSelectConfirm = (activityId: string, userList: any[]) => {
 
 /** 跳转子流程 */
 const handleChildProcess = (activity: any) => {
-  // TODO @lesan：貌似跳不过去？！
+  if (!activity.processInstanceId) {
+    return
+  }
   push({
     name: 'BpmProcessInstanceDetail',
     query: {

From f5feea67a578ee2a549d64bc90c85b011f2e2160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Wed, 23 Jul 2025 17:40:58 +0800
Subject: [PATCH 26/30] =?UTF-8?q?fix:=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E3=80=91=E5=A4=84=E7=90=86=E7=83=AD=E5=8C=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=93=BE=E6=8E=A5=E4=B9=8B=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=93=BE=E6=8E=A5=E8=A2=AB=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BAundefined=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AppLinkInput/AppLinkSelectDialog.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/AppLinkInput/AppLinkSelectDialog.vue b/src/components/AppLinkInput/AppLinkSelectDialog.vue
index 63f19662e..2d4bea423 100644
--- a/src/components/AppLinkInput/AppLinkSelectDialog.vue
+++ b/src/components/AppLinkInput/AppLinkSelectDialog.vue
@@ -80,7 +80,8 @@ const activeAppLink = ref({} as AppLink)
 /** 打开弹窗 */
 const dialogVisible = ref(false)
 const open = (link: string) => {
-  activeAppLink.value.path = link
+  // 进入页面时先重置 activeAppLink
+  activeAppLink.value = { name: '', path: '' }
   dialogVisible.value = true
 
   // 滚动到当前的链接
@@ -102,8 +103,11 @@ defineExpose({ open })
 
 // 处理 APP 链接选中
 const handleAppLinkSelected = (appLink: AppLink) => {
+  // 只有不同链接时才更新（避免重复触发）
   if (!isSameLink(appLink.path, activeAppLink.value.path)) {
-    activeAppLink.value = appLink
+    // 如果新链接的 path 为空，则沿用当前 activeAppLink 的 path
+    const path = appLink.path || activeAppLink.value.path
+    activeAppLink.value = { ...appLink, path: path }
   }
   switch (appLink.type) {
     case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST:

From bb02444af1f3ab2d94e37f8a7ab8ccacdc36627e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Thu, 24 Jul 2025 16:56:45 +0800
Subject: [PATCH 27/30] =?UTF-8?q?new:=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E3=80=91=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E5=8A=9F=E8=83=BD=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavigationBar/components/CellProperty.vue | 32 ++++++++++++++++++-
 .../components/mobile/NavigationBar/config.ts |  6 ++++
 .../components/mobile/NavigationBar/index.vue |  7 ++--
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue
index ea0e7ca92..6c671d3f2 100644
--- a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue
@@ -13,7 +13,7 @@
   <template v-for="(cell, cellIndex) in cellList" :key="cellIndex">
     <template v-if="selectedHotAreaIndex === cellIndex">
       <el-form-item :prop="`cell[${cellIndex}].type`" label="类型">
-        <el-radio-group v-model="cell.type">
+        <el-radio-group v-model="cell.type" @change="handleHotAreaSelected(cell, cellIndex)">
           <el-radio value="text">文字</el-radio>
           <el-radio value="image">图片</el-radio>
           <el-radio value="search">搜索框</el-radio>
@@ -44,9 +44,32 @@
       </template>
       <!-- 3. 搜索框 -->
       <template v-else>
+        <el-form-item label="框体颜色" prop="backgroundColor">
+          <ColorInput v-model="cell.backgroundColor" />
+        </el-form-item>
+        <el-form-item class="lef" label="文本颜色" prop="textColor">
+          <ColorInput v-model="cell.textColor" />
+        </el-form-item>
         <el-form-item :prop="`cell[${cellIndex}].placeholder`" label="提示文字">
           <el-input v-model="cell.placeholder" maxlength="10" show-word-limit />
         </el-form-item>
+        <el-form-item label="文本位置" prop="placeholderPosition">
+          <el-radio-group v-model="cell!.placeholderPosition">
+            <el-tooltip content="居左" placement="top">
+              <el-radio-button value="left">
+                <Icon icon="ant-design:align-left-outlined" />
+              </el-radio-button>
+            </el-tooltip>
+            <el-tooltip content="居中" placement="top">
+              <el-radio-button value="center">
+                <Icon icon="ant-design:align-center-outlined" />
+              </el-radio-button>
+            </el-tooltip>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="扫一扫" prop="showScan">
+          <el-switch v-model="cell!.showScan" />
+        </el-form-item>
         <el-form-item :prop="`cell[${cellIndex}].borderRadius`" label="圆角">
           <el-slider
             v-model="cell.borderRadius"
@@ -88,10 +111,17 @@ const cellCount = computed(() => (props.isMp ? 6 : 8))
 const selectedHotAreaIndex = ref(0)
 const handleHotAreaSelected = (cellValue: NavigationBarCellProperty, index: number) => {
   selectedHotAreaIndex.value = index
+  // 默认设置为选中文字，并设置属性
   if (!cellValue.type) {
     cellValue.type = 'text'
     cellValue.textColor = '#111111'
   }
+  // 如果点击的是搜索框，则初始化搜索框的属性
+  if (cellValue.type === 'search') {
+    cellValue.placeholderPosition = 'left'
+    cellValue.backgroundColor = '#EEEEEE'
+    cellValue.textColor = '#969799'
+  }
 }
 </script>
 
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
index 36612a3f3..4fb5e7c9a 100644
--- a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
@@ -45,8 +45,14 @@ export interface NavigationBarCellProperty {
   imgUrl: string
   // 图片链接
   url: string
+  // 搜索框：框体颜色
+  backgroundColor: string
   // 搜索框：提示文字
   placeholder: string
+  // 搜索框：提示文字位置
+  placeholderPosition: string
+  // 搜索框：是否显示扫一扫
+  showScan: boolean
   // 搜索框：边框圆角半径
   borderRadius: number
 }
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
index c5a92b31f..104c6002a 100644
--- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
@@ -54,9 +54,12 @@ const getCellStyle = (cell: NavigationBarCellProperty) => {
 const getSearchProp = computed(() => (cell: NavigationBarCellProperty) => {
   return {
     height: 30,
-    showScan: false,
+    backgroundColor: cell.backgroundColor,
+    showScan: cell.showScan,
     placeholder: cell.placeholder,
-    borderRadius: cell.borderRadius
+    borderRadius: cell.borderRadius,
+    textColor: cell.textColor,
+    placeholderPosition: cell.placeholderPosition
   } as SearchProperty
 })
 </script>

From 52769ee87584229ad0d7236fc4df7910df5169f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=92=E6=B2=93=E5=A6=82=E6=B5=81=E6=98=9F?=
 <13523376917@163.com>
Date: Fri, 25 Jul 2025 03:32:18 +0000
Subject: [PATCH 28/30] update src/views/system/menu/index.vue.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 飒沓如流星 <13523376917@163.com>
---
 src/views/system/menu/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a72da7ed7..af3e0ad6a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -94,7 +94,7 @@ import { MenuVO } from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
 import DictTag from '@/components/DictTag/src/DictTag.vue'
 import { Icon } from '@/components/Icon'
-import { ElButton, TableV2FixedDir } from 'element-plus'
+import { ElButton, TableV2FixedDir, ElSwitch } from 'element-plus'
 import { checkPermi } from '@/utils/permission'
 import { CommonStatusEnum } from '@/utils/constants'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
@@ -175,7 +175,7 @@ const columns = [
     fixed: TableV2FixedDir.RIGHT,
     cellRenderer: ({ rowData }) => {
       // 定义按钮列表
-      const buttons = []
+      const buttons: InstanceType<typeof ElButton>[] = []
 
       // 检查权限并添加按钮
       if (checkPermi(['system:menu:update'])) {

From 132a4b5e30a73159c0795c1e6d5d9cd2c8498065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=92=E6=B2=93=E5=A6=82=E6=B5=81=E6=98=9F?=
 <13523376917@163.com>
Date: Fri, 25 Jul 2025 03:35:48 +0000
Subject: [PATCH 29/30] =?UTF-8?q?update=20src/components/Echart/src/Echart?=
 =?UTF-8?q?.vue.=20=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 飒沓如流星 <13523376917@163.com>
---
 src/components/Echart/src/Echart.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Echart/src/Echart.vue b/src/components/Echart/src/Echart.vue
index bf22b864e..487f20a8d 100644
--- a/src/components/Echart/src/Echart.vue
+++ b/src/components/Echart/src/Echart.vue
@@ -72,6 +72,7 @@ watch(
   (options) => {
     if (echartRef) {
       echartRef?.setOption(options)
+      echartRef?.resize()
     }
   },
   {

From c05d584045e31014728859930f2b73b6848c53ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=92=E6=B2=93=E5=A6=82=E6=B5=81=E6=98=9F?=
 <13523376917@163.com>
Date: Fri, 25 Jul 2025 03:38:09 +0000
Subject: [PATCH 30/30] =?UTF-8?q?update=20src/components/AppLinkInput/AppL?=
 =?UTF-8?q?inkSelectDialog.vue.=20=E4=BF=AE=E5=A4=8DVscode=20TS=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 飒沓如流星 <13523376917@163.com>
---
 src/components/AppLinkInput/AppLinkSelectDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AppLinkInput/AppLinkSelectDialog.vue b/src/components/AppLinkInput/AppLinkSelectDialog.vue
index 63f19662e..cdd0b66e9 100644
--- a/src/components/AppLinkInput/AppLinkSelectDialog.vue
+++ b/src/components/AppLinkInput/AppLinkSelectDialog.vue
@@ -170,7 +170,7 @@ const groupBtnRefs = ref<ButtonInstance[]>([])
 const scrollToGroupBtn = (group: string) => {
   const groupBtn = groupBtnRefs.value
     .map((btn: ButtonInstance) => btn['ref'])
-    .find((ref: Node) => ref.textContent === group)
+    .find((ref: HTMLButtonElement) => ref.textContent === group)
   if (groupBtn) {
     groupScrollbar.value?.setScrollTop(groupBtn.offsetTop)
   }