Merge branch 'fix/attribute-deliver-password' into 'main_dev'

fix: 修复属性下发取消密码无效

See merge request yunteng/thingskit-scada!191

@@ -21,7 +21,7 @@ enum FormFieldsEnum {
   PASSWORD = 'password',
   PASSWORD = 'password',
 }
 }
 
 
-const createFormSchemas = (title?: string, password?: string): FormSchema[] => {
+const createFormSchemas = (title?: string, password?: string, operationPasswordEnable?: boolean): FormSchema[] => {
   const schemas: FormSchema[] = [
   const schemas: FormSchema[] = [
     {
     {
       field: FormFieldsEnum.ATTR_VALUE,
       field: FormFieldsEnum.ATTR_VALUE,
@@ -31,7 +31,7 @@ const createFormSchemas = (title?: string, password?: string): FormSchema[] => {
     },
     },
   ]
   ]
 
 
-  if (password) {
+  if (password && operationPasswordEnable) {
     schemas.unshift({
     schemas.unshift({
       field: FormFieldsEnum.PASSWORD,
       field: FormFieldsEnum.PASSWORD,
       label: '操作密码',
       label: '操作密码',
@@ -51,13 +51,13 @@ const createFormSchemas = (title?: string, password?: string): FormSchema[] => {
   return schemas
   return schemas
 }
 }
 
 
-const open = async ({ title, operationPassword }: Partial<Record<'operationPassword' | 'title', string>>) => {
+const open = async ({ title, operationPassword, operationPasswordEnable }: Partial<Record<'operationPassword' | 'title', string>> & { operationPasswordEnable: boolean }) => {
   visible.value = true
   visible.value = true
   password.value = operationPassword
   password.value = operationPassword
   return new Promise((resolve) => {
   return new Promise((resolve) => {
     resolveFn.value = resolve
     resolveFn.value = resolve
     nextTick(() => {
     nextTick(() => {
-      setProps({ schemas: createFormSchemas(title, operationPassword) })
+      setProps({ schemas: createFormSchemas(title, operationPassword, operationPasswordEnable) })
     })
     })
   })
   })
 }
 }

@@ -118,7 +118,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
       else {
       else {
         const instance = h(AttributeDeliverModal)
         const instance = h(AttributeDeliverModal)
         render(instance, document.body)
         render(instance, document.body)
-        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword }) as string
+        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword, operationPasswordEnable }) as string
 
 
         command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
         command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
         await doCommandDelivery({ way, command, deviceId })
         await doCommandDelivery({ way, command, deviceId })