(〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能

Merge pull request !827 from 局外人/fix/editor

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin-vue3",
-  "version": "2025.09-snapshot",
+  "version": "2025.10-snapshot",
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,

src/components/Editor/src/Editor.vue

@@ -58,6 +58,16 @@ watch(
     emit('update:modelValue', val)
   }
 )
+watch(
+  () => props.readonly,
+  (val) => {
+    if (val) {
+      editorRef.value?.disable()
+    } else {
+      editorRef.value?.enable()
+    }
+  }
+)
 
 const handleCreated = (editor: IDomEditor) => {
   editorRef.value = editor
@@ -90,6 +100,12 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+      EXTEND_CONF: {
+        mentionConfig: {
+          showModal: () => {},
+          hideModal: () => {}
+        }
+      },
       MENU_CONF: {
         ['uploadImage']: {
           server: getUploadUrl(),

src/store/modules/tagsView.ts

@@ -93,6 +93,11 @@ export const useTagsViewStore = defineStore('tagsView', {
     delCachedView() {
       const route = router.currentRoute.value
       const index = findIndex<string>(this.getCachedViews, (v) => v === route.name)
+      for (const v of this.visitedViews) {
+        if (v.name === route.name) {
+          return
+        }
+      }
       if (index > -1) {
         this.cachedViews.delete(this.getCachedViews[index])
       }

src/views/Profile/components/ResetPwd.vue

@@ -44,11 +44,11 @@ const equalToPassword = (_rule, value, callback) => {
 const rules = reactive<FormRules>({
   oldPassword: [
     { required: true, message: t('profile.password.oldPwdMsg'), trigger: 'blur' },
-    { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' }
+    { min: 4, max: 16, message: t('profile.password.pwdRules'), trigger: 'blur' }
   ],
   newPassword: [
     { required: true, message: t('profile.password.newPwdMsg'), trigger: 'blur' },
-    { min: 6, max: 20, message: t('profile.password.pwdRules'), trigger: 'blur' }
+    { min: 4, max: 16, message: t('profile.password.pwdRules'), trigger: 'blur' }
   ],
   confirmPassword: [
     { required: true, message: t('profile.password.cfPwdMsg'), trigger: 'blur' },

src/views/bpm/task/done/index.vue

@@ -52,13 +52,13 @@
       <el-form-item label="" prop="status" :style="{ position: 'absolute', right: '130px' }">
         <el-select
           v-model="queryParams.status"
-          placeholder="请选择流程状态"
+          placeholder="请选择审批状态"
           clearable
           class="!w-155px"
           @change="handleQuery"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"

src/views/erp/sale/order/components/SaleOrderItemForm.vue

@@ -132,7 +132,7 @@
     </el-table>
   </el-form>
   <el-row justify="center" class="mt-3" v-if="!disabled">
-    <el-button @click="handleAdd" round>+ 添加采购产品</el-button>
+    <el-button @click="handleAdd" round>+ 添加销售产品</el-button>
   </el-row>
 </template>
 <script setup lang="ts">

src/views/iot/device/device/index.vue

@@ -384,6 +384,7 @@ defineOptions({ name: 'IoTDevice' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
+const route = useRoute()
 
 const loading = ref(true) // 列表加载中
 const list = ref<DeviceVO[]>([]) // 列表的数据
@@ -392,7 +393,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   deviceName: undefined,
-  productId: undefined,
+  productId: undefined as number | undefined,
   deviceType: undefined,
   nickname: undefined,
   status: undefined,
@@ -513,7 +514,12 @@ const handleImport = () => {
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
+  // 处理 productId 参数
+  const { productId } = route.query
+  if (productId) {
+    queryParams.productId = Number(productId)
+  }
+  await getList()
 
   // 获取产品列表
   products.value = await ProductApi.getSimpleProductList()

src/views/iot/product/product/detail/ProductDetailsHeader.vue

@@ -72,7 +72,7 @@ const copyToClipboard = async (text: string) => {
 /** 路由跳转到设备管理 */
 const { push } = useRouter()
 const goToDeviceList = (productId: number) => {
-  push({ name: 'IoTDevice', params: { productId } })
+  push({ name: 'IoTDevice', query: { productId } })
 }
 
 /** 修改操作 */

src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue

@@ -89,9 +89,7 @@ const initGiveCouponList = async () => {
   if (isEmpty(rewardRule.value) || isEmpty(rewardRule.value.giveCouponTemplateCounts)) {
     return
   }
-  const tempLateIds = Object.keys(rewardRule.value.giveCouponTemplateCounts!).map((item) =>
-    parseInt(item)
-  )
+  const tempLateIds = Object.keys(rewardRule.value.giveCouponTemplateCounts!)
   const data = await CouponTemplateApi.getCouponTemplateList(tempLateIds)
   if (!data) {
     return

src/views/pay/app/components/channel/WeixinChannelForm.vue

@@ -147,7 +147,11 @@
               前往微信商户平台查看证书序列号
             </a>
           </el-form-item>
-          <el-form-item label="public_key.pem 证书" label-width="180px" prop="config.publicKeyContent">
+          <el-form-item
+            label="public_key.pem 证书"
+            label-width="180px"
+            prop="config.publicKeyContent"
+          >
             <el-input
               v-model="formData.config.publicKeyContent"
               :autosize="{ minRows: 2, maxRows: 4 }"
@@ -174,17 +178,10 @@
             </el-upload>
           </el-form-item>
           <el-form-item label="公钥 ID" label-width="180px" prop="config.publicKeyId">
-            <el-input
-              v-model="formData.config.publicKeyId"
-              clearable
-              placeholder="请输入公钥 ID"
-            />
+            <el-input v-model="formData.config.publicKeyId" clearable placeholder="请输入公钥 ID" />
           </el-form-item>
           <el-form-item label-width="180px">
-            <a
-              href="https://pay.weixin.qq.com/doc/v3/merchant/4012153196"
-              target="_blank"
-            >
+            <a href="https://pay.weixin.qq.com/doc/v3/merchant/4012153196" target="_blank">
               微信支付公钥产品简介及使用说明
             </a>
           </el-form-item>
@@ -246,7 +243,6 @@ const formRules = {
     { required: true, message: '请上传 apiclient_key.pem 证书', trigger: 'blur' }
   ],
   'config.certSerialNo': [{ required: true, message: '请输入证书序列号', trigger: 'blur' }],
-  'config.publicKeyContent': [{ required: true, message: '请上传 public_key.pem 证书', trigger: 'blur' }],
   'config.publicKeyId': [{ required: true, message: '请输入公钥 ID', trigger: 'blur' }],
   'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }]
 }

src/views/pay/cashier/index.vue

@@ -238,7 +238,6 @@ const getDetail = async () => {
     return
   }
   const data = await PayOrderApi.getOrder(id.value, true)
-  payOrder.value = data
   // 1.2 无法查询到支付信息
   if (!data) {
     message.error('支付订单不存在，请检查！')
@@ -255,6 +254,8 @@ const getDetail = async () => {
     goReturnUrl('close')
     return
   }
+  // 2. 正常展示支付信息
+  payOrder.value = data
 }
 
 /** 提交支付 */