frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Add-action-list-Chinese-translation

Browse Source
This commit is contained in:
wangyiyi2056 2023-12-07 09:19:46 +08:00 committed by GitHub
commit 17e4bdbff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/node_modules/@node-red/editor-client/src/js/validators.js vendored
View File

@ -56,6 +56,9 @@ RED.validators = {
if (options.allowBlank && v === '') { if (options.allowBlank && v === '') {
return true return true
} }
if (options.allowUndefined && v === undefined) {
return true
}
const result = RED.utils.validateTypedProperty(v, ptype, opt) const result = RED.utils.validateTypedProperty(v, ptype, opt)
if (result === true || opt) { if (result === true || opt) {
// Valid, or opt provided - return result as-is // Valid, or opt provided - return result as-is

16
packages/node_modules/@node-red/nodes/core/function/10-switch.html vendored
View File

@ -176,14 +176,16 @@
for (var i=0;i<rules.length;i++) { for (var i=0;i<rules.length;i++) {
const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) } const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) }
const r = rules[i]; const r = rules[i];
if (r.hasOwnProperty('v')) { if (r.t !== 'istype') {
if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) { if (r.hasOwnProperty('v')) {
errors.push(msg) if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
errors.push(msg)
}
} }
} if (r.hasOwnProperty('v2')) {
if (r.hasOwnProperty('v2')) { if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) { errors.push(msg)
errors.push(msg) }
} }
} }
} }

5
packages/node_modules/@node-red/nodes/core/function/16-range.html vendored
View File

@ -58,11 +58,8 @@
round: {value:false}, round: {value:false},
property: {value:"payload",required:true, property: {value:"payload",required:true,
label:RED._("node-red:common.label.property"), label:RED._("node-red:common.label.property"),
validate: RED.validators.typedInput({ type: 'msg' }) validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })
}, },
// RED.validators.typedInput("propertyType", false)},
name: {value:""} name: {value:""}
}, },
inputs: 1, inputs: 1,

4
packages/node_modules/@node-red/nodes/core/function/rbe.html vendored
View File

@ -57,10 +57,10 @@
septopics: {value:true}, septopics: {value:true},
property: {value:"payload", required:true, property: {value:"payload", required:true,
label:RED._("node-red:rbe.label.property"), label:RED._("node-red:rbe.label.property"),
validate: RED.validators.typedInput({ type: 'msg' })}, validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
topi: {value:"topic", required:true, topi: {value:"topic", required:true,
label:RED._("node-red:rbe.label.topic"), label:RED._("node-red:rbe.label.topic"),
validate: RED.validators.typedInput({ type: 'msg' })} validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })}
}, },
inputs:1, inputs:1,
outputs:1, outputs:1,

4
packages/node_modules/@node-red/nodes/core/parsers/70-HTML.html vendored
View File

@ -41,8 +41,8 @@
color:"#DEBD5C", color:"#DEBD5C",
defaults: { defaults: {
name: {value:""}, name: {value:""},
property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) }, property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) }, outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }) },
tag: {value:""}, tag: {value:""},
ret: {value:"html"}, ret: {value:"html"},
as: {value:"single"} as: {value:"single"}

2
packages/node_modules/@node-red/nodes/core/parsers/70-JSON.html vendored
View File

@ -32,7 +32,7 @@
defaults: { defaults: {
name: {value:""}, name: {value:""},
property: {value:"payload",required:true, property: {value:"payload",required:true,
validate: RED.validators.typedInput({ type: 'msg' }), validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true}),
label:RED._("node-red:json.label.property")}, label:RED._("node-red:json.label.property")},
action: {value:""}, action: {value:""},
pretty: {value:false} pretty: {value:false}

2
packages/node_modules/@node-red/nodes/core/parsers/70-XML.html vendored
View File

@ -28,7 +28,7 @@
name: {value:""}, name: {value:""},
property: {value:"payload",required:true, property: {value:"payload",required:true,
label:RED._("node-red:common.label.property"), label:RED._("node-red:common.label.property"),
validate: RED.validators.typedInput({ type: 'msg' })}, validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
attr: {value:""}, attr: {value:""},
chr: {value:""} chr: {value:""}
}, },

2
packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html vendored
View File

@ -16,7 +16,7 @@
color:"#DEBD5C", color:"#DEBD5C",
defaults: { defaults: {
property: {value:"payload",required:true, property: {value:"payload",required:true,
validate: RED.validators.typedInput({ type: 'msg' }), validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }),
label:RED._("node-red:common.label.property")}, label:RED._("node-red:common.label.property")},
name: {value:""} name: {value:""}
}, },