Merge branch 'fix/DEFECT-1798' into 'main_dev'

fix: 修复组态属性下发弹框操作密码验证重复

See merge request yunteng/thingskit-scada!192

@@ -11,7 +11,7 @@ const visible = ref(false)
 
 
 const password = ref()
 const password = ref()
 
 
-const [register, { getFieldsValue, resetFields, validate, setProps }] = useForm({
+const [register, { getFieldsValue, resetFields, validate, setProps, clearValidate }] = useForm({
   layout: FormLayoutEnum.VERTICAL,
   layout: FormLayoutEnum.VERTICAL,
   showActionButtonGroup: false,
   showActionButtonGroup: false,
 })
 })
@@ -40,7 +40,7 @@ const createFormSchemas = (title?: string, password?: string, operationPasswordE
       rules: [
       rules: [
         {
         {
           validator(_rule, value) {
           validator(_rule, value) {
-            if (value !== password) return Promise.reject(new Error('操作密码不正确'))
+            if (value && value !== password) return Promise.reject(new Error('操作密码不正确'))
             return Promise.resolve()
             return Promise.resolve()
           },
           },
         },
         },
@@ -70,11 +70,18 @@ const handleOk = async () => {
   resetFields()
   resetFields()
 }
 }
 
 
+const handleCancel = () => {
+  clearValidate()
+  resetFields()
+}
+
 defineExpose({ open })
 defineExpose({ open })
 </script>
 </script>
 
 
 <template>
 <template>
-  <Modal v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @ok="handleOk">
+  <Modal
+    v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel" @ok="handleOk"
+  >
     <!-- <section>
     <!-- <section>
       <FormItem label="操作密码" :label-col="{ span: 24 }">
       <FormItem label="操作密码" :label-col="{ span: 24 }">
         <Input v-model:value="value" placeholder="请输入下发值" />
         <Input v-model:value="value" placeholder="请输入下发值" />

@@ -22,7 +22,7 @@ const createFormSchemas = (password: string): FormSchema[] => {
       required: true,
       required: true,
       rules: [{
       rules: [{
         validator(_rule, value) {
         validator(_rule, value) {
-          if (value !== password) return Promise.reject(new Error('操作密码不正确'))
+          if (value && value !== password) return Promise.reject(new Error('操作密码不正确'))
           return Promise.resolve()
           return Promise.resolve()
         },
         },
       }],
       }],

@@ -11,7 +11,6 @@ import { genModbusCommand, getDeviceActiveTime, getDeviceInfo, getThingsModelSer
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useMessage } from '@/hooks/web/useMessage'
 import type { StructJSON } from '@/api/device/model'
 import type { StructJSON } from '@/api/device/model'
-import { CommandWayEnum } from '@/enums/commandEnum'
 
 
 interface ServiceInfo {
 interface ServiceInfo {
   title?: string
   title?: string