diff --git a/app/controllers/action/node_inputs_controller.rb b/app/controllers/action/node_inputs_controller.rb index 633e63a6a..c03e0bca9 100644 --- a/app/controllers/action/node_inputs_controller.rb +++ b/app/controllers/action/node_inputs_controller.rb @@ -76,6 +76,12 @@ class Action::NodeInputsController < ApplicationController def node_input_params if params.require(:action_node_input) params.require(:action_node_input).permit(:name, :type, :input_type, :description, :is_required, :sort_no, :default_value) + elsif params.require(:action_node_inputs_with) + params.require(:action_node_inputs_with).permit(:name, :type, :input_type, :description, :is_required, :sort_no, :default_value) + elsif params.require(:action_node_inputs_env) + params.require(:action_node_inputs_env).permit(:name, :type, :input_type, :description, :is_required, :sort_no, :default_value) + elsif params.require(:action_node_inputs_other) + params.require(:action_node_inputs_other).permit(:name, :type, :input_type, :description, :is_required, :sort_no, :default_value) else params.permit(:name, :type, :input_type, :description, :is_required, :sort_no, :default_value) end diff --git a/app/models/action/node_input.rb b/app/models/action/node_input.rb index 29e9dc720..3829473ac 100644 --- a/app/models/action/node_input.rb +++ b/app/models/action/node_input.rb @@ -27,4 +27,8 @@ class Action::NodeInput < ApplicationRecord validates :name, presence: { message: "不能为空" }, uniqueness: { scope: :action_nodes_id } validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"} + + def as_json + super.merge!({"type"=>self.type}) + end end diff --git a/app/views/action/nodes/_node_input.json.jbuilder b/app/views/action/nodes/_node_input.json.jbuilder index 8abae0c84..14c2a62ad 100644 --- a/app/views/action/nodes/_node_input.json.jbuilder +++ b/app/views/action/nodes/_node_input.json.jbuilder @@ -1,4 +1,4 @@ -json.extract! node_input, :id, :name, :input_type, :description, :is_required, :default_value +json.extract! node_input, :id, :name, :type, :input_type, :description, :is_required, :default_value if node_input.input_type.to_s == "select" json.select node.action_node_selects do |node_select| json.partial! "node_select", locals: { node_select: node_select, node: node }